address review

Author: blink1073

.evergreen/config.yml

@@ -92,54 +92,63 @@ pre:
 
 tasks:
   - name: test-semantic-kernel-python-local
+    tags: [local]
     commands:
       - func: "fetch repo"
       - func: "setup local atlas"
       - func: "execute tests"
 
   - name: test-semantic-kernel-python-remote
+    tags: [remote]
     commands:
       - func: "fetch repo"
       - func: "setup remote atlas"
       - func: "execute tests"
 
   - name: test-semantic-kernel-csharp-local
+    tags: [local]
     commands:
       - func: "fetch repo"
       - func: "setup local atlas"
       - func: "execute tests"
 
   - name: test-semantic-kernel-csharp-remote
+    tags: [remote]
     commands:
       - func: "fetch repo"
       - func: "setup remote atlas"
       - func: "execute tests"
 
   - name: test-langchain-python-local
+    tags: [local]
     commands:
       - func: "fetch repo"
       - func: "setup local atlas"
       - func: "execute tests"
 
   - name: test-langchain-python-remote
+    tags: [remote]
     commands:
       - func: "fetch repo"
       - func: "setup remote atlas"
       - func: "execute tests"
 
   - name: test-chatgpt-retrieval-plugin-local
+    tags: [local]
     commands:
       - func: "fetch repo"
       - func: "setup local atlas"
       - func: "execute tests"
 
   - name: test-chatgpt-retrieval-plugin-remote
+    tags: [remote]
     commands:
       - func: "fetch repo"
       - func: "setup remote atlas"
       - func: "execute tests"
 
   - name: test-llama-index-local
+    tags: [local]
     commands:
       - func: "fetch repo"
       - func: "setup local atlas"
@@ -152,12 +161,14 @@ tasks:
       - func: "execute tests"
 
   - name: test-docarray-local
+    tags: [local]
     commands:
       - func: "fetch repo"
       - func: "setup local atlas"
       - func: "execute tests"
 
   - name: test-docarray-remote
+    tags: [remote]
     commands:
       - func: "fetch repo"
       - func: "setup remote atlas"

.evergreen/provision-atlas.sh

@@ -3,36 +3,8 @@ set -eu
 
 . .evergreen/utils.sh
 
-PYTHON_BINARY=$(find_python3)
-
-# Should be called from src
-EVERGREEN_PATH=$(pwd)/.evergreen
-TARGET_DIR=$(pwd)/$DIR
-SCAFFOLD_SCRIPT=$EVERGREEN_PATH/scaffold_atlas.py
-
-mkdir atlas
-
-setup_local_atlas
-
-pushd atlas
-
-$PYTHON_BINARY -m venv .
-source ./bin/activate
-popd
-
-# Test server is up
-$PYTHON_BINARY -m pip install pymongo
-CONN_STRING=$CONN_STRING \
-    $PYTHON_BINARY -c "from pymongo import MongoClient; import os; MongoClient(os.environ['CONN_STRING']).db.command('ping')"
-
-# Add database and index configurations
-DATABASE=$DATABASE \
-    CONN_STRING=$CONN_STRING \
-    REPO_NAME=$REPO_NAME \
-    DIR=$DIR \
-    DEBUG="${DEBUG:-1}" \
-    TARGET_DIR=$TARGET_DIR \
-    $PYTHON_BINARY $SCAFFOLD_SCRIPT
+CONN_STRING=$(setup_local_atlas)
+CONN_STRING=$CONN_STRING provision_atlas
 
 # Get the secrets.
 source secrets-export.sh

.evergreen/setup-remote.sh

@@ -42,34 +42,7 @@ export MONGODB_URI
 echo "export OPENAI_API_KEY=$OPENAI_API_KEY" >> env.sh
 echo "export MONGODB_URI=$MONGODB_URI" >> env.sh
 
-
 # Ensure the remote database is populated.
 . .evergreen/utils.sh
 
-PYTHON_BINARY=$(find_python3)
-
-# Should be called from src
-EVERGREEN_PATH=$(pwd)/.evergreen
-TARGET_DIR=$(pwd)/$DIR
-SCAFFOLD_SCRIPT=$EVERGREEN_PATH/scaffold_atlas.py
-
-mkdir atlas
-
-pushd atlas
-
-$PYTHON_BINARY -m venv .
-source ./bin/activate
-popd
-
-# Test server is up
-$PYTHON_BINARY -m pip install pymongo
-CONN_STRING=$MONGODB_URI \
-    $PYTHON_BINARY -c "from pymongo import MongoClient; import os; MongoClient(os.environ['MONGODB_URI']).db.command('ping')"
-
-# Add database and index configurations
-DATABASE=$DATABASE \
-    CONN_STRING=$MONGODB_URI \
-    REPO_NAME=$REPO_NAME \
-    DIR=$DIR \
-    TARGET_DIR=$TARGET_DIR \
-    $PYTHON_BINARY $SCAFFOLD_SCRIPT
+CONN_STRING=MONGODB_URI provision_atlas

.evergreen/utils.sh

@@ -115,3 +115,34 @@ fetch_local_atlas_uri() {
     export CONN_STRING=$CONN_STRING
     echo "$CONN_STRING"
 }
+
+
+scaffold_atlas() {
+    PYTHON_BINARY=$(find_python3)
+
+    # Should be called from src
+    EVERGREEN_PATH=$(pwd)/.evergreen
+    TARGET_DIR=$(pwd)/$DIR
+    SCAFFOLD_SCRIPT=$EVERGREEN_PATH/scaffold_atlas.py
+
+    mkdir -p atlas
+    pushd atlas
+
+    $PYTHON_BINARY -m venv .
+    source ./bin/activate
+    popd
+
+    # Test server is up
+    $PYTHON_BINARY -m pip install pymongo
+    CONN_STRING=$CONN_STRING \
+        $PYTHON_BINARY -c "from pymongo import MongoClient; import os; MongoClient(os.environ['CONN_STRING']).db.command('ping')"
+
+    # Add database and index configurations
+    DATABASE=$DATABASE \
+        CONN_STRING=$CONN_STRING \
+        REPO_NAME=$REPO_NAME \
+        DIR=$DIR \
+        DEBUG="${DEBUG:-1}" \
+        TARGET_DIR=$TARGET_DIR \
+        $PYTHON_BINARY $SCAFFOLD_SCRIPT
+}