psr-factory 5.0.0b2__py3-none-win_amd64.whl → 5.0.0b4__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.0b2"
+__version__ = "5.0.0b4"
 
 from .api import *

psr/runner/runner.py

@@ -135,8 +135,9 @@ def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.
     exec_mode = kwargs.get("_mode", None)
     mpi_path = kwargs.get("mpi_path", __default_mpi_path)
 
+    sddp_path_full = _get_sddp_executable_parent_path(sddp_path)
     # Append last / if missing.
-    case_path = os.path.join(os.path.abspath(case_path), "")
+    case_path_last_slash = os.path.join(os.path.abspath(case_path), "")
 
     mode_arg = exec_mode if exec_mode is not None else ""
     # Disable parallel run in check mode.
@@ -144,34 +145,33 @@ def run_sddp(case_path: Union[str, pathlib.Path], sddp_path: Union[str, pathlib.
 
     major, minor, patch, tag = _get_semver_version(get_sddp_version(sddp_path))
 
-    if os.name == 'nt':
-        if major >= 18:
-            sddp_path_full = os.path.join(sddp_path, r"sddp\Oper")
-        else:
-            sddp_path_full = os.path.join(sddp_path, "Oper")
-
-    else:
-        sddp_path_full = sddp_path
     with change_cwd(sddp_path_full):
         # Write MPI settings if required
         if parallel_run and cluster_settings is not None:
-            mpi_file_path = os.path.join(sddp_path_full, "mpd.hosts")
+            if major >= 18:
+                mpi_file_path = os.path.join(sddp_path_full, "mpd_sddp.hosts")
+            else:
+                mpi_file_path = os.path.join(sddp_path_full, "mpd.hosts")
             _write_mpi_settings(mpi_file_path, cluster_settings)
 
         if parallel_run:
             if os.name == 'nt':
-                cmd = f'sddpar.exe --path="{sddp_path_full}" --mpipath="{mpi_path}" --pathdata="{case_path}" {extra_args}'
+                if major <= 17:
+                    cmd = f'sddpar.exe --path="{sddp_path_full}" --mpipath="{mpi_path}" --pathdata="{case_path_last_slash}" {extra_args}'
+                else:
+                    cmd = f'sddpar.exe --path="{sddp_path_full}" --mpipath="{mpi_path}" --pathdata="{case_path}" {extra_args}'
             else:
                 # 17.3 and before uses one type of args, newer uses another
                 if (major == 17 and minor <= 3) or major < 17:
-                    cmd = f'./sddpar --path="{case_path}" --mpipath="{mpi_path}" --habilitarhidra=1 {extra_args}'
+                    cmd = f'./sddpar --path="{case_path_last_slash}" --mpipath="{mpi_path}" --habilitarhidra=1 {extra_args}'
                 else:
-                    cmd = f'./sddpar --path="{sddp_path}" --mpipath="{mpi_path}" --habilitarhidra=1 --pathdata="{case_path}" {extra_args}'
+                    cmd = f'./sddpar --path="{sddp_path}" --mpipath="{mpi_path}" --habilitarhidra=1 --pathdata="{case_path_last_slash}" {extra_args}'
+
         else:
             if os.name == 'nt':
-                cmd = f'sddp.exe {mode_arg} -path "{case_path}" {extra_args}'
+                cmd = f'sddp.exe {mode_arg} -path "{case_path_last_slash}" {extra_args}'
             else:
-                cmd = f'./sddp {mode_arg} -path "{case_path}" {extra_args}'
+                cmd = f'./sddp {mode_arg} -path "{case_path_last_slash}" {extra_args}'
 
         if os.name != "nt":
             os.environ["LD_LIBRARY_PATH"] = os.path.abspath(sddp_path_full)
@@ -193,16 +193,19 @@ def run_sddp_convert_fcf(case_path: Union[str, pathlib.Path], sddp_path: Union[s
     # TODO: generated file use \t as separator, has an empty column and its name depends on study stage type.
     run_sddp(case_path, sddp_path, **kwargs)
 
+def _get_sddp_executable_parent_path(sddp_path: Union[str, pathlib.Path]) -> str:
+    if os.name == 'nt':
+        model_path = os.path.join(sddp_path, "models", "sddp")
+        if os.path.exists(model_path):
+            return model_path
+        else:
+            return os.path.join(sddp_path, "Oper")
+    return sddp_path
+
 
 def get_sddp_version(sddp_path: Union[str, pathlib.Path]) -> str:
     sddp_path = str(sddp_path)
-
-    if os.name == 'nt' and "18" in sddp_path:
-        sddp_path_full = os.path.join(sddp_path, "sddp/Oper")
-    elif os.name == 'nt':
-        sddp_path_full = os.path.join(sddp_path, "Oper")
-    else:
-        sddp_path_full = sddp_path
+    sddp_path_full = _get_sddp_executable_parent_path(sddp_path)
     if os.name == 'nt':
         command = [os.path.join(sddp_path_full, "sddp.exe"), "ver"]
     else:

{psr_factory-5.0.0b2.dist-info → psr_factory-5.0.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 5.0.0b2
+Version: 5.0.0b4
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License-Expression: MIT
@@ -29,7 +29,7 @@ Requires-Dist: boto3
 Requires-Dist: botocore
 Dynamic: license-file
 
-PSR Factory (version 5.0.0b2)
+PSR Factory (version 5.0.0b4)
 ============================
 
 Factory is a library that helps to manage SDDP cases. 
@@ -50,7 +50,7 @@ pip install psr-factory
 Or, if the package directly from the wheel (whl) file:
 
 ```bash
-pip install psr_factory-5.0.0b2-py3-none-win_amd64.whl
+pip install psr_factory-5.0.0b4-py3-none-win_amd64.whl
 ```
 
 Factory will be available to all Python scripts in your system after importing it:

{psr_factory-5.0.0b2.dist-info → psr_factory-5.0.0b4.dist-info}/RECORD

@@ -11,13 +11,13 @@ 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=LOAdIPKWDzsDv5hMFpBFRS3mDya2Lof2c8WzWJj5jMg,218
+psr/factory/__init__.py,sha256=qKa77RFVnEjpqYdie5kJFmB3E6IfcIFkb8K1ZVSQATQ,218
 psr/factory/api.py,sha256=N5153ZJmZjzLQ0AvRZnSlTu6UmHBQqbYw0UQ69sZHkE,98705
-psr/factory/factory.dll,sha256=hdQZdi-XPBsig31tXaddifWA135jfr9lzqnchHxAPiI,18108240
+psr/factory/factory.dll,sha256=cfqlk9jWmq9jNS77zKONDLEFYFqMaAdJR_6_V4wRPok,18232656
 psr/factory/factory.pmd,sha256=gZnS1mnb1iA1XtNA1JfALM9rKdFLFBbwAJHF2_PxKAk,243405
 psr/factory/factory.pmk,sha256=3xDhU0fpUz6dSn29E8GkXEmCOSadnq7cJPcNPbEyFfI,579203
 psr/factory/factorylib.py,sha256=xnhCFTo4DpU0e5oHtIWMmc-kk6ThtNAUI3cxpDXrBKE,27497
-psr/factory/libcurl-x64.dll,sha256=-IyLfl9t-QM0zOlXf-BfHeLwN7Y7RaS6mMUkwduD_T8,5317968
+psr/factory/libcurl-x64.dll,sha256=Bx50eR62eK_p8DMmNlfV_mNNfxmEn5n6v78wOCPWGv8,5317968
 psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 psr/factory/samples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 psr/factory/samples/sddp_case01.py,sha256=jo71p9NN7dtRqMT76TEbD4S4Lut7p4ejbpu6SoSwg0Y,5034
@@ -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=EYSmdbAzPs1_cAneAR7b3m5RjyFU5YH8_MyYqVzijoc,26572
+psr/runner/runner.py,sha256=esfZbyxN_32p_ufZi7azZwmUKE3fTMrXyoyFkuZX3dI,26938
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-5.0.0b2.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b2.dist-info/METADATA,sha256=BhUPjURqDFo5K_rLjSABpx0L2Zr4uPQv8rNS7MDMldU,2542
-psr_factory-5.0.0b2.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b2.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b2.dist-info/RECORD,,
+psr_factory-5.0.0b4.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b4.dist-info/METADATA,sha256=izHzpBZGI-rL1zWcKVR7ufPGju-9-aYL0R7bO6UrfWc,2542
+psr_factory-5.0.0b4.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b4.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b4.dist-info/RECORD,,