refactor: move yaml system into package

equinor · Sep 25, 2023 · b477b15 · b477b15
1 parent ba788fd
commit b477b15
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/libecalc/input/mappers/component_mapper.py b/src/libecalc/input/mappers/component_mapper.py
@@ -14,10 +14,10 @@
 from libecalc.input.yaml.yaml_models.pyyaml_yaml_model import PyYamlYamlModel
 from libecalc.input.yaml_entities import References
 from libecalc.input.yaml_keywords import EcalcYamlKeywords
-from libecalc.input.yaml_types.components.yaml_compressor_system import (
+from libecalc.input.yaml_types.components.system.yaml_compressor_system import (
     YamlCompressorSystem as YamlCompressorSystem,
 )
-from libecalc.input.yaml_types.components.yaml_pump_system import (
+from libecalc.input.yaml_types.components.system.yaml_pump_system import (
     YamlPumpSystem as YamlPumpSystem,
 )
 from pydantic import ValidationError

diff --git a/...ypes/components/yaml_compressor_system.py → ...mponents/system/yaml_compressor_system.py b/...ypes/components/yaml_compressor_system.py → ...mponents/system/yaml_compressor_system.py
diff --git a/...yaml_types/components/yaml_pump_system.py → ...pes/components/system/yaml_pump_system.py b/...yaml_types/components/yaml_pump_system.py → ...pes/components/system/yaml_pump_system.py
diff --git a/src/libecalc/input/yaml_types/components/yaml_generator_set.py b/src/libecalc/input/yaml_types/components/yaml_generator_set.py
@@ -5,11 +5,11 @@
 from libecalc.input.yaml_types.components.legacy.yaml_electricity_consumer import (
     YamlElectricityConsumer,
 )
-from libecalc.input.yaml_types.components.yaml_category_field import CategoryField
-from libecalc.input.yaml_types.components.yaml_compressor_system import (
+from libecalc.input.yaml_types.components.system.yaml_compressor_system import (
     YamlCompressorSystem,
 )
-from libecalc.input.yaml_types.components.yaml_pump_system import YamlPumpSystem
+from libecalc.input.yaml_types.components.system.yaml_pump_system import YamlPumpSystem
+from libecalc.input.yaml_types.components.yaml_category_field import CategoryField
 from libecalc.input.yaml_types.yaml_placeholder_type import YamlPlaceholderType
 from libecalc.input.yaml_types.yaml_schema_helpers import (
     replace_temporal_placeholder_property_with_legacy_ref,

diff --git a/src/libecalc/input/yaml_types/components/yaml_installation.py b/src/libecalc/input/yaml_types/components/yaml_installation.py
@@ -6,12 +6,12 @@
 from libecalc.input.yaml_types.components.legacy.yaml_fuel_consumer import (
     YamlFuelConsumer,
 )
-from libecalc.input.yaml_types.components.yaml_category_field import CategoryField
-from libecalc.input.yaml_types.components.yaml_compressor_system import (
+from libecalc.input.yaml_types.components.system.yaml_compressor_system import (
     YamlCompressorSystem,
 )
+from libecalc.input.yaml_types.components.system.yaml_pump_system import YamlPumpSystem
+from libecalc.input.yaml_types.components.yaml_category_field import CategoryField
 from libecalc.input.yaml_types.components.yaml_generator_set import YamlGeneratorSet
-from libecalc.input.yaml_types.components.yaml_pump_system import YamlPumpSystem
 from libecalc.input.yaml_types.emitters.yaml_direct_emitter import YamlDirectEmitter
 from libecalc.input.yaml_types.yaml_temporal_model import YamlTemporalModel
 from pydantic import Field