Skip to content

Prevent Conflicting Contingencies #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HaleyRoss wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent Conflicting Contingencies #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
370ac64
Prevent uncalled disturbances from activating
HaleyRoss Aug 28, 2026
4d74a09
Merge remote-tracking branch 'origin/master' into hr/helics_gen_trip
HaleyRoss Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion pypsse/models.py
View file
Open in desktop

@nadiavp nadiavp Sep 14, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could see upcoming use cases where durations were needed for all faults/trips when modeling restoration. Is there a different reason you added the ConfigDict(extra="forbid")?
I could also see this messing with other branches if others have built upon these classes.

Isn't it on the user to prevent conflicting contingencies in their input file? Let me know if I'm missing something, but I'm not sure this change belongs in main.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Dict, List, Literal, Optional, Union, Any

import pandas as pd
from pydantic import UUID4, BaseModel, Field, model_validator
from pydantic import UUID4, BaseModel, ConfigDict, Field, field_validator, model_validator
from pydantic.networks import IPvAnyAddress
from typing_extensions import Annotated

Expand Down Expand Up @@ -247,6 +247,8 @@ class GeneratorSettings(BaseModel):

class BusFault(BaseModel):
"Bus fault model defination"
model_config = ConfigDict(extra="forbid")

time: float = 0.2
bus_id: int = 38205
duration: float = 0.3
Expand All @@ -260,12 +262,16 @@ class BusFault(BaseModel):

class BusTrip(BaseModel):
"Bus trip model defination"
model_config = ConfigDict(extra="forbid")

time: float = 0.2
bus_id: int = 38205


class LineFault(BaseModel):
"Line fault model defination"
model_config = ConfigDict(extra="forbid")

time: float = 0.2
bus_ids: List[int]
duration: float = 0.3
Expand All @@ -279,12 +285,16 @@ class LineFault(BaseModel):

class LineTrip(BaseModel):
"Line trip model defination"
model_config = ConfigDict(extra="forbid")

time: float = 0.2
bus_ids: List[int]


class MachineTrip(BaseModel):
"Machine trip model defination"
model_config = ConfigDict(extra="forbid")

time: float = 0.2
bus_id: int = 38205

@nadiavp nadiavp Sep 14, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all other trips are just a list of ints, why is this one a specific int?

machine_id: str = ""
Expand All @@ -306,6 +316,18 @@ class SimulationSettings(BaseModel):
List[Union[BusFault, LineFault, LineTrip, BusTrip, MachineTrip]]
] = None

@field_validator("contingencies", mode="before")
@classmethod
def parse_machine_trip_contingencies(cls, contingencies):
if contingencies is None:
return contingencies
return [
MachineTrip(**contingency)
if isinstance(contingency, dict) and "machine_id" in contingency
else contingency
for contingency in contingencies
]

@model_validator(mode="after")
def validate_export_paths(self):
base_project_path = self.simulation.project_path
Expand Down
8 changes: 8 additions & 0 deletions pypsse/simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@ def from_setting_files(
)

simulation_settiings = SimulationSettings(**simulation_settiings)
logger.debug(
"Simulator parsed contingencies: {}".format(
[
type(contingency).__name__
for contingency in simulation_settiings.contingencies or []
]
)
)
export_Settings = ExportFileOptions(**export_Settings)
return cls(simulation_settiings, export_Settings)

Expand Down