psr-factory 5.0.0b17__py3-none-win_amd64.whl → 5.0.0b19__py3-none-win_amd64.whl

psr/cloud/cloud.py

@@ -767,7 +767,7 @@ class Client:
 
         if extensions:
             Client._validate_extensions(extensions)
-            filter_elements.extend([f".*.{ext}" for ext in extensions])
+            filter_elements.extend([f"*.{ext}" for ext in extensions])
 
         if files:
             filter_elements.extend(files)

psr/execqueue/client.py

@@ -70,13 +70,13 @@ def upload_and_run_file(zip_path: str, server_url: str, cloud_execution: bool =
         return None
 
 
-def get_execution_status(execution_id: str, server_url: str, cloud_execution: bool = False, return_status_id: bool = False) -> Tuple[bool, dict]:
+def get_execution_status(execution_id: str, server_url: str, cloud_execution: bool = False) -> Optional[tuple[int, str]]:
     """Get the status of an execution."""
-    data = {'cloud_execution': cloud_execution, 'return_status_id': return_status_id}
+    print("Getting status for execution ID:", execution_id)
+    data = {'cloud_execution': cloud_execution}
     response = requests.get(f"{server_url}/status/{execution_id}", data=data)
     result = response.status_code == 200
-    return result, response.json()
-
+    return response.json().get('status_id'), response.json().get('status_msg') if result else None
 
 def get_results(execution_id, server_url, cloud_execution=False) -> Optional[List[str]]:
     """Download the results of an execution."""
@@ -88,7 +88,7 @@ def get_results(execution_id, server_url, cloud_execution=False) -> Optional[Lis
         print("Files:", files)
         return files
     else:
-        print("Download failed:", response.text)
+        print("Results download failed:", response.text)
         return None
 
 

psr/execqueue/db.py

@@ -24,6 +24,7 @@ class CloudStatus(Enum):
     FINISHED = 3
     ERROR = 4
     RESULTS_AVAILABLE = 5
+    LOGS_AVAILABLE_ERROR = 6
 
 
 DB_NAME = "app.db"
@@ -157,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()
@@ -217,4 +218,7 @@ def get_cloud_execution_status(session, repository_id: int) -> Optional[int]:
     return cloud_execution.status if cloud_execution else None
 
 def get_cloud_finished_executions(session) -> List[CloudExecution]:
-    return session.query(CloudExecution).filter(CloudExecution.status == CloudStatus.FINISHED.value).all()
+    return session.query(CloudExecution).filter(CloudExecution.status == CloudStatus.FINISHED.value).all()
+
+def get_cloud_failed_executions(session) -> List[CloudExecution]:
+    return session.query(CloudExecution).filter(CloudExecution.status == CloudStatus.ERROR.value).all()

psr/execqueue/server.py

@@ -42,7 +42,7 @@ except psr.cloud.CloudInputError as e:
 
 _cloud_execution_case_map = {}
 
-app = Flask(__name__)
+app = Flask(__name__, root_path=os.getcwd())
 session = None
 
 
@@ -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.12",
+        program_version = "17.3.9",
         execution_type="Default",
         memory_per_process_ratio='2:1',
         price_optimized=False,
@@ -180,6 +180,20 @@ def monitor_cloud_runs():
                 result_path = os.path.join(CLOUD_RESULTS_FOLDER, str(repository_id))
                 client.download_results(repository_id, result_path)
                 db.update_cloud_execution_status(session, repository_id, db.CloudStatus.RESULTS_AVAILABLE.value)
+            
+            #download failed executions
+            for cloud_execution in db.get_cloud_failed_executions(session):
+                try:
+                    repository_id = cloud_execution.repository_id
+                    print(f"Downloading results for {repository_id}...")
+                    result_path = os.path.join(CLOUD_RESULTS_FOLDER, str(repository_id))
+                    client.download_results(repository_id, result_path, extensions=['log'])
+                    db.update_cloud_execution_status(session, repository_id, db.CloudStatus.LOGS_AVAILABLE_ERROR.value)
+                except Exception as e:
+                    print(f"Error downloading results for {repository_id}: {e}")
+                    print("Forcing execution to Failed downloaded execution")
+                    db.update_cloud_execution_status(session, repository_id, db.CloudStatus.LOGS_AVAILABLE_ERROR.value)
+                    continue
         else:
             print("Database not initialized. Retrying in 30s...")
         time.sleep(30)
@@ -282,30 +296,43 @@ def get_status(execution_id):
       200:
         description: Execution status
         schema:
-          type: string
+          type: object
       404:
         description: Execution ID not found
-    """ 
+    """
     global client
     global session
     cloud_execution = request.form.get('cloud_execution', 'false').lower() == 'true'
-    return_status_id = request.form.get('return_status_id', 'false').lower() == 'true'
 
     if cloud_execution:
         repository_id = db.get_repository_id_from_cloud_upload_id(session, 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)
-        if return_status_id:
-            return jsonify({'status_id': status}), 200
         if status == db.CloudStatus.ERROR.value:
-            return jsonify({'message': 'Execution finished with errors'}), 200
+            status_msg = 'Execution finished with errors. Only log files will be downloaded'
         elif status == db.CloudStatus.RUNNING.value:
-            return jsonify({'message': 'Execution not finished yet'}), 200
+            status_msg = 'Execution not finished yet'
         elif status == db.CloudStatus.FINISHED.value:
-            return jsonify({'message': 'Execution finished, but download not yet downloaded from Cloud server'}), 200
+            status_msg = 'Execution finished, but download not yet started from Cloud server'
         elif status == db.CloudStatus.RESULTS_AVAILABLE.value:
-            return jsonify({'message': 'Execution finished and results are available to download'}), 200
+            status_msg = 'Execution finished and results are available to download'
+        elif status == db.CloudStatus.LOGS_AVAILABLE_ERROR.value:
+            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)
+        if status == db.LOCAL_EXECUTION_ERROR:
+            status_msg = 'Execution finished with errors'
+        elif status != db.LOCAL_EXECUTION_FINISHED:
+            status_msg = 'Execution not finished yet'
+        else:
+            status_msg = 'Execution finished'
+        return jsonify({'status_id': status, 'status_msg': status_msg}), 200
+
 
 @app.route('/results/<execution_id>', methods=['GET'])
 def get_results(execution_id: str):
@@ -319,18 +346,17 @@ def get_results(execution_id: str):
             return jsonify({'error': 'Execution ID not found in Cloud'}),
         status = db.get_cloud_execution_status(session, execution_id)
 
-        if status == db.CloudStatus.ERROR:
-            return jsonify({'error': 'Execution Finished with errors'}), 401
-        elif status == db.CloudStatus.RUNNING:
-            return jsonify({'error': 'Execution not finished yet'}), 402
+        if status == db.CloudStatus.RUNNING:
+            return jsonify({'error': f'{repository_id} execution not finished yet'}), 402
         elif status == db.CloudStatus.FINISHED:
-            return jsonify({'error': 'Results not available yet'}), 403
+            return jsonify({'error': f'{repository_id} results not available yet'}), 403
         else:
             #fazer download da pasta do resultado
             result_path = os.path.join(CLOUD_RESULTS_FOLDER, str(repository_id))
             if not os.path.exists(result_path):
-                return jsonify({'error': 'Execution result folder not found'}), 404
+                return jsonify({'error': f'{repository_id} execution result folder not found'}), 404
             result_files = os.listdir(result_path)
+            result_files = [f for f in result_files if os.path.isfile(os.path.join(result_path, f))]
             return jsonify({'execution_id': repository_id, 'files': result_files}), 200
     else:
         status = db.get_local_execution_status(session, execution_id)
@@ -357,14 +383,18 @@ def download_file(execution_id: str, file):
     else:
         result_path = os.path.join(LOCAL_RESULTS_FOLDER, execution_id)
     if not os.path.exists(result_path):
-        return jsonify({'error': 'Execution result folder not found'}), 404
+        if cloud_execution:
+            msg = f'{repository_id} execution result folder not found'
+        else:
+            msg = f'Execution result folder not found'
+        return jsonify({'error': msg}), 404
 
-    file_path = os.path.join(result_path, file)
+    file_path = os.path.normpath(os.path.join(result_path, file)).replace("\\", "/")
     if not os.path.exists(file_path):
         return jsonify({'error': 'File not found'}), 404
 
     try:
-        return send_file(file_path, as_attachment=True)
+       return send_file(file_path, download_name=file, as_attachment=True)
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 

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", "1"))
 DB_PATH = os.getenv("WATCHER_DB_PATH", "watcher.sqlite")
 
 
@@ -42,14 +42,32 @@ 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)
+            #case_id = execqueue.upload_case_file(zip_path, SERVER_URL)
+            case_id = 1
             if not case_id:
                 logging.error(f"Failed uploading file {zip_path}")
                 continue
@@ -73,11 +91,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 +110,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.0b17"
+__version__ = "5.0.0b19"
 
 from .api import *

psr/factory/factory.pmd

@@ -5036,6 +5036,8 @@ DEFINE_MODEL MODL:SDDP_V10.2_Bateria
 
 	MERGE_MODEL SDDP_MAINTENANCE_PER_STAGE
 	MERGE_MODEL SDDP_MAINTENANCE_PER_HOUR
+
+	PARM REFERENCE ControlledBus PSRBus
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Modelo para Consumo de Combustivel
@@ -5044,6 +5046,7 @@ DEFINE_MODEL MODL:SDDP_ConsumoCombustivel
     DIMENSION         block
     DIMENSION         segment
     VETOR DATE        Data
+    VETOR REAL        GerMax INDEX Data
     VETOR REAL        O&MCost INDEX Data
     VETOR REAL        G DIM(segment) INDEX Data
     VETOR REAL        CTransp INDEX Data

{psr_factory-5.0.0b17.dist-info → psr_factory-5.0.0b19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b17
+Version: 5.0.0b19
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT
@@ -55,69 +55,3 @@ Requires-Dist: pefile; extra == "all"
 Requires-Dist: boto3; extra == "all"
 Requires-Dist: botocore; extra == "all"
 Dynamic: license-file
-
-PSR Factory (version 4.0.38)
-============================
-
-Factory is a library that helps to manage SDDP cases. 
-It contains functions that create, load, and save studies, and also functions that create,
-access, and modify objects in a study.
-
-
-Installation
-------------
-
-### System-wide installation
-
-Open the command prompt and run the following command:
-
-```bash
-pip install psr_factory-4.0.38-py3-none-win_amd64.whl
-```
-
-Factory will be available to all Python scripts in your system after importing it:
-
-```python
-import psr.factory
-```
-
-### Local/project-specific usage
-
-Copy the folder `psr` and its contents to your project folder or a specific folder (e.g., `C:\path\to\factory`). Then, in your Python script, add the following lines:
-
-```python
-import sys
-sys.path.append(r"C:\path\to\factory")
-import psr.factory
-```
-
-
-Usage sample
-------------
-
-```python
-import psr.factory
-
-study = psr.factory.load_study(r"C:\temp\my\study")
-system_1 = study.find("System.*")[0]
-
-battery = psr.factory.create("Battery")
-battery.code = 1
-battery.name = "Battery 1"
-battery.set("InstalledCapacity", 10.0)
-battery.set("RefSystem", system_1)
-study.add(battery)
-
-study.save(r"C:\temp\my\updated_study")
-```
-
-
-Full documentation
-------------------
-
-The full documentation and reference is available at [https://docs.psr-inc.com/factory/](https://docs.psr-inc.com/manual/factory/).
-
-Releases
---------
-
-New releases can be found in the release notes at [https://psrenergy-docs.github.io/factory/releases.html](https://psrenergy-docs.github.io/factory/releases.html).

{psr_factory-5.0.0b17.dist-info → psr_factory-5.0.0b19.dist-info}/RECORD

@@ -3,7 +3,7 @@ psr/apps/apps.py,sha256=V8Ewht7P1I-3sSkV3dnbxbLjF2slxPjcmtzmVaLjiNY,6746
 psr/apps/version.py,sha256=vs459L6JsatAkUxna7BNG-vMCaXpO1Ye8c1bmkEx4U4,194
 psr/cloud/__init__.py,sha256=inZMwG7O9Fca9hg1BhqYObOYtTTJOkpuTIuXnkHJZkI,246
 psr/cloud/aws.py,sha256=ro8kBNVxpGDXgZ5haceqX-MAD-0F5KFDJJ4M6rRvwS8,9915
-psr/cloud/cloud.py,sha256=RNFUXCAj4IRAMWUUyiEeZfwOqVVZdN28UZPLPSbm-5Y,59207
+psr/cloud/cloud.py,sha256=gLwVL4aJITo75F4x2k53TJx0-giBLF614p3t3NdfD9o,59206
 psr/cloud/data.py,sha256=oDJyzcNsA7aAYi_qJKCUjCeGZvN-25E8KjZ-5RamNLE,4160
 psr/cloud/desktop.py,sha256=JFroCMEFV1Nz3has74n7OVrGCg2lS7Ev5bcjdw2hRxY,2980
 psr/cloud/log.py,sha256=Dvhz1enIWlFWeaRK7JAAuZVPfODgoEIRNcHEmbEliyQ,1366
@@ -11,18 +11,18 @@ psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
 psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
 psr/cloud/version.py,sha256=jwq5nQsan38iZF0lj5GFK7l9EIe4aSF1NzdcupAfHP4,192
 psr/cloud/xml.py,sha256=ac2lyflOQm8khPvJn0zmI26I4sfUDY6A_OTsxzbMQEs,1896
-psr/execqueue/client.py,sha256=EjhXXWZli8MZP1rkKuYA1EL-VxO4aAUYZKsRa1mrG6Q,4374
+psr/execqueue/client.py,sha256=P89Yt76W2GqRXaG_MLsa0kXf0jPp-weBd3aSTRcDzcs,4443
 psr/execqueue/config.py,sha256=3KVwASOgRlymOSPeabotgBdLVB5sPKnPQ9og2q3LQfw,1418
-psr/execqueue/db.py,sha256=0pH5ksXChz6PR_GQs6OPokK3zVkY1-OZRAqYbVIEh9k,8281
-psr/execqueue/server.py,sha256=IwqVq0hTMAqAyvCF7FXQsf8i82NyWq2BjnZFDOjwg9s,13936
-psr/execqueue/watcher.py,sha256=34TdU6quJIjWoOBlIbP1fA6fxaX5WmV1tAhvrIL30Uo,5213
-psr/factory/__init__.py,sha256=x7QgqQMjCxzDk6KzDpRTfczgMTQQuiNDrsczAi1ynFM,219
+psr/execqueue/db.py,sha256=sNr_StNEgZZQCKcyCWiB1WrQJIhE9UvLUxPA2tWiXGs,8498
+psr/execqueue/server.py,sha256=nW-Hi5zWHgPeLicASKJND7u6rz6eqwC16k91tUUQPxk,15741
+psr/execqueue/watcher.py,sha256=RCjaWCS3jdbcugMk3-hOQCmrKxFzVOm-Wn-SLYBdBgY,5662
+psr/factory/__init__.py,sha256=E5_ke-sdZr5-RNQ0YkE6Ia4k_dGMXhJAsi0xnl9RBUw,219
 psr/factory/api.py,sha256=OsjFnXgl6ltYtcpDIhvjauGFprVrIaHWPcMgCGJ1C1E,101464
-psr/factory/factory.dll,sha256=v-etVKFq-0V4IxN_eE1-0_J_wZZjy8DXwSP-eS-2Y7M,18276688
-psr/factory/factory.pmd,sha256=NEOeQifMlZfrfQqSgDdvH8yKqdIYhj7biZHeceROr8M,250454
+psr/factory/factory.dll,sha256=Ayn-rwrdTP_jM-x8bFXHLEOp30NFB55kkWbarkjVZns,18301440
+psr/factory/factory.pmd,sha256=HryDY8T6vAV5r0W4ytKNPiIYcdn4LexrsVZ5qFYBZ-g,250535
 psr/factory/factory.pmk,sha256=THhHxBKTBchru3fxTCos-pBAPJJnuug8T2dw0xniDfQ,580185
 psr/factory/factorylib.py,sha256=rwqu9lucfBhiFECDd5UVuy1K9jIJ54mUfxNPh4JhY4I,28182
-psr/factory/libcurl-x64.dll,sha256=3jBgZlBIITj6jzCW39wpf_2UE15DPORnnhLssEqtn5A,5317968
+psr/factory/libcurl-x64.dll,sha256=6WGBmqX4q_eD8Vc0E2VpCvVrFV3W7TQoaKqSdbhXBu0,5313096
 psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 psr/factory/samples/__init__.py,sha256=xxOch5Fokzjy571a6OHD87FWM17qKgvfcbr8xn-n36I,80
 psr/factory/samples/sddp_case01.py,sha256=eLhtOAS2STl9-H7Nr5VUG4ATO0bVcn-CJtCn3Rf-vpI,5044
@@ -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.0b17.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b17.dist-info/METADATA,sha256=rzpiO3UKY-mVsanTn2hpRiD685M-M0Gm5EZUrFXdPl8,3957
-psr_factory-5.0.0b17.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b17.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b17.dist-info/RECORD,,
+psr_factory-5.0.0b19.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b19.dist-info/METADATA,sha256=FibEzT-fEVac6AqnO-y2pXM7tan6URDMUTEk4waReHA,2333
+psr_factory-5.0.0b19.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b19.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b19.dist-info/RECORD,,