Merge pull request #29 from FNNDSC/analysis-progress

updated analysis progress
FNNDSC · Jul 20, 2023 · 5326d20 · 5326d20
2 parents 1860052 + 463596c
commit 5326d20
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/app/config.py b/app/config.py
@@ -3,7 +3,7 @@
 
 class Settings(BaseSettings):
     pflink_mongodb: MongoDsn = 'mongodb://localhost:27017'
-    version: str = "3.5.2"
+    version: str = "3.5.3"
 
 
 class Auth(BaseSettings):

diff --git a/app/controllers/subprocesses/status.py b/app/controllers/subprocesses/status.py
@@ -224,7 +224,7 @@ def get_analysis_status(response: dict) -> dict:
     total = created + waiting + scheduled + started + registering + finished + errored + cancelled
 
     if total > 1:
-        feed_progress = round((finished / MAX_JOBS) * 100)
+        feed_progress = round((finished / total) * 100)
         analysis_details['progress'] = str(feed_progress) + "%"
 
         if errored > 0 or cancelled > 0:

diff --git a/app/controllers/subprocesses/wf_manager.py b/app/controllers/subprocesses/wf_manager.py
@@ -247,6 +247,7 @@ def __run_pipeline_instance(previous_id: str, request: WorkflowRequestSchema, cl
     """
     Run a workflow instance on an existing (previous) plugin instance ID in CUBE
     """
+    print(previous_id)
     # search for pipeline
     pipeline_search_params = {"name": request.workflow_info.pipeline_name}
     pipeline_id = client.getPipelineId(pipeline_search_params)
@@ -266,7 +267,7 @@ def str_to_param_dict(params: str) -> dict:
         if param == "":
             continue
         param = param.strip()
-        items = param.split(' ')
+        items = param.split(' ',1)
         d_params[items[0]] = items[1]
 
     return d_params

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 motor==2.5.1
-pydantic[email]
+pydantic==1.10.11
 requests
 python-chrisclient
 asyncio
@@ -12,4 +12,4 @@ pytest-asyncio
 fastapi_jwt_auth
 python-jose[cryptography]
 passlib[bcrypt]
-python-multipart
+python-multipart