psr-factory 4.1.0b2__py3-none-win_amd64.whl → 4.1.0b4__py3-none-win_amd64.whl

psr/cloud/cloud.py

@@ -328,7 +328,7 @@ class Client:
             _hide_password(xml_content)
             raise CloudInputError(
                 f"Invalid XML content.\n"
-                f"Contact PSR support with following data:\n\n{xml_content}\n\nsuporte@psr-inc.com"
+                f"Contact PSR support at psrcloud@psr-inc.com with following data:\n\n{xml_content}\n\n"
             )
 
     def _get_clusters_by_user(self) -> list:
@@ -631,7 +631,7 @@ class Client:
             xml_str = _xml_to_str(xml)
             raise CloudError(
                 f"Case id not found on returned XML response.\n"
-                f"Contact PSR support with following data:\n\n{xml_str}\n\nsuporte@psr-inc.com"
+                f"Contact PSR support at psrcloud@psr-inc.com with following data:\n\n{xml_str}\n\n"
             )
 
         case_id = int(id_parameter.text)
@@ -679,7 +679,7 @@ class Client:
                 xml_str = _xml_to_str(xml)
                 raise CloudError(
                     f"Status not found on returned XML response.\n"
-                    f"Contact PSR support with following data:\n\n{xml_str}\n\nsuporte@psr-inc.com"
+                    f"Contact PSR support at psrcloud@psr-inc.com with following data:\n\n{xml_str}\n\n"
                 )
             try:
                 status = ExecutionStatus(int(parameter_status.text))
@@ -687,12 +687,35 @@ class Client:
                 xml_str = _xml_to_str(xml)
                 raise CloudError(
                     f"Unrecognized status on returned XML response.\n"
-                    f"Contact PSR support with following data:\n\n{xml_str}\n\nsuporte@psr-inc.com"
+                    f"Contact PSR support at psrcloud@psr-inc.com with following data:\n\n{xml_str}\n\n"
                 )
 
             self._logger.info(f"Status: {STATUS_MAP_TEXT[status]}")
             return status, STATUS_MAP_TEXT[status]
 
+    def list_download_files(self, case_id: int) -> List[str]:
+        xml_files = self._make_soap_request(
+            "prepararListaArquivosRemotaDownload",
+            "listaArquivoRemota",
+            additional_arguments={
+                "cluster": self.cluster["name"],
+                "filtro": "(.*)",
+                "diretorioRemoto": str(case_id),
+            },
+        )
+
+        files = []
+
+        for file in xml_files.findall("Arquivo"):
+            file_info = {
+                "name": file.attrib.get("nome"),
+                "filesize": file.attrib.get("filesize"),
+                "filedate": file.attrib.get("filedate"),
+            }
+            files.append(file_info)
+
+        return files
+
     def download_results(
         self,
         case_id: int,
@@ -816,7 +839,9 @@ class Client:
             initial_date_iso = since.strftime("%Y-%m-%d %H:%M:%S")
 
         xml = self._make_soap_request(
-            "listarFila", "dados", adition_arguments={"dataInicial": initial_date_iso}
+            "listarFila",
+            "dados",
+            additional_arguments={"dataInicial": initial_date_iso},
         )
 
         return self._cases_from_xml(xml)
@@ -830,7 +855,9 @@ class Client:
     def get_cases(self, case_ids: List[int]) -> List["Case"]:
         case_ids_str = ",".join(map(str, case_ids))
         xml = self._make_soap_request(
-            "listarFila", "dados", adition_arguments={"listaRepositorio": case_ids_str}
+            "listarFila",
+            "dados",
+            additional_arguments={"listaRepositorio": case_ids_str},
         )
         return self._cases_from_xml(xml)
 
@@ -851,18 +878,18 @@ class Client:
         budgets.sort()
         return budgets
 
-    def _make_soap_request(self, service: str, nome: str, **kwargs) -> ET.Element:
+    def _make_soap_request(self, service: str, name: str = "", **kwargs) -> ET.Element:
         portal_ws = zeep.Client(self.cluster["url"] + "?WSDL")
         section = str(id(self))
         password_md5 = _md5sum(self.username + self.__password + section).upper()
-        addition_arguments = kwargs.get("adition_arguments", "")
+        additional_arguments = kwargs.get("additional_arguments", None)
         parameters = {
             "sessao_id": section,
             "tipo_autenticacao": "portal",
             "idioma": "3",
         }
-        if addition_arguments:
-            parameters.update(addition_arguments)
+        if additional_arguments:
+            parameters.update(additional_arguments)
 
         # FIXME make additional arguments work as a dictionary to work with this code
         xml_input = create_case_xml(parameters)
@@ -871,22 +898,26 @@ class Client:
             xml_output_str = portal_ws.service.despacharServico(
                 service, self.username, password_md5, xml_input
             )
-        except zeep.exceptions.Fault:
+        except zeep.exceptions.Fault as e:
+            # Log the full exception details
+            self._logger.error(f"Zeep Fault: {str(e)}")
             raise CloudError(
-                "Failed to connect to PSR Cloud service. Contact PSR support: suporte@psr-inc.com"
+                "Failed to connect to PSR Cloud service. Contact PSR support: psrcloud@psr-inc.com"
             )
-
         # Remove control characters - this is a thing
         xml_output_str = xml_output_str.replace("", "")
 
         xml_output = ET.fromstring(xml_output_str)
-        xml_output = next(
-            (
-                ET.fromstring(child.text)
-                for child in xml_output
-                if child.attrib.get("nome") == nome
-            )
-        )
+
+        if name:
+            for child in xml_output:
+                if child.attrib.get("nome") == name:
+                    xml_output = ET.fromstring(child.text)
+                    break
+            else:
+                raise ValueError(
+                    f"Invalid XML response from PSR Cloud: {xml_output_str}. Please contact PSR support at psrcloud@psr-inc.com"
+                )
         return xml_output
 
     def _get_cloud_versions_xml(self) -> ET.Element:

psr/cloud/version.py

@@ -2,4 +2,4 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"

psr/factory/__init__.py

@@ -2,6 +2,6 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "4.1.0b2"
+__version__ = "4.1.0b4"
 
 from .api import *

psr/factory/api.py

@@ -257,6 +257,23 @@ def _get_context(models_or_context: Union[str, list, dict, "Context", None],
     value.set(context)
     return value
 
+def _get_arg_object(arg: Union[dict, "Value", "DataObject", None]) -> "Value":
+    if isinstance(arg, dict):
+        value = Value()
+        value.set(arg)
+        return value
+    elif isinstance(arg, Value):
+        return arg
+    elif isinstance(arg, DataObject):
+        value = Value()
+        value.set(arg)
+        return value
+    elif arg is None:
+        return Value()
+    else:
+        raise TypeError("Unexpected type for argument.")
+
+
 
 class _BaseObject:
     def __init__(self):
@@ -545,6 +562,7 @@ class ValueDict(_BaseObject):
 class Value(_BaseObject):
     def __init__(self):
         super().__init__()
+        _check_loaded()
         self._hdr = factorylib.lib.psrd_new_value()
 
     def __del__(self):
@@ -1270,32 +1288,33 @@ class Study(_BaseObject):
 
     @staticmethod
     def load(study_path: Union[str, pathlib.Path], profile_or_context: Union[str, Context, None],
-             options: Optional[DataObject] = None):
+             options: Optional[Union[dict, "Value", "DataObject"]] = None):
         if not isinstance(options, (DataObject, type(None))):
             raise TypeError("options must be a DataObject or None.")
+        _check_initialized()
         study_path = str(study_path)
         context = _get_context(profile_or_context, None)
         err = Error()
-        options_handler = options.handler() if options is not None else None
+        options_value = _get_arg_object(options)
         study = Study()
         study._hdr = factorylib.lib.psrd_study_load(_c_str(study_path),
                                                     _bytes(study_path),
-                                                    options_handler,
+                                                    options_value.handler(),
                                                     context.handler(),
                                                     err.handler())
         if err.code != 0:
             raise FactoryException(err.what)
         return study
 
-    def save(self, output_path: Union[str, pathlib.Path], options: Optional[DataObject] = None):
+    def save(self, output_path: Union[str, pathlib.Path], options: Optional[Union[dict, Value, DataObject]] = None):
         if not isinstance(options, (DataObject, type(None))):
             raise TypeError("options must be a DataObject or None.")
         output_path = str(output_path)
         _err = Error()
-        _options_handler = options.handler() if options is not None else None
+        options_value = _get_arg_object(options)
         factorylib.lib.psrd_study_save(self._hdr, _c_str(output_path),
                                        _bytes(output_path),
-                                       _options_handler,
+                                       options_value.handler(),
                                        _err.handler())
         if _err.code != 0:
             raise FactoryException(_err.what)
@@ -2091,16 +2110,16 @@ class DataFrame(_BaseObject):
             factorylib.lib.psrd_free_table(self._hdr)
 
     @staticmethod
-    def load_from_file(input_file: Union[str, pathlib.Path], options: Optional[DataObject] = None) -> "DataFrame":
+    def load_from_file(input_file: Union[str, pathlib.Path], options: Optional[Union[dict, Value, DataObject]] = None) -> "DataFrame":
         input_file = str(input_file)
         _check_initialized()
         _err = Error()
         table = DataFrame()
-        options_handler = options.handler() if options is not None else None
+        options_value = _get_arg_object(options)
         factorylib.lib.psrd_table_load(table.handler(),
                                        _c_str(input_file),
                                        _bytes(input_file),
-                                       options_handler,
+                                       options_value.handler(),
                                        _err.handler())
         if _err.code != 0:
             raise FactoryException(_err.what)
@@ -2119,13 +2138,13 @@ class DataFrame(_BaseObject):
             return df_builder.build_from_polars(dataframe_like)
         raise ImportError("Pandas or polars is not available. Please install pandas to use this feature.")
 
-    def save(self, output_file: Union[str, pathlib.Path], options: Optional[DataObject] = None):
+    def save(self, output_file: Union[str, pathlib.Path], options: Optional[Union[dict, Value, DataObject]] = None):
         output_file = str(output_file)
         _err = Error()
-        options_handler = options.handler() if options is not None else None
+        options_value = _get_arg_object(options)
         factorylib.lib.psrd_table_save(self._hdr, _c_str(output_file),
                                        _bytes(output_file),
-                                       options_handler,
+                                       options_value.handler(),
                                        _err.handler())
         if _err.code != 0:
             raise FactoryException(_err.what)
@@ -2174,6 +2193,10 @@ def _initialize():
             "INDEX_STARTS_AT_ZERO": True,
             "NAME": "Python",
             "VERSION": f"{sys.version}",
+            "EXE": f"{sys.executable}",
+            "LIB": f"{factorylib.get_lib_path()}",
+            "BASE_PREFIX": f"{sys.base_prefix}",
+            "REAL_PREFIX": f"{sys.prefix}",
         }
         for prop, value in map_prop_values.items():
             _value = Value()

psr/factory/factory.pmd

@@ -2493,6 +2493,7 @@ DEFINE_MODEL MODL:Optgen_RestricaoCapacidade
 	PARM INTEGER	FlagIncremental
 	PARM INTEGER	PenaltyFlag
 	PARM INTEGER	SystemCodePu
+	PARM REFERENCE  SystemElement PSRSystem
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Modelo para Restricao de Precedencia
@@ -2806,8 +2807,8 @@ END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Modelo para Solicitacao
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_Solicitacao
-	PARM STRING  		Name
+DEFINE_CLASS PSRMaintenanceSolicitation
+	PARM STRING  		Name @id
 	PARM INTEGER		UnitCode
 	PARM INTEGER		MinDateDay
 	PARM INTEGER		MinDateMonth
@@ -2823,66 +2824,66 @@ DEFINE_MODEL MODL:Optmain_Solicitacao
 	PARM INTEGER		Fix
 	PARM INTEGER		FixOuter
 	PARM REFERENCE		Plant
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Grupo Exclusivo
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_Excl
-	PARM STRING  		SetName
+DEFINE_CLASS PSRMaintenanceExclusive
+	PARM STRING  		SetName @id
 	VECTOR REFERENCE	PlantsThermal
 	VECTOR REFERENCE	PlantsHydro
 	VECTOR REFERENCE	PlantsGnd
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Grupo Compartilhado
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_Shared
-	PARM STRING  		SetName
+DEFINE_CLASS PSRMaintenanceShared
+	PARM STRING  		SetName @id
 	VECTOR REFERENCE	PlantsThermal
 	VECTOR REFERENCE	PlantsHydro
 	VECTOR REFERENCE	PlantsGnd
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Grupo Associado
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_Ass
-	PARM STRING  		SetName
+DEFINE_CLASS PSRMaintenanceAssociation
+	PARM STRING  		SetName @id
 	VECTOR REFERENCE	Solicitations
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Restricoes de Solicitacoes Exclusivas
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_ExclSol
-	PARM STRING  		SetName
+DEFINE_CLASS PSRMaintenanceExclusiveSol
+	PARM STRING  		SetName @id
 	VECTOR REFERENCE	Solicitations
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Periodos Restritos
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_StageCstr
+MERGE_CLASS PSRPlant StageCstr
 	VECTOR DATE			RestDate
 	VECTOR INTEGER	    RestrictedStages INDEX RestDate
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Reserva Minima
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_MinRes
+MERGE_CLASS PSRSystem MinRes
 	VECTOR DATE			MinResDate
 	VECTOR REAL	        MinimumReserve INDEX MinResDate
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Demanda Instantanea
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_InstDem
-	VECTOR REAL  	    InstantDemand 
-END_MODEL
+MERGE_CLASS PSRSystem InstDem
+	VECTOR REAL  	    InstantDemand
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Parametros de Opcoes
@@ -2914,31 +2915,33 @@ DEFINE_MODEL MODL:Optmain_Options
 	PARM INTEGER		RFBF
 	PARM INTEGER		ASNM
 	PARM INTEGER		ASDT
+	PARM INTEGER		TUNE
+	PARM INTEGER		NCVR
 END_MODEL
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Restricoes de Precedencia
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_Prec
-	PARM STRING  		PrecName
+DEFINE_CLASS PSRMaintenancePrecedence
+	PARM STRING  		PrecName @id
 	VECTOR INTEGER  	DelayMin
 	VECTOR INTEGER  	DelayMax
 	VECTOR REFERENCE	Solicitations
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Fatores de Unidades
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_UnitFactors
+MERGE_CLASS PSRPlant UnitFactors
 	VECTOR REAL		UnitFactors
-END_MODEL
+END_CLASS
 
 //--------------------------------------------------------------------------------------------------
 // Modelo para Mapeamento de Unidades
 //--------------------------------------------------------------------------------------------------
-DEFINE_MODEL MODL:Optmain_UnitCodes
+MERGE_CLASS PSRPlant UnitCodes
 	VECTOR INTEGER  	UnitCodes
-END_MODEL
+END_CLASS
 //--------------------------------------
 //--- Modelo de Avaliacao Economica  ---
 //--------------------------------------
@@ -4103,6 +4106,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
 	VETOR DATE      Data @addyear_modification
 	VETOR INTEGER   Existing       INDEX Data
 	VETOR INTEGER   Unidades       INDEX Data
+	VETOR REAL      MinGen         INDEX Data
 	VETOR REAL      PotInst        INDEX Data
 	VETOR REAL      FPMed          INDEX Data
 	VETOR REAL      Qmin           INDEX Data
@@ -4245,6 +4249,10 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
 	PARM INTEGER 	SingleReserveInfo
 	PARM INTEGER 	SingleReserveUnit
 
+	PARM  REAL      MinTurbiningPenalty
+	VETOR DATE      DataMinTurbining @chronological @addyear_chronological
+	VETOR REAL      MinTurbining INDEX  DataMinTurbining
+
 	PARM  REAL      MaxTurbiningPenalty
 	VETOR DATE      DataMaxTurbining @chronological @addyear_chronological
 	VETOR REAL      MaxTurbining INDEX  DataMaxTurbining
@@ -4998,7 +5006,7 @@ DEFINE_MODEL MODL:SDDP_WaterWay
 	PARM  REAL      FlowMax
 	VETOR DATE      DataFlowMaximum
 	VETOR REAL      FlowMaximum INDEX DataFlowMaximum
-	PARM  INTEGER   TravelTime
+	PARM  REAL      TravelTime
 	PARM  INTEGER   Disabled
 END_MODEL
 
@@ -5238,6 +5246,39 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
     PARM INTEGER HIRS
     PARM INTEGER FINJ
     PARM INTEGER ETYP
+    PARM INTEGER RFCF
+    PARM INTEGER RFIT
+    PARM INTEGER PFCF
+    PARM INTEGER PENL
+    PARM INTEGER LSFI
+    PARM INTEGER FIXL
+    PARM INTEGER HCMT
+    PARM REAL MXFT
+    PARM INTEGER HLFR
+    PARM INTEGER LSUP
+    PARM INTEGER PVNC
+    PARM INTEGER HMEM
+    PARM INTEGER HTPP
+    PARM INTEGER FSCN
+    PARM INTEGER SKPS
+    PARM REAL MMPP
+    PARM INTEGER FMIP
+    PARM INTEGER MUPR
+    PARM INTEGER MXBD
+    PARM REAL TOLR
+    PARM INTEGER IGMR
+    PARM REAL GCTE
+    PARM INTEGER LCIR
+    PARM INTEGER VSEC
+    PARM INTEGER SRPD
+    PARM INTEGER LSST
+    PARM REAL LLSF
+    PARM INTEGER GLLS
+    PARM INTEGER LSAL
+    PARM INTEGER PTOU
+    PARM INTEGER SHOT
+    PARM INTEGER FCFO
+    PARM INTEGER HYRM
 
     PARM REAL NCPL_MIPR
     PARM REAL NCPL_LTOL
@@ -5281,10 +5322,13 @@ END_MODEL
 // Generic variable
 //--------------------------------------------------------------------------------------------------
 DEFINE_MODEL PSRGenericVariable
-    PARM    STRING     unit
-	PARM	INTEGER	   resol
+	PARM    STRING     unit
+	PARM    INTEGER	   resol
 	PARM    INTEGER    type // 0 continuous, 1 binary
+	PARM    INTEGER    UseCostAndBounds //determines if following values are used
 	PARM    REAL       cost
+	PARM    REAL       UpperBound
+	PARM    REAL       LowerBound
 END_MODEL
 
 //--------------------------------------------------------------------------------------------------
@@ -5295,6 +5339,7 @@ DEFINE_MODEL PSRHydroUnit
 	VETOR	INTEGER		Nunits INDEX Data
 	VETOR	REAL		MinTurb INDEX Data
 	VETOR	REAL		MaxTurb INDEX Data
+	VETOR	REAL		MinGen INDEX Data
 	VETOR	REAL		MaxGen INDEX Data
 	VETOR	INTEGER		Existing INDEX Data
 END_MODEL
@@ -5329,10 +5374,10 @@ END_MODEL
 DEFINE_MODEL MODL:SDDP_Area
 	DIMENSION block
 
-	//--- Importação da Area do  ---
-	VETOR	DATE	DateTransfer @addyear_modification
-	VETOR	REAL	MaxImport DIM(block) INDEX DateTransfer
-	VETOR	REAL	MaxExport DIM(block) INDEX DateTransfer
+	VETOR	DATE	DateMinTransfer @addyear_modification
+	VETOR	DATE	DateMaxTransfer @addyear_modification
+	VETOR	REAL	MinTransfer DIM(block) INDEX DateMinTransfer
+	VETOR	REAL	MaxTransfer DIM(block) INDEX DateMaxTransfer
 END_MODEL
 
 //----------------------------------------------------------------------
@@ -5694,6 +5739,7 @@ DEFINE_MODEL MODL:SDDP_FlowController
 	VETOR	REAL	Xmax INDEX Data
 	VETOR	REAL	Rn INDEX Data
 	VETOR	REAL	Re INDEX Data
+	VETOR	REAL	MaxPower INDEX Data
 
 	PARM	INTEGER	Location
 	PARM	INTEGER	FlowControlType
@@ -5759,8 +5805,8 @@ DEFINE_MODEL MODL:SDDP_DCBus
 	PARM	REAL	BaseVoltage
 	PARM	REAL	GroundResistance
 
-	VETOR	DATE	DataVoltage
-	VETOR	REAL	Voltage DIM(block) INDEX DataVoltage
+	VETOR	DATE	DateVolt
+	VETOR	REAL	Volt DIM(block) INDEX DateVolt
 
 	MERGE_MODEL Sddp_Georeference
 END_MODEL
@@ -5949,6 +5995,7 @@ DEFINE_CLASS PSRGenerationOfferHydroPlant
 	VECTOR	DATE 		Date @addyear_modification
 	VECTOR	REAL		Price INDEX Date
 	VECTOR	REAL		Quantity INDEX Date
+	PARM	REFERENCE	Plant PSRHydroPlant
 END_CLASS
 
 DEFINE_CLASS PSRGenerationOfferThermalPlant
@@ -5958,6 +6005,7 @@ DEFINE_CLASS PSRGenerationOfferThermalPlant
 	VECTOR	DATE 		Date @addyear_modification
 	VECTOR	REAL		Price INDEX Date
 	VECTOR	REAL		Quantity INDEX Date
+	PARM	REFERENCE	Plant PSRThermalPlant
 END_CLASS
 
 DEFINE_CLASS PSRGenerationOfferRenewablePlant
@@ -5967,6 +6015,7 @@ DEFINE_CLASS PSRGenerationOfferRenewablePlant
 	VECTOR	DATE 		Date @addyear_modification
 	VECTOR	REAL		Price INDEX Date
 	VECTOR	REAL		Quantity INDEX Date
+	PARM	REFERENCE	Plant PSRGndPlant
 END_CLASS
 
 //----------------------------------------------------------------------