psr-factory 5.0.0b12__py3-none-win_amd64.whl → 5.0.0b13__py3-none-win_amd64.whl

psr/execqueue/server.py

@@ -76,7 +76,7 @@ def run_cloud_case(execution_id: str, case_path: str):
         name="LSEG Server "+ execution_id,
         data_path=case_path,
         program="SDDP",
-        program_version = "17.2.10",
+        program_version = "17.3.9",
         execution_type="Default",
         memory_per_process_ratio='2:1',
         price_optimized=False,

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", "60"))
+SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "30"))
 DB_PATH = os.getenv("WATCHER_DB_PATH", "watcher.sqlite")
 
 
@@ -74,7 +74,7 @@ def _check_and_download_results():
     for row in rows:
         record_id, filename, cloud_upload_id = row
         status = execqueue.get_execution_status(cloud_upload_id, SERVER_URL, cloud_execution=True, return_status_id=True)
-        if status == "5" or status == 5:  # finished status
+        if status == "5" or status == 5:
             files = execqueue.get_results(cloud_upload_id, SERVER_URL, cloud_execution=True)
             if files:
                 base_filename = os.path.splitext(filename)[0]
@@ -88,6 +88,10 @@ 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()
 
 
@@ -116,8 +120,8 @@ if __name__ == "__main__":
 
     while True:
         try:
-            _process_zip_files()
             _check_and_download_results()
+            _process_zip_files()
 
         except Exception as e:
             logging.error(f"Watcher error: {e}", exc_info=True)

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

{psr_factory-5.0.0b12.dist-info → psr_factory-5.0.0b13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b12
+Version: 5.0.0b13
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT
@@ -48,6 +48,7 @@ Requires-Dist: requests; extra == "execqueue-server"
 Provides-Extra: all
 Requires-Dist: pandas; extra == "all"
 Requires-Dist: polars; extra == "all"
+Requires-Dist: psutil; extra == "all"
 Requires-Dist: zeep; extra == "all"
 Requires-Dist: filelock; extra == "all"
 Requires-Dist: pefile; extra == "all"

{psr_factory-5.0.0b12.dist-info → psr_factory-5.0.0b13.dist-info}/RECORD

@@ -14,11 +14,11 @@ psr/cloud/xml.py,sha256=ac2lyflOQm8khPvJn0zmI26I4sfUDY6A_OTsxzbMQEs,1896
 psr/execqueue/client.py,sha256=hAhoFPL6xu-o1wtoTtkTp-LCqHdXUohTbCyt9nXkdrQ,4724
 psr/execqueue/config.py,sha256=3KVwASOgRlymOSPeabotgBdLVB5sPKnPQ9og2q3LQfw,1418
 psr/execqueue/db.py,sha256=0pH5ksXChz6PR_GQs6OPokK3zVkY1-OZRAqYbVIEh9k,8281
-psr/execqueue/server.py,sha256=mw0UzZJDzMJM6vY234_RbNpL6TEWNu6C7HvXv3qBumE,13932
-psr/execqueue/watcher.py,sha256=t2sxAewrNu1AIbvv2X05kWWzCRfpn6EEG8GmT0NVjIw,4829
-psr/factory/__init__.py,sha256=aW4b07XVpYmcm3W4NPIGQtN8oLiT2YafCRDEC1rp4z0,219
+psr/execqueue/server.py,sha256=ojbiNVI_h3M-HU8dgwdjzkvLeAMLGWzFJhg1rjXHh_k,13931
+psr/execqueue/watcher.py,sha256=q9ceq119OW-gEnEt5aAvbiGHtN8H3c0s-j2H_1rCXII,5060
+psr/factory/__init__.py,sha256=Se7s9WOKQuJv_s9CJeQCYc04sDTkMx3tmTeCH0hwd7M,219
 psr/factory/api.py,sha256=S7xoNxSKkyPEGtOLa_jBah59Edn39_wtoVQUrwrA6uk,100481
-psr/factory/factory.dll,sha256=7TqTH4vgFq-UinLucMaAtnbQEVd3EZKCkf4-TEHsJkc,18432336
+psr/factory/factory.dll,sha256=_Efujjt6EdP50PzF59Ee92tgQdXrwUnoqtp37dhjeSM,18433872
 psr/factory/factory.pmd,sha256=XKpcyaQhVX3kF3S34ZjBtsDNr8bU6Mz8cfSFLWRu0dU,243646
 psr/factory/factory.pmk,sha256=pIvKXc7mi-njtH9AJMzq8E6Ws2Dr4gma95uWs3g-hBg,579362
 psr/factory/factorylib.py,sha256=-8wOx9h5oys0ZbG12OptwjzJVrgc48AgiAkBJJPKfio,27829
@@ -33,8 +33,8 @@ psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,39
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
 psr/runner/runner.py,sha256=L_YOCArpkr_O-UJH6aT3K46NlEYT_o7LA1Ldk81BULQ,27326
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-5.0.0b12.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b12.dist-info/METADATA,sha256=THTUvX1YhKROKLmWdLwOmVuXdxdT8Awz8olRjlAd1sM,2294
-psr_factory-5.0.0b12.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b12.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b12.dist-info/RECORD,,
+psr_factory-5.0.0b13.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b13.dist-info/METADATA,sha256=xkzPBlZDOAiAxSrTsNxCcVY-aL8-Rt5UwvIkBfCahRY,2333
+psr_factory-5.0.0b13.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b13.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b13.dist-info/RECORD,,