NO-TICKET: Consolidate backfill into transfers

.github/workflows/CD_production.yml

@@ -43,18 +43,6 @@ jobs:
           run: |
             uv run alembic upgrade head
 
-        - name: Run backfill script on production database
-          env:
-            DB_DRIVER: "cloudsql"
-            CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}"
-            CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}"
-            CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}"
-            CLOUD_SQL_IAM_AUTH: true
-            GCS_SERVICE_ACCOUNT_KEY: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
-            GCS_BUCKET_NAME: "${{ vars.GCS_BUCKET_NAME }}"
-          run: |
-            uv run python -m transfers.backfill.backfill
-
         - name: Create app.yaml
           run: |
             cat <<EOF > app.yaml

.github/workflows/CD_staging.yml

@@ -47,18 +47,6 @@ jobs:
           run: |
             uv run alembic upgrade head
 
-        - name: Run backfill script on staging database
-          env:
-            DB_DRIVER: "cloudsql"
-            CLOUD_SQL_INSTANCE_NAME: "${{ secrets.CLOUD_SQL_INSTANCE_NAME }}"
-            CLOUD_SQL_DATABASE: "${{ vars.CLOUD_SQL_DATABASE }}"
-            CLOUD_SQL_USER: "${{ secrets.CLOUD_SQL_USER }}"
-            CLOUD_SQL_IAM_AUTH: true
-            GCS_SERVICE_ACCOUNT_KEY: "${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}"
-            GCS_BUCKET_NAME: "${{ vars.GCS_BUCKET_NAME }}"
-          run: |
-            uv run python -m transfers.backfill.backfill
-
         # Uses Google Cloud Secret Manager to store secret credentials
         - name: Create app.yaml
           run: |

admin/views/aquifer_system.py

@@ -33,42 +33,26 @@ class AquiferSystemAdmin(OcotilloModelView):
 
     # ========== List View ==========
 
-    column_list = [
+    sortable_fields = [
         "id",
         "name",
         "primary_aquifer_type",
         "geographic_scale",
         "release_status",
         "created_at",
-        "updated_by_name",
     ]
 
-    column_sortable_list = [
-        "id",
-        "name",
-        "primary_aquifer_type",
-        "geographic_scale",
-        "release_status",
-        "created_at",
-    ]
-
-    column_default_sort = ("name", False)
+    fields_default_sort = [("name", False)]
 
-    search_fields = [
+    searchable_fields = [
         "name",
         "description",
-    ]
-
-    column_filters = [
         "primary_aquifer_type",
         "geographic_scale",
         "release_status",
         "created_at",
     ]
 
-    can_export = True
-    export_types = ["csv", "excel"]
-
     page_size = 50
     page_size_options = [25, 50, 100, 200]
 
@@ -105,17 +89,5 @@ class AquiferSystemAdmin(OcotilloModelView):
         "created_by_name",
     ]
 
-    labels = {
-        "id": "Aquifer System ID",
-        "name": "Name",
-        "description": "Description",
-        "primary_aquifer_type": "Primary Aquifer Type",
-        "geographic_scale": "Geographic Scale",
-        "release_status": "Release Status",
-        "created_at": "Created At",
-        "created_by_name": "Created By",
-        "updated_by_name": "Updated By",
-    }
-
 
 # ============= EOF =============================================

admin/views/aquifer_type.py

@@ -32,38 +32,22 @@ class AquiferTypeAdmin(OcotilloModelView):
 
     # ========== List View ==========
 
-    column_list = [
+    sortable_fields = [
         "id",
         "thing_aquifer_association_id",
         "aquifer_type",
         "release_status",
         "created_at",
-        "updated_by_name",
     ]
 
-    column_sortable_list = [
-        "id",
-        "thing_aquifer_association_id",
-        "aquifer_type",
-        "release_status",
-        "created_at",
-    ]
+    fields_default_sort = [("created_at", True)]
 
-    column_default_sort = ("created_at", True)
-
-    search_fields = [
-        "aquifer_type",
-    ]
-
-    column_filters = [
+    searchable_fields = [
         "aquifer_type",
         "release_status",
         "created_at",
     ]
 
-    can_export = True
-    export_types = ["csv", "excel"]
-
     page_size = 50
     page_size_options = [25, 50, 100, 200]
 
@@ -97,15 +81,5 @@ class AquiferTypeAdmin(OcotilloModelView):
         "created_by_name",
     ]
 
-    labels = {
-        "id": "Aquifer Type ID",
-        "thing_aquifer_association_id": "Thing-Aquifer Association",
-        "aquifer_type": "Aquifer Type",
-        "release_status": "Release Status",
-        "created_at": "Created At",
-        "created_by_name": "Created By",
-        "updated_by_name": "Updated By",
-    }
-
 
 # ============= EOF =============================================

admin/views/asset.py

@@ -34,49 +34,29 @@ class AssetAdmin(OcotilloModelView):
 
     # ========== List View ==========
 
-    column_list = [
+    sortable_fields = [
         "id",
         "name",
-        "label",
         "mime_type",
         "storage_service",
         "size",
         "release_status",
         "created_at",
-        "updated_by_name",
     ]
 
-    column_sortable_list = [
-        "id",
-        "name",
-        "mime_type",
-        "storage_service",
-        "size",
-        "release_status",
-        "created_at",
-    ]
-
-    column_default_sort = ("created_at", True)
+    fields_default_sort = [("created_at", True)]
 
-    search_fields = [
+    searchable_fields = [
         "name",
         "label",
         "mime_type",
         "storage_service",
         "storage_path",
         "uri",
-    ]
-
-    column_filters = [
-        "mime_type",
-        "storage_service",
         "release_status",
         "created_at",
     ]
 
-    can_export = True
-    export_types = ["csv", "excel"]
-
     page_size = 50
     page_size_options = [25, 50, 100, 200]
 
@@ -115,20 +95,5 @@ class AssetAdmin(OcotilloModelView):
         "created_by_name",
     ]
 
-    labels = {
-        "id": "Asset ID",
-        "name": "Name",
-        "label": "Label",
-        "storage_service": "Storage Service",
-        "storage_path": "Storage Path",
-        "mime_type": "MIME Type",
-        "size": "Size (bytes)",
-        "uri": "URI",
-        "release_status": "Release Status",
-        "created_at": "Created At",
-        "created_by_name": "Created By",
-        "updated_by_name": "Updated By",
-    }
-
 
 # ============= EOF =============================================

admin/views/base.py

@@ -15,12 +15,12 @@
 # ===============================================================================
 from __future__ import annotations
 
-from typing import Any, Iterable
+from typing import Any, Iterable, Sequence
 
 from sqlalchemy import select, update
 from starlette.requests import Request
 from starlette.responses import Response
-from starlette_admin import action
+from starlette_admin import ExportType, action
 from starlette_admin.contrib.sqla import ModelView
 
 from db.engine import session_ctx
@@ -39,6 +39,10 @@ class OcotilloModelView(ModelView):
     draft_value = "draft"
     published_value = "published"
     enable_publish_actions: bool = True
+    export_types: Sequence[ExportType] = (ExportType.CSV, ExportType.EXCEL)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
     # ========= Permissions (RBAC) =========
     def _get_user(self, request: Request) -> Any:

admin/views/chemistry_sampleinfo.py

@@ -32,22 +32,10 @@ class ChemistrySampleInfoAdmin(OcotilloModelView):
 
     # ========== List View ==========
 
-    column_list = [
-        "object_id",
-        "sample_point_id",
+    sortable_fields = [
         "sample_pt_id",
-        "wclab_id",
-        "collection_date",
-        "sample_type",
-        "data_source",
-        "data_quality",
-        "public_release",
-    ]
-
-    column_sortable_list = [
         "object_id",
         "sample_point_id",
-        "sample_pt_id",
         "wclab_id",
         "collection_date",
         "sample_type",
@@ -56,18 +44,15 @@ class ChemistrySampleInfoAdmin(OcotilloModelView):
         "public_release",
     ]
 
-    column_default_sort = ("collection_date", True)
+    fields_default_sort = [("collection_date", True)]
 
-    search_fields = [
+    searchable_fields = [
         "sample_point_id",
         "sample_pt_id",
         "wclab_id",
         "collected_by",
         "analyses_agency",
         "sample_notes",
-    ]
-
-    column_filters = [
         "collection_date",
         "sample_type",
         "sample_material_not_h2o",
@@ -78,18 +63,15 @@ class ChemistrySampleInfoAdmin(OcotilloModelView):
         "public_release",
     ]
 
-    can_export = True
-    export_types = ["csv", "excel"]
-
     page_size = 50
     page_size_options = [25, 50, 100, 200]
 
     # ========== Form View ==========
 
     fields = [
-        "object_id",
-        "sample_point_id",
         "sample_pt_id",
+        "sample_point_id",
+        "object_id",
         "wclab_id",
         "collection_date",
         "collection_method",
@@ -115,26 +97,5 @@ class ChemistrySampleInfoAdmin(OcotilloModelView):
         "object_id",
     ]
 
-    labels = {
-        "object_id": "OBJECTID",
-        "sample_point_id": "SamplePointID",
-        "sample_pt_id": "SamplePtID",
-        "wclab_id": "WCLab ID",
-        "collection_date": "Collection Date",
-        "collection_method": "Collection Method",
-        "collected_by": "Collected By",
-        "analyses_agency": "Analyses Agency",
-        "sample_type": "Sample Type",
-        "sample_material_not_h2o": "Sample Material Not H2O",
-        "water_type": "Water Type",
-        "study_sample": "Study Sample",
-        "data_source": "Data Source",
-        "data_quality": "Data Quality",
-        "public_release": "Public Release",
-        "added_day_to_date": "Added Day to Date",
-        "added_month_day_to_date": "Added Month Day to Date",
-        "sample_notes": "Sample Notes",
-    }
-
 
 # ============= EOF =============================================