feat(from_HBJSON): Convert PO Models to WUFI XML

PHX/PHPP/phpp_app.py

@@ -22,7 +22,6 @@
     hot_water_tank,
     shading_rows,
     uvalues_constructor,
-    vent_ducts,
     vent_space,
     vent_units,
     ventilation_data,

PHX/PHPP/phpp_model/areas_thermal_bridges.py

@@ -5,7 +5,7 @@
 
 from dataclasses import dataclass
 from functools import partial
-from typing import List, Tuple
+from typing import List
 
 from PHX.model import components
 from PHX.PHPP.phpp_localization import shape_model

PHX/PHPP/phpp_model/climate_entry.py

@@ -5,7 +5,7 @@
 
 from dataclasses import dataclass
 from functools import partial
-from typing import ClassVar, Dict, List, Tuple
+from typing import ClassVar, List
 
 from PHX.model import phx_site
 from PHX.PHPP.phpp_localization import shape_model

PHX/PHPP/phpp_model/component_vent.py

@@ -5,7 +5,7 @@
 
 from dataclasses import dataclass
 from functools import partial
-from typing import List, Tuple
+from typing import List
 
 from PHX.model import hvac
 from PHX.PHPP.phpp_localization import shape_model

PHX/PHPP/phpp_model/elec_non_res.py

@@ -5,7 +5,6 @@
 
 import re
 from dataclasses import dataclass
-from typing import Dict, List, Optional
 
 from PHX.PHPP.phpp_localization import shape_model
 from PHX.xl import xl_data

PHX/PHPP/phpp_model/electricity_item.py

@@ -4,7 +4,7 @@
 """Model class for a PHPP Electricity / Equipment row input."""
 
 from dataclasses import dataclass
-from typing import Any, Dict, List, NamedTuple, Tuple
+from typing import Any, List, NamedTuple, Tuple
 
 from PHX.model import elec_equip
 from PHX.model.enums.elec_equip import ElectricEquipmentType

PHX/PHPP/phpp_model/shading_rows.py

@@ -5,7 +5,7 @@
 
 from dataclasses import dataclass
 from functools import partial
-from typing import List, Tuple
+from typing import List
 
 from PHX.model import components
 from PHX.PHPP.phpp_localization import shape_model

PHX/PHPP/phpp_model/windows_rows.py

@@ -5,7 +5,7 @@
 
 from dataclasses import dataclass
 from functools import partial
-from typing import List, Optional, Tuple
+from typing import List, Optional
 
 from PHX.model import constructions, geometry
 from PHX.PHPP.phpp_localization import shape_model

PHX/PHPP/sheet_io/io_PER.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Any, Collection, Dict, List, Optional, Sequence, Tuple, Union
+from typing import Collection, Dict, List, Optional, Sequence, Tuple, Union
 
 from ph_units.unit_type import Unit
 

PHX/PHPP/sheet_io/io_areas.py

@@ -10,7 +10,7 @@
 from ph_units.unit_type import Unit
 
 from PHX.PHPP.phpp_localization import shape_model
-from PHX.PHPP.phpp_model import areas_data, areas_surface, areas_thermal_bridges, version
+from PHX.PHPP.phpp_model import areas_data, areas_surface, areas_thermal_bridges
 from PHX.xl import xl_app, xl_data
 from PHX.xl.xl_data import col_offset
 
@@ -128,15 +128,15 @@ def find_section_first_entry_row(self) -> int:
             if val == self.shape.surface_rows.locator_string_entry:
                 return i
 
-        raise Exception(f'\n\tError: Not able to find the first surface entry row in the "Areas input" section?')
+        raise Exception('\n\tError: Not able to find the first surface entry row in the "Areas input" section?')
 
     def find_section_last_entry_row(self, _start_row: Optional[int] = None) -> int:
         """Return the row number of the last user-input entry row in the 'Area input' section."""
 
         if not _start_row:
             _start_row = self.section_first_entry_row
         elif _start_row > 10_000:
-            raise Exception(f'\n\tError: Not able to find the last surface entry row in the "Areas input" section?')
+            raise Exception('\n\tError: Not able to find the last surface entry row in the "Areas input" section?')
 
         _row_end = _start_row + 500
         xl_data = self.xl.get_single_column_data(
@@ -301,7 +301,7 @@ def find_section_first_entry_row(self) -> int:
                 return i
 
         raise Exception(
-            f'\n\tError: Not able to find the first Thermal Bridge entry row in the "Thermal Bridge input" section?'
+            '\n\tError: Not able to find the first Thermal Bridge entry row in the "Thermal Bridge input" section?'
         )
 
 

PHX/PHPP/sheet_io/io_components.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Dict, List, Optional, Set
+from typing import Dict, List, Optional
 
 from ph_units.unit_type import Unit
 

PHX/PHPP/sheet_io/io_cooling_demand.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Dict
 
 from ph_units.unit_type import Unit
 

PHX/PHPP/sheet_io/io_cooling_units.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, Optional, Tuple
 
 from ph_units.unit_type import Unit
 

PHX/PHPP/sheet_io/io_elec_non_res.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Generator, List, Optional, Tuple
+from typing import Generator, Optional, Tuple
 
 from PHX.PHPP.phpp_localization import shape_model
 from PHX.PHPP.phpp_model.elec_non_res import ExistingLightingRow
@@ -76,15 +76,15 @@ def find_section_first_entry_row(self) -> int:
             if val == self.shape.lighting_rows.locator_string_entry:
                 return i + 1
 
-        raise Exception(f'\n\tError: Not able to find the first surface entry row in the "Lighting input" section?')
+        raise Exception('\n\tError: Not able to find the first surface entry row in the "Lighting input" section?')
 
     def find_section_last_entry_row(self, _start_row: Optional[int] = None) -> int:
         """Return the row number of the last user-input entry row in the 'Lighting input' section."""
 
         if not _start_row:
             _start_row = self.section_first_entry_row
         elif _start_row > 10_000:
-            raise Exception(f'\n\tError: Not able to find the last surface entry row in the "Lighting input" section?')
+            raise Exception('\n\tError: Not able to find the last surface entry row in the "Lighting input" section?')
 
         _row_end = _start_row + 500
         xl_data = self.xl.get_single_column_data(

PHX/PHPP/sheet_io/io_electricity.py

@@ -5,12 +5,11 @@
 
 from __future__ import annotations
 
-from typing import List, Type
+from typing import List
 
 from PHX.model import elec_equip
 from PHX.PHPP.phpp_localization import shape_model
 from PHX.PHPP.phpp_model import electricity_item
-from PHX.PHPP.phpp_model.electricity_item import PHPPReadAddress
 from PHX.xl import xl_app, xl_data
 
 

PHX/PHPP/sheet_io/io_heating_demand.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Dict
 
 from ph_units.unit_type import Unit
 

PHX/PHPP/sheet_io/io_heating_peak_load.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Dict
 
 from ph_units.unit_type import Unit
 

PHX/PHPP/sheet_io/io_ihg_non_res.py

@@ -5,12 +5,8 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
-
 from PHX.PHPP.phpp_localization import shape_model
-from PHX.PHPP.phpp_model import uvalues_constructor
-from PHX.xl import xl_app, xl_data
-from PHX.xl.xl_data import col_offset
+from PHX.xl import xl_app
 
 
 class IhgNonRes:

PHX/PHPP/sheet_io/io_solar_pv.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from functools import partial
 from typing import Any, Dict, List
 
 from ph_units.unit_type import Unit

PHX/PHPP/sheet_io/io_use_non_res.py

@@ -5,12 +5,8 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
-
 from PHX.PHPP.phpp_localization import shape_model
-from PHX.PHPP.phpp_model import uvalues_constructor
-from PHX.xl import xl_app, xl_data
-from PHX.xl.xl_data import col_offset
+from PHX.xl import xl_app
 
 
 class UseNonRes:

PHX/PHPP/sheet_io/io_variants.py

@@ -10,16 +10,6 @@
 from PHX.PHPP.phpp_localization import shape_model
 from PHX.xl import xl_app, xl_data
 from PHX.xl.xl_data import col_offset
-from PHX.xl.xl_typing import (
-    xl_app_Protocol,
-    xl_apps_Protocol,
-    xl_Book_Protocol,
-    xl_Books_Protocol,
-    xl_Framework_Protocol,
-    xl_Range_Protocol,
-    xl_Sheet_Protocol,
-    xl_Sheets_Protocol,
-)
 
 
 @dataclass

PHX/PHPP/sheet_io/io_verification.py

@@ -6,7 +6,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import List
 
 from PHX.PHPP.phpp_localization import shape_model
 from PHX.PHPP.phpp_model import verification_data