psr-factory 5.0.0b67__py3-none-win_amd64.whl → 5.0.0b69__py3-none-win_amd64.whl

psr/factory/__init__.py

@@ -1,7 +1,7 @@
-# PSR Factory. Copyright (C) PSR, Inc - All Rights Reserved
-# Unauthorized copying of this file, via any medium is strictly prohibited
-# Proprietary and confidential
-
-__version__ = "5.0.0b67"
-
-from .api import *
+# PSR Factory. Copyright (C) PSR, Inc - All Rights Reserved
+# Unauthorized copying of this file, via any medium is strictly prohibited
+# Proprietary and confidential
+
+__version__ = "5.0.0b69"
+
+from .api import *

psr/factory/api.py

@@ -1080,11 +1080,11 @@ class DataObject(_BaseObject):
 
     def __repr__(self):
         identifiers = []
-        if self.code != 0:
+        if self.has_code():
             identifiers.append(f"code={self.code}")
-        if self.id != "":
+        if self.has_id():
             identifiers.append(f"id={self.id.strip()}")
-        if self.name != "":
+        if self.has_name():
             identifiers.append(f"name={self.name.strip()}")
         return f"psr.factory.DataObject({self.type}, {', '.join(identifiers)})"
 
@@ -1237,19 +1237,19 @@ class DataObject(_BaseObject):
         if _err.code != 0:
             raise FactoryException(_err.what)
 
-    def set_df(self, dataframe_like):
-        if not _has_pandas():
-            raise ModuleNotFoundError("pandas required.")
-        dataframe_like = pandas.api.interchange.from_dataframe(dataframe_like)
+    def set_df(self, dataframe_like: DataFrameLike):
         df_builder = _DataFrameBuilder()
-        _df = df_builder.build_from_pandas(dataframe_like)
+        if _has_pandas() and isinstance(dataframe_like, pandas.DataFrame):
+            _df = df_builder.build_from_pandas(dataframe_like)
+        elif _has_polars() and isinstance(dataframe_like, polars.DataFrame):
+            _df = df_builder.build_from_polars(dataframe_like)
+        else:
+            raise FactoryException("No supported DataFrame library is available.")
         _err = Error()
-        factorylib.lib.psrd_object_set_table(self._hdr, _df.handler(),
-                                             _err.handler())
+        factorylib.lib.psrd_object_set_table(self._hdr, _df.handler(), _err.handler())
         if _err.code != 0:
             raise FactoryException(_err.what)
 
-
     def clear_values(self, expression: str):
         _err = Error()
         factorylib.lib.psrd_object_clear_values(self._hdr,
@@ -1281,6 +1281,14 @@ class DataObject(_BaseObject):
         object_list._hdr = ref
         return object_list.to_list()
 
+    def has_code(self) -> bool:
+        _err = Error()
+        bool_value = ctypes.c_bool()
+        factorylib.lib.psrd_object_has_code(self._hdr, ctypes.byref(bool_value), _err.handler())
+        if _err.code != 0:
+            raise FactoryException(_err.what)
+        return bool(bool_value.value)
+
     @property
     def code(self) -> int:
         _err = Error()
@@ -1354,6 +1362,14 @@ class DataObject(_BaseObject):
     def key(self):
         raise AttributeError("do not delete key")
 
+    def has_name(self) -> bool:
+        _err = Error()
+        bool_value = ctypes.c_bool()
+        factorylib.lib.psrd_object_has_name(self._hdr, ctypes.byref(bool_value), _err.handler())
+        if _err.code != 0:
+            raise FactoryException(_err.what)
+        return bool(bool_value.value)
+
     @property
     def name(self) -> str:
         err = Error()
@@ -1382,6 +1398,14 @@ class DataObject(_BaseObject):
     def name(self):
         raise AttributeError("do not delete name")
 
+    def has_id(self) -> bool:
+        _err = Error()
+        bool_value = ctypes.c_bool()
+        factorylib.lib.psrd_object_has_id(self._hdr, ctypes.byref(bool_value), _err.handler())
+        if _err.code != 0:
+            raise FactoryException(_err.what)
+        return bool(bool_value.value)
+
     @property
     def id(self) -> str:
         err = Error()
@@ -1905,6 +1929,8 @@ def _polars_dtype_to_column_type(dtype: "polars.datatypes.classes.DataTypeClass"
         return 4
     if dtype == polars.String:
         return 5
+    if dtype == polars.Boolean:
+        return 1  # TODO: create a boolean column type
     else:
         raise FactoryException(f"Unsupported polars dtype \"{dtype}\".")
 
@@ -2311,7 +2337,7 @@ class _DataFrameBuilder:
         return df
 
     def build_polars_dataframe(self, **kwargs) -> "polars.DataFrame":
-        use_object_dtype = kwargs.get("use_object_dtype", True)
+        use_object_dtype = kwargs.get("use_object_dtype", False)
         if not _has_polars():
             raise ModuleNotFoundError("polars required.")
         def convert_column_values(column_name:str, values):
@@ -2325,13 +2351,13 @@ class _DataFrameBuilder:
         data = {column.name: convert_column_values(column.name, column.values)
                 for column in self.indices + self.columns}
         if use_object_dtype:
-            return polars.DataFrame(data=data, dtype=object)
+            return polars.DataFrame({k: polars.Series(k, v, dtype=polars.Object) for k, v in data.items()})
         else:
             return polars.DataFrame(data=data)
 
     def build_from_polars(self, table_data: "polars.DataFrame") -> "DataFrame":
         # check if the table has indices and if its multi-index or common index
-        index_names = ("year", "week", "month", "hour", "scenario", "block", "stage")
+        index_names = ("year", "week", "month", "hour", "scenario", "block", "stage", "date")
         column_index = 0
         data_columns = table_data.columns[:]
         if len(self.column_names) != len(set(self.column_names)):

psr/factory/factorylib.py

@@ -157,14 +157,20 @@ def initialize():
     lib.psrd_object_get_key.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
     lib.psrd_object_set_key.restype = ctypes.c_int
     lib.psrd_object_set_key.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
+    lib.psrd_object_has_code.restype = ctypes.c_int
+    lib.psrd_object_has_code.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_bool), ctypes.c_void_p]
     lib.psrd_object_get_code.restype = ctypes.c_int
     lib.psrd_object_get_code.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_int), ctypes.c_void_p]
     lib.psrd_object_set_code.restype = ctypes.c_int
     lib.psrd_object_set_code.argtypes = [ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p]
+    lib.psrd_object_has_name.restype = ctypes.c_int
+    lib.psrd_object_has_name.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_bool), ctypes.c_void_p]
     lib.psrd_object_get_name.restype = ctypes.c_int
     lib.psrd_object_get_name.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
     lib.psrd_object_set_name.restype = ctypes.c_int
     lib.psrd_object_set_name.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
+    lib.psrd_object_has_id.restype = ctypes.c_int
+    lib.psrd_object_has_id.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_bool), ctypes.c_void_p]
     lib.psrd_object_get_id.restype = ctypes.c_int
     lib.psrd_object_get_id.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_void_p]
     lib.psrd_object_set_id.restype = ctypes.c_int

psr/runner/runner.py

@@ -236,6 +236,18 @@ def _get_optgen_executable_parent_path(optgen_path: Union[str, pathlib.Path]) ->
         optgen_path = os.path.realpath(optgen_path)
     return optgen_path
 
+def _get_optmain_executable_parent_path(optmain_path: Union[str, pathlib.Path]) -> str:
+    if os.name == 'nt':
+        model_path = os.path.join(optmain_path, "models", "optmain")
+        if os.path.exists(model_path):
+            return model_path
+        else:
+            return os.path.join(optmain_path, "Model")
+    else:
+        # solve symlinks, if needed
+        optmain_path = os.path.realpath(optmain_path)
+    return optmain_path
+
 
 def get_sddp_version(sddp_path: Union[str, pathlib.Path]) -> str:
     sddp_path = str(sddp_path)
@@ -320,6 +332,17 @@ def run_optgen_cleanup(case_path: Union[str, pathlib.Path], optgen_path: Union[s
     kwargs["_mode"] = "clean"
     run_optgen(case_path, optgen_path, sddp_path, **kwargs)
 
+
+def run_optmain(case_path: Union[str, pathlib.Path], optmain_path: Union[str, pathlib.Path], **kwargs):
+    case_path = os.path.abspath(str(case_path)).replace("\\", "/") + "/"
+    optmain_path = str(optmain_path)
+    optmain_path_full = _get_optmain_executable_parent_path(optmain_path)
+
+    with change_cwd(optmain_path_full):
+        cmd = f'optmain {case_path}'
+        exec_cmd(cmd, **kwargs)
+
+
 def run_psrio(case_path, sddp_path: str, **kwargs):
     recipe_script = kwargs.get('r', kwargs.get('recipes', False))
     output_path = kwargs.get('o', kwargs.get('output', False))

{psr_factory-5.0.0b67.dist-info → psr_factory-5.0.0b69.dist-info}/METADATA

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

{psr_factory-5.0.0b67.dist-info → psr_factory-5.0.0b69.dist-info}/RECORD

@@ -6,12 +6,13 @@ psr/execqueue/config.py,sha256=F8sp-JGeoRspQRR63SjSKV5wDz0OVGnA-cNm1UDYHBY,1693
 psr/execqueue/db.py,sha256=T3EWiK_2USmgNKTiVaavbqnS-EklCCZKsScOtdD6FgM,10853
 psr/execqueue/server.py,sha256=0N5_ekXj1h5A1QyI4xPmTDpYlAo-qQfLWAa-TL0syWI,28781
 psr/execqueue/watcher.py,sha256=R1dyXJ-OYn_QjqdItBwbLJZQ2LcbtdHqnRaYkyphi4w,5637
-psr/factory/__init__.py,sha256=KSv5D-MDslXpdDYG_dS2AepstsHOHOrJvQftXoA9b5E,219
-psr/factory/api.py,sha256=7rk0qAs36xUQFKyct8CWHh5wfGct-Vi-MH4wsSDa330,113875
-psr/factory/factory.dll,sha256=TqrlyNj9edTZxMz3RmfD1yeAJ_RuktXLdF2SVW3v12k,20271952
+psr/factory/__init__.py,sha256=SDxMzOm1aV-IMUXaahBqoutgc1lBZ69rE4YfLaROy1w,212
+psr/factory/api.py,sha256=PK0OpX4AtHE2u25vmaornVR4XU5jbwiQiTGlAlVPvao,115062
+psr/factory/factory.dll,sha256=QHD1k65DWU4jzQSOjw4DQVgR4IxF-t_Q6IAr98TMOOo,20277584
 psr/factory/factory.pmd,sha256=wPTJucfpUxc7vyeldE-caD4TqJiT_dCbl-DY2zOkq8c,252791
 psr/factory/factory.pmk,sha256=WrSXrK3zR_7v4cOVppRGWehnLhnZFSFWHnjyA9OUe00,607612
-psr/factory/factorylib.py,sha256=VV8CtwH30k5YItDn6SVo1o5LFJ_IG2WZjs0F1eIimcs,30750
+psr/factory/factorylib.py,sha256=-i_3j_dkCKZA_hpCePD7_qdGOqD8o89mwzqKmvya_EI,31226
+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=h0iVqswPeOzauikiHjwUiPRQbmIQjECPcGkX54G1Clo,5060
@@ -23,10 +24,10 @@ psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,20
 psr/psrfcommon/psrfcommon.py,sha256=LOuojeKX51eCMcPwpfDgRnGlK6WpS5UwDxQajbdRb5I,1571
 psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,3939
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
-psr/runner/runner.py,sha256=DN5oEPaQo7_LtYjoQgyLiiMBcwrDCUzbjXfWql6bNEI,29484
+psr/runner/runner.py,sha256=bgxZAvlgroe_F9QCInp9XbTVfSMSwjbpLEei5FeAxao,30352
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-5.0.0b67.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-5.0.0b67.dist-info/METADATA,sha256=DYdTRa9suJAe0ffO9EZFjNZ0w8pwhWTaEVwXy4NzsDM,1914
-psr_factory-5.0.0b67.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-psr_factory-5.0.0b67.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-5.0.0b67.dist-info/RECORD,,
+psr_factory-5.0.0b69.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-5.0.0b69.dist-info/METADATA,sha256=-1mvIhGhrAzHEVozKeJcccVfT1dvU7dCf5koKzWIvBA,1914
+psr_factory-5.0.0b69.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+psr_factory-5.0.0b69.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-5.0.0b69.dist-info/RECORD,,