lsst-ctrl-bps-panda 29.2025.3900__tar.gz → 29.2025.4100__tar.gz

{lsst_ctrl_bps_panda-29.2025.3900/python/lsst_ctrl_bps_panda.egg-info → lsst_ctrl_bps_panda-29.2025.4100}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-panda
-Version: 29.2025.3900
+Version: 29.2025.4100
 Summary: PanDA plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_ctrl_bps_panda-29.2025.3900 → lsst_ctrl_bps_panda-29.2025.4100}/python/lsst/ctrl/bps/panda/utils.py

@@ -636,9 +636,19 @@ def add_idds_work(config, generic_workflow, idds_workflow):
     order_id_map = {}
     job_name_to_order_id_map = {}
     order_id_map_file = None
+    max_payloads_per_panda_job_by_label = {}
     if enable_event_service:
         enable_event_service = enable_event_service.split(",")
-        enable_event_service = [i.strip() for i in enable_event_service]
+        enable_event_service_tmp = []
+        for es_def in enable_event_service:
+            if ":" in es_def:
+                es_label, m_payloads = es_def.split(":")
+            else:
+                es_label, m_payloads = es_def, max_payloads_per_panda_job
+            es_label = es_label.strip()
+            enable_event_service_tmp.append(es_label)
+            max_payloads_per_panda_job_by_label[es_label] = int(m_payloads)
+        enable_event_service = enable_event_service_tmp
     if enable_job_name_map:
         _, order_id_map_filename = config.search(
             "orderIdMapFilename", opt={"default": PANDA_DEFAULT_ORDER_ID_MAP_FILE}
@@ -708,6 +718,9 @@ def add_idds_work(config, generic_workflow, idds_workflow):
                 work_enable_event_service = False
                 if enable_event_service and job_label in enable_event_service:
                     work_enable_event_service = True
+                max_payloads_per_panda_job_current = max_payloads_per_panda_job_by_label.get(
+                    job_label, max_payloads_per_panda_job
+                )
                 work, files = _make_doma_work(
                     config,
                     generic_workflow,
@@ -718,11 +731,12 @@ def add_idds_work(config, generic_workflow, idds_workflow):
                     enable_job_name_map=enable_job_name_map,
                     order_id_map_files=order_id_map_files,
                     es_label=job_label,
-                    max_payloads_per_panda_job=max_payloads_per_panda_job,
+                    max_payloads_per_panda_job=max_payloads_per_panda_job_current,
                     max_wms_job_wall_time=max_wms_job_wall_time,
                     remote_filename=remote_archive_filename,
                     qnode_map_filename=qnode_map_filename,
                 )
+                work.dependency_tasks = []
                 name_works[work.task_name] = work
                 files_to_pre_stage.update(files)
                 idds_workflow.add_work(work)
@@ -751,12 +765,15 @@ def add_idds_work(config, generic_workflow, idds_workflow):
                     else:
                         inputname = job_to_pseudo_filename[parent_job_name]
 
+                    parent_task_name = job_to_task[parent_job_name]
                     deps.append(
                         {
-                            "task": job_to_task[parent_job_name],
+                            "task": parent_task_name,
                             "inputname": inputname,
                         }
                     )
+                    if parent_task_name not in work.dependency_tasks:
+                        work.dependency_tasks.append(parent_task_name)
             if not missing_deps:
                 j_name = job_to_pseudo_filename[gwjob.name]
                 f_name = f"{job_label}:orderIdMap_{order_id}" if enable_job_name_map else j_name
@@ -802,12 +819,15 @@ def add_idds_work(config, generic_workflow, idds_workflow):
                 else:
                     inputname = job_to_pseudo_filename[parent_job_name]
 
+                parent_task_name = job_to_task[parent_job_name]
                 deps.append(
                     {
-                        "task": job_to_task[parent_job_name],
+                        "task": parent_task_name,
                         "inputname": inputname,
                     }
                 )
+                if parent_task_name not in work.dependency_tasks:
+                    work.dependency_tasks.append(parent_task_name)
 
             work.dependency_map.append(
                 {

lsst_ctrl_bps_panda-29.2025.4100/python/lsst/ctrl/bps/panda/version.py

@@ -0,0 +1,2 @@
+__all__ = ["__version__"]
+__version__ = "29.2025.4100"

{lsst_ctrl_bps_panda-29.2025.3900 → lsst_ctrl_bps_panda-29.2025.4100/python/lsst_ctrl_bps_panda.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps-panda
-Version: 29.2025.3900
+Version: 29.2025.4100
 Summary: PanDA plugin for lsst-ctrl-bps.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

lsst_ctrl_bps_panda-29.2025.3900/python/lsst/ctrl/bps/panda/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "29.2025.3900"