Add additional data point collection of liquid level sensor and relay boards.

Author: matteius

.pre-commit-config.yaml

@@ -18,29 +18,28 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black
-  rev: 22.3.0
+  rev: 24.8.0
   hooks:
   - id: black
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 4.0.1
+  rev: 7.1.1
   hooks:
   - id: flake8
     additional_dependencies: [
-        'flake8-bugbear==20.1.4',
-        'flake8-logging-format==0.6.0',
-        'flake8-implicit-str-concat==0.2.0',
+        'flake8-bugbear==24.8.19',
+        'flake8-implicit-str-concat==0.4.0',
     ]
     exclude: tests/data
 
 - repo: https://github.com/PyCQA/isort
-  rev: 5.12.0
+  rev: 5.13.2
   hooks:
   - id: isort
     files: \.py$
 
 - repo: https://github.com/pre-commit/pygrep-hooks
-  rev: v1.7.0
+  rev: v1.10.0
   hooks:
   - id: python-no-log-warn
   - id: python-no-eval

opensensor/collection_apis.py

@@ -15,9 +15,11 @@
     DeviceMetadata,
     Environment,
     Humidity,
+    LiquidLevel,
     Lux,
     Moisture,
     Pressure,
+    RelayBoard,
     Temperature,
 )
 from opensensor.db import get_open_sensor_db
@@ -63,6 +65,8 @@
     "co2": "ppm_CO2",
     "moisture": "moisture_readings",
     "pH": "pH",
+    "liquid": "liquid",
+    "relays": "relays",
 }
 
 
@@ -308,6 +312,8 @@ def get_uniform_sample_pipeline(
     "readings": Moisture,
     "pH": PH,
     "VPD": VPD,
+    "liquid": LiquidLevel,
+    "relays": RelayBoard,
 }
 model_class_attributes = {v: k for k, v in model_classes.items()}
 
@@ -450,6 +456,30 @@ async def historical_data_route(
     response_model=Page[VPD],
     methods=["GET"],
 )
+router.add_api_route(
+    "/pressure/{device_id}",
+    create_historical_data_route(Pressure),
+    response_model=Page[Pressure],
+    methods=["GET"],
+)
+router.add_api_route(
+    "/lux/{device_id}",
+    create_historical_data_route(Lux),
+    response_model=Page[Lux],
+    methods=["GET"],
+)
+router.add_api_route(
+    "/liquid/{device_id}",
+    create_historical_data_route(LiquidLevel),
+    response_model=Page[LiquidLevel],
+    methods=["GET"],
+)
+router.add_api_route(
+    "/relays/{device_id}",
+    create_historical_data_route(RelayBoard),
+    response_model=Page[RelayBoard],
+    methods=["GET"],
+)
 
 
 @router.post("/environment/")
@@ -498,5 +528,13 @@ async def record_environment(
         _record_data_point_to_ts_collection(
             db.pH, "pH", environment.device_metadata, environment.pH, user
         )
+    if environment.liquid:
+        _record_data_point_to_ts_collection(
+            db.LiquidLevel, "liquid", environment.device_metadata, environment.liquid, user
+        )
+    if environment.relays:
+        _record_data_point_to_ts_collection(
+            db.RelayBoard, "relays", environment.device_metadata, environment.relays, user
+        )
 
     return Response(status_code=status.HTTP_201_CREATED)

opensensor/collections.py

@@ -46,6 +46,25 @@ def collection_name(cls):
         return "pH"
 
 
+class LiquidLevel(TimestampModel):
+    """Liquid Level Sensor output"""
+
+    liquid: bool
+
+
+class RelayStatus(BaseModel):
+    position: int
+    enabled: bool
+    seconds: int | None = None
+    description: str | None = None
+
+
+class RelayBoard(TimestampModel):
+    """Relay Board control tracking"""
+
+    relays: List[RelayStatus]
+
+
 class Moisture(TimestampModel):
     readings: List[float | Decimal | int] | str
 
@@ -66,6 +85,8 @@ class Environment(BaseModel):
     co2: CO2 | None = None
     moisture: Moisture | None = None
     pH: PH | None = None
+    liquid: LiquidLevel | None = None
+    relays: RelayBoard | None = None
 
 
 class VPD(BaseModel):