test: added NTGS test data and example of use

LoopDataConverter/__init__.py

@@ -1 +1,3 @@
 from .converters import LoopConverter
+from .input import InputData
+from .datatypes import SurveyName

LoopDataConverter/converters/loop_converter.py

@@ -48,8 +48,7 @@ def read_file(self):
         """
         read the file using the correct file reader
         """
-        file_reader = LoopGisReader(self._fileData)
-        file_reader.read(self._fileData, self._layer)
+        file_reader = LoopGisReader(self._fileData)()
         return file_reader.data
 
     def get_converter(self):

LoopDataConverter/file_readers/_file_readers.py

@@ -21,7 +21,7 @@ def check_source_type(self, file_source: str):
             file_source
         ), "Invalid file source, must be a valid URL or file path"
 
-    @beartype.beartype
+
     @abstractmethod
     def get_file(self, file_source: str, layer: str = None):
         pass
@@ -49,7 +49,7 @@ def type(self):
     def check_source_type(self, file_source: str):
         super().check_source_type(file_source)
 
-    @beartype.beartype
+
     def get_file(self, file_source: str, layer: str = None):
         return pandas.read_csv(file_source)
 
@@ -67,7 +67,6 @@ def read(self, file_source: str):
 class GeoDataFileReader(BaseFileReader):
     def __init__(self):
         self.file_reader_label = "GeoDataFileReader"
-        self.file = None
         self.data = None
 
     def type(self):
@@ -76,9 +75,10 @@ def type(self):
     @beartype.beartype
     def check_source_type(self, file_source: str):
         super().check_source_type(file_source)
-
-    @beartype.beartype
-    def get_file(self, file_source: str, layer: str = None):
+
+    # TODO: add general check for variable types
+    def get_file(self, file_source: str, 
+                 layer: str = None):
         file_extension = os.path.splitext(file_source)[1]
 
         if file_extension in [".shp", ".geojson"]:
@@ -137,7 +137,9 @@ def assign_reader(self, file_source):
             raise ValueError(f"Unsupported file format: {file_extension}")
 
     def read(self, datatype: Datatype):
-        self._reader.read(self._fileData[Datatype.GEOLOGY], self._layer)
+        self._reader[datatype] = self.assign_reader(self._fileData[datatype])
+        self.file_reader_label[datatype] = self._reader[datatype].type()
+        self._reader[datatype].get_file(self._fileData[datatype], self._layer)
 
         return self._reader.data
 
@@ -147,25 +149,15 @@ def __call__(self):
         """
 
         if self._fileData[Datatype.GEOLOGY] is not None:
-            self._reader[Datatype.GEOLOGY] = self.assign_reader(self._fileData[Datatype.GEOLOGY])
-            self.file_reader_label[Datatype.GEOLOGY] = self._reader[Datatype.GEOLOGY].type()
             self._data[Datatype.GEOLOGY] = self.read(Datatype.GEOLOGY)
 
         if self._fileData[Datatype.STRUCTURE] is not None:
-            self._reader[Datatype.STRUCTURE] = self.assign_reader(
-                self._fileData[Datatype.STRUCTURE]
-            )
-            self.file_reader_label[Datatype.STRUCTURE] = self._reader[Datatype.STRUCTURE].type()
             self._data[Datatype.STRUCTURE] = self.read(Datatype.STRUCTURE)
 
         if self._fileData[Datatype.FAULT] is not None:
-            self._reader[Datatype.FAULT] = self.assign_reader(self._fileData[Datatype.FAULT])
-            self.file_reader_label[Datatype.FAULT] = self._reader[Datatype.FAULT].type()
             self._data[Datatype.FAULT] = self.read(Datatype.FAULT)
 
         if self._fileData[Datatype.FOLD] is not None:
-            self._reader[Datatype.FOLD] = self.assign_reader(self._fileData[Datatype.FOLD])
-            self.file_reader_label[Datatype.FOLD] = self._reader[Datatype.FOLD].type()
             self._data[Datatype.FOLD] = self.read(Datatype.FOLD)
 
     def save(self, file_path, file_extension=None):

LoopDataConverter/input/input_data.py

@@ -1,35 +1,72 @@
 from dataclasses import dataclass
 from ..datatypes import Datatype
 
-
 @dataclass
 class InputData:
     """Class to store input data for the loop data converter
 
     Attributes:
-    geology: Datatype.GEOLOGY = None
-    structure: Datatype.STRUCTURE = None
-    fault: Datatype.FAULT = None
-    fold: Datatype.FOLD = None
-
+        geology: Optional[Datatype] = None
+        structure: Optional[Datatype] = None
+        fault: Optional[Datatype] = None
+        fold: Optional[Datatype] = None
     """
+
+    GEOLOGY: Datatype.GEOLOGY = None
+    STRUCTURE: Datatype.STRUCTURE = None
+    FAULT: Datatype.FAULT = None
+    FOLD: Datatype.FOLD = None
 
-    geology: Datatype.GEOLOGY = None
-    structure: Datatype.STRUCTURE = None
-    fault: Datatype.FAULT = None
-    fold: Datatype.FOLD = None
-
-    def __getitem__(self, datatype: Datatype):
-        """Method to get the the file directory of a datatype
+    def __getitem__(self, datatype: str):
+        """Method to get the file directory of a datatype
 
         Parameters:
-            datatype (Datatype): The datatype to get the file directory of
+            datatype (str): The datatype to get the file directory of
 
         Returns:
             The file directory of the datatype
+
+        Raises:
+            KeyError: If the datatype is not found in InputData
         """
+        try:
+            return getattr(self, datatype.name)
+        except AttributeError:
+            raise KeyError(f"Datatype {datatype.name} not found in InputData")
+
+
+
+# @dataclass
+# class InputData:
+#     """Class to store input data for the loop data converter
+
+#     Attributes:
+#     geology: Datatype.GEOLOGY = None
+#     structure: Datatype.STRUCTURE = None
+#     fault: Datatype.FAULT = None
+#     fold: Datatype.FOLD = None
+
+#     """
+
+#     geology: Datatype.GEOLOGY = None
+#     structure: Datatype.STRUCTURE = None
+#     fault: Datatype.FAULT = None
+#     fold: Datatype.FOLD = None
+
+#     def __getitem__(self, datatype: Datatype):
+#         """Method to get the the file directory of a datatype
+
+#         Parameters:
+#             datatype (Datatype): The datatype to get the file directory of
+
+#         Returns:
+#             The file directory of the datatype
+#         """
 
-        return self.__dict__[datatype]
+#         try:
+#             return self.__dict__[datatype]
+#         except KeyError:
+#             raise KeyError(f"Datatype {datatype} not found in InputData")
 
 
 @dataclass