implemented asset model using filedepot. refactor. added ondelete to foreignkeys

Author: jirhiker

.gitignore

@@ -18,4 +18,5 @@ wheels/
 # local development files
 development.db
 .env
-reset_db.sh
+reset_db.sh
+tests/uploads

api/asset.py

@@ -0,0 +1,55 @@
+# ===============================================================================
+# Copyright 2025 ross
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ===============================================================================
+from fastapi import APIRouter, Depends, UploadFile
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from db import get_db_session
+from db.asset import Asset
+
+router = APIRouter(prefix="/asset", tags=["asset"])
+
+@router.get("/{asset_id}")
+async def get_asset(asset_id: int,
+                    database_session: Session = Depends(get_db_session)
+                    ):
+    """
+    Retrieve an asset by its ID.
+    """
+    sql = select(Asset).where(Asset.id == asset_id)
+    return database_session.scalars(sql).one_or_none()
+
+
+@router.post("/", status_code=201)
+async def add_asset(file: UploadFile,
+                    database_session: Session = Depends(get_db_session)
+                    ):
+    """
+    Add a new asset.
+    """
+    asset = Asset()
+    asset.name = file.filename
+    asset.file_type = file.content_type
+
+    content = file.file.read()
+    asset.content = content
+    if file.content_type.startswith('image/'):
+        asset.photo = content
+
+    database_session.add(asset)
+    database_session.commit()
+    return asset
+# ============= EOF =============================================

api/base.py

@@ -36,7 +36,7 @@
     Well,
     SampleLocation,
     Group,
-    GroupLocation,
+    GroupLocationAssociation,
     Owner,
     Contact,
     WellScreen,
@@ -143,7 +143,7 @@ def create_group_location(
     """
     Create a new group location association in the database.
     """
-    return adder(session, GroupLocation, group_location_data)
+    return adder(session, GroupLocationAssociation, group_location_data)
 
 
 @router.post(
@@ -384,7 +384,7 @@ async def get_group_locations(session: Session = Depends(get_db_session)):
     """
     Retrieve all group locations from the database.
     """
-    return simple_all_getter(session, GroupLocation)
+    return simple_all_getter(session, GroupLocationAssociation)
 
 
 @router.get(
@@ -528,7 +528,7 @@ async def get_group_location_by_id(
     """
     Retrieve a group location by ID from the database.
     """
-    group_location = simple_get_by_id(session, GroupLocation, group_location_id)
+    group_location = simple_get_by_id(session, GroupLocationAssociation, group_location_id)
     if not group_location:
         return {"message": "Group location not found"}
     return group_location

api/form.py

@@ -15,18 +15,17 @@
 # ===============================================================================
 
 from fastapi import APIRouter, Depends, status
-from fastapi.responses import JSONResponse
 
 from db import get_db_session
-from db.base import SampleLocation, Owner, Contact, Well, Group, GroupLocation
-from services.query_helper import simple_get_by_name, simple_get_by_id
+from db.base import SampleLocation, Owner, Well, Group
 from schemas.form import (
     WellForm,
     WellFormResponse,
     GroundwaterLevelFormResponse,
     GroundwaterLevelForm,
 )
 from services.people_helper import add_contact
+from services.query_helper import simple_get_by_name
 
 router = APIRouter(prefix="/form")
 

core/app.py

@@ -18,7 +18,7 @@
 
 from fastapi import FastAPI
 
-from db import database_sessionmaker, engine, Base
+from db import database_sessionmaker, engine, Base, get_db_session
 from db.lexicon import Lexicon, Category, TermCategoryAssociation
 from services.lexicon import add_lexicon_term
 from .settings import settings
@@ -40,26 +40,28 @@ def init_lexicon():
         default_lexicon = json.load(f)
 
     # populate lexicon
-    with database_sessionmaker() as s:
-        for term_dict in default_lexicon:
-            add_lexicon_term(
-                s, term_dict["term"], term_dict["definition"], term_dict["category"]
-            )
-            # s.add(Lexicon(**term_dict))
-        s.commit()
+
+    session = next(get_db_session())
+
+    for term_dict in default_lexicon:
+        add_lexicon_term(
+            session, term_dict["term"], term_dict["definition"], term_dict["category"]
+        )
+        # s.add(Lexicon(**term_dict))
+    session.commit()
 
 
 def create_superuser():
     from admin.user import User
 
-    with database_sessionmaker() as s:
-        user = User(
-            username="admin",
-            password="admin",
-            is_superuser=True,
-        )
-        s.add(user)
-        s.commit()
+    session = next(get_db_session())
+    user = User(
+        username="admin",
+        password="admin",
+        is_superuser=True,
+    )
+    session.add(user)
+    session.commit()
 
 
 @asynccontextmanager

db/__init__.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 # ===============================================================================
 import os
-
+import re
 from geoalchemy2 import load_spatialite
 from sqlalchemy import create_engine, Column, Integer, DateTime, func, JSON
 from sqlalchemy.event import listen
@@ -75,10 +75,12 @@ def on_connect(dbapi_connection, connection_record):
 database_sessionmaker = sessionmaker(engine, expire_on_commit=False)
 
 
-async def get_db_session():
+def get_db_session():
     session = database_sessionmaker()
-    yield session
-    session.close()
+    try:
+        yield session
+    finally:
+        session.close()
 
 
 Base = declarative_base()
@@ -105,20 +107,16 @@ class AuditMixin:
     def created_at(self):
         return Column(DateTime, nullable=False, server_default=func.now())
 
-    @declared_attr
-    def updated_at(self):
-        return Column(
-            DateTime,
-            nullable=False,
-            server_default=func.now(),
-            server_onupdate=func.now(),
-        )
+
+def pascal_to_snake(name):
+    return re.sub(r'(?<!^)(?=[A-Z])', '_', name).lower()
 
 
 class AutoBaseMixin(AuditMixin):
     @declared_attr
     def __tablename__(self):
-        return self.__name__.lower()
+        return pascal_to_snake(self.__name__)
+
 
     @declared_attr
     def id(self):

db/asset.py

@@ -0,0 +1,44 @@
+# ===============================================================================
+# Copyright 2025 ross
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ===============================================================================
+from sqlalchemy import Column, String, Integer, ForeignKey
+from sqlalchemy.orm import relationship
+
+from db import Base, AutoBaseMixin
+
+from depot.fields.sqlalchemy import UploadedFileField
+from depot.fields.specialized.image import UploadedImageWithThumb
+
+
+class Asset(Base, AutoBaseMixin):
+    name = Column(String(100), nullable=False, unique=True)
+    file_type = Column(String(50), nullable=False)
+
+    content = Column(UploadedFileField)
+    photo = Column(UploadedFileField(upload_type=UploadedImageWithThumb))
+
+
+class AssetLocationAssociation(Base, AutoBaseMixin):
+
+
+    asset_id = Column(Integer, ForeignKey("asset.id", ondelete='CASCADE'), nullable=False)
+    location_id = Column(Integer, ForeignKey("sample_location.id", ondelete="CASCADE"), nullable=False)
+
+    location = relationship("SampleLocation", back_populates="asset_associations")
+
+    # publication = relationship("Publication", back_populates="author_associations")
+    # author = relationship("Author", back_populates="publication_associations")
+
+# ============= EOF =============================================

db/base.py

@@ -19,18 +19,16 @@
     Integer,
     String,
     ForeignKey,
-    UUID,
     Float,
     Boolean,
     Text,
     DateTime,
-    func,
 )
-from sqlalchemy.orm import relationship, declared_attr, Mapped, mapped_column
+from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import relationship, Mapped, mapped_column
 from sqlalchemy_utils import TSVectorType
 
 from db import Base, AutoBaseMixin
-from db.lexicon import Lexicon
 
 
 class SampleLocation(Base, AutoBaseMixin):
@@ -42,21 +40,13 @@ class SampleLocation(Base, AutoBaseMixin):
         Geometry(geometry_type="POINT", srid=4326, spatial_index=True)
     )
 
-    owner_id = Column(Integer, ForeignKey("owner.id"), nullable=True)
+    owner_id = Column(Integer, ForeignKey("owner.id", ondelete='CASCADE'), nullable=True)
 
-
-class Asset(Base, AutoBaseMixin):
-    fs_path = Column(String(255), nullable=False, unique=True)
-    name = Column(String(100), nullable=False, unique=True)
-    file_type = Column(String(50), nullable=False)
-
-
-class AssetLocation(Base, AutoBaseMixin):
-    asset_id = Column(Integer, ForeignKey("asset.id"), nullable=False)
-    location_id = Column(Integer, ForeignKey("samplelocation.id"), nullable=False)
-
-    asset = relationship("Asset")
-    location = relationship("SampleLocation")
+    asset_associations = relationship("AssetLocationAssociation",
+                                      back_populates="location",
+                                      cascade="all, delete-orphan"
+                                      )
+    assets = association_proxy("asset_associations", "asset")
 
 
 class Owner(Base, AutoBaseMixin):
@@ -95,7 +85,7 @@ class Contact(Base, AutoBaseMixin):
 
 
 class Well(Base, AutoBaseMixin):
-    location_id = Column(Integer, ForeignKey("samplelocation.id"), nullable=False)
+    location_id = Column(Integer, ForeignKey("sample_location.id", ondelete="CASCADE"), nullable=False)
 
     ose_pod_id = Column(String(50), nullable=True)
     api_id = Column(String(50), nullable=True, default="")  # API well number
@@ -136,7 +126,7 @@ class Well(Base, AutoBaseMixin):
 
 
 class WellScreen(Base, AutoBaseMixin):
-    well_id = Column(Integer, ForeignKey("well.id"), nullable=False)
+    well_id = Column(Integer, ForeignKey("well.id", ondelete='CASCADE'), nullable=False)
     screen_depth_top = Column(
         Float, nullable=False, info={"unit": "feet below ground surface"}
     )
@@ -148,7 +138,7 @@ class WellScreen(Base, AutoBaseMixin):
     )  # e.g., "PVC", "Steel", etc.
 
     # Define a relationship to well if needed
-    well = relationship("Well")
+    # well = relationship("Well")
 
 
 class Equipment(Base, AutoBaseMixin):
@@ -159,14 +149,14 @@ class Equipment(Base, AutoBaseMixin):
     date_removed = Column(DateTime)
     recording_interval = Column(Integer)
     equipment_notes = Column(String(50))
-    location_id = Column(Integer, ForeignKey("samplelocation.id"), nullable=False)
+    location_id = Column(Integer, ForeignKey("sample_location.id", ondelete="CASCADE"), nullable=False)
 
     location = relationship("SampleLocation")
 
 
 class Spring(Base, AutoBaseMixin):
     description = Column(String(255), nullable=True)
-    location_id = Column(Integer, ForeignKey("samplelocation.id"), nullable=False)
+    location_id = Column(Integer, ForeignKey("sample_location.id", ondelete="CASCADE"), nullable=False)
 
     # Define a relationship to samplelocations if needed
     location = relationship("SampleLocation")
@@ -177,12 +167,12 @@ class Group(Base, AutoBaseMixin):
     description = Column(String(255), nullable=True)
 
     # Define a relationship to samplelocations if needed
-    locations = relationship("SampleLocation", secondary="grouplocation")
+    locations = relationship("SampleLocation", secondary="group_location_association")
 
 
-class GroupLocation(Base, AutoBaseMixin):
-    group_id = Column(Integer, ForeignKey("group.id"), nullable=False)
-    location_id = Column(Integer, ForeignKey("samplelocation.id"), nullable=False)
+class GroupLocationAssociation(Base, AutoBaseMixin):
+    group_id = Column(Integer, ForeignKey("group.id", ondelete='CASCADE'), nullable=False)
+    location_id = Column(Integer, ForeignKey("sample_location.id", ondelete="CASCADE"), nullable=False)
 
     # group = relationship("Group")
     # location = relationship("SampleLocation")

db/chemistry.py

@@ -52,7 +52,7 @@ class WaterChemistryAnalysisSet(Base, AutoBaseMixin):
 
     __tablename__ = "water_chemistry_analysis_set"
 
-    well_id = mapped_column(Integer, ForeignKey("well.id"))
+    well_id = mapped_column(Integer, ForeignKey("well.id" , ondelete='CASCADE'))
     note = mapped_column(String(255), nullable=True)
 
     collection_timestamp = mapped_column(DateTime, nullable=False)

db/collabnet.py

@@ -23,7 +23,7 @@ class CollaborativeNetworkWell(Base, AutoBaseMixin):
     """ """
 
     actively_monitored = mapped_column(Boolean, default=False, nullable=False)
-    well_id = mapped_column(Integer, ForeignKey("well.id"), nullable=False)
+    well_id = mapped_column(Integer, ForeignKey("well.id", ondelete='CASCADE'), nullable=False)
 
     well = relationship("Well")