psr-factory 5.0.0b14__py3-none-win_amd64.whl → 5.0.0b15__py3-none-win_amd64.whl

psr/cloud/cloud.py

@@ -961,7 +961,9 @@ class Client:
             "sessao_id": section,
             "tipo_autenticacao": "bcrypt",
             "idioma": "3",
-            "versao_cliente": self._get_console_version().split("-")[0],
+            "versao_cliente": self._get_console_version().split("-")[0]
+            if not self._python_client
+            else "5.4.0",
         }
         if additional_arguments:
             parameters.update(additional_arguments)

psr/execqueue/client.py

@@ -1,7 +1,7 @@
 import os
 import zipfile
 import requests
-from typing import List, Optional
+from typing import List, Optional, Tuple
 
 
 def zip_directory(directory_path, output_zip):
@@ -70,21 +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) -> Optional[str]:
+def get_execution_status(execution_id: str, server_url: str, cloud_execution: bool = False, return_status_id: bool = False) -> Tuple[bool, dict]:
     """Get the status of an execution."""
-    print("Getting status for execution ID:", execution_id)
     data = {'cloud_execution': cloud_execution, 'return_status_id': return_status_id}
     response = requests.get(f"{server_url}/status/{execution_id}", data=data)
+    result = response.status_code == 200
+    return result, response.json()
 
-    if response.status_code == 200:
-        if return_status_id:
-            print("Status ID:", response.json().get('status_id'))
-            return response.json().get('status_id') 
-        print("Status:", response.json().get('status'))
-        return response.json().get('status')
-    else:
-        print("Failed to get status:", response.text)
-        return None
 
 def get_results(execution_id, server_url, cloud_execution=False) -> Optional[List[str]]:
     """Download the results of an execution."""

psr/execqueue/server.py

@@ -299,13 +299,13 @@ def get_status(execution_id):
         if return_status_id:
             return jsonify({'status_id': status}), 200
         if status == db.CloudStatus.ERROR.value:
-            return jsonify({'status': 'Execution finished with errors'}), 200
+            return jsonify({'message': 'Execution finished with errors'}), 200
         elif status == db.CloudStatus.RUNNING.value:
-            return jsonify({'status': 'Execution not finished yet'}), 200
+            return jsonify({'message': 'Execution not finished yet'}), 200
         elif status == db.CloudStatus.FINISHED.value:
-            return jsonify({'status': 'Execution finished, but download not yet downloaded from Cloud server'}), 200
+            return jsonify({'message': 'Execution finished, but download not yet downloaded from Cloud server'}), 200
         elif status == db.CloudStatus.RESULTS_AVAILABLE.value:
-            return jsonify({'status': 'Execution finished and results are available to download'}), 200
+            return jsonify({'message': 'Execution finished and results are available to download'}), 200
 
 @app.route('/results/<execution_id>', methods=['GET'])
 def get_results(execution_id: str):

psr/execqueue/watcher.py

@@ -73,7 +73,10 @@ def _check_and_download_results():
     rows = cursor.fetchall()
     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)
+        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:
             files = execqueue.get_results(cloud_upload_id, SERVER_URL, cloud_execution=True)
             if files:
@@ -92,6 +95,7 @@ def _check_and_download_results():
             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.0b14"
+__version__ = "5.0.0b15"
 
 from .api import *

psr/factory/factory.pmd

@@ -4875,6 +4875,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_ReservaGeracao
 	PARM REAL	Penalty			DEFAULT -1
 	PARM INTEGER	Exclusive	DEFAULT 0
 	PARM INTEGER	LimitType	DEFAULT 0
+	PARM INTEGER	Sense       DEFAULT 0
 	PARM INTEGER	Type
 	PARM INTEGER	CompensateNoSel
 	PARM INTEGER	CompensateSel
@@ -5849,7 +5850,7 @@ DEFINE_MODEL MODL:SDDP_Line
 	VECTOR REAL	CostFromTo DIM(block) INDEX DateCostFromTo
 	VECTOR DATE	DateCostToFrom @addyear_chronological
 	VECTOR REAL	CostToFrom DIM(block) INDEX DateCostToFrom
-	
+
 	PARM INTEGER	MaxSecondaryReserveUnit
 	PARM INTEGER  HasMaxSecondaryReserve
 	VETOR DATE	DataMaxSecondaryReserve @chronological @addyear_chronological

psr/factory/factory.pmk

@@ -9753,6 +9753,7 @@ Penalty		REAL            41,50	AUTOSET(model.parm("Penalty"))
 Exclusive	INTEGER         52,52	AUTOSET(model.parm("Exclusive"))
 LimitType	INTEGER         54,54	AUTOSET(model.parm("LimitType"))
 ReserveAreaCode INTEGER 56,59
+Sense       INTEGER 61,64           AUTOSET(model.parm("Sense"))
 END_DATA
 
 END_BLOCK

{psr_factory-5.0.0b14.dist-info → psr_factory-5.0.0b15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b14
+Version: 5.0.0b15
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT
@@ -55,3 +55,69 @@ Requires-Dist: pefile; extra == "all"
 Requires-Dist: boto3; extra == "all"
 Requires-Dist: botocore; extra == "all"
 Dynamic: license-file
+
+PSR Factory (version 4.0.37)
+============================
+
+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.37-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.0b14.dist-info → psr_factory-5.0.0b15.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=DyekYGxUP2PeEwd0eJvRaWlelrYvRgAWRDYf01H3cks,59141
+psr/cloud/cloud.py,sha256=RNFUXCAj4IRAMWUUyiEeZfwOqVVZdN28UZPLPSbm-5Y,59207
 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,16 +11,16 @@ 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=hAhoFPL6xu-o1wtoTtkTp-LCqHdXUohTbCyt9nXkdrQ,4724
+psr/execqueue/client.py,sha256=EjhXXWZli8MZP1rkKuYA1EL-VxO4aAUYZKsRa1mrG6Q,4374
 psr/execqueue/config.py,sha256=3KVwASOgRlymOSPeabotgBdLVB5sPKnPQ9og2q3LQfw,1418
 psr/execqueue/db.py,sha256=0pH5ksXChz6PR_GQs6OPokK3zVkY1-OZRAqYbVIEh9k,8281
-psr/execqueue/server.py,sha256=jhpSFFTTeTTOp5XrH_sHhRmjnZtRIMkJYxr_OkTyWjY,13932
-psr/execqueue/watcher.py,sha256=q9ceq119OW-gEnEt5aAvbiGHtN8H3c0s-j2H_1rCXII,5060
-psr/factory/__init__.py,sha256=9fKZAK3rOarrwrFHwW34OI8ZwrS_34HFbsQhx8ak0RE,219
+psr/execqueue/server.py,sha256=IwqVq0hTMAqAyvCF7FXQsf8i82NyWq2BjnZFDOjwg9s,13936
+psr/execqueue/watcher.py,sha256=34TdU6quJIjWoOBlIbP1fA6fxaX5WmV1tAhvrIL30Uo,5213
+psr/factory/__init__.py,sha256=3FZ_2un2wbep3zmXTR8RmbWZiqG914IRpuZxWPGPH0c,219
 psr/factory/api.py,sha256=S7xoNxSKkyPEGtOLa_jBah59Edn39_wtoVQUrwrA6uk,100481
-psr/factory/factory.dll,sha256=qktXDYWJYT3wF8rIi7hYZ19_n_B1Yf6WlkihL4_xAyY,18265936
-psr/factory/factory.pmd,sha256=zXLD1yi0iI70nPGKziPLeIF3zO2mntOaozPttOdQXE8,243119
-psr/factory/factory.pmk,sha256=gq-J-fLkAwbsC1e6B93butoxH_1v4pYVB9kJaFWVYYc,579698
+psr/factory/factory.dll,sha256=H9Y85_SnrGwiGN21wfy3BYx3v9ZmpFOU5gPLjvCQ5iQ,18266448
+psr/factory/factory.pmd,sha256=0bMTABqJvBVpHQLLVg5E-EJCbiST5mGjQnTgrXgYpyI,243155
+psr/factory/factory.pmk,sha256=2kvj37seFO_POOqRIdOZuWRs4wSZuWT7z1LuaXi6qbg,579764
 psr/factory/factorylib.py,sha256=-8wOx9h5oys0ZbG12OptwjzJVrgc48AgiAkBJJPKfio,27829
 psr/factory/libcurl-x64.dll,sha256=E3rWQwQR-0-CxqJMpTF3PRS-P_6I-9so2hOTzRfKbMA,5317968
 psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.0b14.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b14.dist-info/METADATA,sha256=RYlnuurU-13P2hU5JG1tvsdv_6LAkHTlIjGv30D1TPw,2333
-psr_factory-5.0.0b14.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b14.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b14.dist-info/RECORD,,
+psr_factory-5.0.0b15.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b15.dist-info/METADATA,sha256=jc4ppv3v5A_ZPesDAyd6hDMhpqiHcrSG8rJSNcYc5rU,3957
+psr_factory-5.0.0b15.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b15.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b15.dist-info/RECORD,,