airflow-unicore-integration 0.1.6__tar.gz → 0.1.8__tar.gz

{airflow_unicore_integration-0.1.6/src/airflow_unicore_integration.egg-info → airflow_unicore_integration-0.1.8}/PKG-INFO

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

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

{airflow_unicore_integration-0.1.6 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/__init__.py

@@ -9,4 +9,7 @@ def get_provider_info():
                 "hook-class-name": "airflow_unicore_integration.hooks.unicore_hooks.UnicoreHook",
             }
         ],
+        "executors": [
+            "airflow_unicore_integration.executors.unicore_executor.UnicoreExecutor",
+        ],
     }

{airflow_unicore_integration-0.1.6 → airflow_unicore_integration-0.1.8}/src/airflow_unicore_integration/executors/unicore_executor.py

@@ -19,8 +19,8 @@ from airflow.executors.workloads import All
 from airflow.executors.workloads import ExecuteTask
 from airflow.models.taskinstancekey import TaskInstanceKey
 from airflow.utils.state import TaskInstanceState
-
-from airflow_unicore_integration.hooks import unicore_hooks
+from pyunicore import client
+from pyunicore.credentials import create_credential
 
 from ..util.job import JobDescriptionGenerator
 from ..util.job import NaiveJobDescriptionGenerator
@@ -47,7 +47,6 @@ class UnicoreExecutor(BaseExecutor):
 
     def start(self):
         self.active_jobs: Dict[TaskInstanceKey, uc_client.Job] = {}
-        self.uc_conn = unicore_hooks.UnicoreHook().get_conn()
         # TODO get job description generator class and init params from config
         self.job_descr_generator: JobDescriptionGenerator = NaiveJobDescriptionGenerator()
 
@@ -73,23 +72,25 @@ class UnicoreExecutor(BaseExecutor):
         return []
 
     def _get_unicore_client(self, executor_config: dict | None = {}):
-        return self.uc_conn
-        # include client desires from executor_config
-        unicore_conn_id = executor_config.get(  # type: ignore
-            UnicoreExecutor.EXECUTOR_CONFIG_UNICORE_CONN_KEY,
-            conf.get("unicore.executor", "UNICORE_CONN_ID"),
-        )  # task can provide a different unicore connection to use, else airflow-wide default is used
-        self.log.info(f"Using base unicore connection with id '{unicore_conn_id}'")
-        hook = unicore_hooks.UnicoreHook(uc_conn_id=unicore_conn_id)
-        unicore_site = executor_config.get(  # type: ignore
+        overwrite_unicore_site = executor_config.get(  # type: ignore
             UnicoreExecutor.EXECUTOR_CONFIG_UNICORE_SITE_KEY, None
         )  # task can provide a different site to run at, else default from connetion is used
-        unicore_credential = executor_config.get(  # type: ignore
+        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
-        return hook.get_conn(
-            overwrite_base_url=unicore_site, overwrite_credential=unicore_credential
+        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_unicore_site is not None:
+            base_url = overwrite_unicore_site
+        if overwrite_unicore_credential is not None:
+            credential = overwrite_unicore_credential
+        if not base_url:
+            raise TypeError()
+        conn = client.Client(credential, base_url)
+        return conn
 
     def _submit_job(self, workload: ExecuteTask):
         uc_client = self._get_unicore_client(executor_config=workload.ti.executor_config)

{airflow_unicore_integration-0.1.6 → airflow_unicore_integration-0.1.8/src/airflow_unicore_integration.egg-info}/PKG-INFO

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