airflow-unicore-integration 0.2.5__py3-none-any.whl → 0.3.1__py3-none-any.whl

airflow_unicore_integration/executors/unicore_executor.py

@@ -159,7 +159,7 @@ class UnicoreExecutor(BaseExecutor):
         except AuthenticationFailedException as auth_exception:
             self.fail(workload.ti.key)
             self.log.error(
-                "Invalid default credentials for UNICORE. Failing all UNICORE tasks until this has been resolved."
+                "Invalid credentials for UNICORE. Failing all UNICORE tasks until this has been resolved."
             )
             self.log.error(auth_exception)
             return

airflow_unicore_integration/operators/container.py

@@ -1,6 +1,3 @@
-from typing import Dict
-from typing import List
-
 from airflow_unicore_integration.operators.unicore_operators import (
     UnicoreGenericOperator,
 )
@@ -10,13 +7,13 @@ class UnicoreContainerOperator(UnicoreGenericOperator):
     def __init__(
         self, name: str, docker_image_url: str, command: str, options: str | None = None, **kwargs
     ):
-        params: Dict[str, str | List[str]] = {"COMMAND": command, "IMAGE_URL": docker_image_url}
-        if options is not None:
-            params["OPTIONS"] = options
         super().__init__(
             name=name,
             application_name="CONTAINER",
             application_version="1.0",
-            parameters=params,
             **kwargs,
         )
+        self.params["COMMAND"] = command
+        self.params["IMAGE_URL"] = docker_image_url
+        if options is not None:
+            self.params["OPTIONS"] = options

airflow_unicore_integration/operators/unicore_operators.py

@@ -45,7 +45,7 @@ class UnicoreGenericOperator(BaseOperator):
         user_post_command: str | None = None,
         run_user_post_command_on_login_node: bool | None = None,
         user_post_command_ignore_non_zero_exit_code: bool | None = None,
-        resources: Dict[str, str] | None = None,
+        uc_resources: Dict[str, str] | None = None,
         project: str | None = None,
         imports: List[Dict[str, str | Sequence[str]]] | None = None,
         exports: List[Dict[str, str | List[str]]] | None = None,
@@ -97,7 +97,7 @@ class UnicoreGenericOperator(BaseOperator):
         self.user_post_command_ignore_non_zero_exit_code = (
             user_post_command_ignore_non_zero_exit_code
         )
-        self.resources = resources
+        self.uc_resources = uc_resources
         self.project = project
         self.imports = imports
         self.exports = exports
@@ -217,7 +217,7 @@ class UnicoreGenericOperator(BaseOperator):
                 self.user_post_command_ignore_non_zero_exit_code
             )
 
-        if self.resources is not None:
+        if self.uc_resources is not None:
             job_description_dict["Resources"] = self.resources
 
         if self.project is not None:

{airflow_unicore_integration-0.2.5.dist-info → airflow_unicore_integration-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airflow-unicore-integration
-Version: 0.2.5
+Version: 0.3.1
 Summary: Running Unicore Jobs from airflow DAGs.
 Author-email: Christian Böttcher <c.boettcher@fz-juelich.de>
 License-Expression: BSD-3-Clause

{airflow_unicore_integration-0.2.5.dist-info → airflow_unicore_integration-0.3.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
 airflow_unicore_integration/__init__.py,sha256=Qy1mlyxe2Y-PPSn0LgIW0sT6BxFuwW4_LGsPBf-Wm4s,549
 airflow_unicore_integration/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 airflow_unicore_integration/executors/run_task_via_supervisor.py,sha256=3ErgPf-Oy3B4Di5yNXhhPkaojIJykvCxMZ9MlKSYPI8,2756
-airflow_unicore_integration/executors/unicore_executor.py,sha256=5yYqh6vFC6eGyNJbhSYz0QUvP6okJ-4h-ORG_wRwFsM,8629
+airflow_unicore_integration/executors/unicore_executor.py,sha256=zXl9mqNyvRdNm_tOXt4wPJlEzgr7m-Cb1zYwcC4WGuo,8621
 airflow_unicore_integration/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 airflow_unicore_integration/hooks/unicore_hooks.py,sha256=ot9j8sG--_eTmmfoY5TpJj8BPo8nfYvjOSmqHyyQhBM,3383
 airflow_unicore_integration/operators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-airflow_unicore_integration/operators/container.py,sha256=D-2La59XZazXvBDVn-_wFIZ0IrCYeGy18miK8S5Usmc,693
-airflow_unicore_integration/operators/unicore_operators.py,sha256=PrcB-riakRUt8DHR9Hkk0ccOe-xk6NjJmNAmDpNgpN4,16868
+airflow_unicore_integration/operators/container.py,sha256=_kIBN2JYoI2KKu94MvsGZaP4sVzKbzLwwsTG3-epEbg,614
+airflow_unicore_integration/operators/unicore_operators.py,sha256=VpvCWU5OxSCwGU2CklXvBAN4Q6NSeWqtc6eR0Gj_3Dk,16880
 airflow_unicore_integration/policies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 airflow_unicore_integration/util/job.py,sha256=GcRVQkmuyLWUhfIGrIZFAdY4DyPTy2mB1mlmVdJ7TgM,11188
 airflow_unicore_integration/util/launch_script_content.py,sha256=42_aFpaCMmvFmmUxQDGcudkleX1YSK_yYWE8T41NOy0,2915
-airflow_unicore_integration-0.2.5.dist-info/licenses/LICENSE,sha256=hZ5ouAedeNr8ClHrQE-RLsgMsARcmv3kSZz7tE2BTJE,1526
-airflow_unicore_integration-0.2.5.dist-info/METADATA,sha256=8wUMooX4AtnWiZR1LHwIUkV2gbibNnSzJcDOxN9Anc0,13696
-airflow_unicore_integration-0.2.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-airflow_unicore_integration-0.2.5.dist-info/entry_points.txt,sha256=PzEfCLYLSawjiYR-HNBzw8-YGfJxs1nPBULevgBQjoY,147
-airflow_unicore_integration-0.2.5.dist-info/top_level.txt,sha256=j45X-uIuOk3oL78iwlpHakMWtUkg__B7zUlJLwmZx6w,28
-airflow_unicore_integration-0.2.5.dist-info/RECORD,,
+airflow_unicore_integration-0.3.1.dist-info/licenses/LICENSE,sha256=hZ5ouAedeNr8ClHrQE-RLsgMsARcmv3kSZz7tE2BTJE,1526
+airflow_unicore_integration-0.3.1.dist-info/METADATA,sha256=HCNwVprVhzFT8-YXbu5OJIgVN5jds4xoqEKy1PoAqlg,13696
+airflow_unicore_integration-0.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+airflow_unicore_integration-0.3.1.dist-info/entry_points.txt,sha256=PzEfCLYLSawjiYR-HNBzw8-YGfJxs1nPBULevgBQjoY,147
+airflow_unicore_integration-0.3.1.dist-info/top_level.txt,sha256=j45X-uIuOk3oL78iwlpHakMWtUkg__B7zUlJLwmZx6w,28
+airflow_unicore_integration-0.3.1.dist-info/RECORD,,