airflow-unicore-integration 0.1.0__tar.gz → 0.1.2__tar.gz

{airflow_unicore_integration-0.1.0/src/airflow_unicore_integration.egg-info → airflow_unicore_integration-0.1.2}/PKG-INFO

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

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

{airflow_unicore_integration-0.1.0 → airflow_unicore_integration-0.1.2}/src/airflow_unicore_integration/util/job.py

@@ -49,10 +49,12 @@ class NaiveJobDescriptionGenerator(JobDescriptionGenerator):
         dag_rel_path = str(workload.dag_rel_path)
         if dag_rel_path.startswith("DAG_FOLDER"):
             dag_rel_path = dag_rel_path[10:]
-        local_dag_path = conf.get("core", "DAGS_FOLDER") + "/" + dag_rel_path
+        # local_dag_path = conf.get("core", "DAGS_FOLDER") + "/" + dag_rel_path
         base_url = conf.get("api", "base_url", fallback="/")
         default_execution_api_server = f"{base_url.rstrip('/')}/execution/"
-        server = conf.get("core", "execution_api_server_url", fallback=default_execution_api_server)
+        server = conf.get(
+            "unicore.executor", "execution_api_server_url", fallback=default_execution_api_server
+        )
 
         # check which python virtualenv to use
         if user_defined_python_env:
@@ -60,12 +62,12 @@ class NaiveJobDescriptionGenerator(JobDescriptionGenerator):
         else:
             python_env = conf.get("unicore.executor", "DEFAULT_ENV")
         # prepare dag file to be uploaded via unicore
-        dag_file = open(local_dag_path)
-        dag_content = dag_file.readlines()
-        dag_import = {"To": dag_rel_path, "Data": dag_content}
+        # dag_file = open(local_dag_path)
+        # dag_content = dag_file.readlines()
+        # dag_import = {"To": dag_rel_path, "Data": dag_content}
         worker_script_import = {
             "To": "run_task_via_supervisor.py",
-            "From": "https://gist.githubusercontent.com/cboettcher/3f1101a1d1b67e7944d17c02ecd69930/raw/6da9ec16ba598ddda9cf288900498fab5e226788/run_task_via_supervisor.py",
+            "From": "https://gist.githubusercontent.com/cboettcher/3f1101a1d1b67e7944d17c02ecd69930/raw/1d90bf38199d8c0adf47a79c8840c3e3ddf57462/run_task_via_supervisor.py",
         }
         # start filling the actual job description
         job_descr_dict["Name"] = f"{key.dag_id} - {key.task_id} - {key.run_id} - {key.try_number}"
@@ -87,7 +89,7 @@ class NaiveJobDescriptionGenerator(JobDescriptionGenerator):
         job_descr_dict["RunUserPrecommandOnLoginNode"] = (
             "false"  # precommand is activating the python env, this can also be done on compute node right before running the job
         )
-        job_descr_dict["Imports"] = [dag_import, worker_script_import]
+        job_descr_dict["Imports"] = [worker_script_import]
         # add user defined options to description
         if user_added_env:
             job_descr_dict["Environment"].update(user_added_env)

{airflow_unicore_integration-0.1.0 → airflow_unicore_integration-0.1.2/src/airflow_unicore_integration.egg-info}/PKG-INFO

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