added schema testing with django models

JCSDA-internal · Mar 28, 2024 · ccbc601 · ccbc601
1 parent 63e9298
commit ccbc601
Show file tree

Hide file tree

Showing 12 changed files with 120 additions and 560 deletions.
diff --git a/.github/workflows/test_django_views.yaml → .github/workflows/test_django_api.yaml b/.github/workflows/test_django_views.yaml → .github/workflows/test_django_api.yaml
@@ -1,4 +1,4 @@
-name: Test Django API Views
+name: Test Database Tool
 on:
   pull_request:
     types:
@@ -35,11 +35,5 @@ jobs:
           python -m pip install --upgrade pip
           pip install . -r requirements.txt
 
-      - name: Run Test Django API Views
-        env:
-          DB_HOST: ${{secrets.DB_HOST}}
-          DB_PORT: ${{secrets.DB_PORT}}
-          DB_NAME: ${{secrets.DB_NAME}}
-          DB_USER: ${{secrets.DB_USER}}
-          DB_PASSWORD: ${{secrets.DB_PASSWORD}}
+      - name: Test Django API App
         run: python ./src/evagram/website/backend/manage.py test api
diff --git a/pycodestyle.cfg b/pycodestyle.cfg
@@ -9,3 +9,4 @@ max-line-length = 100
 indent-size = 4
 statistics = True
 ignore = W503, W504
+exclude = __pycache__, src/evagram/website/backend/api/migrations
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ autopep8==2.0.4
 Django==4.2.10
 django-cors-headers==4.3.1
 djangorestframework==3.14.0
-psycopg2==2.9.9
+psycopg2-binary==2.9.9
 pycodestyle>=2.8.0
 python-dotenv==1.0.0
 pytz==2023.3.post1

diff --git a/src/evagram/database/dataset.json b/src/evagram/database/dataset.json
@@ -61,38 +61,38 @@
         {
             "plot_id": 121,
             "plot_file": "brightnessTemperature_4_effectiveerror-vs-gsifinalerror.pkl",
-            "experiment_id": 12
+            "experiment_id": 12,
+            "observation_name": "amsua_aqua"
         },
         {
             "plot_id": 322,
             "plot_file": "brightnessTemperature_10_hofx-vs-gsihofxbc.pkl",
-            "experiment_id": 12
+            "experiment_id": 12,
+            "observation_name": "amsua_aqua"
         },
         {
             "plot_id": 323,
             "plot_file": "brightnessTemperature_8_hofx-vs-gsihofxbc.pkl",
-            "experiment_id": 3
+            "experiment_id": 3,
+            "observation_name": "amsua_n18"
         },
         {
             "plot_id": 114,
             "plot_file": "brightnessTemperature_8_effectiveerror-vs-gsifinalerror.pkl",
-            "experiment_id": 3
+            "experiment_id": 3,
+            "observation_name": "amsua_n18"
         },
         {
             "plot_id": 165,
             "plot_file": "brightnessTemperature_86_effectiveerror-vs-gsifinalerror.pkl",
-            "experiment_id": 1
+            "experiment_id": 1,
+            "observation_name": "cris-fsr_n20"
         },
         {
             "plot_id": 966,
             "plot_file": "windEastward__effectiveerrordiff-vs-gsifinalerror.pkl",
-            "experiment_id": 96
+            "experiment_id": 96,
+            "observation_name": "satwind"
         }
-    ],
-    "observation_dirs": [
-        "amsua_aqua",
-        "amsua_n18",
-        "cris-fsr_n20",
-        "satwind"
     ]
 }
diff --git a/src/evagram/database/input_tool.py b/src/evagram/database/input_tool.py