Some fixes and improvements, made composer watch work

Dockerfile

@@ -3,7 +3,4 @@ WORKDIR /code
 COPY ./requirements.txt /code/requirements.txt
 RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 COPY ./app /code/app
-
-# we use 'dev' here so we can sync code changes into the container and
-# have the application pick these up without restarting for easy development
-CMD ["fastapi", "dev", "app/main.py", "--host", "0.0.0.0"]
+CMD ["fastapi", "run", "app/main.py", "--host", "0.0.0.0"]

app/dependencies/database.py

@@ -1,4 +1,4 @@
-from sqlmodel import SQLModel, create_engine
+from sqlmodel import SQLModel, create_engine, Session
 from os import getenv
 from app.models import *
 

app/routers/observations.py

@@ -41,20 +41,12 @@ def patch_observation(id: int, observation: ObservationUpdate):
     with Session(engine) as session:
         db_observation = __require_observation(id, session)
         db_observation.sqlmodel_update(observation.model_dump(exclude_unset=True))
-        add_to_session(db_observation)
-        return db_observation
-
-@router.put("/{id}")
-def put_observation(id: int, observation: Observation):
-    with Session(engine) as session:
-        db_observation = __require_observation(id, session)
-        db_observation.sqlmodel_update(observation.model_dump())
-        add_to_session(db_observation)
+        add_to_session(db_observation, session)
         return db_observation
 
 @router.post("/", status_code=201)
 def post_observation(observation: ObservationCreate) -> Observation:
     with Session(engine) as session:
         db_observation = Observation.model_validate(observation)
-        add_to_session(db_observation)
+        add_to_session(db_observation, session)
         return db_observation

compose.yaml

@@ -9,7 +9,7 @@ services:
       BOSWACHTER_DB_URL: "postgresql://boswachter:highsecurity@database:5432/boswachter"
     develop:
       watch:
-        - action: sync
+        - action: sync+restart
           path: ./app
           target: /code/app