airflow-unicore-integration 0.2.0__tar.gz → 0.2.1__tar.gz

{airflow_unicore_integration-0.2.0/src/airflow_unicore_integration.egg-info → airflow_unicore_integration-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airflow-unicore-integration
-Version: 0.2.0
+Version: 0.2.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.0 → airflow_unicore_integration-0.2.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "airflow-unicore-integration"
-version = "0.2.0"
+version = "0.2.1"
 authors = [
   { name="Christian Böttcher", email="c.boettcher@fz-juelich.de" },
 ]

{airflow_unicore_integration-0.2.0 → airflow_unicore_integration-0.2.1}/src/airflow_unicore_integration/executors/unicore_executor.py

@@ -22,6 +22,7 @@ from airflow.utils.state import TaskInstanceState
 from pyunicore import client
 from pyunicore.credentials import create_credential
 
+from ..hooks.unicore_hooks import UnicoreHook
 from ..util.job import JobDescriptionGenerator
 from ..util.job import NaiveJobDescriptionGenerator
 
@@ -78,11 +79,18 @@ class UnicoreExecutor(BaseExecutor):
         overwrite_unicore_credential = executor_config.get(  # type: ignore
             UnicoreExecutor.EXECUTOR_CONFIG_UNICORE_CREDENTIAL_KEY, None
         )  # task can provide a different credential to use, else default from connection is used
+        overwrite_conn_id = executor_config.get(  # type: ignore
+            UnicoreExecutor.EXECUTOR_CONFIG_UNICORE_CONN_KEY, None
+        )
         token = conf.get("unicore.executor", "AUTH_TOKEN", fallback="")
         base_url = conf.get(
             "unicore.executor", "DEFAULT_URL", fallback="http://localhost:8080/DEMO-SITE/rest/core"
         )
         credential = create_credential(token=token)
+        if overwrite_conn_id is not None:
+            hook = UnicoreHook(overwrite_conn_id)
+            base_url = hook.get_base_url()
+            credential = hook.get_credential()
         if overwrite_unicore_site is not None:
             base_url = overwrite_unicore_site
         if overwrite_unicore_credential is not None:

{airflow_unicore_integration-0.2.0 → airflow_unicore_integration-0.2.1/src/airflow_unicore_integration.egg-info}/PKG-INFO

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