update to python 3.13

bnord01 · bnord01 · commit 1559bb2dc413 · 2025-07-25T16:13:38.000+02:00
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -13,13 +13,13 @@ services:
     environment:
       INFLUX_CONFIG_FILE: /run/secrets/influx_config
       TMM_BUCKET_FILE: /run/secrets/tmm_bucket
-      TMM_API_KEY_FILE: /run/secrets/tmm_api_key
+      TMM_AUTH_SECRET_FILE: /run/secrets/tmm_auth_secret
       DEVELOPMENT_MODE: true
       ENABLE_WRITE: true
     secrets:
       - influx_config
       - tmm_bucket
-      - tmm_api_key
+      - tmm_auth_secret
     ports:
       - "5000:5000"
 
@@ -92,5 +92,5 @@ secrets:
     file: ./examples/influx_config.ini
   tmm_bucket:
     file: ./examples/tmm_bucket
-  tmm_api_key:
-    file: ./examples/tmm_api_key
+  tmm_auth_secret:
+    file: ./examples/tmm_auth_secret
diff --git a/examples/tmm_api_key b/examples/tmm_api_key
diff --git a/examples/tmm_auth_secret b/examples/tmm_auth_secret
@@ -0,0 +1 @@
+secret
diff --git a/services/tmm-api/Dockerfile b/services/tmm-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-alpine as base
+FROM python:3.13-alpine as base
 
 ENV PYTHONFAULTHANDLER=1 \
     PYTHONHASHSEED=random \
diff --git a/services/tmm-api/noxfile.py b/services/tmm-api/noxfile.py
@@ -18,7 +18,7 @@ def black(session):
 @nox.session(python=False)
 def ruff(session):
     session.run("uv", "sync", "--quiet", external=True)
-    session.run("uv", "run", "ruff", ".", external=True)
+    session.run("uv", "run", "ruff", "check", external=True)
 
 
 @nox.session(python=False)
diff --git a/services/tmm-api/pyproject.toml b/services/tmm-api/pyproject.toml
@@ -3,27 +3,27 @@ name = "tmm-api"
 version = "0.1.0"
 description = "Teuto Moisture Map Api"
 authors = [{ name = "code4bielefeld" }]
-requires-python = "~=3.11.0"
+requires-python = "~=3.13.0"
 license = "MIT"
 dependencies = [
-    "influxdb-client>=1.31.0,<2",
-    "fastapi>=0.87.0,<0.88",
-    "uvicorn>=0.19.0,<0.20",
-    "python-multipart>=0.0.5,<0.0.6",
-    "mangum>=0.17.0,<0.18",
-    "cachetools>=5.3.0,<6",
-    "boto3>=1.28.26,<2",
+    "influxdb-client>=1.31.0",
+    "fastapi>=0.87.0",
+    "uvicorn>=0.19.0",
+    "python-multipart>=0.0.5",
+    "mangum>=0.17.0",
+    "cachetools>=5.3.0",
+    "boto3>=1.28.26",
 ]
 
 [dependency-groups]
 dev = [
-    "black>=22.10.0,<23",
-    "boto3-stubs>=1.28.26,<2",
-    "mypy>=0.982,<0.983",
-    "nox>=2023.4.22,<2024",
-    "ruff>=0.0.128,<0.0.129",
-    "pytest>=7.1.2,<8",
-    "watchfiles>=0.18.1,<0.19",
+    "black>=22.10.0",
+    "boto3-stubs>=1.28.26",
+    "mypy>=0.982",
+    "nox>=2023.4.22",
+    "ruff>=0.0.128",
+    "pytest>=7.1.2",
+    "watchfiles>=0.18.1",
 ]
 
 [build-system]
@@ -32,6 +32,19 @@ build-backend = "hatchling.build"
 
 [tool.ruff]
 line-length = 120
+exclude = [
+    ".git",
+    "__pycache__",
+    "*.egg-info",
+    ".nox",
+    ".pytest_cache",
+    ".mypy_cache",
+    "dist",
+    ".venv",
+    "scratch",
+]
+
+[tool.ruff.lint]
 select = [
     "C",
     "E",
@@ -44,17 +57,6 @@ select = [
     #,"D" # todo
 ]
 ignore = ["E501"]
-exclude = [
-    ".git",
-    "__pycache__",
-    "*.egg-info",
-    ".nox",
-    ".pytest_cache",
-    ".mypy_cache",
-    "dist",
-    ".venv",
-    "scratch",
-]
 
 [tool.black]
 line-length = 120
diff --git a/services/tmm-api/test/ttn/test_TTNMessage.py b/services/tmm-api/test/ttn/test_TTNMessage.py
@@ -10,7 +10,9 @@ class TestTTNMessageParsing(unittest.TestCase):
     def test_parse_payload(self):
         filepath = f"{dirname(__file__)}/../dragino_ttn_payload.json"
 
-        message = TTNMessage.parse_file(filepath)
+        with open(filepath) as f:
+            json_str = f.read()
+        message = TTNMessage.model_validate_json(json_str)
         measurement = message.to_measurement()
 
         self.assertEqual(measurement.battery, 3.304, "Battery value not ok")
diff --git a/services/tmm-api/tmm_api/app.py b/services/tmm-api/tmm_api/app.py
@@ -45,6 +45,7 @@
         responses={401: {}},
     )
     def ttn_dragino(message: TTNMessage, TMM_APIKEY: str = Header()):  # noqa: B008,N803
+        logger.info(f"Device: {message.end_device_ids.device_id}, API_KEY: {TMM_APIKEY}")
         if not is_auth(message.end_device_ids.device_id, TMM_APIKEY):
             return JSONResponse(status_code=401, content={"error": "Unauthorized"})
         measurement = message.to_measurement()
diff --git a/services/tmm-api/tmm_api/common/secrets.py b/services/tmm-api/tmm_api/common/secrets.py
@@ -7,7 +7,7 @@
 @cached(cache={})
 def get_secret(name: str) -> str | None:
     if secret_file := os.environ.get(f"{name}_FILE"):
-        return open(secret_file, "r").read().strip()
+        return open(secret_file).read().strip()
     elif ssm_param_name := os.environ.get(f"{name}_SSM_NAME"):
         return get_aws_ssm_parameter(ssm_param_name)
     else:
diff --git a/services/tmm-api/tmm_api/common/sensor_metadata.py b/services/tmm-api/tmm_api/common/sensor_metadata.py
@@ -23,7 +23,7 @@ def get_sensors_metadata():
         }
     except Exception as e:
         print(f"Error retrieving sensor metadata: {e}")
-        raise HTTPException(status_code=500, detail="Error retrieving sensor metadata")
+        raise HTTPException(status_code=500, detail="Error retrieving sensor metadata") from e
 
 
 def convert_dyno_to_plain(dynamo_item):
@@ -47,4 +47,4 @@ def write_sensor_metadata(sensor):
         return response
     except Exception as e:
         print(f"Error saving sensor metadata: {e}")
-        raise HTTPException(status_code=500, detail="Error saving sensor metadata")
+        raise HTTPException(status_code=500, detail="Error saving sensor metadata") from e
diff --git a/services/tmm-api/tmm_api/export/map_overview.py b/services/tmm-api/tmm_api/export/map_overview.py
@@ -67,14 +67,14 @@ def export_moisture_map_data(days: int = 1) -> MapData:
         |> group(columns: ["device"])
 
         //latest |> yield(name: "latest")
-        
+
         joined = join.inner(
             left: average,
             right: latest,
             on: (l, r) => l.device == r.device,
             as: (l, r) => ({{r with last_update: r._time, avg_soil_moisture: l.soil_moisture, avg_soil_temperature: l.soil_temperature, avg_soil_conductivity: l.soil_conductivity, avg_battery: l.battery}}),
         ) |> drop(columns: ["_time"])
-                
+
         joined |> yield(name: "joined")
     """
     with get_influx_client() as client:
diff --git a/services/tmm-api/tmm_api/export/queries/sensor_report.py b/services/tmm-api/tmm_api/export/queries/sensor_report.py
@@ -7,7 +7,7 @@ def _get_query() -> str:
     global _query
     if _query is None:
         query_file = os.path.join(os.path.dirname(__file__), "sensor_report.flux")
-        with open(query_file, "r") as file:
+        with open(query_file) as file:
             _query = file.read()
     return _query
 
diff --git a/services/tmm-api/tmm_api/ttn/TTNMessage.py b/services/tmm-api/tmm_api/ttn/TTNMessage.py
@@ -1,15 +1,12 @@
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 import re
-from typing import Union
-from pydantic import BaseModel, ConstrainedStr
+from typing import Annotated, Union
+from pydantic import BaseModel, ConfigDict, StringConstraints
 from tmm_api.domain.SoilMeasurement import SoilMeasurement
 
 FLOAT_REGEX = re.compile(r"^-?\d+[.]*\d*")
-
-
-class FloatStringWithUnit(ConstrainedStr):
-    regex = FLOAT_REGEX
+FloatStringWithUnit = Annotated[str, StringConstraints(pattern=FLOAT_REGEX)]
 
 
 FloatValue = Union[FloatStringWithUnit, float]  # noqa: U007
@@ -22,40 +19,41 @@ class EndDeviceIds:
 
 
 class VersionIds(BaseModel):
-    brand_id: str
-    model_id: str
-
-    class Config:
-        schema_extra = {
+    model_config = ConfigDict(
+        json_schema_extra={
             "example": {"brand_id": "dragino", "model_id": "lse01"},
         }
+    )
+
+    brand_id: str
+    model_id: str
 
 
 class DecodedPayload(BaseModel):
+    model_config = ConfigDict(
+        json_schema_extra={
+            "example": {"Bat": "3.304 V", "conduct_SOIL": "57 uS/cm", "temp_SOIL": "7.87 °C", "water_SOIL": "23.42 %"}
+        }
+    )
+
     Bat: MaybeFloatValue
     conduct_SOIL: MaybeFloatValue  # noqa: N815
     temp_SOIL: MaybeFloatValue  # noqa: N815
     water_SOIL: FloatValue  # noqa: N815
 
-    class Config:
-        schema_extra = {
-            "example": {"Bat": "3.304 V", "conduct_SOIL": "57 uS/cm", "temp_SOIL": "7.87 °C", "water_SOIL": "23.42 %"}
-        }
-
 
 @dataclass
 class RxMetadata:
     time: datetime | None = None
 
 
 class UserLocations(BaseModel):
+    model_config = ConfigDict(json_schema_extra={"example": {"latitude": 52.014, "longitude": 8.526, "altitude": 62.1}})
+
     latitude: float
     longitude: float
     altitude: float | None = None
 
-    class Config:
-        schema_extra = {"example": {"latitude": 52.014, "longitude": 8.526, "altitude": 62.1}}
-
 
 @dataclass
 class Locations:
@@ -89,7 +87,7 @@ def to_measurement(self) -> SoilMeasurement:
             device_brand=self.uplink_message.version_ids.brand_id,
             device_model=self.uplink_message.version_ids.model_id,
             time=min(
-                datetime.now(timezone.utc),
+                datetime.now(UTC),
                 self.received_at,
                 self.uplink_message.received_at,
                 *[x.time for x in self.uplink_message.rx_metadata if x is not None and x.time is not None],
diff --git a/services/tmm-api/tmm_api/ttn/test_data.py b/services/tmm-api/tmm_api/ttn/test_data.py
@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 from random import random
-from typing import Generator
+from collections.abc import Generator
 
 from tmm_api.domain.SoilMeasurement import SoilMeasurement
 
@@ -21,9 +21,7 @@ def construct_data(device_id, lon, lat, received_at, moisture, temperature, cond
     )
 
 
-def generate_test_data(
-    num_devices: int, days: int, num_measurements: int = 24
-) -> Generator[SoilMeasurement, None, None]:
+def generate_test_data(num_devices: int, days: int, num_measurements: int = 24) -> Generator[SoilMeasurement]:
     last = datetime.now()
     for device in range(num_devices):
         lat = 52.01 + (random() - 0.5) / 2
diff --git a/services/tmm-api/uv.lock b/services/tmm-api/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.11-alpine as base`
	`1`	`+FROM python:3.13-alpine as base`
`2`	`2`
`3`	`3`	`ENV PYTHONFAULTHANDLER=1 \`
`4`	`4`	`PYTHONHASHSEED=random \`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`responses={401: {}},`
`46`	`46`	`)`
`47`	`47`	`def ttn_dragino(message: TTNMessage, TMM_APIKEY: str = Header()): # noqa: B008,N803`
	`48`	`+ logger.info(f"Device: {message.end_device_ids.device_id}, API_KEY: {TMM_APIKEY}")`
`48`	`49`	`if not is_auth(message.end_device_ids.device_id, TMM_APIKEY):`
`49`	`50`	`return JSONResponse(status_code=401, content={"error": "Unauthorized"})`
`50`	`51`	`measurement = message.to_measurement()`