Aerie 2.18.0

NASA-AMMOS · Aug 27, 2024 · 2414cc9 · 2414cc9
1 parent ff4b2ec
commit 2414cc9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-DOCKER_TAG=v2.11.0
+DOCKER_TAG=v2.18.0
 REPOSITORY_DOCKER_URL=ghcr.io/nasa-ammos
 
 AERIE_USERNAME=aerie

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.6.15", "3.11"]
-        aerie-version: ["2.11.0"]
+        aerie-version: ["2.18.0"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}

diff --git a/src/aerie_cli/aerie_client.py b/src/aerie_cli/aerie_client.py
@@ -1862,7 +1862,7 @@ def __expand_activity_arguments(self, plan: ActivityPlanRead, full_args: str = N
         for activity in plan.activities:
             if expand_all or activity.type in expand_types:
                 query = """
-                query ($args: ActivityArguments!, $act_type: String!, $model_id: ID!) {
+                query ($args: ActivityArguments!, $act_type: String!, $model_id: Int!) {
                     getActivityEffectiveArguments(
                         activityArguments: $args,
                         activityTypeName: $act_type,

diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py
@@ -43,7 +43,7 @@
 CONFIGURATIONS_PATH = os.path.join(FILES_PATH, "configuration")
 CONFIGURATION_PATH = os.path.join(CONFIGURATIONS_PATH, "localhost_config.json")
 MODELS_PATH = os.path.join(FILES_PATH, "models")
-MODEL_VERSION = os.environ.get("AERIE_VERSION", "2.11.0")
+MODEL_VERSION = os.environ.get("AERIE_VERSION", "2.18.0")
 MODEL_JAR = os.path.join(MODELS_PATH, f"banananation-{MODEL_VERSION}.jar")
 MODEL_NAME = "banananation"
 MODEL_VERSION = "0.0.1"

diff --git a/...ests/files/models/banananation-2.11.0.jar → ...ests/files/models/banananation-2.18.0.jar b/...ests/files/models/banananation-2.11.0.jar → ...ests/files/models/banananation-2.18.0.jar