psr-factory 5.0.0b18__py3-none-win_amd64.whl → 5.0.0b20__py3-none-win_amd64.whl

psr/execqueue/db.py

@@ -158,7 +158,7 @@ def update_local_execution_status(session, execution_id: str, status: int):
 def update_cloud_execution_status(session, repository_id: int, status: int):
     cloud_execution = session.query(CloudExecution).filter(CloudExecution.repository_id == repository_id).first()
     if cloud_execution:
-        if status not in CloudStatus:
+        if CloudStatus(status) not in CloudStatus:
             raise ValueError("Wrong status for update.")
         cloud_execution.status = status
         session.commit()

psr/execqueue/server.py

@@ -309,7 +309,6 @@ def get_status(execution_id):
         if repository_id is None:
             return jsonify({'error': 'Execution ID not found in Cloud'}), 404
         status = db.get_cloud_execution_status(session, repository_id)
-        print(status)
         if status == db.CloudStatus.ERROR.value:
             status_msg = 'Execution finished with errors. Only log files will be downloaded'
         elif status == db.CloudStatus.RUNNING.value:
@@ -322,6 +321,7 @@ def get_status(execution_id):
             status_msg = 'Execution finished with errors and log files are avaialble to download'
         else:
             status_msg = 'Unknown status'
+        print(f"Cloud execution status for {execution_id} ({repository_id}): {status_msg}")
         return jsonify({'status_id': status, 'status_msg': status_msg}), 200
     else:
         status = db.get_local_execution_status(session, execution_id)

psr/execqueue/watcher.py

@@ -12,7 +12,7 @@ SERVER_URL = os.getenv("SERVER_URL", "http://127.0.0.1:5000")
 WATCH_DIR = os.getenv("WATCH_DIR")
 PROCESSED_DIR = os.getenv("PROCESSED_DIR")
 RESULTS_DIR = os.getenv("RESULTS_DIR", "results")
-SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "1"))
+SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "30"))
 DB_PATH = os.getenv("WATCHER_DB_PATH", "watcher.sqlite")
 
 
@@ -66,8 +66,7 @@ def _process_zip_files():
 
             logging.info(f"zip file found: {zip_path}")
 
-            #case_id = execqueue.upload_case_file(zip_path, SERVER_URL)
-            case_id = 1
+            case_id = execqueue.upload_case_file(zip_path, SERVER_URL)
             if not case_id:
                 logging.error(f"Failed uploading file {zip_path}")
                 continue
@@ -98,7 +97,6 @@ def _check_and_download_results():
             continue
         if status_id == 5 or status_id == 6:
             files = execqueue.get_results(cloud_upload_id, SERVER_URL, cloud_execution=True)
-            print("Files:", files)
             if files:
                 base_filename = os.path.splitext(filename)[0]
                 download_folder_name = f"{base_filename}-{cloud_upload_id}"

psr/factory/__init__.py

@@ -2,6 +2,6 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "5.0.0b18"
+__version__ = "5.0.0b20"
 
 from .api import *