diff --git a/.github/workflows/staging_deploy.yml b/.github/workflows/staging_deploy.yml index bf9a046a6..e12a024f8 100644 --- a/.github/workflows/staging_deploy.yml +++ b/.github/workflows/staging_deploy.yml @@ -48,7 +48,7 @@ jobs: echo " CLOUD_SQL_DATABASE: \"${{ secrets.CLOUD_SQL_DATABASE }}\"" >> app.yaml echo " CLOUD_SQL_USER: \"${{ secrets.CLOUD_SQL_USER }}\"" >> app.yaml echo " CLOUD_SQL_PASSWORD: \"${{ secrets.CLOUD_SQL_PASSWORD }}\"" >> app.yaml - echo " GCS_SERVICE_ACCOUNT_KEY: \"${{ secrets.GCS_SERVICE_ACCOUNT_KEY}}\"" >> app.yaml + echo " GCS_SERVICE_ACCOUNT_KEY: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }} >> app.yaml echo " GCS_BUCKET_NAME: \"${{secrets.GCS_BUCKET_NAME}}\"" >> app.yaml echo " AUTHENTIK_URL: \"${{secrets.AUTHENTIK_URL}}\"" >> app.yaml echo " AUTHENTIK_CLIENT_ID: \"${{secrets.AUTHENTIK_CLIENT_ID}}\"" >> app.yaml diff --git a/db/thing.py b/db/thing.py index 7ebd20f30..3ec71919a 100644 --- a/db/thing.py +++ b/db/thing.py @@ -113,7 +113,7 @@ class WellScreen(Base, AutoBaseMixin): String(1000), nullable=True, info={"unit": "description of the screen"} ) # Define a relationship to well if needed - # well = relationship("Well") + thing = relationship("Thing") # ============= EOF ============================================= diff --git a/schemas/thing.py b/schemas/thing.py index 69fc0a7b7..a7504fab6 100644 --- a/schemas/thing.py +++ b/schemas/thing.py @@ -161,6 +161,7 @@ class WellScreenResponse(ORMBaseModel): """ thing_id: int + thing: WellResponse screen_depth_bottom: float screen_depth_top: float screen_type: str | None = None