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

psr/cloud/cloud.py

@@ -68,12 +68,8 @@ def _check_for_errors(
 
 
 def _hide_password(params: str) -> str:
-    # Define a expressão regular para encontrar o parâmetro senha com atributos adicionais
     pattern = r'(<Parametro nome="senha"[^>]*>)(.*?)(</Parametro>)'
-
-    # Substitui o conteúdo da senha por ********
     result = re.sub(pattern, r"\1********\3", params)
-
     return result
 
 
@@ -882,10 +878,21 @@ class Client:
         portal_ws = zeep.Client(self.cluster["url"] + "?WSDL")
         section = str(id(self))
         password_md5 = _md5sum(self.username + self.__password + section).upper()
+        password_md5 = (
+            password_md5
+            if self.cluster["name"] == "PSR-US"
+            or self.cluster["name"] == "PSR-HOTFIX"
+            or self.cluster["name"] == "PSR-US_OHIO"
+            else self.__password.upper()
+        )
         additional_arguments = kwargs.get("additional_arguments", None)
         parameters = {
             "sessao_id": section,
-            "tipo_autenticacao": "portal",
+            "tipo_autenticacao": "portal"
+            if self.cluster["name"] == "PSR-US"
+            or self.cluster["name"] == "PSR-HOTFIX"
+            or self.cluster["name"] == "PSR-US_OHIO"
+            else "bcrypt",
             "idioma": "3",
         }
         if additional_arguments:

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.1"
+__version__ = "0.3.3"

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

psr/factory/api.py

@@ -5,6 +5,7 @@
 import locale
 from typing import Dict, List, Optional, Tuple, Union
 from types import ModuleType
+import copy
 import ctypes
 import datetime as dt
 import enum
@@ -945,6 +946,9 @@ class DataObject(_BaseObject):
     def help(self) -> str:
         return help(self.type)
 
+    def clone(self) -> "DataObject":
+        return copy.copy(self)
+
     @property
     def context(self) -> "Context":
         _check_initialized()
@@ -1234,7 +1238,6 @@ class Context(DataObject):
 class Study(_BaseObject):
     def __init__(self):
         super().__init__()
-        self.find_by_name = self.find
 
     def __del__(self):
         if self._hdr is not None:
@@ -1269,10 +1272,18 @@ class Study(_BaseObject):
         dest._hdr = ref
         return dest
 
+    def create(self, object_type: str) -> DataObject:
+        _check_initialized()
+        return create(object_type, self.context)
+
+
     @staticmethod
     def help():
         return help("Study")
 
+    def clone(self) -> "Study":
+        return copy.deepcopy(self)
+
     @staticmethod
     def create_object(profile_or_context: Union[str, Context, dict, None],
                       blocks: Optional[int] = None):
@@ -1288,6 +1299,7 @@ class Study(_BaseObject):
 
     @staticmethod
     def load(study_path: Union[str, pathlib.Path], profile_or_context: Union[str, Context, None],
+             settings_only: bool = False,
              options: Optional[Union[dict, "Value", "DataObject"]] = None):
         if not isinstance(options, (DataObject, type(None))):
             raise TypeError("options must be a DataObject or None.")
@@ -1297,28 +1309,41 @@ class Study(_BaseObject):
         err = Error()
         options_value = _get_arg_object(options)
         study = Study()
-        study._hdr = factorylib.lib.psrd_study_load(_c_str(study_path),
-                                                    _bytes(study_path),
-                                                    options_value.handler(),
-                                                    context.handler(),
-                                                    err.handler())
+        if not settings_only:
+            load_fn = factorylib.lib.psrd_study_load
+        else:
+            load_fn = factorylib.lib.psrd_study_load_settings
+        study._hdr = load_fn(_c_str(study_path), _bytes(study_path),
+                             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[Union[dict, Value, DataObject]] = None):
-        if not isinstance(options, (DataObject, type(None))):
-            raise TypeError("options must be a DataObject or None.")
+    def save(self, output_path: Union[str, pathlib.Path],
+             options: Optional[Union[dict, Value, DataObject]] = None):
         output_path = str(output_path)
         _err = Error()
         options_value = _get_arg_object(options)
-        factorylib.lib.psrd_study_save(self._hdr, _c_str(output_path),
-                                       _bytes(output_path),
+        factorylib.lib.psrd_study_save(self._hdr,
+                                       _c_str(output_path), _bytes(output_path),
                                        options_value.handler(),
                                        _err.handler())
         if _err.code != 0:
             raise FactoryException(_err.what)
 
+    def save_settings(self, output_path: Union[str, pathlib.Path],
+             options: Optional[Union[dict, Value, DataObject]] = None):
+        output_path = str(output_path)
+        _err = Error()
+        options_value = _get_arg_object(options)
+        factorylib.lib.psrd_study_save_settings(self._hdr, _c_str(output_path),
+                                                _bytes(output_path),
+                                                options_value.handler(),
+                                                _err.handler())
+        if _err.code != 0:
+            raise FactoryException(_err.what)
+
     @property
     def context(self) -> "Context":
         _check_initialized()
@@ -1396,6 +1421,16 @@ class Study(_BaseObject):
         if _err.code != 0:
             raise FactoryException(_err.what)
 
+    def get_all_objects(self) -> List[DataObject]:
+        object_list = ValueList(False)
+        error = Error()
+        ref = factorylib.lib.psrd_study_get_all_objects(self._hdr,
+                                                        error.handler())
+        if error.code != 0 or ref is None:
+            raise FactoryException(error.what)
+        object_list._hdr = ref
+        return object_list.to_list()
+
     def find(self, expression: str) -> List[DataObject]:
         object_list = ValueList(False)
         _err = Error()
@@ -1407,6 +1442,27 @@ class Study(_BaseObject):
         object_list._hdr = ref
         return object_list.to_list()
 
+    def find_by_name(self, type_name: str, name: Optional[str] = None) -> List[DataObject]:
+        if name is None:
+            warnings.warn(DeprecationWarning("Starting from Factory 4.0.28 "
+                                             "the second argument 'name' must be provided.\n"
+                                             "Use find_by_name(type_name, name)"))
+
+        type_name, name_str = type_name.split(".", 1)
+        name = name_str
+        object_list = ValueList(False)
+        _err = Error()
+        if name.strip() == "":
+            name = "*"
+        expression = f"{type_name}.{name}"
+        ref = factorylib.lib.psrd_study_find(self._hdr,
+                                             _c_str(expression),
+                                             _err.handler())
+        if _err.code != 0 or ref is None:
+            raise FactoryException(_err.what)
+        object_list._hdr = ref
+        return object_list.to_list()
+
     def find_by_code(self, type_name: str, code: Optional[int] = None) -> List[DataObject]:
         if code is None:
             warnings.warn(DeprecationWarning("Starting from Factory 4.0.9 "
@@ -1727,7 +1783,7 @@ class _DataFrameBuilder:
                 if self._err.code != 0:
                     raise FactoryException(self._err.what)
                 # convert array values to python datetime
-                self.indices[index].values = [dt.datetime.utcfromtimestamp(value - _date_transform) for value in array_values]
+                self.indices[index].values = [dt.datetime.fromtimestamp(value - _date_transform, dt.UTC) for value in array_values]
             else:
                 array_values = (ctypes.c_int * rows_count)()
                 factorylib.lib.psrd_table_index_get_int32_values(df.handler(),
@@ -2254,7 +2310,15 @@ def create_study(*args, **kwargs) -> Study:
 def load_study(study_path: Union[str, pathlib.Path],
                profile_or_context: Union[str, Context, None] = None,
                options: Optional[DataObject] = None) -> Study:
-    return Study.load(study_path, profile_or_context, options)
+    settings_only = False
+    return Study.load(study_path, profile_or_context, settings_only, options)
+
+
+def load_study_settings(study_path: Union[str, pathlib.Path],
+               profile_or_context: Union[str, Context, None] = None,
+               options: Optional[DataObject] = None) -> Study:
+    settings_only = True
+    return Study.load(study_path, profile_or_context, settings_only, options)
 
 
 def create(class_name: str,

psr/factory/factory.pmd

@@ -2494,6 +2494,7 @@ DEFINE_MODEL MODL:Optgen_RestricaoCapacidade
 	PARM INTEGER	PenaltyFlag
 	PARM INTEGER	SystemCodePu
 	PARM REFERENCE  SystemElement PSRSystem
+	VECTOR REFERENCE AgentElement PSRElement
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Modelo para Restricao de Precedencia
@@ -2515,11 +2516,12 @@ DEFINE_MODEL MODL:Optgen_RestricaoGenerica
 	PARM DATE		DataMin
 	PARM DATE		DataMax
 	PARM REAL		RHS
-	PARM STRING		Type
 	VECTOR REAL		Coefficients
 	PARM INTEGER	LimitType
 	PARM REAL		Penalty
 	PARM INTEGER    Selected
+	PARM INTEGER	FlagIncremental
+	VECTOR REFERENCE AgentElement PSRElement
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Modelo para Restricao Generica
@@ -2737,6 +2739,7 @@ DEFINE_MODEL MODL:Optgen_Configuration_Keywords
     PARM INTEGER RXGM
     PARM INTEGER FSCN
     PARM INTEGER RMET
+    PARM REAL MXPF
 END_MODEL
 
 
@@ -2823,7 +2826,7 @@ DEFINE_CLASS PSRMaintenanceSolicitation
 	PARM REAL			Score
 	PARM INTEGER		Fix
 	PARM INTEGER		FixOuter
-	PARM REFERENCE		Plant
+	PARM REFERENCE		Plant PSRPlant
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2831,9 +2834,9 @@ END_CLASS
 //--------------------------------------------------------------------------------------------------
 DEFINE_CLASS PSRMaintenanceExclusive
 	PARM STRING  		SetName @id
-	VECTOR REFERENCE	PlantsThermal
-	VECTOR REFERENCE	PlantsHydro
-	VECTOR REFERENCE	PlantsGnd
+	VECTOR REFERENCE	PlantsThermal PSRThermalPlant
+	VECTOR REFERENCE	PlantsHydro PSRHydroPlant
+	VECTOR REFERENCE	PlantsGnd PSRGndPlant
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2841,9 +2844,9 @@ END_CLASS
 //--------------------------------------------------------------------------------------------------
 DEFINE_CLASS PSRMaintenanceShared
 	PARM STRING  		SetName @id
-	VECTOR REFERENCE	PlantsThermal
-	VECTOR REFERENCE	PlantsHydro
-	VECTOR REFERENCE	PlantsGnd
+	VECTOR REFERENCE	PlantsThermal PSRThermalPlant
+	VECTOR REFERENCE	PlantsHydro	PSRHydroPlant
+	VECTOR REFERENCE	PlantsGnd PSRGndPlant
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2882,7 +2885,8 @@ END_CLASS
 // Modelo para Demanda Instantanea
 //--------------------------------------------------------------------------------------------------
 MERGE_CLASS PSRSystem InstDem
-	VECTOR REAL  	    InstantDemand
+	VECTOR DATE			InstantDemandDate
+	VECTOR REAL  	    InstantDemand INDEX InstantDemandDate
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -2926,7 +2930,7 @@ DEFINE_CLASS PSRMaintenancePrecedence
 	PARM STRING  		PrecName @id
 	VECTOR INTEGER  	DelayMin
 	VECTOR INTEGER  	DelayMax
-	VECTOR REFERENCE	Solicitations
+	VECTOR REFERENCE	Solicitations	PSRMaintenanceSolicitation
 END_CLASS
 
 //--------------------------------------------------------------------------------------------------
@@ -3685,6 +3689,9 @@ DEFINE_MODEL MODL:SDDP_V10.2_ConfiguracaoEstudo
 	VETOR DATE SubHourlyStage
 	VETOR INTEGER SubHourlyScenario INDEX SubHourlyStage
 	VETOR INTEGER SubHourlyDays INDEX SubHourlyStage
+	PARM INTEGER DynamicConvergenceNumberSegments
+  VETOR REAL   DynamicConvergenceMaxTime
+  VETOR REAL   DynamicConvergenceTolerance
 
 	//--------------------------------------
 	//--- MAXREV                         ---
@@ -4185,11 +4192,13 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
 
 	//--- Net Head x Power ---
 	VECTOR DATE     HxP_Date
+	VECTOR DATE     HxP_EndDate INTERVAL HxP_Date
 	VECTOR REAL     NetHead  DIM(varpoint) INDEX HxP_Date
 	VECTOR REAL     Power    DIM(varpoint) INDEX HxP_Date
 
 	//--- Net Head x Production coefficient ---
 	VECTOR DATE     HxPC_Date
+	VECTOR DATE     HxPC_EndDate INTERVAL HxPC_Date
 	VECTOR REAL     NetH     DIM(varpoint) INDEX HxPC_Date
 	VECTOR REAL     ProdCoef DIM(varpoint) INDEX HxPC_Date
 
@@ -4442,8 +4451,8 @@ END_MODEL
 //--------------------------------------------------------------------------------------------------
 DEFINE_MODEL MODL:SDDP_V10.2_Combustivel
 	VETOR DATE		Data @addyear_chronological
-	PARM  STRING		UComb
-	PARM  STRING		UE
+	PARM  STRING	UComb
+	PARM  STRING	UE
 	PARM  REAL		EmiCO2
 	VETOR REAL		Custo INDEX Data
 
@@ -4452,7 +4461,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Combustivel
 	VETOR DATE		DataAvailability @addyear_chronological
 	VETOR REAL		Availability INDEX DataAvailability
 
-	PARM INTEGER		FlagScenario
+	PARM INTEGER	FlagScenario
 	VETOR REAL		ScenarioCost
 END_MODEL
 
@@ -4856,7 +4865,7 @@ END_MODEL
 // Supply chain Node
 //--------------------------------------------------------------------------------------------------
 DEFINE_MODEL MODL:SDDP_ElectrificationNode
-	// nada aqui
+	MERGE_MODEL Sddp_Georeference
 END_MODEL
 //--------------------------------------------------------------------------------------------------
 // Supply chain Transport
@@ -5030,7 +5039,6 @@ END_MODEL
 //--------------------------------------------------------------------------------------------------
 DEFINE_CLASS SingleContingency
 	@dictionary singlecontingency, singctg
-	PARM	STRING	name @id
 	PARM	REFERENCE	Serie PSRSerie @id
 	PARM	REFERENCE	MonitoringList MonitoringList
 END_CLASS
@@ -5166,7 +5174,7 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
     PARM INTEGER CCTA
     PARM INTEGER CCTL
     PARM INTEGER MAXT
-    PARM INTEGER RPK2
+    PARM STRING RPK2
     PARM INTEGER BINF
     PARM INTEGER EXPN
     PARM INTEGER MXAP
@@ -5295,27 +5303,29 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
     PARM INTEGER NCPL_TERF
     PARM INTEGER NCPL_DEBG
     PARM INTEGER NCPL_CCOS
-	PARM INTEGER NCPL_SCRT
-	PARM INTEGER NCPL_RLOS
-	PARM INTEGER NCPL_RSBT
-	PARM INTEGER NCPL_HUNI
-	PARM INTEGER NCPL_RAMP
-	PARM INTEGER NCPL_INCO
-	PARM INTEGER NCPL_RTRA
-	PARM INTEGER NCPL_INWT
-	PARM INTEGER NCPL_BINS
-	PARM INTEGER NCPL_BETR
-	PARM INTEGER NCPL_NDIS
-	PARM INTEGER NCPL_KDIS
-	PARM INTEGER NCPL_DETM
-	PARM INTEGER NCPL_CKMC
-	PARM INTEGER NCPL_TMUP
-	PARM INTEGER NCPL_GNPR
-	PARM INTEGER NCPL_PRES
-	PARM INTEGER NCPL_MEMO
-	PARM INTEGER NCPL_GMIN
-	PARM INTEGER NCPL_HGEN
-	PARM INTEGER NCPL_BMIP
+    PARM INTEGER NCPL_SCRT
+    PARM INTEGER NCPL_RLOS
+    PARM INTEGER NCPL_RSBT
+    PARM INTEGER NCPL_HUNI
+    PARM INTEGER NCPL_RAMP
+    PARM INTEGER NCPL_INCO
+    PARM INTEGER NCPL_RTRA
+    PARM INTEGER NCPL_INWT
+    PARM INTEGER NCPL_BINS
+    PARM INTEGER NCPL_BETR
+    PARM INTEGER NCPL_NDIS
+    PARM INTEGER NCPL_KDIS
+    PARM INTEGER NCPL_DETM
+    PARM INTEGER NCPL_CKMC
+    PARM INTEGER NCPL_TMUP
+    PARM INTEGER NCPL_GNPR
+    PARM INTEGER NCPL_PRES
+    PARM INTEGER NCPL_MEMO
+    PARM INTEGER NCPL_GMIN
+    PARM INTEGER NCPL_HGEN
+    PARM INTEGER NCPL_BMIP
+    PARM INTEGER NCPL_UDNC // use ncplite dynamic convergence
+	PARM INTEGER INFM
 END_MODEL
 
 //--------------------------------------------------------------------------------------------------
@@ -5363,11 +5373,21 @@ END_MODEL
 DEFINE_MODEL MODL:SDDP_Asset
 	DIMENSION owner
 
-    //--- Proprietários e participações ---
+	//--- Proprietários e participações ---
 	PARM REFERENCE Owner      DIM(owner) PSROwner
 	PARM REAL      OwnerShare DIM(owner)
 END_MODEL
 
+//----------------------------------------------------------------------
+// Propriedade/Ativo/Asset
+//----------------------------------------------------------------------
+DEFINE_MODEL MODL:SDDP_Ownership
+	//--- Relacionamento PSROwner x PSRElement ---
+	PARM	REFERENCE Owner      PSROwner
+	PARM	REFERENCE Element    PSRElement
+	PARM	REAL      Share
+END_MODEL
+
 //----------------------------------------------------------------------
 // Area
 //----------------------------------------------------------------------
@@ -5456,7 +5476,7 @@ DEFINE_MODEL MODL:SDDP_Line
 	VECTOR	REAL	Re INDEX Data
 	VECTOR	REAL	Prob INDEX Data
 
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	MERGE_MODEL MODL:SDDP_Asset
@@ -5500,7 +5520,7 @@ DEFINE_MODEL MODL:SDDP_Transformer
 	VECTOR	REAL	MinPhaseAngle INDEX Data
 	VECTOR	REAL	MaxPhaseAngle INDEX Data
 
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	VETOR	DATE	DateTap
@@ -5579,7 +5599,7 @@ DEFINE_MODEL MODL:SDDP_Transformer3Winding
 	VETOR	REAL	MinPhaseAngle3 INDEX Data
 	VETOR	REAL	MaxPhaseAngle3 INDEX Data
 
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	VETOR	DATE	DateTap
@@ -5708,14 +5728,14 @@ DEFINE_MODEL MODL:SDDP_TCSC
 	VETOR	REAL	Prob INDEX Data
 
 	//--- Status do circuito para cada patamar ---
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 
 	VETOR	DATE	DateBypass
 	VETOR	INTEGER	Bypass DIM(block) INDEX DateBypass
 
 	VETOR	DATE	DateSetpoint
-	VETOR	INTEGER	Setpoint DIM(block) INDEX DateSetpoint
+	VETOR	REAL	Setpoint DIM(block) INDEX DateSetpoint
 
 	VETOR	DATE	DateFlow
 	VETOR	REAL	MaxFlow DIM(block) INDEX DateFlow
@@ -5778,7 +5798,9 @@ DEFINE_MODEL MODL:SDDP_SimpleTwoTerminal_DCLink
 	VETOR	REAL	CapacityEmergencyFromTo INDEX Data
 	VETOR	REAL	CapacityEmergencyToFrom INDEX Data
 	VETOR	REAL	R INDEX Data
-	VETOR	INTEGER	Status INDEX Data
+
+	VETOR	DATE	DateStatus @addyear_fullmodification
+	VETOR	INTEGER	Status INDEX DateStatus
 
 	// Reactive power model
 	VETOR	REAL	ReactivePowerFactorFrom INDEX Data
@@ -5828,7 +5850,7 @@ DEFINE_MODEL MODL:SDDP_DCLine
 	VETOR	REAL	Re INDEX Data
 	VETOR	REAL	Prob INDEX Data
 
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 //----------------------------------------------------------------------
@@ -5866,7 +5888,7 @@ DEFINE_MODEL MODL:SDDP_LCC_Converter
 	VETOR	DATE	DateTap
 	VETOR	REAL	Tap DIM(block) INDEX DateTap
 
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 //----------------------------------------------------------------------
@@ -5887,7 +5909,7 @@ DEFINE_MODEL MODL:SDDP_VSC_Converter
 
     MERGE_MODEL MODL:SDDP_GeneratorVoltageRegulator
 
-	VETOR	DATE	DateStatus
+	VETOR	DATE	DateStatus @addyear_fullmodification
 	VETOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 
@@ -5903,7 +5925,7 @@ DEFINE_MODEL MODL:SDDP_BusShunt
 	VECTOR	REAL	B INDEX Data
 	VECTOR	INTEGER	NumberOfUnits INDEX Data
 	VECTOR	DATE	DateUnitsInService
-	VECTOR	REAL	UnitsInService DIM(block) INDEX DateUnitsInService
+	VECTOR	INTEGER	UnitsInService DIM(block) INDEX DateUnitsInService
 END_MODEL
 //----------------------------------------------------------------------
 // Non-linear Reactive Power Models - Line Shunt
@@ -5916,7 +5938,7 @@ DEFINE_MODEL MODL:SDDP_LineShunt
 	VECTOR	REAL	Bfrom	INDEX Data
 	VECTOR	REAL	Gto	INDEX Data
 	VECTOR	REAL	Bto	INDEX Data
-	VECTOR	DATE	DateStatus
+	VECTOR	DATE	DateStatus @addyear_fullmodification
 	VECTOR	INTEGER	Status DIM(block) INDEX DateStatus
 END_MODEL
 //----------------------------------------------------------------------