psr-factory 5.0.0b16__py3-none-win_amd64.whl → 5.0.0b67__py3-none-win_amd64.whl

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", "30"))
+SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "10"))
 DB_PATH = os.getenv("WATCHER_DB_PATH", "watcher.sqlite")
 
 
@@ -42,11 +42,28 @@ def _log_to_db(filename, cloud_upload_id):
     conn.commit()
     conn.close()
 
-
+def _is_file_locked(filepath):
+    """Returns True if the file is locked by another process (e.g., still being copied)."""
+    if not os.path.exists(filepath):
+        return True
+    try:
+        # Try to open for exclusive writing
+        with open(filepath, 'rb+') as f:
+            pass
+        return False
+    except (OSError, PermissionError):
+        return True
+    
 def _process_zip_files():
     for filename in os.listdir(WATCH_DIR):
         if filename.lower().endswith('.zip'):
             zip_path = os.path.join(WATCH_DIR, filename)
+
+            # Check if the file is locked
+            if _is_file_locked(zip_path):
+                logging.info(f"Skipping {zip_path}: file is locked or being copied.")
+                continue
+
             logging.info(f"zip file found: {zip_path}")
 
             case_id = execqueue.upload_case_file(zip_path, SERVER_URL)
@@ -73,11 +90,12 @@ def _check_and_download_results():
     rows = cursor.fetchall()
     for row in rows:
         record_id, filename, cloud_upload_id = row
-        result, response = execqueue.get_execution_status(cloud_upload_id, SERVER_URL, cloud_execution=True, return_status_id=True)
-        status = response.get('status_id', 0)
-        message = response.get('message', None)
-        error = response.get('error', None)
-        if status == "5" or status == 5:
+        status_id, status_msg = execqueue.get_execution_status(cloud_upload_id, SERVER_URL, cloud_execution=True)
+        logging.info(f"Execution status for {cloud_upload_id}: {status_id} - {status_msg}")
+        if status_id is None:
+            logging.error(f"Failed to get status for {cloud_upload_id}. Skipping download.")
+            continue
+        if status_id == 5 or status_id == 6:
             files = execqueue.get_results(cloud_upload_id, SERVER_URL, cloud_execution=True)
             if files:
                 base_filename = os.path.splitext(filename)[0]
@@ -91,10 +109,6 @@ def _check_and_download_results():
                 cursor.execute("UPDATE processed_files SET downloaded=1 WHERE id=?", (record_id,))
                 conn.commit()
                 logging.info(f"Results of {cloud_upload_id} downloaded to {download_path}")
-        elif status == "4" or status == 4:
-            logging.info(f"Execution {cloud_upload_id} is finished with errors.")
-            cursor.execute("UPDATE processed_files SET downloaded=4 WHERE id=?", (record_id,))
-            conn.commit()
 
     conn.close()
 

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.0b16"
+__version__ = "5.0.0b67"
 
 from .api import *