reverting to pp 1.11.2

m-karo · m-karo · commit b1e5f5fde23c · 2025-09-18T13:48:13.000+03:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ dependencies = [
     "pika>=1.3.2",
     "pip>=25.1.1",
     "pydantic>=2.11.5",
-    "pypowsybl>=1.12.0",
+    "pypowsybl>=1.11.0",
     "rdflib>=7.1.4",
     "requests>=2.32.3",
     "setuptools>=80.4.0",
diff --git a/rao/config.properties b/rao/config.properties
@@ -5,6 +5,7 @@ RMQ_QUEUE_IN = rao.violations
 OPTIMIZE_ONLY_CURRENT_VIOLATIONS = True
 CRAC_USE_LIMITS_FROM_MODEL = True
 VIOLATION_THRESHOLD_PERCENT = 100
+CONTINGENCIES_COUNT_THRESHOLD = 10
 ELASTIC_RESULTS_INDEX = rao-results
 S3_BUCKET_RESULTS = opde-confidential-analyses
 DEBUG = False
diff --git a/rao/crac/models.py b/rao/crac/models.py
@@ -120,11 +120,16 @@ class Config:
     def exclude_3w_transformer_from_flow_cnecs(self, values: List[FlowCnec]) -> List[FlowCnec]:
         # TODO TEMPORARY FILTER - remove after September release
         logger.warning(f"[TEMPORARY] Excluding 3W transformers from serialized CNECs for operator: ELERING")
+        logger.warning(f"[TEMPORARY] Excluding paired dangling lines from serialized CNECs")
         result = []
         for cnec in values:
             if "AT" in cnec.name and "10X1001A1001A39W" in cnec.operator:
                 logger.warning(f"3W transformer CNEC excluded: {cnec.name} [{cnec.instant}]")
                 continue
+            # TODO - relevant until pypowsybl 1.11.2
+            elif "Tie-line" in cnec.description:
+                logger.warning(f"Dangling line CNEC excluded: {cnec.name} [{cnec.instant}]")
+                continue
             else:
                 result.append(cnec)
 
diff --git a/rao/handlers.py b/rao/handlers.py
@@ -40,6 +40,9 @@ def __init__(self, current_violations_only: bool = OPTIMIZE_ONLY_CURRENT_VIOLATI
         except Exception as e:
             logger.error(f"Failed to initialize ObjectStorage service: {e}")
 
+        # Loading configuration
+        self.lf_settings_manager = LoadflowSettingsManager()
+
         # Metadata
         self.scenario_timestamp = None
         self.network_model_meta = None
@@ -194,6 +197,14 @@ def handle(self, message: bytes, properties: object, **kwargs):
         else:
             logger.info(f"SAR profile contains number of relevant violations: {len(violations)}")
 
+        # Exit if there are more unique contingencies to be optimized than configured limit
+        if 'ContingencyPowerFlowResult.Contingency' in violations.columns:
+            _contingencies_count = len(violations['ContingencyPowerFlowResult.Contingency'].unique())
+            logger.info(f"SAR profile contains number of unique contingencies: {_contingencies_count}")
+            if _contingencies_count > CONTINGENCIES_COUNT_THRESHOLD:
+                logger.error("Number of unique contingencies is above threshold and message can not be processed")
+                return message, properties
+
         # Get network model from object storage
         content_reference = properties.headers.get('content-reference', None)
         if not content_reference:
@@ -203,13 +214,13 @@ def handle(self, message: bytes, properties: object, **kwargs):
         logger.info(f"Loading network model to pypowsybl")
         self.network = pypowsybl.network.load_from_binary_buffer(
             buffer=network_object,
-            parameters=LoadflowSettingsManager().config['CGMES_IMPORT_PARAMETERS'])
+            parameters=self.lf_settings_manager.config['CGMES_IMPORT_PARAMETERS'])
 
         # Solve initial loadflow on retrieved model
         logger.info(f"Solve initial loadflow analysis")
         lf_result = pypowsybl.loadflow.run_ac(
             network=self.network,
-            parameters=LoadflowSettingsManager().build_pypowsybl_parameters())
+            parameters=self.lf_settings_manager.build_pypowsybl_parameters())
         logger.info(f"Loadflow status: {lf_result[0]}")
         if lf_result[0].status.value:
             logger.error(f"Initial load flow computation failed, exiting message handling")
diff --git a/rao/parameters/loadflow.py b/rao/parameters/loadflow.py
@@ -87,7 +87,6 @@
     dc_use_transformer_ratio=True,
     countries_to_balance=[],
     connected_component_mode=pypowsybl.loadflow.ConnectedComponentMode.ALL,
-    hvdc_ac_emulation=True,
     dc_power_factor=1.0,
     provider_parameters=LF_PROVIDER,
 )
diff --git a/rao/parameters/manager.py b/rao/parameters/manager.py
@@ -40,6 +40,10 @@ def __init__(self, override_path: str | None = None):
         # Decide override path from arg or env
         env_path = os.environ.get('LOADFLOW_CONFIG_OVERRIDE_PATH')
         self.override_path = Path(override_path or env_path) if (override_path or env_path) else None
+        if self.override_path:
+            logger.info(f"Loadflow settings override path: {self.override_path}")
+        else:
+            logger.info("Using default loadflow settings")
 
         # Build defaults snapshot (dict-based), then merge overrides if any
         base = {
@@ -242,6 +246,8 @@ class RaoSettingsManager:
 
     RAO_PARAMETERS_VERSION_MAP = {
         "1.11.0": f"{Path(__file__).parent.joinpath('rao_v30.json')}",
+        "1.11.1": f"{Path(__file__).parent.joinpath('rao_v30.json')}",
+        "1.11.2": f"{Path(__file__).parent.joinpath('rao_v30.json')}",
         "1.12.0": f"{Path(__file__).parent.joinpath('rao_v31.json')}",
     }
 
diff --git a/rao/parameters/rao_v30.json b/rao/parameters/rao_v30.json
@@ -59,10 +59,11 @@
           "load-flow-parameters" : {
             "version" : "1.9",
             "voltageInitMode" : "UNIFORM_VALUES",
-            "transformerVoltageControlOn" : false,
+            "transformerVoltageControlOn" : true,
             "phaseShifterRegulationOn" : false,
+            "useReactiveLimits" : true,
             "twtSplitShuntAdmittance" : false,
-            "shuntCompensatorVoltageControlOn" : false,
+            "shuntCompensatorVoltageControlOn" : true,
             "readSlackBus" : true,
             "writeSlackBus" : true,
             "dc" : false,
@@ -75,22 +76,80 @@
             "dcPowerFactor" : 1.0,
             "extensions" : {
               "open-load-flow-parameters" : {
-                "plausibleActivePowerLimit" : 10000.0,
-                "minPlausibleTargetVoltage" : 0.8,
-                "maxPlausibleTargetVoltage" : 1.2,
-                "maxNewtonRaphsonIterations" : 30,
-                "newtonRaphsonConvEpsPerEq" : 1.0E-3,
-                "slackBusSelectionMode" : "MOST_MESHED",
+                "slackBusSelectionMode" : "LARGEST_GENERATOR",
                 "slackBusesIds" : [ ],
+                "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
+                "voltageRemoteControl" : true,
+                "voltageRemoteControlRobustMode" : true,
                 "lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
                 "loadPowerFactorConstant" : false,
+                "plausibleActivePowerLimit" : 10000.0,
+                "newtonRaphsonStoppingCriteriaType" : "UNIFORM_CRITERIA",
+                "maxActivePowerMismatch" : 0.01,
+                "maxReactivePowerMismatch" : 0.01,
+                "maxVoltageMismatch" : 1.0E-4,
+                "maxAngleMismatch" : 1.0E-5,
+                "maxRatioMismatch" : 1.0E-5,
+                "maxSusceptanceMismatch" : 1.0E-4,
                 "slackBusPMaxMismatch" : 0.1,
                 "voltagePerReactivePowerControl" : false,
-                "voltageInitModeOverride" : "NONE",
-                "transformerVoltageControlMode" : "AFTER_GENERATOR_VOLTAGE_CONTROL",
+                "generatorReactivePowerRemoteControl" : false,
+                "transformerReactivePowerControl" : false,
+                "maxNewtonRaphsonIterations" : 30,
+                "maxOuterLoopIterations" : 20,
+                "newtonRaphsonConvEpsPerEq" : 0.001,
+                "voltageInitModeOverride" : "FULL_VOLTAGE",
+                "transformerVoltageControlMode" : "INCREMENTAL_VOLTAGE_CONTROL",
+                "shuntVoltageControlMode" : "INCREMENTAL_VOLTAGE_CONTROL",
+                "minPlausibleTargetVoltage" : 0.8,
+                "maxPlausibleTargetVoltage" : 1.2,
+                "minNominalVoltageTargetVoltageCheck" : 20.0,
                 "minRealisticVoltage" : 0.5,
                 "maxRealisticVoltage" : 1.5,
-                "reactiveRangeCheckMode" : "MAX"
+                "lowImpedanceThreshold" : 3.0E-5,
+                "reactiveRangeCheckMode" : "MAX",
+                "networkCacheEnabled" : false,
+                "svcVoltageMonitoring" : true,
+                "stateVectorScalingMode" : "NONE",
+                "maxSlackBusCount" : 1,
+                "debugDir" : null,
+                "incrementalTransformerRatioTapControlOuterLoopMaxTapShift" : 3,
+                "secondaryVoltageControl" : false,
+                "reactiveLimitsMaxPqPvSwitch" : 3,
+                "phaseShifterControlMode" : "CONTINUOUS_WITH_DISCRETISATION",
+                "alwaysUpdateNetwork" : false,
+                "mostMeshedSlackBusSelectorMaxNominalVoltagePercentile" : 95.0,
+                "reportedFeatures" : [ ],
+                "slackBusCountryFilter" : ["PL"],
+                "actionableSwitchesIds" : [ ],
+                "actionableTransformersIds" : [ ],
+                "asymmetrical" : false,
+                "reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
+                "outerLoopNames" : null,
+                "useActiveLimits" : true,
+                "disableVoltageControlOfGeneratorsOutsideActivePowerLimits" : false,
+                "lineSearchStateVectorScalingMaxIteration" : 10,
+                "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+                "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+                "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+                "linePerUnitMode" : "IMPEDANCE",
+                "useLoadModel" : false,
+                "dcApproximationType" : "IGNORE_R",
+                "simulateAutomationSystems" : false,
+                "acSolverType" : "NEWTON_RAPHSON",
+                "maxNewtonKrylovIterations" : 100,
+                "newtonKrylovLineSearch" : false,
+                "referenceBusSelectionMode" : "GENERATOR_REFERENCE_PRIORITY",
+                "writeReferenceTerminals" : true,
+                "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ],
+                "transformerVoltageControlUseInitialTapPosition" : false,
+                "generatorVoltageControlMinNominalVoltage" : -1.0,
+                "fictitiousGeneratorVoltageControlCheckMode" : "FORCED",
+                "areaInterchangeControl" : false,
+                "areaInterchangeControlAreaType" : "ControlArea",
+                "areaInterchangePMaxMismatch" : 2.0,
+                "forceTargetQInReactiveLimits" : false,
+                "disableInconsistentVoltageControls" : false
               }
             }
           }
diff --git a/rao/parameters/rao_v31.json b/rao/parameters/rao_v31.json
@@ -59,6 +59,7 @@
             "voltageInitMode" : "UNIFORM_VALUES",
             "transformerVoltageControlOn" : true,
             "phaseShifterRegulationOn" : false,
+            "useReactiveLimits" : true,
             "twtSplitShuntAdmittance" : false,
             "shuntCompensatorVoltageControlOn" : true,
             "readSlackBus" : true,
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@`
`87`	`87`	`dc_use_transformer_ratio=True,`
`88`	`88`	`countries_to_balance=[],`
`89`	`89`	`connected_component_mode=pypowsybl.loadflow.ConnectedComponentMode.ALL,`
`90`		`- hvdc_ac_emulation=True,`
`91`	`90`	`dc_power_factor=1.0,`
`92`	`91`	`provider_parameters=LF_PROVIDER,`
`93`	`92`	`)`