cwms-python 0.7.0__tar.gz → 0.8.0__tar.gz

{cwms_python-0.7.0 → cwms_python-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cwms-python
-Version: 0.7.0
+Version: 0.8.0
 Summary: Corps water management systems (CWMS) REST API for Data Retrieval of USACE water data
 License: LICENSE
 Keywords: USACE,water data,CWMS

{cwms_python-0.7.0 → cwms_python-0.8.0}/cwms/__init__.py

@@ -17,6 +17,7 @@ from cwms.outlets.virtual_outlets import *
 from cwms.projects.project_lock_rights import *
 from cwms.projects.project_locks import *
 from cwms.projects.projects import *
+from cwms.projects.water_supply.accounting import *
 from cwms.ratings.ratings import *
 from cwms.ratings.ratings_spec import *
 from cwms.ratings.ratings_template import *

{cwms_python-0.7.0 → cwms_python-0.8.0}/cwms/api.py

@@ -131,7 +131,6 @@ def init_session(
     """
 
     global SESSION
-
     if api_root:
         logging.debug(f"Initializing root URL: api_root={api_root}")
         SESSION = sessions.BaseUrlSession(base_url=api_root)
@@ -142,8 +141,10 @@ def init_session(
         )
         SESSION.mount("https://", adapter)
     if api_key:
+        if api_key.startswith("apikey "):
+            api_key = api_key.replace("apikey ", "")
         logging.debug(f"Setting authorization key: api_key={api_key}")
-        SESSION.headers.update({"Authorization": api_key})
+        SESSION.headers.update({"Authorization": "apikey " + api_key})
 
     return SESSION
 

{cwms_python-0.7.0 → cwms_python-0.8.0}/cwms/cwms_types.py

@@ -62,8 +62,8 @@ class Data:
         def rating_type(data: JSON) -> DataFrame:
             # grab the correct point values for a rating table
             df = DataFrame(data["point"]) if data["point"] else DataFrame()
-            df = df.apply(to_numeric)
-            return df
+            df_numeric = df.apply(to_numeric, axis=0, result_type="expand")
+            return DataFrame(df_numeric)
 
         def timeseries_type(orig_json: JSON, value_json: JSON) -> DataFrame:
             # if timeseries values are present then grab the values and put into
@@ -79,6 +79,44 @@ class Data:
                 df["date-time"] = to_datetime(df["date-time"], unit="ms", utc=True)
             return df
 
+        def reorder_measurement_cols(df: DataFrame) -> DataFrame:
+            # reorders measurement columns for usability
+
+            # Define the columns to bring to the front
+            front_columns = [
+                "id.office-id",
+                "id.name",
+                "number",
+                "instant",
+                "streamflow-measurement.gage-height",
+                "streamflow-measurement.flow",
+                "streamflow-measurement.quality",
+                "used",
+                "agency",
+                "wm-comments",
+            ]
+
+            # Identify columns containing 'unit' to be last
+            unit_columns = [col for col in df.columns if "unit" in col]
+
+            # Identify remaining columns (not in front_columns or unit_columns)
+            remaining_columns = [
+                col
+                for col in df.columns
+                if col not in front_columns and col not in unit_columns
+            ]
+
+            # Construct the new column order
+            new_column_order = front_columns + remaining_columns + unit_columns
+
+            # Filter out columns that might not actually exist in the DataFrame.
+            existing_columns = [col for col in new_column_order if col in df.columns]
+
+            # Reorder the DataFrame
+            df = df[existing_columns]
+
+            return df
+
         data = deepcopy(json)
 
         if selector:
@@ -95,6 +133,9 @@ class Data:
                 df = json_normalize(df_data) if df_data else DataFrame()
         else:
             df = json_normalize(data)
+            # if streamflow-measurement reorder columns
+            if "streamflow-measurement.flow" in df.columns:
+                df = reorder_measurement_cols(df)
 
         return df
 

{cwms_python-0.7.0 → cwms_python-0.8.0}/cwms/measurements/measurements.py

@@ -116,8 +116,15 @@ def store_measurements(
         "fail-if-exists": fail_if_exists,
     }
 
-    if not isinstance(data, dict):
-        raise ValueError("Cannot store a timeseries without a JSON data dictionary")
+    if not isinstance(data, list):
+        raise ValueError(
+            "Cannot store a measurement without a JSON list, object is not a list of dictionaries"
+        )
+    for item in data:
+        if not isinstance(item, dict):
+            raise ValueError(
+                "Cannot store a measurement without a JSON list: a non-dictionary object was found"
+            )
 
     return api.post(endpoint, data, params, api_version=1)
 
@@ -175,3 +182,28 @@ def delete_measurements(
     }
 
     return api.delete(endpoint, params, api_version=1)
+
+
+def get_measurements_extents(
+    office_mask: Optional[str] = None,
+) -> Data:
+    """Get time extents of streamflow measurements
+
+    Parameters
+    ----------
+        office_mask: string
+            Office Id used to filter the results.
+
+    Returns
+    -------
+        cwms data type.  data.json will return the JSON output and data.df will return a dataframe. Dates returned are all in UTC.
+
+    """
+    endpoint = "measurements/time-extents"
+
+    params = {
+        "office-mask": office_mask,
+    }
+
+    response = api.get(endpoint, params, api_version=1)
+    return Data(response)  # , selector=selector)

cwms_python-0.8.0/cwms/projects/water_supply/accounting.py

@@ -0,0 +1,145 @@
+#  Copyright (c) 2024
+#  United States Army Corps of Engineers - Hydrologic Engineering Center (USACE/HEC)
+#  All Rights Reserved.  USACE PROPRIETARY/CONFIDENTIAL.
+#  Source may not be released without written approval from HEC
+import cwms.api as api
+from cwms.cwms_types import JSON, Data
+
+
+def get_pump_accounting(
+    office_id: str,
+    project_id: str,
+    water_user: str,
+    contract_name: str,
+    start: str,
+    end: str,
+    timezone: str = "UTC",
+    unit: str = "cms",
+    start_time_inclusive: bool = True,
+    end_time_inclusive: bool = True,
+    ascending: bool = True,
+    row_limit: int = 0,
+) -> Data:
+    """
+    Retrieves pump accounting entries associated with a water supply contract.
+
+    Parameters
+    ----------
+    office_id : str
+        The office ID the pump accounting is associated with. (Path)
+    project_id : str
+        The project ID the pump accounting is associated with. (Path)
+    water_user : str
+        The water user the pump accounting is associated with. (Path)
+    contract_name : str
+        The name of the contract associated with the pump accounting. (Path)
+    start : str
+        The start time of the time window for pump accounting entries to retrieve.
+        Format: ISO 8601 extended, with optional offset and timezone. (Query)
+    end : str
+        The end time of the time window for pump accounting entries to retrieve.
+        Format: ISO 8601 extended, with optional offset and timezone. (Query)
+    timezone : str, optional
+        The default timezone to use if `start` or `end` lacks offset/timezone info.
+        Defaults to "UTC". (Query)
+    unit : str, optional
+        Unit of flow rate for accounting entries. Defaults to "cms". (Query)
+    start_time_inclusive : bool, optional
+        Whether the start time is inclusive. Defaults to True. (Query)
+    end_time_inclusive : bool, optional
+        Whether the end time is inclusive. Defaults to True. (Query)
+    ascending : bool, optional
+        Whether entries should be returned in ascending order. Defaults to True. (Query)
+    row_limit : int, optional
+        Maximum number of rows to return. Defaults to 0, meaning no limit. (Query)
+
+    Returns
+    -------
+    Data
+        The JSON response from CWMS Data API wrapped in a Data object.
+
+    Raises
+    ------
+    ValueError
+        If any required path parameters are None.
+    ClientError
+        If a 400-level error occurs.
+    NoDataFoundError
+        If a 404-level error occurs.
+    ServerError
+        If a 500-level error occurs.
+    """
+    if not all([office_id, project_id, water_user, contract_name, start, end]):
+        raise ValueError("All required parameters must be provided.")
+
+    endpoint = f"projects/{office_id}/{project_id}/water-user/{water_user}/contracts/{contract_name}/accounting"
+
+    params: dict[str, str | int] = {
+        "start": start,
+        "end": end,
+        "timezone": timezone,
+        "unit": unit,
+        "start-time-inclusive": str(start_time_inclusive).lower(),
+        "end-time-inclusive": str(end_time_inclusive).lower(),
+        "ascending": str(ascending).lower(),
+        "row-limit": row_limit,
+    }
+
+    response = api.get(endpoint, params, api_version=1)
+    return Data(response)
+
+
+def store_pump_accounting(
+    office: str,
+    project_id: str,
+    water_user: str,
+    contract_name: str,
+    data: JSON,
+) -> None:
+    """
+    Creates a new pump accounting entry associated with a water supply contract.
+
+    Parameters
+    ----------
+    office : str
+        The office ID the accounting is associated with. (Path)
+    project_id : str
+        The project ID the accounting is associated with. (Path)
+    water_user : str
+        The water user the accounting is associated with. (Path)
+    contract_name : str
+        The name of the contract associated with the accounting. (Path)
+    data : dict
+        A dictionary representing the JSON data to be stored. This should match the
+        WaterSupplyAccounting structure as defined by the API.
+
+    Returns
+    -------
+    None
+
+    Raises
+    ------
+    ValueError
+        If any required argument is missing.
+    ClientError
+        If a 400 range error code response is returned from the server.
+    NoDataFoundError
+        If a 404 range error code response is returned from the server.
+    ServerError
+        If a 500 range error code response is returned from the server.
+    """
+    if not all([office, project_id, water_user, contract_name]):
+        raise ValueError(
+            "Office, project_id, water_user, and contract_name must be provided."
+        )
+    if not data:
+        raise ValueError("Data must be provided and cannot be empty.")
+
+    endpoint = f"projects/{office}/{project_id}/water-user/{water_user}/contracts/{contract_name}/accounting"
+    params = {
+        "office": office,
+        "project-id": project_id,
+        "water-user": water_user,
+        "contract-name": contract_name,
+    }
+    api.post(endpoint, data, params)

{cwms_python-0.7.0 → cwms_python-0.8.0}/cwms/timeseries/timeseries.py

@@ -247,64 +247,69 @@ def timeseries_df_to_json(
     df = df.reindex(columns=["date-time", "value", "quality-code"])
     if df.isnull().values.any():
         raise ValueError("Null/NaN data must be removed from the dataframe")
-
+    if version_date:
+        version_date_iso = version_date.isoformat()
+    else:
+        version_date_iso = None
     ts_dict = {
         "name": ts_id,
         "office-id": office_id,
         "units": units,
         "values": df.values.tolist(),
-        "version-date": version_date,
+        "version-date": version_date_iso,
     }
 
     return ts_dict
 
 
 def store_multi_timeseries_df(
-    ts_data: pd.DataFrame, office_id: str, max_workers: Optional[int] = 30
+    data: pd.DataFrame, office_id: str, max_workers: Optional[int] = 30
 ) -> None:
-
     def store_ts_ids(
         data: pd.DataFrame,
         ts_id: str,
         office_id: str,
         version_date: Optional[datetime] = None,
     ) -> None:
-        units = data["units"].iloc[0]
-        data_json = timeseries_df_to_json(
-            data=data,
-            ts_id=ts_id,
-            units=units,
-            office_id=office_id,
-            version_date=version_date,
-        )
-        store_timeseries(data=data_json)
+        try:
+            units = data["units"].iloc[0]
+            data_json = timeseries_df_to_json(
+                data=data,
+                ts_id=ts_id,
+                units=units,
+                office_id=office_id,
+                version_date=version_date,
+            )
+            store_timeseries(data=data_json)
+        except Exception as e:
+            print(f"Error processing {ts_id}: {e}")
         return None
 
+    ts_data_all = data.copy()
+    if "version_date" not in ts_data_all.columns:
+        ts_data_all = ts_data_all.assign(version_date=pd.to_datetime(pd.Series([])))
     unique_tsids = (
-        ts_data["ts_id"].astype(str) + ":" + ts_data["version_date"].astype(str)
+        ts_data_all["ts_id"].astype(str) + ":" + ts_data_all["version_date"].astype(str)
     ).unique()
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
-        for ts_id_all in unique_tsids:
-            try:
-                ts_id, version_date = ts_id_all.split(":", 1)
-                if version_date != "NaT":
-                    version_date_dt = pd.to_datetime(version_date)
-                    data = ts_data[
-                        (ts_data["ts_id"] == ts_id)
-                        & (ts_data["version_date"] == version_date_dt)
-                    ]
-                else:
-                    version_date_dt = None
-                    data = ts_data[
-                        (ts_data["ts_id"] == ts_id) & ts_data["version_date"].isna()
-                    ]
-                if not data.empty:
-                    executor.submit(
-                        store_ts_ids, data, ts_id, office_id, version_date_dt
-                    )
-            except Exception as e:
-                print(f"Error processing {ts_id}: {e}")
+        for unique_tsid in unique_tsids:
+            ts_id, version_date = unique_tsid.split(":", 1)
+            if version_date != "NaT":
+                version_date_dt = pd.to_datetime(version_date)
+                ts_data = ts_data_all[
+                    (ts_data_all["ts_id"] == ts_id)
+                    & (ts_data_all["version_date"] == version_date_dt)
+                ]
+            else:
+                version_date_dt = None
+                ts_data = ts_data_all[
+                    (ts_data_all["ts_id"] == ts_id) & ts_data_all["version_date"].isna()
+                ]
+            if not data.empty:
+                executor.submit(
+                    store_ts_ids, ts_data, ts_id, office_id, version_date_dt
+                )
 
 
 def store_timeseries(

{cwms_python-0.7.0 → cwms_python-0.8.0}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "cwms-python"
 repository = "https://github.com/HydrologicEngineeringCenter/cwms-python"
 
-version = "0.7.0"
+version = "0.8.0"
 
 
 packages = [