Merge branch 'release-1.7.5'

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ozon3
-version = 1.7.4
+version = 1.7.5
 author = Milind Sharma
 author_email = [email protected]
 description = A package to get air quality data using the WAQI API

setup.py

@@ -9,8 +9,8 @@
  description="A package to get air quality data using the WAQI API",
  license="GPLv3+",
  url="https://github.com/Milind220/Ozone",
- version="1.7.4",
- download_url="https://github.com/Milind220/Ozone/archive/refs/tags/v1.7.4.tar.gz",
+ version="1.7.5",
+ download_url="https://github.com/Milind220/Ozone/archive/refs/tags/v1.7.5.tar.gz",
  packages=setuptools.find_packages(),
  install_requires=[
  "numpy; python_version>='3'",

src/ozone/ozone.py

@@ -91,7 +91,8 @@ def __init__(
 
  if self.file_name == "air_quality":
  warnings.warn(
- "You have not specified a custom save file name. Existing files with the same name may be overwritten!"
+ "You have not specified a custom save file name. "
+ "Existing files with the same name may be overwritten!"
  )
 
  def _check_token_validity(self) -> None:
@@ -160,6 +161,11 @@ def _format_output(
  if data_format == "df":
  return df
 
+ if data_format not in ["csv", "xlsx", "json"]:
+ raise Exception(
+ f"Invalid file format {data_format}. Use any of: csv, json, xlsx, df"
+ )
+
  self.output_dir_path.mkdir(exist_ok=True)
 
  if data_format == "csv":
@@ -179,10 +185,7 @@ def _format_output(
  print(
  f"File saved to disk at {self.output_dir_path} as {self.file_name}.xlsx"
  )
- else:
- raise Exception(
- f"Invalid file format {data_format}. Use any of: csv, json, xlsx, df"
- )
+
  return pandas.DataFrame()
 
  def _extract_live_data(
@@ -246,7 +249,12 @@ def _extract_forecast_data(self, data_obj: Any) -> pandas.DataFrame:
  dict_of_frames[pol] = pandas.DataFrame(lst).set_index("day")
 
  df = pandas.concat(dict_of_frames, axis=1)
+
+ # Convert to numeric while making non-numerics nan,
+ # and then convert to float, just in case there's int
+ df = df.apply(lambda x: pandas.to_numeric(x, errors="coerce")).astype(float)
  df.index = pandas.to_datetime(df.index)
+ df = df.reset_index().rename(columns={"day": "date"})
  return df
 
  def _check_and_get_data_obj(