psr-factory 5.0.0b7__py3-none-win_amd64.whl → 5.0.0b9__py3-none-win_amd64.whl

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

psr/factory/api.py

@@ -173,6 +173,18 @@ def build_version() -> str:
     return _version_short()
 
 
+def diagnostics() -> str:
+    """Run diagnostics and returns the results as text.
+    Use for troubleshoot and debug purposes."""
+    _check_loaded()
+    size = 1000
+    buffer = ctypes.create_string_buffer(size)
+    status = factorylib.lib.psrd_diagnostics(buffer, size)
+    if status == 0:
+        return _from_c_str(buffer.value)
+    return ""
+
+
 def get_log_level() -> LogLevel:
     """Get log level."""
     _check_loaded()

psr/runner/runner.py

@@ -125,7 +125,6 @@ def _write_mpi_settings(mpi_file_path: Union[str, pathlib.Path], cluster_setting
 
 def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.Path], **kwargs):
     case_path = os.path.abspath(str(case_path))
-
     sddp_path = str(sddp_path)
     parallel_run = kwargs.get("parallel_run", True)
     cluster_settings: Optional[Union[int, bool, Dict[str, int]]] = kwargs.get("cluster_settings", False)
@@ -202,6 +201,15 @@ def _get_sddp_executable_parent_path(sddp_path: Union[str, pathlib.Path]) -> str
             return os.path.join(sddp_path, "Oper")
     return sddp_path
 
+def _get_optgen_executable_parent_path(optgen_path: Union[str, pathlib.Path]) -> str:
+    if os.name == 'nt':
+        model_path = os.path.join(optgen_path, "models", "optgen", "Model")
+        if os.path.exists(model_path):
+            return model_path
+        else:
+            return os.path.join(optgen_path, "Model")
+    return optgen_path
+
 
 def get_sddp_version(sddp_path: Union[str, pathlib.Path]) -> str:
     sddp_path = str(sddp_path)
@@ -261,14 +269,14 @@ def run_optgen(case_path: Union[str, pathlib.Path], optgen_path: Union[str, path
     case_path = os.path.abspath(str(case_path)).replace("\\", "/") + "/"
     optgen_path = str(optgen_path)
     sddp_path = str(sddp_path)
-    sddp_full_path = os.path.join(sddp_path, "Oper")
-    optgen_path = os.path.join(optgen_path, "Model")
+    sddp_path_full = _get_sddp_executable_parent_path(sddp_path)
+    optgen_path_full = _get_optgen_executable_parent_path(optgen_path)
     exec_mode = kwargs.get("_mode", None)
 
     mode_arg = exec_mode if exec_mode is not None else ""
 
-    with change_cwd(optgen_path):
-        cmd = f'optgen {mode_arg} -optgdat="{case_path}" -sddpexe="{sddp_full_path}" -sddpmpi="{__default_mpi_path}"'
+    with change_cwd(optgen_path_full):
+        cmd = f'optgen {mode_arg} -optgdat="{case_path}" -sddpexe="{sddp_path_full}" -sddpmpi="{__default_mpi_path}"'
         exec_cmd(cmd, **kwargs)
 
 

{psr_factory-5.0.0b7.dist-info → psr_factory-5.0.0b9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b7
+Version: 5.0.0b9
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT

{psr_factory-5.0.0b7.dist-info → psr_factory-5.0.0b9.dist-info}/RECORD

@@ -11,9 +11,9 @@ psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
 psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
 psr/cloud/version.py,sha256=Wxm5oXHAe8U9QoQpN5WIlzAhFR9bGfvIITFeq8QPBLw,192
 psr/cloud/xml.py,sha256=ac2lyflOQm8khPvJn0zmI26I4sfUDY6A_OTsxzbMQEs,1896
-psr/factory/__init__.py,sha256=PoaFit8kHU-Fr9vJ90s-9TkfHiTsZXja01icIbSLyP0,218
-psr/factory/api.py,sha256=N5153ZJmZjzLQ0AvRZnSlTu6UmHBQqbYw0UQ69sZHkE,98705
-psr/factory/factory.dll,sha256=eoXJmRZPa15y1UzwW6gPwIZiymSpEbLJLnDGn2HwkFM,18287440
+psr/factory/__init__.py,sha256=qfmU1P3t5sL5hYAD1IxAxqaMWB50rj3Sp0xixY1iTyE,218
+psr/factory/api.py,sha256=JYl-tI_py_7mxEU4rUw_t4ObzVUr_nd8lnYQBGZnxLU,99066
+psr/factory/factory.dll,sha256=Q4Y9EDcPcQzb300AIbQwOF3WJiz-RyB2UiQq9FYDuzM,18287440
 psr/factory/factory.pmd,sha256=gZnS1mnb1iA1XtNA1JfALM9rKdFLFBbwAJHF2_PxKAk,243405
 psr/factory/factory.pmk,sha256=3xDhU0fpUz6dSn29E8GkXEmCOSadnq7cJPcNPbEyFfI,579203
 psr/factory/factorylib.py,sha256=xnhCFTo4DpU0e5oHtIWMmc-kk6ThtNAUI3cxpDXrBKE,27497
@@ -28,10 +28,10 @@ psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,20
 psr/psrfcommon/psrfcommon.py,sha256=NABM5ahvyfSizDC9c0Vu9dVK1pD_vOzIGFHL1oz2E1o,1464
 psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,3939
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
-psr/runner/runner.py,sha256=esfZbyxN_32p_ufZi7azZwmUKE3fTMrXyoyFkuZX3dI,26938
+psr/runner/runner.py,sha256=5Ak_sQyBKho8zb3H0hCH97a1HKTiC3ga-Jji-i3COsc,27327
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-5.0.0b7.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b7.dist-info/METADATA,sha256=gWTglTmUUJoceU5IbdZN4dLCD5O584T7D74zs8ntpNg,3308
-psr_factory-5.0.0b7.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b7.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b7.dist-info/RECORD,,
+psr_factory-5.0.0b9.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b9.dist-info/METADATA,sha256=hYpRVKc5TEdxQYIv4tB1H7zE2T-79ejalXp-uGyL5nc,3308
+psr_factory-5.0.0b9.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b9.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b9.dist-info/RECORD,,