Small bug correction in the new dictionary structure

hub/helpers/data/alkis_function_to_hub_function.py

@@ -181,5 +181,5 @@ class AlkisFunctionToHubFunction:
                         }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/data/hft_function_to_hub_function.py

@@ -28,5 +28,5 @@ class HftFunctionToHubFunction:
   }
 
   @property
-  def dictionary(self):
+  def dictionary(self)  -> dict:
     return self._dictionary

hub/helpers/data/hub_function_to_nrcan_construction_function.py

@@ -74,5 +74,5 @@ class HubFunctionToNrcanConstructionFunction:
   }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/data/hub_function_to_nrel_construction_function.py

@@ -74,5 +74,5 @@ class HubFunctionToNrelConstructionFunction:
   }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/data/hub_usage_to_comnet_usage.py

@@ -74,5 +74,5 @@ class HubUsageToComnetUsage:
   }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/data/hub_usage_to_hft_usage.py

@@ -74,5 +74,5 @@ class HubUsageToHftUsage:
   }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/data/hub_usage_to_nrcan_usage.py

@@ -74,5 +74,5 @@ class HubUsageToNrcanUsage:
   }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/data/montreal_function_to_hub_function.py

@@ -546,5 +546,5 @@ class MontrealFunctionToHubFunction:
     }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/data/pluto_function_to_hub_function.py

@@ -213,5 +213,5 @@ class PlutoFunctionToHubFunction:
   }
 
   @property
-  def dictionary(self):
+  def dictionary(self) -> dict:
     return self._dictionary

hub/helpers/dictionaries.py

@@ -21,72 +21,72 @@ class Dictionaries:
   """
 
   @property
-  def hub_usage_to_hft_usage(self):
+  def hub_usage_to_hft_usage(self) -> dict:
     """
     Hub usage to HfT usage, transformation dictionary
     :return: dict
     """
-    return HubUsageToHftUsage.dictionary
+    return HubUsageToHftUsage().dictionary
 
   @property
-  def hub_usage_to_comnet_usage(self):
+  def hub_usage_to_comnet_usage(self) -> dict:
     """
     Hub usage to Comnet usage, transformation dictionary
     :return: dict
     """
-    return HubUsageToComnetUsage.dictionary
+    return HubUsageToComnetUsage().dictionary
 
   @property
-  def hub_usage_to_nrcan_usage(self):
+  def hub_usage_to_nrcan_usage(self) -> dict:
     """
     Get hub usage to NRCAN usage, transformation dictionary
     :return: dict
     """
-    return HubUsageToNrcanUsage.dictionary
+    return HubUsageToNrcanUsage().dictionary
 
   @property
-  def hub_function_to_nrcan_construction_function(self):
+  def hub_function_to_nrcan_construction_function(self) -> dict:
     """
     Get hub function to NRCAN construction function, transformation dictionary
     :return: dict
     """
-    return HubFunctionToNrcanConstructionFunction.dictionary
+    return HubFunctionToNrcanConstructionFunction().dictionary
 
   @property
-  def hub_function_to_nrel_construction_function(self):
+  def hub_function_to_nrel_construction_function(self) -> dict:
     """
     Get hub function to NREL construction function, transformation dictionary
     :return: dict
     """
-    return HubFunctionToNrelConstructionFunction.dictionary
+    return HubFunctionToNrelConstructionFunction().dictionary
 
   @property
-  def pluto_function_to_hub_function(self):
+  def pluto_function_to_hub_function(self) -> dict:
     """
     Get Pluto function to hub function, transformation dictionary
     :return: dict
     """
-    return PlutoFunctionToHubFunction.dictionary
+    return PlutoFunctionToHubFunction().dictionary
 
   @property
-  def hft_function_to_hub_function(self):
+  def hft_function_to_hub_function(self) -> dict:
     """
     Get Hft function to hub function, transformation dictionary
     :return: dict
     """
-    return HftFunctionToHubFunction.dictionary
+    return HftFunctionToHubFunction().dictionary
 
   @property
-  def montreal_function_to_hub_function(self):
+  def montreal_function_to_hub_function(self) -> dict:
     """
     Get Montreal function to hub function, transformation dictionary
     """
-    return MontrealFunctionToHubFunction.dictionary
+    return MontrealFunctionToHubFunction().dictionary
 
   @property
-  def alkis_function_to_hub_function(self):
+  def alkis_function_to_hub_function(self) -> dict:
     """
     Get Alkis function to hub function, transformation dictionary
     """
-    return AlkisFunctionToHubFunction.dictionary
+    return AlkisFunctionToHubFunction().dictionary
 

setup.py

@@ -62,6 +62,7 @@ setup(
               'hub.exports.energy_systems',
               'hub.exports.formats',
               'hub.helpers',
+              'hub.helpers.data',
               'hub.hub_logger',
               'hub.imports',
               'hub.imports.construction',