update

codeforboston · Jun 19, 2024 · dfe2899 · dfe2899
1 parent 9087ff0
commit dfe2899
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 27 deletions.
diff --git a/app/data/processing/predictive_models/v1.py b/app/data/processing/predictive_models/v1.py
@@ -56,16 +56,16 @@ def process_data(df_hobolink: pd.DataFrame, df_usgs: pd.DataFrame) -> pd.DataFra
         df_hobolink.groupby("time")
         .agg(
             {
-                "pressure": np.mean,
-                "par": np.mean,
-                "rain": np.sum,
-                "rh": np.mean,
-                "dew_point": np.mean,
-                "wind_speed": np.mean,
-                "gust_speed": np.mean,
-                "wind_dir": np.mean,
+                "pressure": "mean",
+                "par": "mean",
+                "rain": "sum",
+                "rh": "mean",
+                "dew_point": "mean",
+                "wind_speed": "mean",
+                "gust_speed": "mean",
+                "wind_dir": "mean",
                 # 'water_temp': np.mean,
-                "air_temp": np.mean,
+                "air_temp": "mean",
             }
         )
         .reset_index()

diff --git a/app/data/processing/predictive_models/v2.py b/app/data/processing/predictive_models/v2.py
@@ -62,14 +62,14 @@ def process_data(df_hobolink: pd.DataFrame, df_usgs: pd.DataFrame) -> pd.DataFra
         df_usgs.groupby("time")
         .agg(
             {
-                "log_stream_flow": np.mean,
+                "log_stream_flow": "mean",
             }
         )
         .reset_index()
     )
     df_hobolink = (
         df_hobolink.groupby("time")
-        .agg({"rain": np.sum, "log_air_temp": np.mean, "days_since_sig_rain": np.min})
+        .agg({"rain": "sum", "log_air_temp": "mean", "days_since_sig_rain": "min"})
         .reset_index()
     )
 

diff --git a/app/data/processing/predictive_models/v3.py b/app/data/processing/predictive_models/v3.py
@@ -43,16 +43,16 @@ def process_data(df_hobolink: pd.DataFrame, df_usgs: pd.DataFrame) -> pd.DataFra
         df_hobolink.groupby("time")
         .agg(
             {
-                "pressure": np.mean,
-                "par": np.mean,
-                "rain": np.sum,
-                "rh": np.mean,
-                "dew_point": np.mean,
-                "wind_speed": np.mean,
-                "gust_speed": np.mean,
-                "wind_dir": np.mean,
+                "pressure": "mean",
+                "par": "mean",
+                "rain": "sum",
+                "rh": "mean",
+                "dew_point": "mean",
+                "wind_speed": "mean",
+                "gust_speed": "mean",
+                "wind_dir": "mean",
                 # 'water_temp': np.mean,
-                "air_temp": np.mean,
+                "air_temp": "mean",
             }
         )
         .reset_index()

diff --git a/app/main.py b/app/main.py
@@ -265,18 +265,18 @@ def _wrap(*args, **kwargs):
 
     @app.cli.command("update-db")
     @click.option(
-        "--async",
-        "async_",
+        "--tweet-status/--dont-tweet-status",
         is_flag=True,
         default=False,
-        help="If set, then run this command in Celery."
-        " This can help save a bit of money on Heroku compute.",
+        help="If set, then send a tweet indicating the status of the flags.",
     )
     @click.option(
-        "--tweet-status/--dont-tweet-status",
+        "--async",
+        "async_",
         is_flag=True,
         default=False,
-        help="If set, then send a tweet indicating the status of the flags.",
+        help="If set, then run this command in Celery."
+        " This can help save a bit of money on Heroku compute.",
     )
     @with_appcontext
     @mail_on_fail

diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,4 @@
 [pytest]
-mocked-sessions = app.data.database.db.session
 addopts = --cov=app
 testpaths =
     tests