Skip to content

V9.0 fix get transformations files count #8162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisburr merged 3 commits into from
Apr 16, 2025
Merged

V9.0 fix get transformations files count #8162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
549f411
fix: f string in TCA
chaen Apr 16, 2025
701a0eb
fix (TS): only set the URL of the TransformationClient if not given i…
chaen Apr 16, 2025
2c7e363
fix (TS): explicitely cast keys to str in getTransformationFilesCount
chaen Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DIRAC/TransformationSystem/Agent/TransformationCleaningAgent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ def __submitRemovalRequests(self, lfns, transID=0):

for index, lfnList in enumerate(breakListIntoChunks(lfns, 300)):
oRequest = Request()
requestName = "TCA_{transID}_{index}_{md5(repr(time.time()).encode()).hexdigest()[:5]}"
requestName = f"TCA_{transID}_{index}_{md5(repr(time.time()).encode()).hexdigest()[:5]}"
oRequest.RequestName = requestName
oOperation = Operation()
oOperation.Type = "RemoveFile"
Expand Down
6 changes: 3 additions & 3 deletions src/DIRAC/TransformationSystem/Client/TransformationClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
""" Class that contains client access to the transformation DB handler. """
"""Class that contains client access to the transformation DB handler."""

from DIRAC import S_OK, S_ERROR, gLogger
from DIRAC.Core.Base.Client import Client, createClient
Expand Down Expand Up @@ -62,8 +62,8 @@ def __init__(self, **kwargs):
super().__init__(**kwargs)
opsH = Operations()
self.maxResetCounter = opsH.getValue("Transformations/FilesMaxResetCounter", 10)

self.setServer("Transformation/TransformationManager")
if "url" not in kwargs:
self.setServer("Transformation/TransformationManager")

def setServer(self, url):
self.serverURL = url
Expand Down
12 changes: 6 additions & 6 deletions src/DIRAC/TransformationSystem/DB/TransformationDB.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
""" DIRAC Transformation DB
"""DIRAC Transformation DB

Transformation database is used to collect and serve the necessary information
in order to automate the task of job preparation for high level transformations.
This class is typically used as a base class for more specific data processing
databases
Transformation database is used to collect and serve the necessary information
in order to automate the task of job preparation for high level transformations.
This class is typically used as a base class for more specific data processing
databases
"""

import re
Expand Down Expand Up @@ -706,7 +706,7 @@ def getTransformationFilesCount(self, transName, field, selection=None, connecti
res = self.getCounters("TransformationFiles", ["TransformationID", field], selection)
if not res["OK"]:
return res
countDict = {attrDict[field]: count for attrDict, count in res["Value"]}
countDict = {str(attrDict[field]): count for attrDict, count in res["Value"]}
countDict["Total"] = sum(countDict.values())
return S_OK(countDict)

Expand Down
Loading