Skip to content

refactor: add yaml process constraints #1376

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

Merged
frodehk merged 4 commits into from
Feb 10, 2026
Merged

refactor: add yaml process constraints #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89b67a8
refactor: add yaml process constraints
frodehk Feb 5, 2026
d696657
chore: update targets
frodehk Feb 5, 2026
16c6ae6
chore: remove intermediate and add support for inline definitions
frodehk Feb 9, 2026
1d6bb2f
chore: dont expect numpy to be unlicensed
frodehk Feb 10, 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
2 changes: 1 addition & 1 deletion .github/workflows/license-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
env:
UNRESOLVED_LICENSES: "${{ steps.review.outputs.invalid-license-changes }}"
run: |
EXPECTED='{"unlicensed":["numpy"],"unresolved":[],"forbidden":[]}'
EXPECTED='{"unlicensed":[],"unresolved":[],"forbidden":[]}'

echo $EXPECTED
echo $UNRESOLVED_LICENSES
Expand Down
32 changes: 20 additions & 12 deletions src/libecalc/presentation/yaml/yaml_types/components/yaml_process_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from libecalc.presentation.yaml.yaml_types.components.yaml_expression_type import YamlExpressionType
from libecalc.presentation.yaml.yaml_types.models.yaml_compressor_chart import UnitsField, YamlCurve, YamlUnits
from libecalc.presentation.yaml.yaml_types.models.yaml_compressor_stages import YamlControlMarginUnits
from libecalc.presentation.yaml.yaml_types.streams.yaml_inlet_stream import YamlInletStream
from libecalc.presentation.yaml.yaml_types.yaml_data_or_file import DataOrFile

StreamRef = str
Expand Down Expand Up @@ -67,7 +68,7 @@ class YamlCompressorStageProcessSystem(YamlBase):
description="Pressure drop before compression stage [in bar]",
title="PRESSURE_DROP_AHEAD_OF_STAGE",
)
compressor: CompressorReference
compressor: CompressorReference | YamlCompressor


TTarget = TypeVar("TTarget")
Expand All @@ -83,42 +84,49 @@ class YamlSerialProcessSystem(YamlBase):
items: list[YamlItem[YamlCompressorStageProcessSystem]]


class YamlParallelProcessSystem(YamlBase):
type: Literal["PARALLEL"]
name: ProcessSystemReference
items: list[YamlItem[YamlSerialProcessSystem]]


class YamlOverflow(YamlBase):
from_reference: ProcessSystemReference
to_reference: ProcessSystemReference


class YamlCommonStreamSetting(YamlBase):
rate_fractions: list[YamlExpressionType]
overflow: list[YamlOverflow]
overflow: list[YamlOverflow] | None = None


class YamlCommonStreamDistribution(YamlBase):
method: Literal["COMMON_STREAM"]
inlet_stream: StreamRef
inlet_stream: StreamRef | YamlInletStream
settings: list[YamlCommonStreamSetting]


class YamlIndividualStreamDistribution(YamlBase):
method: Literal["INDIVIDUAL_STREAMS"]
inlet_streams: list[StreamRef]
inlet_streams: list[StreamRef | YamlInletStream]


YamlStreamDistribution = Annotated[
YamlCommonStreamDistribution | YamlIndividualStreamDistribution, Field(discriminator="method")
]


class YamlProcessConstraints(YamlBase):
outlet_pressure: YamlExpressionType | None = Field(
None,
title="OUTLET_PRESSURE",
description="Target outlet pressure [bara].",
)


class YamlProcessSimulation(YamlBase):
name: str
target: YamlParallelProcessSystem | YamlSerialProcessSystem | ProcessSystemReference
targets: list[YamlItem[YamlSerialProcessSystem]] = Field(..., title="TARGETS")
stream_distribution: YamlStreamDistribution
constraints: dict[ProcessSystemReference, YamlProcessConstraints] = Field(
default_factory=dict,
title="CONSTRAINTS",
description="Optional constraints per process system reference.",
)


YamlProcessUnit = Annotated[
Expand All @@ -127,6 +135,6 @@ class YamlProcessSimulation(YamlBase):
]

YamlProcessSystem = Annotated[
YamlParallelProcessSystem | YamlSerialProcessSystem | YamlCompressorStageProcessSystem,
YamlSerialProcessSystem | YamlCompressorStageProcessSystem,
Field(discriminator="type"),
]
3 changes: 2 additions & 1 deletion src/libecalc/presentation/yaml/yaml_types/streams/yaml_inlet_stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from libecalc.common.utils.rates import RateType
from libecalc.presentation.yaml.yaml_types import YamlBase
from libecalc.presentation.yaml.yaml_types.components.yaml_expression_type import YamlExpressionType
from libecalc.presentation.yaml.yaml_types.models import YamlFluidModel

StreamRef = str
FluidModelReference = str
Expand Down Expand Up @@ -67,7 +68,7 @@ class YamlInletStream(YamlBase):
title="NAME",
description="Unique name of the inlet stream.",
)
fluid_model: FluidModelReference = Field(
fluid_model: FluidModelReference | YamlFluidModel = Field(
...,
title="FLUID_MODEL",
description="Reference to a fluid model (e.g. defined in MODELS/FLUID_MODELS elsewhere).",
Expand Down