From f0f13cbf8aecf8309a8374a3ae101e4e360df62a Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Thu, 15 Jun 2023 15:06:24 +0100
Subject: [PATCH] rename attributes to epc_attributes

---
 model_data/EpcClean.py                                    | 8 ++++----
 model_data/app.py                                         | 2 +-
 .../{attributes => epc_attributes}/FloorAttributes.py     | 2 +-
 .../{attributes => epc_attributes}/HotWaterAttributes.py  | 4 ++--
 .../{attributes => epc_attributes}/MainFuelAttributes.py  | 2 +-
 .../{attributes => epc_attributes}/MainheatAttributes.py  | 4 ++--
 .../MainheatControlAttributes.py                          | 2 +-
 .../{attributes => epc_attributes}/RoofAttributes.py      | 2 +-
 .../{attributes => epc_attributes}/WallAttributes.py      | 2 +-
 .../{attributes => epc_attributes}/WindowAttributes.py    | 2 +-
 .../{attributes => epc_attributes}/attribute_utils.py     | 2 +-
 model_data/tests/test_attribute_utils.py                  | 2 +-
 model_data/tests/test_floor_attributes.py                 | 2 +-
 model_data/tests/test_hotwater_attributes.py              | 2 +-
 model_data/tests/test_mainfuel_attributes.py              | 2 +-
 model_data/tests/test_mainheat_attributes.py              | 2 +-
 model_data/tests/test_mainheat_controls_attributes.py     | 2 +-
 model_data/tests/test_roof_attributes.py                  | 2 +-
 model_data/tests/test_wall_attributes.py                  | 2 +-
 model_data/tests/test_window_attributes.py                | 2 +-
 20 files changed, 25 insertions(+), 25 deletions(-)
 rename model_data/{attributes => epc_attributes}/FloorAttributes.py (93%)
 rename model_data/{attributes => epc_attributes}/HotWaterAttributes.py (96%)
 rename model_data/{attributes => epc_attributes}/MainFuelAttributes.py (96%)
 rename model_data/{attributes => epc_attributes}/MainheatAttributes.py (95%)
 rename model_data/{attributes => epc_attributes}/MainheatControlAttributes.py (97%)
 rename model_data/{attributes => epc_attributes}/RoofAttributes.py (95%)
 rename model_data/{attributes => epc_attributes}/WallAttributes.py (94%)
 rename model_data/{attributes => epc_attributes}/WindowAttributes.py (97%)
 rename model_data/{attributes => epc_attributes}/attribute_utils.py (98%)

diff --git a/model_data/EpcClean.py b/model_data/EpcClean.py
index 5d35aa94..fab0fb3c 100644
--- a/model_data/EpcClean.py
+++ b/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()
 
diff --git a/model_data/app.py b/model_data/app.py
index 936de358..479fa419 100644
--- a/model_data/app.py
+++ b/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}
diff --git a/model_data/attributes/FloorAttributes.py b/model_data/epc_attributes/FloorAttributes.py
similarity index 93%
rename from model_data/attributes/FloorAttributes.py
rename to model_data/epc_attributes/FloorAttributes.py
index 36bb0783..394a2d54 100644
--- a/model_data/attributes/FloorAttributes.py
+++ b/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:
diff --git a/model_data/attributes/HotWaterAttributes.py b/model_data/epc_attributes/HotWaterAttributes.py
similarity index 96%
rename from model_data/attributes/HotWaterAttributes.py
rename to model_data/epc_attributes/HotWaterAttributes.py
index 494bab1f..65a85185 100644
--- a/model_data/attributes/HotWaterAttributes.py
+++ b/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
diff --git a/model_data/attributes/MainFuelAttributes.py b/model_data/epc_attributes/MainFuelAttributes.py
similarity index 96%
rename from model_data/attributes/MainFuelAttributes.py
rename to model_data/epc_attributes/MainFuelAttributes.py
index 32ed191a..fa3c4618 100644
--- a/model_data/attributes/MainFuelAttributes.py
+++ b/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:
diff --git a/model_data/attributes/MainheatAttributes.py b/model_data/epc_attributes/MainheatAttributes.py
similarity index 95%
rename from model_data/attributes/MainheatAttributes.py
rename to model_data/epc_attributes/MainheatAttributes.py
index ccd132fa..c03efec8 100644
--- a/model_data/attributes/MainheatAttributes.py
+++ b/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
diff --git a/model_data/attributes/MainheatControlAttributes.py b/model_data/epc_attributes/MainheatControlAttributes.py
similarity index 97%
rename from model_data/attributes/MainheatControlAttributes.py
rename to model_data/epc_attributes/MainheatControlAttributes.py
index 5a1b92fb..547fc853 100644
--- a/model_data/attributes/MainheatControlAttributes.py
+++ b/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:
diff --git a/model_data/attributes/RoofAttributes.py b/model_data/epc_attributes/RoofAttributes.py
similarity index 95%
rename from model_data/attributes/RoofAttributes.py
rename to model_data/epc_attributes/RoofAttributes.py
index f23d946f..02379f8c 100644
--- a/model_data/attributes/RoofAttributes.py
+++ b/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:
diff --git a/model_data/attributes/WallAttributes.py b/model_data/epc_attributes/WallAttributes.py
similarity index 94%
rename from model_data/attributes/WallAttributes.py
rename to model_data/epc_attributes/WallAttributes.py
index f3c2df70..cd38559d 100644
--- a/model_data/attributes/WallAttributes.py
+++ b/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:
diff --git a/model_data/attributes/WindowAttributes.py b/model_data/epc_attributes/WindowAttributes.py
similarity index 97%
rename from model_data/attributes/WindowAttributes.py
rename to model_data/epc_attributes/WindowAttributes.py
index a6bf7e4b..3aeaddc8 100644
--- a/model_data/attributes/WindowAttributes.py
+++ b/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:
diff --git a/model_data/attributes/attribute_utils.py b/model_data/epc_attributes/attribute_utils.py
similarity index 98%
rename from model_data/attributes/attribute_utils.py
rename to model_data/epc_attributes/attribute_utils.py
index a32ed9e5..c0816943 100644
--- a/model_data/attributes/attribute_utils.py
+++ b/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.
     """
 
diff --git a/model_data/tests/test_attribute_utils.py b/model_data/tests/test_attribute_utils.py
index 64bfbd4c..132c4857 100644
--- a/model_data/tests/test_attribute_utils.py
+++ b/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():
diff --git a/model_data/tests/test_floor_attributes.py b/model_data/tests/test_floor_attributes.py
index 1030b5f5..5cdaa5be 100644
--- a/model_data/tests/test_floor_attributes.py
+++ b/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:
diff --git a/model_data/tests/test_hotwater_attributes.py b/model_data/tests/test_hotwater_attributes.py
index 24b26775..040cc1ba 100644
--- a/model_data/tests/test_hotwater_attributes.py
+++ b/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
 
 
diff --git a/model_data/tests/test_mainfuel_attributes.py b/model_data/tests/test_mainfuel_attributes.py
index c7f98e86..b67bf203 100644
--- a/model_data/tests/test_mainfuel_attributes.py
+++ b/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
 
 
diff --git a/model_data/tests/test_mainheat_attributes.py b/model_data/tests/test_mainheat_attributes.py
index ed28ac97..761618eb 100644
--- a/model_data/tests/test_mainheat_attributes.py
+++ b/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
 
 
diff --git a/model_data/tests/test_mainheat_controls_attributes.py b/model_data/tests/test_mainheat_controls_attributes.py
index 6ffd52e1..15a99fed 100644
--- a/model_data/tests/test_mainheat_controls_attributes.py
+++ b/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
 
 
diff --git a/model_data/tests/test_roof_attributes.py b/model_data/tests/test_roof_attributes.py
index eee020e0..70016651 100644
--- a/model_data/tests/test_roof_attributes.py
+++ b/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>":
diff --git a/model_data/tests/test_wall_attributes.py b/model_data/tests/test_wall_attributes.py
index 946e245a..eb13cb98 100644
--- a/model_data/tests/test_wall_attributes.py
+++ b/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
 
 
diff --git a/model_data/tests/test_window_attributes.py b/model_data/tests/test_window_attributes.py
index 24758ce0..137c2313 100644
--- a/model_data/tests/test_window_attributes.py
+++ b/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