Merge pull request #10 from DataIntegrationGroup/jir-mvp

jir-mvp

Author: jirhiker

.github/workflows/format_code.yml

@@ -22,7 +22,7 @@ jobs:
   format:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
       pull-requests: write
     steps:
       - uses: actions/checkout@v4

admin/base.py

@@ -17,11 +17,12 @@
 from geoalchemy2.shape import to_shape
 from fastadmin import register, SqlAlchemyModelAdmin, WidgetType
 
-from db import async_database_sessionmaker
-from db.base import SampleLocation, Well
+from db.engine import async_database_sessionmaker
+from db.location import Location
+from db.thing.well import WellThing
 
 
-@register(SampleLocation, sqlalchemy_sessionmaker=async_database_sessionmaker)
+@register(Location, sqlalchemy_sessionmaker=async_database_sessionmaker)
 class SampleLocationsAdmin(SqlAlchemyModelAdmin):
     """
     Admin interface for SampleLocations.
@@ -45,7 +46,7 @@ async def serialize_obj(self, obj: Any, list_view: bool = False) -> dict:
         }
 
 
-@register(Well, sqlalchemy_sessionmaker=async_database_sessionmaker)
+@register(WellThing, sqlalchemy_sessionmaker=async_database_sessionmaker)
 class WellAdmin(SqlAlchemyModelAdmin):
     """
     Admin interface for Well.

admin/user.py

@@ -19,7 +19,7 @@
 from fastadmin import register, SqlAlchemyModelAdmin, WidgetType
 from sqlalchemy import update, select
 
-from db import async_database_sessionmaker
+from db.engine import async_database_sessionmaker
 from db.base import User
 
 

alembic/env.py

@@ -19,16 +19,7 @@
 # from myapp import mymodel
 
 # from db import Base  # Import your Base from models/__init__.py
-from db.base import *
-from db.lexicon import *
-from db.publication import *
-from db.geothermal import *
-from db.geochronology import *
-from db.collabnet import *
-from db.chemistry import *
-from db.asset import *
-from db.timeseries import *
-
+from db import *
 
 # target_metadata = mymodel.Base.metadata
 target_metadata = Base.metadata