Unify DB initialization and app_read grants

.pre-commit-config.yaml

@@ -16,18 +16,18 @@ repos:
           '--statistics'
           ]
         exclude: ^db/__init__.py$ # all models need to be imported for Alembic, but are not used directly
-#  - repo: local
-#    hooks:
-#      - id: pytest
-#        name: pytest
-#        entry: pytest  # Or your specific test command, e.g., poetry run pytest
-#        language: system
-#        types: [python] # Specify relevant file types for your tests
-#        pass_filenames: false
-#        always_run: true
-#        args:
-#          - -x
-#          - --ignore=tests/transfers
+  - repo: local
+    hooks:
+      - id: pytest
+        name: pytest
+        entry: pytest  # Or your specific test command, e.g., poetry run pytest
+        language: system
+        types: [python] # Specify relevant file types for your tests
+        pass_filenames: false
+        always_run: true
+        args:
+          - -x
+          - --ignore=tests/transfers
 
   # - repo: https://github.com/pre-commit/mirrors-mypy
   #   rev: v1.10.0  # Use the latest stable version or pin to your preference

admin/config.py

@@ -38,7 +38,6 @@
     SampleAdmin,
     HydraulicsDataAdmin,
     ChemistrySampleInfoAdmin,
-    FieldParametersAdmin,
     RadionuclidesAdmin,
     GeologicFormationAdmin,
     DataProvenanceAdmin,
@@ -69,7 +68,6 @@
 from db.nma_legacy import (
     ChemistrySampleInfo,
     NMAHydraulicsData,
-    NMAFieldParameters,
     NMARadionuclides,
     SurfaceWaterData,
 )
@@ -140,7 +138,6 @@ def create_admin(app):
     # Samples
     admin.add_view(SampleAdmin(Sample))
     admin.add_view(ChemistrySampleInfoAdmin(ChemistrySampleInfo))
-    admin.add_view(FieldParametersAdmin(NMAFieldParameters))
     admin.add_view(SurfaceWaterDataAdmin(SurfaceWaterData))
 
     # Hydraulics

admin/views/__init__.py

@@ -33,7 +33,6 @@
 from admin.views.sample import SampleAdmin
 from admin.views.hydraulicsdata import HydraulicsDataAdmin
 from admin.views.chemistry_sampleinfo import ChemistrySampleInfoAdmin
-from admin.views.field_parameters import FieldParametersAdmin
 from admin.views.radionuclides import RadionuclidesAdmin
 from admin.views.geologic_formation import GeologicFormationAdmin
 from admin.views.data_provenance import DataProvenanceAdmin
@@ -63,7 +62,6 @@
     "SampleAdmin",
     "HydraulicsDataAdmin",
     "ChemistrySampleInfoAdmin",
-    "FieldParametersAdmin",
     "RadionuclidesAdmin",
     "GeologicFormationAdmin",
     "DataProvenanceAdmin",

alembic/env.py

@@ -5,9 +5,8 @@
 
 from alembic import context
 from dotenv import load_dotenv
-from sqlalchemy import create_engine, engine_from_config, pool, text
-
 from services.util import get_bool_env
+from sqlalchemy import create_engine, engine_from_config, pool, text
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -25,6 +24,7 @@
 
 # from db import Base  # Import your Base from models/__init__.py
 from db import Base
+from db.initialization import grant_app_read_members
 
 # target_metadata = mymodel.Base.metadata
 target_metadata = Base.metadata
@@ -167,6 +167,7 @@ def getconn():
         ).first()
         if not role_exists:
             autocommit_role.execute(text("CREATE ROLE app_read"))
+        grant_app_read_members(autocommit_role)
 
     with connectable.connect() as connection:
         context.configure(