psr-factory 4.1.0b3__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.0b3"
+__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)

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
@@ -2921,26 +2922,26 @@ 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  ---
 //--------------------------------------
@@ -5246,6 +5247,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
     PARM INTEGER FINJ
     PARM INTEGER ETYP
     PARM INTEGER RFCF
+    PARM INTEGER RFIT
     PARM INTEGER PFCF
     PARM INTEGER PENL
     PARM INTEGER LSFI
@@ -5803,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

psr/factory/factory.pmk

@@ -6592,6 +6592,7 @@ END_MASK
 DEFINE_MASK CSVDATA Optmain_Prec
 
 DEFINE_HEADER
+$version=1
 !PrecName,SolName,DelayMin,DelayMax
 END_HEADER
 DEFINE_DATA
@@ -6627,6 +6628,397 @@ SetName	     			STRING,1
 Solicitation			STRING,2
 END_DATA
 END_MASK
+
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceSolicitation Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmcfg_v3
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmcfg.dat
+VERSION 3
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceSolicitation
+MODEL PSRMaintenanceSolicitation
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+Name			STRING,1	AUTOSET(model.parm("Name"))
+UnitCode			INTEGER,2	AUTOSET(model.parm("UnitCode"))
+MinDateDay			INTEGER,3	AUTOSET(model.parm("MinDateDay"))
+MinDateMonth			INTEGER,4	AUTOSET(model.parm("MinDateMonth"))
+MinDateYear			INTEGER,5	AUTOSET(model.parm("MinDateYear"))
+MaxDateDay			INTEGER,6	AUTOSET(model.parm("MaxDateDay"))
+MaxDateMonth			INTEGER,7	AUTOSET(model.parm("MaxDateMonth"))
+MaxDateYear			INTEGER,8	AUTOSET(model.parm("MaxDateYear"))
+Duration			INTEGER,9	AUTOSET(model.parm("Duration"))
+PrefDateDay			INTEGER,10	AUTOSET(model.parm("PrefDateDay"))
+PrefDateMonth			INTEGER,11	AUTOSET(model.parm("PrefDateMonth"))
+PrefDateYear			INTEGER,12	AUTOSET(model.parm("PrefDateYear"))
+Score			REAL,13	AUTOSET(model.parm("Score"))
+Fix			INTEGER,14	AUTOSET(model.parm("Fix"))
+FixOuter			INTEGER,15	AUTOSET(model.parm("FixOuter"))
+Plant			REFERENCE,16	AUTOSET(model.parm("Plant"))
+END_DATA
+DEFINE_HEADER
+$version=3
+!Name,UnitCode,MinDateDay,MinDateMonth,MinDateYear,MaxDateDay,MaxDateMonth,MaxDateYear,Duration,PrefDateDay,PrefDateMonth,PrefDateYear,Score,Fix,FixOuter,Plant
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusive Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexcl_v3
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexcl.dat
+VERSION 3
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusive
+MODEL PSRMaintenanceExclusive
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=3
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusive Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexclv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexclv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusive
+MODEL PSRMaintenanceExclusive
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceExclusive		REFERENCE,1
+PlantsThermal		REFERENCE,2
+PlantsHydro		REFERENCE,3
+PlantsGnd		REFERENCE,4
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceExclusive,PlantsThermal,PlantsHydro,PlantsGnd
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceShared Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmshr_v3
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmshr.dat
+VERSION 3
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceShared
+MODEL PSRMaintenanceShared
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=3
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceShared Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmshrv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmshrv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceShared
+MODEL PSRMaintenanceShared
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceShared		REFERENCE,1
+PlantsThermal		REFERENCE,2
+PlantsHydro		REFERENCE,3
+PlantsGnd		REFERENCE,4
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceShared,PlantsThermal,PlantsHydro,PlantsGnd
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceAssociation Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmass_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmass.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceAssociation
+MODEL PSRMaintenanceAssociation
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=2
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceAssociation Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmassv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmassv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceAssociation
+MODEL PSRMaintenanceAssociation
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceAssociation		REFERENCE,1
+Solicitations		REFERENCE,2
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceAssociation,Solicitations
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusiveSol Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexcls_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexcls.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusiveSol
+MODEL PSRMaintenanceExclusiveSol
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=2
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusiveSol Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexclsv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexclsv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusiveSol
+MODEL PSRMaintenanceExclusiveSol
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceExclusiveSol		REFERENCE,1
+Solicitations		REFERENCE,2
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceExclusiveSol,Solicitations
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRPlant Vectors indexed by RestDate
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmstgcstr
+DEFINE_AUTOMATIC_INFO
+FILENAME optmstgcstr.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRPlant
+MODEL StageCstr
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRPlant		REFERENCE,1
+RestDate		DATE,2	YYYY/MM/DD	AUTOSET
+RestrictedStages		INTEGER,3	AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRPlant,RestDate,RestrictedStages
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRSystem Vectors indexed by MinResDate
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmresmin_v2
+DEFINE_AUTOMATIC_INFO
+FILENAME optmresmin.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRSystem
+MODEL MinRes
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRSystem		REFERENCE,1
+MinResDate		DATE,2	YYYY/MM/DD	AUTOSET
+MinimumReserve		REAL,3	AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRSystem,MinResDate,MinimumReserve
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRSystem Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmload_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmload.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRSystem
+MODEL InstDem
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRSystem		REFERENCE,1
+InstantDemand		REAL,2
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRSystem,InstantDemand
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenancePrecedence Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmprec_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmprec.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenancePrecedence
+MODEL PSRMaintenancePrecedence
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PrecName			STRING,1	AUTOSET(model.parm("PrecName"))
+END_DATA
+DEFINE_HEADER
+$version=2
+!PrecName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenancePrecedence Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmprecv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmprecv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenancePrecedence
+MODEL PSRMaintenancePrecedence
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenancePrecedence		REFERENCE,1
+DelayMin		INTEGER,2
+DelayMax		INTEGER,3
+Solicitations		REFERENCE,4
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenancePrecedence,DelayMin,DelayMax,Solicitations
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRPlant Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmuntfct_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmuntfct.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRPlant
+MODEL UnitFactors
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRPlant		REFERENCE,1
+UnitFactors		REAL,2
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRPlant,UnitFactors
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRPlant Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmuntcod_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmuntcod.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRPlant
+MODEL UnitCodes
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRPlant		REFERENCE,1
+UnitCodes		INTEGER,2
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRPlant,UnitCodes
+END_HEADER
+END_MASK
+
 DEFINE_MASK CSVDATA Reliability_Generation
 DEFINE_HEADER
 Barra, Sis, Tp, Cod,      Nome, Uni, Pmn, Pmx, Qmn, Qmx,          tx.Falha,     tx.Retor
@@ -14672,13 +15064,12 @@ DEFINE_MASK CSVDATA SDDP_darea
 
 DEFINE_HEADER
 $version=2
-!Code,Name,SystemCode
+!Code,Name
 END_HEADER
 
 DEFINE_DATA
 Code       INTEGER 1
 Name       STRING  2
-SystemCode INTEGER 3
 END_DATA
 
 END_MASK
@@ -16417,6 +16808,30 @@ $version=1
 !code,Date,block,MinFlow,MaxFlow,MinFlowEmergency,MaxFlowEmergency
 END_HEADER
 END_MASK
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK CSVDATA SDDP_dcbusvolt
+DEFINE_AUTOMATIC_INFO
+FILENAME dcbusvolt.dat
+VERSION 1
+CONTEXT_READ sddpac
+CONTEXT_WRITE sddpac
+CLASSNAME PSRBusDC
+MODEL  MODL:SDDP_DCBus
+ATTRIBUTE_ID code
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+code        REFERENCE   1
+DateVolt    DATE        2 YYYY/MM/DD AUTOSET
+block       INTEGER     3
+Volt        REAL        4
+END_DATA
+DEFINE_HEADER
+$version=1
+!code,Date,block,Volt
+END_HEADER
+END_MASK
 
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------

{psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psr-factory
-Version: 4.1.0b3
+Version: 4.1.0b4
 Summary: PSR database management module.
 Author-email: "PSR Inc." <psrfactory@psr-inc.com>
 License: MIT License
@@ -46,7 +46,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Dynamic: license-file
 
-PSR Factory (version 4.1.0b3)
+PSR Factory (version 4.1.0b4)
 ============================
 
 Factory is a library that helps to manage SDDP cases. 
@@ -67,7 +67,7 @@ pip install psr-factory
 Or, if the package directly from the wheel (whl) file:
 
 ```bash
-pip install psr_factory-4.1.0b3-py3-none-win_amd64.whl
+pip install psr_factory-4.1.0b4-py3-none-win_amd64.whl
 ```
 
 Factory will be available to all Python scripts in your system after importing it:

{psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b4.dist-info}/RECORD

@@ -2,21 +2,21 @@ psr/apps/__init__.py,sha256=frSq1WIy5vIdU21xJIGX7U3XoAZRj0pcQmFb-R00b7I,228
 psr/apps/apps.py,sha256=8jVxTFZ73KFk_PbY-8rZDD8HBONdCjt-jzsDJyu2P50,6921
 psr/apps/version.py,sha256=vs459L6JsatAkUxna7BNG-vMCaXpO1Ye8c1bmkEx4U4,194
 psr/cloud/__init__.py,sha256=inZMwG7O9Fca9hg1BhqYObOYtTTJOkpuTIuXnkHJZkI,246
-psr/cloud/cloud.py,sha256=sl-Sbmhg7EPeECi1FH4fI12LGGzQA7eBtbb5zgINJ2A,42235
+psr/cloud/cloud.py,sha256=5Id6YAVqUjcakttj9DqiCmgviYWK5IBccOHkb5d4ltA,43374
 psr/cloud/data.py,sha256=3zWh1qnBNFfI8K3N8jZKqDnzHWMQ5llc_wwGMZ4FtKs,3548
 psr/cloud/desktop.py,sha256=JFroCMEFV1Nz3has74n7OVrGCg2lS7Ev5bcjdw2hRxY,2980
 psr/cloud/log.py,sha256=Dvhz1enIWlFWeaRK7JAAuZVPfODgoEIRNcHEmbEliyQ,1366
 psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
 psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
-psr/cloud/version.py,sha256=FMkUnJ7LLpNt9YmROO5l8D4w-g7A6-Fo0eI9JbYZh0o,192
+psr/cloud/version.py,sha256=BpUfaGYiH-pI7AmsrOg4kw1AMIrzxQnhaYJhik3dXPA,192
 psr/cloud/xml.py,sha256=dmBh4iRieORCctm1obz1EGA2QN-KkZlH5_dQfBud-AI,1847
-psr/factory/__init__.py,sha256=IVy9wUtd7XwVWcncZkrnNFvxa6H-DdlVgggY6VReIPk,218
-psr/factory/api.py,sha256=Ruz9klp70FJnsarb-Se5b5G5FAyqa11mBsP7CqBAzuo,95439
-psr/factory/factory.dll,sha256=C4cVo0_k0GHWTkktG6_Eu_gg6rgsR7_RTgLJxd8PPPk,17828912
-psr/factory/factory.pmd,sha256=r-2idBk98sKzDC-h0-nn6CF8Pr-mxz1RtnpEpvIEaU0,229581
-psr/factory/factory.pmk,sha256=NzPpz4_bR3hvBAff9BWqf-6IWcHNwDd31PHUizo4YYs,555896
+psr/factory/__init__.py,sha256=lgKVj-eqOOmnk_p7wb2ScOICXmUf_P_eILgZE2sJuI0,218
+psr/factory/api.py,sha256=A7MQ5uhCWHuy4dDwOf9i2zDZ7Jm-9lSYtkDgMFlw3n8,95962
+psr/factory/factory.dll,sha256=-D_fB_YeX-0qYDWdrqm5poGsbbCHx3946rcSGgGBazI,17805344
+psr/factory/factory.pmd,sha256=8AKUfKW1fQHT76oCzaCWLTpd0jwPTg2MV83C-KN4zA8,229668
+psr/factory/factory.pmk,sha256=cOMeJvl_magd8mfOwdt-IJ77nQx2CCutPzC_AYPurCo,568182
 psr/factory/factorylib.py,sha256=Orcg4X47J3J1CNr0WEERucqsTJLqt0TV9VFFZXLv6WE,26978
-psr/factory/libcurl-x64.dll,sha256=d8hRt8TBfeZxKiqQj1ZLxOjdgtZTawVMimzV3KGykRw,5328944
+psr/factory/libcurl-x64.dll,sha256=i1buVpg57cf1FMEI_ddD0ocD3fk74vqeosyBA7IJ5QQ,5319200
 psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,200
 psr/psrfcommon/psrfcommon.py,sha256=NABM5ahvyfSizDC9c0Vu9dVK1pD_vOzIGFHL1oz2E1o,1464
@@ -24,8 +24,8 @@ psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,39
 psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
 psr/runner/runner.py,sha256=fiuwKDRnqOLfV5UKJamLMZqm7PneeVjgEEmhpZbMm98,26340
 psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
-psr_factory-4.1.0b3.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
-psr_factory-4.1.0b3.dist-info/METADATA,sha256=e3ajWcmlXdJYZfnNBcpHI6cjg8lMBx6Ay1pm1XDdwuE,3721
-psr_factory-4.1.0b3.dist-info/WHEEL,sha256=GRAwO4abswPoD8u6X5Ix8yKoy-wTIXRf_V-PAIDNIsM,97
-psr_factory-4.1.0b3.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
-psr_factory-4.1.0b3.dist-info/RECORD,,
+psr_factory-4.1.0b4.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
+psr_factory-4.1.0b4.dist-info/METADATA,sha256=2OmQazPLiYvF_1958lyh2C6GtOBf24nuWTjD7lpNBKU,3721
+psr_factory-4.1.0b4.dist-info/WHEEL,sha256=jcBIzWeetTfKWoqh1t37_3WRou9luDyd3A1574l0jA4,97
+psr_factory-4.1.0b4.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
+psr_factory-4.1.0b4.dist-info/RECORD,,

{psr_factory-4.1.0b3.dist-info → psr_factory-4.1.0b4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-win_amd64