chore: improve resource discovery and reference handling for new sections (#1557)

* chore: improve resource discovery and reference handling for new sections

Author: frodehk

src/libecalc/presentation/yaml/mappers/process_simulation_mapper.py

@@ -180,9 +180,17 @@ def _get_compressor_chart(self, yaml_compressor_model_chart: YamlCompressorModel
             resource = self._resources.get(resource_name)
             if resource is None:
                 raise EcalcValidationException(f"Resource '{resource_name}' not found for variable speed chart.")
+            if "SPEED" not in resource.get_headers():
+                raise EcalcValidationException(
+                    f"Chart resource '{resource_name}' is missing required 'SPEED' column. "
+                    f"For single-speed charts, use the same speed value for all rows."
+                )
             try:
                 return UserDefinedChartData.from_resource(
-                    resource, units=yaml_chart.units, is_single_speed=False, control_margin=control_margin_fraction
+                    resource,
+                    units=yaml_chart.units,
+                    is_single_speed=False,
+                    control_margin=control_margin_fraction,
                 )
             except InvalidResourceException as e:
                 raise InvalidChartResourceException(
@@ -215,13 +223,16 @@ def _resolve_fluid_model_reference(self, ref: str | YamlFluidModel) -> YamlFluid
         else:
             return ref
 
-    def _map_conditions(self, condition: YamlExpressionType | None, conditions: list[YamlExpressionType] | None):
-        if condition:
+    def _map_conditions(
+        self, condition: YamlExpressionType | None, conditions: list[YamlExpressionType] | None
+    ) -> YamlExpressionType | None:
+        if condition is not None:
             assert isinstance(condition, ExpressionType)
             return condition
-        else:
+        if conditions is not None:
             assert isinstance(conditions, list)
             return handle_condition_list(conditions)
+        return None
 
     def _get_regularity(self) -> Regularity:
         return Regularity(

src/libecalc/presentation/yaml/yaml_models/pyyaml_yaml_model.py

@@ -48,7 +48,10 @@
 _INLET_STREAMS_KEY = "INLET_STREAMS"
 _FLUID_MODELS_KEY = "FLUID_MODELS"
 _PROCESS_SIMULATIONS_KEY = "PROCESS_SIMULATIONS"
-
+_NEW_SECTIONS_WITH_FILE_REFS: tuple[str, ...] = (
+    "PROCESS_UNITS",
+    "PROCESS_SYSTEMS",
+)
 dt_adapter = TypeAdapter(datetime.datetime)
 
 
@@ -310,10 +313,16 @@ def facility_resource_names(self) -> list[str]:
             if isinstance(model.get(model_curves), dict)
         ]
         resource_data = facility_input_data + model_curves_data
-        resource_names = [
+        resource_names: list[str] = [
             data.get(EcalcYamlKeywords.file) for data in resource_data if data.get(EcalcYamlKeywords.file) is not None
         ]
-        return resource_names
+
+        # Pick up FILE references nested in the new YAML sections (PROCESS_UNITS, PROCESS_SYSTEMS, ...).
+        for section in _NEW_SECTIONS_WITH_FILE_REFS:
+            resource_names.extend(_find_file_references(self._internal_datamodel.get(section)))
+
+        # Dedup while preserving order — the same CSV may be referenced by multiple charts.
+        return list(dict.fromkeys(resource_names))
 
     @property
     def timeseries_resource_names(self) -> list[str]:
@@ -627,3 +636,23 @@ def common_iterable(obj: list | dict) -> dict | Iterator[int]:
             output.extend(find_date_keys_in_yaml(yaml_object[index]))
 
     return output
+
+
+def _find_file_references(node: dict | list | None) -> list[str]:
+    """Recursively collect all string values under a `FILE` key in a parsed YAML datamodel.
+
+    Structure-agnostic so we don't have to hard-code each section's nesting
+    (e.g. CURVES inside COMPRESSOR_MODEL inside COMPRESSOR inside PROCESS_UNITS).
+    Only string values are returned; anything else under FILE is ignored.
+    """
+    references: list[str] = []
+    if isinstance(node, dict):
+        for key, value in node.items():
+            if key == EcalcYamlKeywords.file and isinstance(value, str):
+                references.append(value)
+            else:
+                references.extend(_find_file_references(value))
+    elif isinstance(node, list):
+        for item in node:
+            references.extend(_find_file_references(item))
+    return references

src/libecalc/presentation/yaml/yaml_models/yaml_model.py

@@ -20,7 +20,7 @@
 )
 from libecalc.presentation.yaml.yaml_types.facility_model.yaml_facility_model import YamlFacilityModel
 from libecalc.presentation.yaml.yaml_types.fuel_type.yaml_fuel_type import YamlFuelType
-from libecalc.presentation.yaml.yaml_types.models import YamlConsumerModel
+from libecalc.presentation.yaml.yaml_types.models import YamlConsumerModel, YamlFluidModel
 from libecalc.presentation.yaml.yaml_types.streams.yaml_inlet_stream import YamlInletStream
 from libecalc.presentation.yaml.yaml_types.time_series.yaml_time_series import (
     YamlTimeSeriesCollection,
@@ -75,6 +75,11 @@ def models(self) -> Iterable[YamlConsumerModel]:
     def fuel_types(self) -> Iterable[YamlFuelType]:
         pass
 
+    @property
+    @abc.abstractmethod
+    def fluid_models(self) -> dict[str, YamlFluidModel]:
+        pass
+
     @property
     @abc.abstractmethod
     def inlet_streams(self) -> dict[str, YamlInletStream]:

src/libecalc/presentation/yaml/yaml_reference_service.py

@@ -123,6 +123,13 @@ def __init__(
             references[process_simulation.name] = process_simulation
             reference_yaml_context[process_simulation.name] = process_simulation_path
 
+        fluid_models_path = YamlPath(keys=("FLUID_MODELS",))
+
+        for fluid_model_key, fluid_model in configuration.fluid_models.items():
+            fluid_model_path = fluid_models_path.append(fluid_model_key)
+            references[fluid_model_key] = fluid_model
+            reference_yaml_context[fluid_model_key] = fluid_model_path
+
         self._references = references
         self._references_yaml_context = reference_yaml_context