Python bug fixes, including Wind.from_csv datetimeindex (#334)

jamesramsden-bh · web-flow · commit bb8ee216f4d0 · 2026-02-02T11:31:28.000Z
diff --git a/LadybugTools_Adapter/AdapterActions/Execute/HBJSONToGEMCommand.cs b/LadybugTools_Adapter/AdapterActions/Execute/HBJSONToGEMCommand.cs
@@ -79,15 +79,15 @@ public List<object> RunCommand(HBJSONToGEMCommand command, ActionConfig actionCo
             }
 
             //as the file output is hard to verify by itself, check that no errors got output to stderr log
-            success &= !result.Contains("Traceback (most recent call last):");
+            success &= (!result.Contains("Traceback (most recent call last):") || result.Length == 0);
 
             if (!success)
             {
                 BH.Engine.Base.Compute.RecordError($"An error occurred while converting the file to gem.\nPython output: {result}.");
                 return new List<object>();
             }
 
-            string outputFileName = Path.Combine(command.OutputDirectory, Path.GetFileNameWithoutExtension(command.HBJSONFile.FileName) + ".hbjson");
+            string outputFileName = Path.Combine(command.OutputDirectory, Path.GetFileNameWithoutExtension(command.HBJSONFile.FileName) + ".gem");
             File.WriteAllText(outputFileName, result);
 
             m_executeSuccess = success;
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/epw_to_csv.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/epw_to_csv.py
@@ -36,7 +36,7 @@ def epw_to_csv(epw_file: str, include_additional: bool) -> str:
         return csv_str
     except Exception:
         CONSOLE_LOGGER.error("CSV file could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 if __name__ == "__main__":
     args = PARSER.parse_args()
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/gem_to_hbjson.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/gem_to_hbjson.py
@@ -45,7 +45,7 @@ def gem_to_hbjson(gem_file: str) -> None:
         return json.dumps(model_dict)
     except Exception:
         CONSOLE_LOGGER.error("HBJSON file could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 
 if __name__ == "__main__":
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/hbjson_to_gem.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/hbjson_to_gem.py
@@ -41,17 +41,17 @@ def hbjson_to_gem(hbjson_file: str) -> None:
         model = Model.from_dict(hbjson_dict)
         name = str(uuid.uuid4()) + ".gem"
         model_to_ies(
-            model, folder=tempfile.gettempdir, name=name
+            model, folder=tempfile.gettempdir(), name=name
         )
 
-        gem_file = (Path(tempfile.gettempdir) / name)
+        gem_file = (Path(tempfile.gettempdir()) / name)
         gem = gem_file.read_text()
         gem_file.unlink()
 
         return gem
     except Exception:
         CONSOLE_LOGGER.error("Could not convert the hbjson file to a gem file.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 
 if __name__ == "__main__":
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/directional_solar_radiation.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/directional_solar_radiation.py
@@ -116,7 +116,7 @@ def directional_solar_radiation(epw_file, directions, tilts, irradiance_type, an
     
     except Exception:
         CONSOLE_LOGGER.error("Solar Radiation plot could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 if __name__ == "__main__":
     args = PARSER.parse_args()
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/diurnal.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/diurnal.py
@@ -91,7 +91,7 @@ def diurnal(epw_file, data_type_key="Dry Bulb Temperature", colour="#000000", ti
 
     except Exception:
         CONSOLE_LOGGER.error("Diurnal plot could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 if __name__ == "__main__":
     args = PARSER.parse_args()
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/heatmap.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/heatmap.py
@@ -4,6 +4,7 @@
 from pathlib import Path
 import json
 import sys
+import traceback
 import matplotlib
 import matplotlib.figure
 from ladybug.epw import EPW
@@ -84,7 +85,7 @@ def heatmap(epw_file: str, data_type_key: str, colour_map: str, save_path:str =
             
     except Exception:
         CONSOLE_LOGGER.error("Heatmap could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 
 if __name__ == "__main__":
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/sunpath.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/sunpath.py
@@ -73,7 +73,7 @@ def sunpath(epw_file, analysis_period, size, save_path) -> str:
 
     except Exception:
         CONSOLE_LOGGER.error("Sunpath could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 if __name__ == "__main__":
 
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/utci_heatmap.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/utci_heatmap.py
@@ -82,7 +82,7 @@ def utci_heatmap(input_json:str, save_path = None, epw_file:str = None) -> str:
         return json.dumps(return_dict, default=str)
     except Exception:
         CONSOLE_LOGGER.error("UTCI Heatmap could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 if __name__ == "__main__":
     args = PARSER.parse_args()
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/walkability_heatmap.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/walkability_heatmap.py
@@ -64,7 +64,7 @@ def walkability_heatmap(input_json: str, save_path: str, epw_file:str = None) ->
     
     except Exception:
         CONSOLE_LOGGER.error("Walkability plot could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 if __name__ == "__main__":
 
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/windrose.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/bhom/wrapped/plot/windrose.py
@@ -87,7 +87,7 @@ def windrose(epw_file: str, analysis_period: str, colour_map: str, bins: int, sa
             
     except Exception:
         CONSOLE_LOGGER.error("Windrose could not be created.", exc_info=1)
-        return ""
+        return traceback.format_exc()
 
 
 if __name__ == "__main__":
diff --git a/LadybugTools_Engine/Python/src/ladybugtools_toolkit/wind.py b/LadybugTools_Engine/Python/src/ladybugtools_toolkit/wind.py
@@ -218,10 +218,10 @@ def from_dataframe(
         """
 
         if not isinstance(df, pd.DataFrame):
-            raise ValueError(f"df must be of type {type(pd.DataFrame)}")
+            raise TypeError(f"df must be of type {pd.DataFrame}")
 
         if not isinstance(df.index, pd.DatetimeIndex):
-            raise ValueError(f"The DataFrame's index must be of type {type(pd.DatetimeIndex)}")
+            raise TypeError(f"The DataFrame's index must be of type {pd.DatetimeIndex}")
 
         # remove NaN values
         df.dropna(axis=0, how="any", inplace=True)
@@ -263,6 +263,7 @@ def from_csv(
         """
         csv_path = Path(csv_path)
         df = pd.read_csv(csv_path, **kwargs)
+        df.index = pd.to_datetime(df.index)
         return cls.from_dataframe(
             df,
             wind_speed_column=wind_speed_column,
diff --git a/LadybugTools_Engine/Python/tests/__init__.py b/LadybugTools_Engine/Python/tests/__init__.py
@@ -31,7 +31,7 @@
 SPATIAL_COMFORT_MODEL_OBJ: Model = Model.from_hbjson(SPATIAL_COMFORT_MODEL_FILE)
 
 EPW_FILE = Path(__file__).parent / "assets" / "example.epw"
-EPW_CSV_FILE = (Path(__file__).parent / "assets" / "example.csv",)
+EPW_CSV_FILE = Path(__file__).parent / "assets" / "example.csv"
 EPW_OBJ = EPW(EPW_FILE)
 
 TEST_DAYLIGHT_MODEL: Model = Model.from_hbjson(
diff --git a/LadybugTools_Engine/Python/tests/assets/example.csv b/LadybugTools_Engine/Python/tests/assets/example.csv
@@ -1,5 +1,3 @@
-,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example,example
-,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW,EPW
 ,Aerosol Optical Depth (fraction),Albedo (fraction),Atmospheric Station Pressure (Pa),Ceiling Height (m),Days Since Last Snowfall (day),Dew Point Temperature (C),Diffuse Horizontal Illuminance (lux),Diffuse Horizontal Radiation (Wh/m2),Direct Normal Illuminance (lux),Direct Normal Radiation (Wh/m2),Dry Bulb Temperature (C),Extraterrestrial Direct Normal Radiation (Wh/m2),Extraterrestrial Horizontal Radiation (Wh/m2),Global Horizontal Illuminance (lux),Global Horizontal Radiation (Wh/m2),Horizontal Infrared Radiation Intensity (W/m2),Liquid Precipitation Depth (mm),Liquid Precipitation Quantity (fraction),Opaque Sky Cover (tenths),Precipitable Water (mm),Present Weather Codes (codes),Present Weather Observation (observation),Relative Humidity (%),Snow Depth (cm),Total Sky Cover (tenths),Visibility (km),Wind Direction (degrees),Wind Speed (m/s),Year (yr),Zenith Luminance (cd/m2)
 2017-01-01 00:00:00,0.088,0.0,101000,720,88,2.0,0,0,0,0,4.3,1415,0,0,0,288,0.0,0.0,7,0,999999999,9,85,1,7,30.0,250,7.7,1983,0
 2017-01-01 01:00:00,0.04,0.0,101000,22000,88,1.1,0,0,0,0,2.7,1415,0,0,0,264,0.0,0.0,1,0,999999999,9,89,0,2,40.0,220,1.0,1991,0
diff --git a/LadybugTools_Engine/Python/tests/test_wind.py b/LadybugTools_Engine/Python/tests/test_wind.py
@@ -8,7 +8,7 @@
 from ladybugtools_toolkit.ladybug_extension.datacollection import collection_to_series
 from ladybugtools_toolkit.wind import Wind
 
-from . import EPW_OBJ, EPW_FILE
+from . import EPW_OBJ, EPW_FILE, EPW_CSV_FILE
 
 TEST_WIND = Wind.from_epw(EPW_OBJ)
 
@@ -118,7 +118,7 @@ def test_wind_from_dataframe():
         Wind,
     )
 
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         Wind.from_dataframe(
             df="not_a_dataframe",
             wind_speed_column="speed",
@@ -132,6 +132,12 @@ def test_wind_from_dataframe():
             height_above_ground=10,
         )
 
+def test_wind_from_csv():
+    """."""
+    assert isinstance(
+        Wind.from_csv(EPW_CSV_FILE, "Wind Speed (m/s)", "Wind Direction (degrees)"),
+        Wind,
+    )
 
 def test_wind_from_openmeteo():
     """."""

Original file line number	Diff line number	Diff line change
`@@ -79,15 +79,15 @@ public List<object> RunCommand(HBJSONToGEMCommand command, ActionConfig actionCo`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`//as the file output is hard to verify by itself, check that no errors got output to stderr log`
`82`		`- success &= !result.Contains("Traceback (most recent call last):");`
	`82`	`+ success &= (!result.Contains("Traceback (most recent call last):") \|\| result.Length == 0);`
`83`	`83`
`84`	`84`	`if (!success)`
`85`	`85`	`{`
`86`	`86`	`BH.Engine.Base.Compute.RecordError($"An error occurred while converting the file to gem.\nPython output: {result}.");`
`87`	`87`	`return new List<object>();`
`88`	`88`	`}`
`89`	`89`
`90`		`- string outputFileName = Path.Combine(command.OutputDirectory, Path.GetFileNameWithoutExtension(command.HBJSONFile.FileName) + ".hbjson");`
	`90`	`+ string outputFileName = Path.Combine(command.OutputDirectory, Path.GetFileNameWithoutExtension(command.HBJSONFile.FileName) + ".gem");`
`91`	`91`	`File.WriteAllText(outputFileName, result);`
`92`	`92`
`93`	`93`	`m_executeSuccess = success;`