Removed task monitor and enabled background data save flow (#251)

Co-authored-by: Alex Kanitz <[email protected]>
elixir-cloud-aai · Dec 31, 2022 · 8b138a0 · 8b138a0
1 parent 574f62a
commit 8b138a0
Show file tree

Hide file tree

Showing 12 changed files with 993 additions and 803 deletions.
diff --git a/cwl_wes/app.py b/cwl_wes/app.py
@@ -6,7 +6,6 @@
 from flask import current_app
 from foca import Foca
 
-from cwl_wes.tasks.register_celery import register_task_service
 from cwl_wes.ga4gh.wes.service_info import ServiceInfo
 from cwl_wes.exceptions import NotFound
 
@@ -25,7 +24,6 @@ def init_app() -> App:
             service_info.set_service_info(
                 data=current_app.config.foca.custom.service_info.dict()
             )
-    register_task_service()
     return app
 
 

diff --git a/cwl_wes/config.yaml b/cwl_wes/config.yaml
@@ -118,13 +118,27 @@ custom:
         tmp_dir: '/data/tmp'
         remote_storage_url: 'ftp://ftp-private.ebi.ac.uk/upload/foivos'
     celery:
-        monitor:
-            timeout: 0.1
+        timeout: 0.1
         message_maxsize: 16777216
-    endpoint_params:
+    controller:
         default_page_size: 5
         timeout_cancel_run: 60
         timeout_run_workflow: null
+        tes_server:
+            url: 'http://62.217.122.249:31567/'
+            timeout: 5
+            status_query_params: 'FULL'
+        drs_server:
+            port: null  # use this port for resolving DRS URIs; set to `null` to use default (443)
+            base_path: null  # use this base path for resolving DRS URIs; set to `null` to use default (`ga4gh/drs/v1`)
+            use_http: False  # use `http` for resolving DRS URIs; set to `False` to use default (`https`)
+            file_types:  # extensions of files to scan for DRS URI resolution
+                - cwl
+                - yaml
+                - yml
+        runs_id:
+            length: 6
+            charset: string.ascii_uppercase + string.digits
     service_info:
         contact_info: 'https://github.com/elixir-cloud-aai/cwl-WES'
         auth_instructions_url: 'https://www.elixir-europe.org/services/compute/aai'
@@ -147,19 +161,3 @@ custom:
               default_value: '5'
         tags:
             known_tes_endpoints: 'https://tes.tsi.ebi.ac.uk/|https://tes-dev.tsi.ebi.ac.uk/|https://csc-tesk.c03.k8s-popup.csc.fi/|https://tesk.c01.k8s-popup.csc.fi/'
-            app_version: 0.15.0
-    tes_server:
-        url: 'https://csc-tesk.c03.k8s-popup.csc.fi/'
-        timeout: 5
-        status_query_params: 'FULL'
-    drs_server:
-        port: null  # use this port for resolving DRS URIs; set to `null` to use default (443)
-        base_path: null  # use this base path for resolving DRS URIs; set to `null` to use default (`ga4gh/drs/v1`)
-        use_http: False  # use `http` for resolving DRS URIs; set to `False` to use default (`https`)
-        file_types:  # extensions of files to scan for DRS URI resolution
-            - cwl
-            - yaml
-            - yml
-    runs_id:
-        length: 6
-        charset: string.ascii_uppercase + string.digits