Empty dataframe fix (#9)

* fix: migrating from setup.py to pyproject.toml

* fix: updating to use map instead of applymap

* fix: quick fix for returning empty dataframe when fault log is empty.

Error message from eventlog is different to datacollection

Author: lachlangrose

LoopProjectFile/LoopProjectFileUtils.py

@@ -306,7 +306,7 @@ def ElementToDataframe(loopFilename, element, loopCompoundType):
         df = pandas.DataFrame.from_records(resp["value"], columns=columns)
         for name in columns:
             df[name] = df[name].astype(loopCompoundType[name])
-        df = df.applymap(lambda x: x.decode() if isinstance(x, bytes) else x)
+        df = df.map(lambda x: x.decode() if isinstance(x, bytes) else x)
         # df.set_index(columns[0], inplace=True)
         return df  # .to_csv(outputFilename)
 
@@ -383,9 +383,7 @@ def ToCsv(loopFilename, outputPath):
         print("    utm zone:", str(resp["value"]["utm"][0]) + utmNorthSouth)
         print("    easting: ", resp["value"]["utm"][2], "-", resp["value"]["utm"][3])
         print("    northing:", resp["value"]["utm"][4], "-", resp["value"]["utm"][5])
-        print(
-            "    altitude:", resp["value"]["depth"][0], "-", resp["value"]["depth"][1]
-        )
+        print("    altitude:", resp["value"]["depth"][0], "-", resp["value"]["depth"][1])
         columns = [
             "minLong",
             "maxLong",
@@ -459,9 +457,7 @@ def ToCsv(loopFilename, outputPath):
         "foliationLog",
         LoopProjectFile.foliationEventType,
     )
-    print(
-        "  Exporting foliation observations into", str(outputPath) + "foliationObs.csv"
-    )
+    print("  Exporting foliation observations into", str(outputPath) + "foliationObs.csv")
     ElementToCsv(
         loopFilename,
         outputPath + "foliationObs.csv",

LoopProjectFile/projectfile.py

@@ -116,9 +116,7 @@ def _add_names_to_df(self, log, df):
         """
         df["name"] = "none"
         for stratigraphic_id in log.index:
-            df.loc[df["layerId"] == stratigraphic_id, "name"] = log.loc[
-                stratigraphic_id, "name"
-            ]
+            df.loc[df["layerId"] == stratigraphic_id, "name"] = log.loc[stratigraphic_id, "name"]
 
     @property
     def extents(self) -> np.ndarray:
@@ -328,10 +326,7 @@ def stratigraphyLocations(self, value: pd.DataFrame):
             raise TypeError("stratigraphyLocations must be set with a pandas dataframe")
         self._validate_data_frame_columns(
             value,
-            {
-                k: False
-                for k in ["layerId", "easting", "northing", "altitude", "type", "name"]
-            },
+            {k: False for k in ["layerId", "easting", "northing", "altitude", "type", "name"]},
         )
         self.__setitem__("contacts", value)
 
@@ -344,9 +339,7 @@ def stratigraphyOrientations(self) -> pd.DataFrame:
     @stratigraphyOrientations.setter
     def stratigraphyOrientations(self, value: pd.DataFrame):
         if isinstance(value, pd.DataFrame) is False:
-            raise TypeError(
-                "stratigraphyOrientations must be set with a pandas dataframe"
-            )
+            raise TypeError("stratigraphyOrientations must be set with a pandas dataframe")
         self._validate_data_frame_columns(
             value,
             {
@@ -388,6 +381,13 @@ def __getitem__(self, element):
                 # TODO: this isn't really ideal and maybe need to be removed but at least it gives an idea of the column
                 # names needed.
                 return pd.DataFrame(columns=list(compoundTypeMap[element].names))
+            if (
+                resp["errorString"]
+                == "No EventLog present in ExtractedInformation for access request"
+            ):
+                # TODO: this isn't really ideal and maybe need to be removed but at least it gives an idea of the column
+                # names needed.
+                return pd.DataFrame(columns=list(compoundTypeMap[element].names))
         # return ProjectFileElement(self.project_filename, element).value
 
     def __setitem__(self, element, value):