Merge pull request #62 from DataIntegrationGroup/pre-production

Pre production

Author: jacob-a-brown

backend/config.py

@@ -149,7 +149,7 @@ class Config(Loggable):
     analyte_output_units: str = MILLIGRAMS_PER_LITER
     waterlevel_output_units: str = FEET
 
-    output_format: str = OutputFormat.CSV
+    output_format: str = OutputFormat.CSV.value
 
     yes: bool = False
 

backend/connectors/nmbgmr/source.py

@@ -49,7 +49,7 @@ def _make_url(endpoint):
     if os.getenv("DEBUG") == "1":
         url = f"http://localhost:8000/latest/{endpoint}"
     else:
-        url = f"https://waterdata.nmt.edu/latest/{endpoint}"
+        url = f"https://ampapidev-dot-waterdatainitiative-271000.appspot.com/latest/{endpoint}"
     return url
 
 

backend/persister.py

@@ -129,7 +129,7 @@ def dump_summary(self, path: str):
     def dump_timeseries_unified(self, path: str):
         if self.timeseries:
             path = os.path.join(path, "timeseries_unified")
-            path = self.add_extension(path, OutputFormat.CSV)
+            path = self.add_extension(path, OutputFormat.CSV.value)
             self.log(f"dumping unified timeseries to {os.path.abspath(path)}")
             self._dump_timeseries(path, self.timeseries)
         else:
@@ -144,7 +144,7 @@ def dump_timeseries_separated(self, path: str):
             for records in self.timeseries:
                 site_id = records[0].id
                 path = os.path.join(timeseries_path, str(site_id).replace(" ", "_"))
-                path = self.add_extension(path, OutputFormat.CSV)
+                path = self.add_extension(path, OutputFormat.CSV.value)
                 self.log(f"dumping {site_id} to {os.path.abspath(path)}")
 
                 list_of_records = [records]

setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name="nmuwd",
-    version="0.9.7",
+    version="0.9.8",
     author="Jake Ross",
     description="New Mexico Water Data Integration Engine",
     long_description=long_description,