fix: Add code to get_usgs_CDA to allow converting smaller interval data to store as 15 minute data.

.pre-commit-config.yaml

@@ -3,26 +3,30 @@ repos:
     hooks:
       - id: black
         name: black
-        entry: poetry run black
-        language: system
+        entry: black
+        language: python
+        additional_dependencies: [black]
         types: [file, python]
         exclude: ^cwmscli/_generated/ownership_data\.py$
 
       - id: isort
         name: isort
-        entry: poetry run isort
-        language: system
+        entry: isort
+        language: python
+        additional_dependencies: [isort]
         types: [file, python]
         exclude: ^cwmscli/_generated/ownership_data\.py$
 
       - id: yamlfix
         name: yamlfix
-        entry: poetry run yamlfix
-        language: system
+        entry: yamlfix
+        language: python
+        additional_dependencies: [yamlfix]
         types: [file, yaml]
 
       - id: ownership-sync
         name: generated ownership files
-        entry: poetry run python scripts/sync_ownership.py --check
-        language: system
+        entry: python scripts/sync_ownership.py --check
+        language: python
+        additional_dependencies: [poetry]
         pass_filenames: false

.pre-commit-config.yaml.org

@@ -0,0 +1,28 @@
+repos:
+  - repo: local
+    hooks:
+      - id: black
+        name: black
+        entry: poetry run black
+        language: system
+        types: [file, python]
+        exclude: ^cwmscli/_generated/ownership_data\.py$
+
+      - id: isort
+        name: isort
+        entry: poetry run isort
+        language: system
+        types: [file, python]
+        exclude: ^cwmscli/_generated/ownership_data\.py$
+
+      - id: yamlfix
+        name: yamlfix
+        entry: poetry run yamlfix
+        language: system
+        types: [file, yaml]
+
+      - id: ownership-sync
+        name: generated ownership files
+        entry: poetry run python scripts/sync_ownership.py --check
+        language: system
+        pass_filenames: false

cwmscli/usgs/getusgs_cda.py

@@ -1,4 +1,5 @@
 import logging
+import re
 from datetime import datetime, timedelta
 from typing import Optional
 
@@ -370,6 +371,30 @@ def CWMS_writeData(USGS_ts, USGS_data, USGS_data_method, days_back):
                         office = row["office-id"]
                         values["quality-code"] = 0
 
+                        # check for non irregular data interval and resample data to that interval
+                        if not (
+                            "~" in ts_id.split(".")[3] or ts_id.split(".")[3] == "0"
+                        ):
+                            interval_number = re.match(
+                                r"^(\d+)(.*)", ts_id.split(".")[3]
+                            ).group(1)
+                            interval_type = re.match(
+                                r"^(\d+)(.*)", ts_id.split(".")[3]
+                            ).group(2)
+                            if interval_type == "Minutes":
+                                interval_initial = "min"
+                            else:
+                                interval_initial = interval_type[0]
+                            values_dt = values.copy()
+                            values_dt["date-time"] = pd.to_datetime(
+                                values_dt["date-time"]
+                            )
+                            values_dt.set_index("date-time", inplace=True)
+                            values_new = values_dt.resample(
+                                interval_number + interval_initial
+                            ).first()
+                            values = values_new.reset_index()
+
                         # write values to CWMS database
                         try:
                             data = cwms.timeseries_df_to_json(