Merge branch 'main' into MMT-3382

nasa · Oct 23, 2023 · 5019200 · 5019200
2 parents 1bd9bc4 + 730841f
commit 5019200
Show file tree

Hide file tree

Showing 53 changed files with 14,300 additions and 25,915 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,9 +67,27 @@ jobs:
       run: npm run silent-test
     - name: Upload coverage to codecov
       uses: codecov/codecov-action@v3
+  python-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.9']
+      fail-fast: false
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+      - name: Run tests
+        run: python -m unittest discover
+        working-directory: ./src/earthdataVarinfo
   deploy:
     if: success() && github.ref == 'refs/heads/main' # only run on main success
-    needs: [jest] # only run after jest jobs complete
+    needs: [jest, python-test] # only run after jest and python-test jobs complete
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code

diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,11 @@ junit.xml
 .dir-locals.el
 \#*\#
 .\#*
+
+# Python Runtime
+.venv
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
diff --git a/README.md b/README.md
@@ -26,6 +26,12 @@ Before running the application you'll want to ensure that all necessary packages
 
    npm install
 
+You will also need Python3.9+ (Ideally installed in a virtual environment) to query the collection generateVariableDrafts field. Run the following to ensure proper operation of this query.
+
+    python3 -m venv .venv
+    source .venv/bin/activate
+    pip install -r requirements.txt
+
 CMR-GraphQL uses a few environment variables for configuring runtime options:
 
 |Variable Name|Default|Description|
@@ -651,12 +657,12 @@ We use [GraphQL interfaces](https://graphql.org/learn/schema/#interfaces) in ord
 ##### Example Response
 
     {
-      "conceptId": "C1200400842-GHRC",
+      "conceptId": "C1000000001-EXAMPLE",
       "relatedCollections": {
         "count": 18,
         "items": [
           {
-            "id": "C1200400792-GHRC",
+            "id": "C2000000001-EXAMPLE",
             "title": "Infrared Global Geostationary Composite Demo 4",
             "doi": "10.5067/GHRC/AMSU-A/DATA303",
             "relationships": [
@@ -682,6 +688,77 @@ We use [GraphQL interfaces](https://graphql.org/learn/schema/#interfaces) in ord
       }
     }
 
+#### Generate Collection Variable Drafts
+
+For all supported arguments and columns, see [the schema](src/types/collection.graphql).
+
+CMR-GraphQL queries an earthdata-varinfo lambda in order to generate collection variable drafts. These generated variable drafts can be returned as part of the Collection type response.
+
+`generateVariableDrafts` will return collection generated variable drafts, using the earthdata-varinfo project(https://github.com/nasa/earthdata-varinfo)
+
+##### Example Queries
+
+    query Collection($params: CollectionInput) {
+      collection(params: $params) {
+        conceptId
+        generateVariableDrafts {
+          count
+          items {
+            dataType
+            definition
+            dimensions
+            longName
+            name
+            standardName
+            units
+            metadataSpecification
+          }
+        }
+      }
+    }
+
+    variables:
+    {
+      "params": {
+        "conceptId": "C1000000001-EXAMPLE"
+      }
+    }
+
+##### Example Response
+
+     {
+      "data": {
+        "collection": {
+          "conceptId": "C1000000001-EXAMPLE",
+          "generateVariableDrafts": {
+            "count": 16,
+            "items": [
+              {
+                "dataType": "int32",
+                "definition": "Grid/time",
+                "dimensions": [
+                  {
+                    "Name": "Grid/time",
+                    "Size": 1,
+                    "Type": "TIME_DIMENSION"
+                  }
+                ],
+                "longName": "Grid/time",
+                "name": "Grid/time",
+                "standardName": "time",
+                "units": "seconds since 1970-01-01 00:00:00 UTC",
+                "metadataSpecification": {
+                  "URL": "https://cdn.earthdata.nasa.gov/umm/variable/v1.8.2",
+                  "Name": "UMM-Var",
+                  "Version": "1.8.2"
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+
 #### Local graph database:
 
 Normally running GraphQl with `serverless offline` will utilize the `(cmr.earthdata.nasa.gov/graphdb)` endpoint, to query against related collections and duplicate collections in the graph database. To send queries to a locally running graph database, we can use a docker gremlin-server that exposes an HTTP endpoint. This is launched by running

diff --git a/bin/deploy-bamboo.sh b/bin/deploy-bamboo.sh
@@ -16,6 +16,9 @@ FROM node:18.16-bullseye
 COPY . /build
 WORKDIR /build
 RUN npm ci --omit=dev
+RUN apt-get update
+RUN apt-get install -y python3 python3-pip python-is-python3
+RUN pip install -r requirements.txt
 EOF
 
 dockerTag=edsc-$bamboo_STAGE_NAME