panda-server 0.3.7__tar.gz → 0.3.8__tar.gz

{panda_server-0.3.7 → panda_server-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: panda-server
-Version: 0.3.7
+Version: 0.3.8
 Summary: PanDA Server Package
 Project-URL: Homepage, https://panda-wms.readthedocs.io/en/latest/
 Author-email: PanDA Team <panda-support@cern.ch>

panda_server-0.3.8/PandaPkgInfo.py

@@ -0,0 +1 @@
+release_version = "0.3.8"

{panda_server-0.3.7 → panda_server-0.3.8}/pandaserver/dataservice/setupper_atlas_plugin.py

@@ -9,12 +9,11 @@ import sys
 import time
 import traceback
 import uuid
+from typing import Dict, List, Optional, Tuple
 
-from typing import List, Dict, Tuple, Optional
 from rucio.common.exception import DataIdentifierNotFound
 
 import pandaserver.brokerage.broker
-
 from pandaserver.brokerage.SiteMapper import SiteMapper
 from pandaserver.dataservice import DataServiceUtils, ErrorCode
 from pandaserver.dataservice.DataServiceUtils import select_scope
@@ -24,12 +23,12 @@ from pandaserver.taskbuffer import EventServiceUtils, JobUtils
 from pandaserver.taskbuffer.DatasetSpec import DatasetSpec
 
 
-
 class SetupperAtlasPlugin(SetupperPluginBase):
     """
     setup dataset for ATLAS
 
     """
+
     # constructor
     def __init__(self, taskBuffer, jobs: List, logger, **params: Dict) -> None:
         """
@@ -506,7 +505,7 @@ class SetupperAtlasPlugin(SetupperPluginBase):
         if start_idx == -1:
             jobs_list = self.jobs
         else:
-            jobs_list = self.jobs[start_idx: start_idx + n_jobs_in_loop]
+            jobs_list = self.jobs[start_idx : start_idx + n_jobs_in_loop]
         for job in jobs_list:
             # ignore failed jobs
             if job.jobStatus in ["failed", "cancelled"] or job.isCancelled():
@@ -1376,14 +1375,13 @@ class SetupperAtlasPlugin(SetupperPluginBase):
                     # input project
                     if tmp_input_file_project is not None:
                         tmp_job.inputFileProject = tmp_input_file_project
-                    # input type
-                    if tmp_input_file_type is not None:
-                        tmp_job.inputFileType = tmp_input_file_type
                 # protection
                 max_input_file_bytes = 99999999999
                 tmp_job.inputFileBytes = min(tmp_job.inputFileBytes, max_input_file_bytes)
                 # set background-able flag
                 tmp_job.setBackgroundableFlag()
+                # set input and output file types
+                tmp_job.set_input_output_file_types()
             except Exception:
                 error_type, error_value = sys.exc_info()[:2]
                 self.logger.error(f"failed to set data summary fields for PandaID={tmp_job.PandaID}: {error_type} {error_value}")
@@ -1506,7 +1504,6 @@ class SetupperAtlasPlugin(SetupperPluginBase):
         self.logger.error(out)
         return False, out
 
-
     # get datasets in container
     def get_list_dataset_replicas_in_container(self, container: str, get_map: bool = False) -> Tuple[int, str]:
         """

{panda_server-0.3.7 → panda_server-0.3.8}/pandaserver/taskbuffer/JobSpec.py

@@ -140,6 +140,7 @@ class JobSpec(object):
         "gco2_regional",
         "gco2_global",
         "cpu_architecture_level",
+        "outputFileType",
     )
     # slots
     __slots__ = _attributes + ("Files", "_changedAttrs", "_reserveChangedState")
@@ -181,6 +182,8 @@ class JobSpec(object):
         "jobSubStatus": 80,
         "supErrorDiag": 250,
         "commandToPilot": 250,
+        "inputFileType": 32,
+        "outputFileType": 32,
     }
     # tag for special handling
     _tagForSH = {
@@ -880,6 +883,40 @@ class JobSpec(object):
             file_spec.__setstate__(file_stat)
             self.addFile(file_spec)
 
+    # set input and output file types
+    def set_input_output_file_types(self) -> None:
+        """
+        Set input and output file types based on the input and output file names
+        """
+        in_types = set()
+        out_types = set()
+        for tmp_file in self.Files:
+            # ignore DBRelease/lib.tgz files
+            if tmp_file.dataset.startswith("ddo") or tmp_file.lfn.endswith(".lib.tgz"):
+                continue
+            # extract type while ignoring user/group/groupXY
+            tmp_items = tmp_file.dataset.split(".")
+            if (
+                len(tmp_items) > 4
+                and (not tmp_items[0] in ["", "NULL", "user", "group", "hc_test"])
+                and (not tmp_items[0].startswith("group"))
+                and not tmp_file.dataset.startswith("panda.um.")
+            ):
+                tmp_type = tmp_items[4]
+            else:
+                continue
+            if tmp_file.type == "input":
+                in_types.add(tmp_type)
+            elif tmp_file.type == "output":
+                out_types.add(tmp_type)
+        # set types
+        if in_types:
+            in_types = sorted(list(in_types))
+            self.inputFileType = ",".join(in_types)[: self._limitLength["inputFileType"]]
+        if out_types:
+            out_types = sorted(list(out_types))
+            self.outputFileType = ",".join(out_types)[: self._limitLength["outputFileType"]]
+
 
 # utils
 

{panda_server-0.3.7 → panda_server-0.3.8}/pandaserver/taskbuffer/PandaDBSchemaInfo.py

@@ -13,6 +13,6 @@ class PandaDBSchemaInfo:
     schema_version = None
 
     def method(self):
-        schema_version = "0.0.14"
+        schema_version = "0.0.17"
         _logger.debug(f"PanDA schema version required for Server is : {schema_version}")
         return schema_version

panda_server-0.3.7/PandaPkgInfo.py

@@ -1 +0,0 @@
-release_version = "0.3.7"