fmt

Author: danielfeismann

pypsdm/db/weather/models.py

@@ -5,8 +5,7 @@
 from geoalchemy2 import Geometry, WKBElement
 from shapely import Point
 from shapely.geometry.base import BaseGeometry
-from shapely.wkb import loads
-from shapely.wkb import dumps
+from shapely.wkb import dumps, loads
 from sqlalchemy import Column
 from sqlmodel import Field, SQLModel
 
@@ -62,6 +61,7 @@ def name_mapping():
 
 class Coordinate(SQLModel, table=True):
     """Represents a geographical coordinate."""
+
     id: int = Field(default=None, primary_key=True)
 
     # Use Geometry for storing WKB data (binary format)
@@ -88,7 +88,6 @@ def point(self) -> BaseGeometry:
             coordinate = self.coordinate
         return loads(coordinate)
 
-
     @property
     def latitude(self) -> float:
         return self.point.y
@@ -106,12 +105,12 @@ def x(self) -> float:
         return self.point.x
 
     @staticmethod
-    def from_xy(id: int, x: float, y: float) -> 'Coordinate':
+    def from_xy(id: int, x: float, y: float) -> "Coordinate":
         point = Point(x, y)
         wkb_data = dumps(point)
         return Coordinate(id=id, coordinate=wkb_data)
 
     @staticmethod
-    def from_hex(id: int, wkb_hex: str) -> 'Coordinate':
+    def from_hex(id: int, wkb_hex: str) -> "Coordinate":
         bytes = binascii.unhexlify(wkb_hex)
-        return Coordinate(id=id, coordinate=bytes)
+        return Coordinate(id=id, coordinate=bytes)

tests/db/weather/test_weather_models.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 
 import pytest
-from sqlalchemy import text, select
+from sqlalchemy import select, text
 
-from pypsdm.db.weather.models import WeatherValue, Coordinate
+from pypsdm.db.weather.models import Coordinate, WeatherValue
 
 
 @pytest.mark.docker_required
@@ -14,13 +14,15 @@ def test_create_coordinate(db_session):
     coord_2 = Coordinate.from_xy(2, 7.46, 51.5)
     coordinates: list[Coordinate] = coordinates + [coord_1, coord_2]
 
-    query = text("""
+    query = text(
+        """
         INSERT INTO coordinate (id, coordinate)
         VALUES (:id, ST_SetSRID(ST_GeomFromWKB(:geom), 4326));
-    """)
+    """
+    )
 
     for coord in coordinates:
-        db_session.execute(query, {'id': coord.id, 'geom': coord.coordinate})
+        db_session.execute(query, {"id": coord.id, "geom": coord.coordinate})
     db_session.commit()
 
     first_coordinate: Coordinate = db_session.get(Coordinate, 1)
@@ -43,12 +45,14 @@ def test_create_weather_value(db_session):
     """Test creating a weather value."""
     berlin = Coordinate.from_xy(id=1, x=13.405, y=52.52)
 
-    query = text("""
+    query = text(
+        """
         INSERT INTO coordinate (id, coordinate)
         VALUES (:id, ST_SetSRID(ST_GeomFromWKB(:geom), 4326));
-    """)
+    """
+    )
 
-    db_session.execute(query, {'id': berlin.id, 'geom': berlin.coordinate})
+    db_session.execute(query, {"id": berlin.id, "geom": berlin.coordinate})
     db_session.commit()
 
     now = datetime.now()