ran mypy and fixed the errors

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         run: black --check .
 
       - name: Type check with mypy
-        run: mypy .
+        run: mypy --config-file mypy.ini .
 
       - name: Set up Node.js
         uses: actions/setup-node@v3

.pre-commit-config.yaml

@@ -1,5 +1,17 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.3.0  # use the latest version from PyPI
+    rev: 23.3.0  
     hooks:
-      - id: black
+      - id: black
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v1.13.0'
+    hooks:
+      - id: mypy
+        args: ["--config-file", "mypy.ini"]     
+        additional_dependencies:
+          - "pydantic>=2.9.0" 
+          - "sqlalchemy>=2.0.35"
+          - "pydantic-settings>=2.5.2"
+          - "fastapi>=0.114.0"
+          - "GeoAlchemy2>=0.15.2"
+          - "pytest>=8.3.3"

backend/api/models/landslide_zones.py

@@ -1,11 +1,11 @@
 """All data of the Landslide Zones table from SFData."""
 
-from sqlalchemy import String, Integer
+from sqlalchemy import String, Integer, Float, DateTime, func
 from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import mapped_column
 from geoalchemy2 import Geometry
-from datetime import datetime, DateTime
+from datetime import datetime
 
 
 class LandslideZones(DeclarativeBase):
@@ -22,17 +22,13 @@ class LandslideZones(DeclarativeBase):
     sum_shape: Mapped[float] = mapped_column(Float)
     shape_length: Mapped[float] = mapped_column(Float)
     created_us: Mapped[str] = mapped_column(String)
-    created_da: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
-    )
+    created_da: Mapped[datetime] = mapped_column(DateTime(timezone=True))
     last_edited: Mapped[str] = mapped_column(String)
-    last_edi_1: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
-    )
+    last_edi_1: Mapped[datetime] = mapped_column(DateTime(timezone=True))
     shape_Le_1: Mapped[float] = mapped_column(Float)
     shape_area: Mapped[float] = mapped_column(Float)
     update_timestamp: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
+        DateTime(timezone=True), server_default=func.now()
     )
 
     def __repr__(self) -> str:

backend/api/models/liquefaction_zones.py

@@ -1,11 +1,11 @@
 """All data of the Liquefaction Zones table from SFData."""
 
-from sqlalchemy import String
+from sqlalchemy import String, Float, DateTime, func
 from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import mapped_column
 from geoalchemy2 import Geometry
-from datetime import datetime, DateTime
+from datetime import datetime
 
 
 class LiquefactionZones(DeclarativeBase):
@@ -23,7 +23,7 @@ class LiquefactionZones(DeclarativeBase):
     shape_length: Mapped[float] = mapped_column(Float)
     shape_area: Mapped[float] = mapped_column(Float)
     update_timestamp: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
+        DateTime(timezone=True), server_default=func.now()
     )
 
     def __repr__(self) -> str:

backend/api/models/neighborhoods.py

@@ -1,11 +1,11 @@
 """Neighborhood boundaries in San Francisco"""
 
-from sqlalchemy import String, Integer
+from sqlalchemy import String, Integer, DateTime, func
 from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import mapped_column
 from geoalchemy2 import Geometry
-from datetime import datetime, DateTime
+from datetime import datetime
 
 
 MAPPED_COLUMN_STRING_LENGTH = 200
@@ -22,7 +22,7 @@ class Neighborhoods(DeclarativeBase):
     neighborhood: Mapped[str] = mapped_column(String(MAPPED_COLUMN_STRING_LENGTH))
     geometry: Mapped[Geometry] = mapped_column(Geometry("MULTIPOLYGON", srid=4326))
     update_timestamp: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utc_now
+        DateTime(timezone=True), server_default=func.now()
     )
 
     def __repr__(self) -> str:

backend/api/models/seismic_hazard_zones.py

@@ -1,11 +1,11 @@
 """All data of the Seismic Hazard table from SFData."""
 
-from sqlalchemy import Integer
+from sqlalchemy import Integer, DateTime, func
 from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import mapped_column
 from geoalchemy2 import Geometry
-from datetime import datetime, DateTime
+from datetime import datetime
 
 
 class SeismicHazardZones(DeclarativeBase):
@@ -19,7 +19,7 @@ class SeismicHazardZones(DeclarativeBase):
     identifier: Mapped[int] = mapped_column(Integer, primary_key=True)
     geometry: Mapped[Geometry] = mapped_column(Geometry("MULTIPOLYGON", srid=4326))
     update_timestamp: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
+        DateTime(timezone=True), server_default=func.now()
     )
 
     def __repr__(self) -> str:

backend/api/models/soft_story_properties.py

@@ -1,11 +1,11 @@
 """All data of the Soft Story table from SFData."""
 
-from sqlalchemy import String, Integer
+from sqlalchemy import String, Integer, DateTime, func
 from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import mapped_column
 from geoalchemy2 import Geometry
-from datetime import datetime, DateTime
+from datetime import datetime
 
 
 MAPPED_COLUMN_STRING_LENGTH = 200
@@ -31,14 +31,10 @@ class SoftStoryProperties(DeclarativeBase):
     status: Mapped[str] = mapped_column(String(MAPPED_COLUMN_STRING_LENGTH))
     bos_district: Mapped[int] = mapped_column(Integer)
     point: Mapped[Geometry] = mapped_column(Geometry("POINT", srid=4326))
-    sfdata_as_of: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
-    )
-    sfdata_loaded_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
-    )
+    sfdata_as_of: Mapped[datetime] = mapped_column(DateTime(timezone=True))
+    sfdata_loaded_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
     update_timestamp: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
+        DateTime(timezone=True), server_default=func.now()
     )
 
     def __repr__(self) -> str:

backend/api/models/tsunami.py

@@ -1,11 +1,11 @@
 """Tsunami Risk Zone data"""
 
-from sqlalchemy import String, Integer
+from sqlalchemy import String, Integer, Float, DateTime, func
 from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import mapped_column
 from geoalchemy2 import Geometry
-from datetime import datetime, DateTime
+from datetime import datetime
 
 
 MAPPED_COLUMN_STRING_LENGTH = 200
@@ -30,7 +30,7 @@ class TsunamiZones(DeclarativeBase):
     # This data is ingested as PolygonZ but should be stored as MultiPolygon
     geometry: Mapped[Geometry] = mapped_column(Geometry("MULTIPOLYGON", srid=4326))
     update_timestamp: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=datetime.utcnow
+        DateTime(timezone=True), server_default=func.now()
     )
 
     def __repr__(self) -> str:

backend/api/routers/combined_risk.py

@@ -16,23 +16,15 @@ async def delete_combined_risks(address: str):
     Remove the combined seismic risks of an address from
     the database.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.put("/{address}")
 async def put_combined_risks(address: str, risks: dict):
     """
     Add the combined seismic risks of an address to the database.
     """
-    pass
-
-
-@router.post("/{address}")
-async def put_combined_risks(address: str, risks: dict):
-    """
-    Add the combined seismic risks of an address to the database.
-    """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.get("/{address}")
@@ -42,4 +34,4 @@ async def get_combined_risks(address: str) -> dict:
     three booleans.
     """
     # TODO: Return a dictionary to avoid validation error
-    pass
+    return {"message": "This endpoint is not yet implemented"}

backend/api/routers/polygons.py

@@ -11,36 +11,34 @@
 class Polygon(BaseModel):
     """GIS data container of vertices defining a polygon."""
 
-    pass
-
 
 @router.delete("/{id}")
 async def delete_polygon(id: int, table_name: str):
     """
     Delete this polygon from that table.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.put("/{id}")
 async def put_polygon(id: int, polygon: Polygon, table_name: str):
     """
     Put this polygon into that table.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.post("/")
 async def post_polygon(id: int, polygon: Polygon, table_name: str):
     """
     Post this polygon to that table.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.get("/{id}")
-async def get_polygon(id: int, table_name: str) -> Polygon:
+async def get_polygon(id: int, table_name: str):
     """
     Get this polygon from that table.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}

backend/api/routers/reinforced_soft_story.py

@@ -18,7 +18,7 @@ async def delete_reinforced(address: str):
     Check a small group of reinforced soft stories and raise an
     exception if the building lacks an original soft story.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.put("/{address}")
@@ -32,7 +32,7 @@ async def put_reinforced(
     Check a small group of reinforced soft stories and raise an
     exception if the building lacks an original soft story.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.post("/{address}")
@@ -46,11 +46,11 @@ async def post_reinforced(
     Check a small table of reinforced soft stories and raise an
     exception if the building lacks an original soft story.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.get("/{address}")
-async def get_reinforced(address: str) -> bool:
+async def get_reinforced(address: str):
     """
     Return whether the building at an address, having a soft story,
     has been reinforced.
@@ -59,4 +59,4 @@ async def get_reinforced(address: str) -> bool:
     exception if the building lacks an original soft story.
     """
     # TODO: Change return type to boolean to avoid validation error
-    pass
+    return {"message": "This endpoint is not yet implemented"}

backend/api/routers/seismic.py

@@ -11,10 +11,10 @@
 
 
 @router.get("/risk/{address}")
-async def get_seismic_risk(address: str) -> bool:
+async def get_seismic_risk(address: str):
     """
     Return whether this address is in the current seismic risk
     polygon.
     """
     # TODO: Change return type to boolean to avoid validation error
-    pass
+    return {"message": "This endpoint is not yet implemented"}

backend/api/routers/soft_story.py

@@ -15,7 +15,7 @@ async def delete_soft_story(address: str):
     Delete the record that the building at an address has a soft
     story.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.put("/{address}")
@@ -26,7 +26,7 @@ async def put_soft_story(
     Update whether the building at an address has a soft story
     to the database.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.post("/{address}")
@@ -37,13 +37,13 @@ async def post_soft_story(
     Add that the building at an address has a soft story to the
     database.
     """
-    pass
+    return {"message": "This endpoint is not yet implemented"}
 
 
 @router.get("/{address}")
-async def get_soft_story(address: str) -> bool:
+async def get_soft_story(address: str):
     """
     Return whether the building at an address has a soft story.
     """
     # TODO: Change return type to boolean to avoid validation error
-    pass
+    return {"message": "This endpoint is not yet implemented"}

backend/api/routers/tsunami.py

@@ -11,10 +11,10 @@
 
 
 @router.get("/risk/{address}")
-async def get_risk(address: str) -> bool:
+async def get_risk(address: str):
     """
     Return whether this address is in the current tsunami risk
     polygon.
     """
     # TODO: Change return type to boolean to avoid validation error
-    pass
+    return {"message": "This endpoint is not yet implemented"}

backend/api/tests/test_polygons.py

@@ -5,7 +5,7 @@
 import pytest
 from fastapi.testclient import TestClient
 from ..schemas import Polygon
-from ..index import app
+from ..main import app
 
 
 @pytest.fixture

backend/database/tests/test_database.py

@@ -1,7 +1,7 @@
 import pytest
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, scoped_session
-from ...api.models.comined_risk import Base, CombinedRisk
+from ...api.models.combined_risk import Base, CombinedRisk
 from ...api.config import settings
 
 

mypy.ini

@@ -0,0 +1,7 @@
+# Global options:
+[mypy]
+plugins = pydantic.mypy, sqlalchemy.ext.mypy.plugin
+ignore_missing_imports = True 
+
+[pytest]
+addopts = --mypy