fix: ensure unique names in system v2 (#238)

Also fix error message when names are not unique

src/libecalc/dto/components.py

@@ -507,7 +507,20 @@ def validate_unique_names(cls, values):
                 names.append(fuel_consumer.name)
                 if isinstance(fuel_consumer, GeneratorSet):
                     for electricity_consumer in fuel_consumer.consumers:
-                        names.append(electricity_consumer.name)
+                        if isinstance(electricity_consumer, (CompressorSystem, PumpSystem)):
+                            if isinstance(electricity_consumer, CompressorSystem):
+                                consumers = electricity_consumer.compressors
+                            else:
+                                consumers = electricity_consumer.pumps
+                            for consumer in consumers:
+                                names.append(consumer.name)
+                elif isinstance(fuel_consumer, (CompressorSystem, PumpSystem)):
+                    if isinstance(fuel_consumer, CompressorSystem):
+                        consumers = fuel_consumer.compressors
+                    else:
+                        consumers = fuel_consumer.pumps
+                    for consumer in consumers:
+                        names.append(consumer.name)
                 if fuel_consumer.fuel is not None:
                     for fuel_type in fuel_consumer.fuel.values():
                         # Need to verify that it is a different fuel
@@ -520,8 +533,8 @@ def validate_unique_names(cls, values):
 
         if len(duplicated_names) > 0:
             raise ValueError(
-                "Component names must be unique. Components include asset/ecalc-model, installations,"
-                " generator sets, electricity consumers, fuel consumers and direct emitters."
+                "Component names must be unique. Components include the main model, installations,"
+                " generator sets, electricity consumers, fuel consumers, systems and its consumers and direct emitters."
                 f" Duplicated names are: {', '.join(duplicated_names)}"
             )
 

src/libecalc/input/validation_errors.py

@@ -126,7 +126,7 @@ def __init__(
                 error_location_info = " -> ".join(
                     [str(s).capitalize().replace("__root__", "General error").replace("_", " ") for s in error_loc]
                 )
-                if component_name := data.get(EcalcYamlKeywords.name):
+                if data is not None and (component_name := data.get(EcalcYamlKeywords.name)):
                     messages.append(f"{component_name} - {error_location_info}:\n\t{error_message}\n")
                 else:
                     messages.append(f"{error_location_info}:\n\t{error_message}\n")