rename attributes to epc_attributes

model_data/EpcClean.py

@@ -1,13 +1,13 @@
 from typing import List, Dict, Any
 from collections import Counter
 
-from model_data.attributes.RoofAttributes import RoofAttributes
-from model_data.attributes.FloorAttributes import FloorAttributes
+from model_data.epc_attributes.RoofAttributes import RoofAttributes
+from model_data.epc_attributes.FloorAttributes import FloorAttributes
 
 
 class EpcClean:
     """
-    Container for methods which we utilise for attributes EPC data
+    Container for methods which we utilise for epc_attributes EPC data
     """
 
     CLEANING_FIELDS: List[str] = [
@@ -29,7 +29,7 @@ class EpcClean:
 
     def clean(self) -> None:
         """
-        Cleans the EPC data, mapping text fields to property attributes.
+        Cleans the EPC data, mapping text fields to property epc_attributes.
         """
         self._init_empty_cleaned_obj()
 

model_data/app.py

@@ -40,7 +40,7 @@ def handler():
     cleaner.clean()
 
     # For testing:
-    from model_data.attributes.HotWaterAttributes import HotWaterAttributes
+    from model_data.epc_attributes.HotWaterAttributes import HotWaterAttributes
     from collections import Counter
     count = Counter([x["main-fuel"] for x in data])
     descriptions = {x["hotwater-description"] for x in data}

model_data/epc_attributes/FloorAttributes.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union, Optional
-from model_data.attributes.attribute_utils import extract_thermal_transmittance, extract_component_types
+from model_data.epc_attributes.attribute_utils import extract_thermal_transmittance, extract_component_types
 
 
 class FloorAttributes:

model_data/epc_attributes/HotWaterAttributes.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union
-from model_data.attributes.attribute_utils import clean_description, remove_punctuation, find_keyword
+from model_data.epc_attributes.attribute_utils import clean_description, remove_punctuation, find_keyword
 
 
 class HotWaterAttributes:
@@ -34,7 +34,7 @@ class HotWaterAttributes:
         'water heating only',  # Indicates that the heater is used only for water heating, not space heating
     ]
 
-    # ENERGY_RECOVERY refers to systems or attributes that recover and utilize waste energy.
+    # ENERGY_RECOVERY refers to systems or epc_attributes that recover and utilize waste energy.
     ENERGY_RECOVERY = [
         'waste water heat recovery',
         # A system that recovers heat from waste hot water (e.g., from showers) to preheat incoming cold water

model_data/epc_attributes/MainFuelAttributes.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union
-from model_data.attributes.attribute_utils import clean_description, remove_punctuation, find_keyword
+from model_data.epc_attributes.attribute_utils import clean_description, remove_punctuation, find_keyword
 
 
 class MainFuelAttributes:

model_data/epc_attributes/MainheatAttributes.py

@@ -1,4 +1,4 @@
-from model_data.attributes.attribute_utils import clean_description, process_part
+from model_data.epc_attributes.attribute_utils import clean_description, process_part
 from typing import Dict, Union
 
 
@@ -46,7 +46,7 @@ class MainHeatAttributes:
             # Distribution Systems
             process_part(result, part, self.DISTRIBUTION_SYSTEMS, 'has_')
 
-            # Other attributes
+            # Other epc_attributes
             process_part(result, part, self.OTHERS, 'has_')
 
         # Check for "underfloor" separately in the entire description

model_data/epc_attributes/MainheatControlAttributes.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union
-from model_data.attributes.attribute_utils import clean_description, remove_punctuation, find_keyword
+from model_data.epc_attributes.attribute_utils import clean_description, remove_punctuation, find_keyword
 
 
 class MainheatControlAttributes:

model_data/epc_attributes/RoofAttributes.py

@@ -1,6 +1,6 @@
 import re
 from typing import Dict, Union
-from model_data.attributes.attribute_utils import extract_component_types, extract_thermal_transmittance
+from model_data.epc_attributes.attribute_utils import extract_component_types, extract_thermal_transmittance
 
 
 class RoofAttributes:

model_data/epc_attributes/WallAttributes.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union
-from model_data.attributes.attribute_utils import extract_component_types, extract_thermal_transmittance
+from model_data.epc_attributes.attribute_utils import extract_component_types, extract_thermal_transmittance
 
 
 class WallAttributes:

model_data/epc_attributes/WindowAttributes.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union
-from model_data.attributes.attribute_utils import clean_description
+from model_data.epc_attributes.attribute_utils import clean_description
 
 
 class WindowAttributes:

model_data/epc_attributes/attribute_utils.py

@@ -67,7 +67,7 @@ def clean_description(description: str) -> str:
 
 def process_part(result: Dict[str, Union[str, bool]], part: str, attr_list: List[str], prefix: str):
     """
-    Process a part of the description with a given list of attributes
+    Process a part of the description with a given list of epc_attributes
     and update the result dictionary.
     """
 

model_data/tests/test_attribute_utils.py

@@ -1,5 +1,5 @@
 import pytest
-import model_data.attributes.attribute_utils as attribute_utils
+import model_data.epc_attributes.attribute_utils as attribute_utils
 
 
 def test_extract_thermal_transmittance():

model_data/tests/test_floor_attributes.py

@@ -1,6 +1,6 @@
 import pytest
 from model_data.tests.test_data.test_floor_attributes_cases import clean_floor_cases
-from model_data.attributes.FloorAttributes import FloorAttributes
+from model_data.epc_attributes.FloorAttributes import FloorAttributes
 
 
 class TestCleanFloor:

model_data/tests/test_hotwater_attributes.py

@@ -1,5 +1,5 @@
 import pytest
-from model_data.attributes.HotWaterAttributes import HotWaterAttributes
+from model_data.epc_attributes.HotWaterAttributes import HotWaterAttributes
 from model_data.tests.test_data.test_hot_water_attributes_cases import hotwater_cases
 
 

model_data/tests/test_mainfuel_attributes.py

@@ -1,5 +1,5 @@
 import pytest
-from model_data.attributes.MainFuelAttributes import MainFuelAttributes
+from model_data.epc_attributes.MainFuelAttributes import MainFuelAttributes
 from model_data.tests.test_data.test_main_fuel_attributes_cases import mainfuel_cases
 
 

model_data/tests/test_mainheat_attributes.py

@@ -1,5 +1,5 @@
 import pytest
-from model_data.attributes.MainheatAttributes import MainHeatAttributes
+from model_data.epc_attributes.MainheatAttributes import MainHeatAttributes
 from model_data.tests.test_data.test_mainheat_attributes_cases import mainheat_cases
 
 

model_data/tests/test_mainheat_controls_attributes.py

@@ -1,5 +1,5 @@
 import pytest
-from model_data.attributes.MainheatControlAttributes import MainheatControlAttributes
+from model_data.epc_attributes.MainheatControlAttributes import MainheatControlAttributes
 from model_data.tests.test_data.test_mainheat_control_attributes_cases import mainheat_control_cases
 
 

model_data/tests/test_roof_attributes.py

@@ -3,7 +3,7 @@ import pickle
 from model_data.EpcClean import EpcClean
 from pathlib import Path
 from model_data.tests.test_data.test_roof_attributes_cases import clean_roof_test_cases
-from model_data.attributes.RoofAttributes import RoofAttributes
+from model_data.epc_attributes.RoofAttributes import RoofAttributes
 
 # For local testing
 if __file__ == "<input>":

model_data/tests/test_wall_attributes.py

@@ -1,5 +1,5 @@
 import pytest
-from model_data.attributes.WallAttributes import WallAttributes
+from model_data.epc_attributes.WallAttributes import WallAttributes
 from model_data.tests.test_data.test_wall_attributes_cases import wall_cases
 
 

model_data/tests/test_window_attributes.py

@@ -1,5 +1,5 @@
 import pytest
-from model_data.attributes.WindowAttributes import WindowAttributes
+from model_data.epc_attributes.WindowAttributes import WindowAttributes
 from model_data.tests.test_data.test_window_attributes_cases import windows_cases