Merge branch 'main' into PYTHON-4680-local-llama

Jibola · web-flow · commit ee068271f7f6 · 2024-10-02T15:25:44.000-04:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -142,9 +142,8 @@ buildvariants:
     display_name: Langchain RHEL Python
     expansions:
       DIR: langchain-python
-      REPO_NAME: langchain
-      # TODO - Replace with upstream when closing PYTHON-4435
-      CLONE_URL: -b PYTHON-4435-explicit-ids --single-branch https://github.com/caseyclements/langchain.git
+      REPO_NAME: langchain  # TODO [PYTHON-4679] Merge change in this branch
+      CLONE_URL: -b ci-on-local-atlas --single-branch https://github.com/caseyclements/langchain.git
       DATABASE: langchain_test_db
     run_on:
       - rhel87-small
diff --git a/.evergreen/provision-atlas.sh b/.evergreen/provision-atlas.sh
@@ -8,6 +8,7 @@ PYTHON_BINARY=$(find_python3)
 EVERGREEN_PATH=$(pwd)/.evergreen
 TARGET_DIR=$(pwd)/$DIR
 PING_ATLAS=$EVERGREEN_PATH/ping_atlas.py
+SCAFFOLD_SCRIPT=$EVERGREEN_PATH/scaffold_atlas.py
 DEPLOYMENT_NAME=$DIR
 
 set -ex
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,7 @@ mongo-c-driver-*
 # Benchmark and test output files
 results/*
 xunit-results/
+
+# Miscellaneous
+.DS_Store
+
diff --git a/langchain-python/database/langchain_test_chain_example.json b/langchain-python/database/langchain_test_chain_example.json
@@ -0,0 +1 @@
+[]
diff --git a/langchain-python/database/langchain_test_from_documents.json b/langchain-python/database/langchain_test_from_documents.json
@@ -0,0 +1 @@
+[]
diff --git a/langchain-python/database/langchain_test_from_texts.json b/langchain-python/database/langchain_test_from_texts.json
@@ -0,0 +1 @@
+[]
diff --git a/langchain-python/database/langchain_test_retrievers.json b/langchain-python/database/langchain_test_retrievers.json
@@ -0,0 +1 @@
+[]
diff --git a/langchain-python/indexes/langchain_test_chain_example_vector_index.json b/langchain-python/indexes/langchain_test_chain_example_vector_index.json
@@ -0,0 +1,14 @@
+{
+    "fields": [
+        {
+            "numDimensions": 1536,
+            "path": "embedding",
+            "similarity": "cosine",
+            "type": "vector"
+        }
+    ],
+    "name": "langchain-test-chain-example-vector-index",
+    "type": "vectorSearch",
+    "database": "langchain_test_db",
+    "collectionName": "langchain_test_chain_example"
+}
diff --git a/langchain-python/indexes/langchain_test_from_documents.json b/langchain-python/indexes/langchain_test_from_documents.json
@@ -0,0 +1,14 @@
+{
+  "fields": [
+    {
+      "numDimensions": 5,
+      "path": "embedding",
+      "similarity": "cosine",
+      "type": "vector"
+    }
+  ],
+  "name": "langchain-test-index-from-documents",
+  "type": "vectorSearch",
+  "database": "langchain_test_db",
+  "collectionName": "langchain_test_from_documents"
+}
diff --git a/langchain-python/indexes/langchain_test_index_vectorstores.json b/langchain-python/indexes/langchain_test_index_vectorstores.json
@@ -1,7 +1,7 @@
 {
     "fields": [
         {
-            "numDimensions": 1536,
+            "numDimensions": 5,
             "path": "embedding",
             "similarity": "cosine",
             "type": "vector"
diff --git a/langchain-python/indexes/langchain_test_retrievers_fulltext_index.json b/langchain-python/indexes/langchain_test_retrievers_fulltext_index.json
@@ -0,0 +1,16 @@
+{
+    "mappings": {
+    "dynamic": false,
+    "fields": {
+      "text": [
+        {
+          "type": "string"
+        }
+      ]
+    }
+    },
+    "name": "text_index",
+    "type": "search",
+    "database": "langchain_test_db",
+    "collectionName": "langchain_test_retrievers"
+}
diff --git a/langchain-python/indexes/langchain_test_retrievers_vector_index.json b/langchain-python/indexes/langchain_test_retrievers_vector_index.json
@@ -0,0 +1,18 @@
+{
+    "fields": [
+        {
+            "numDimensions": 1536,
+            "path": "embedding",
+            "similarity": "dotProduct",
+            "type": "vector"
+        },
+        {
+            "path": "c",
+            "type": "filter"
+        }
+    ],
+    "name": "vector_index",
+    "type": "vectorSearch",
+    "database": "langchain_test_db",
+    "collectionName": "langchain_test_retrievers"
+}
diff --git a/langchain-python/indexes/langchain_test_vectorstores_from_texts.json b/langchain-python/indexes/langchain_test_vectorstores_from_texts.json
@@ -0,0 +1,18 @@
+{
+  "fields": [
+    {
+      "numDimensions": 5,
+      "path": "embedding",
+      "similarity": "dotProduct",
+      "type": "vector"
+    },
+    {
+      "path": "c",
+      "type": "filter"
+    }
+  ],
+  "name": "langchain-test-index-from-texts",
+  "type": "vectorSearch",
+  "database": "langchain_test_db",
+  "collectionName": "langchain_test_from_texts"
+}
diff --git a/langchain-python/run.sh b/langchain-python/run.sh
@@ -9,14 +9,17 @@ PYTHON_BINARY=$(find_python3)
 
 cd libs/partners/mongodb
 
-$PYTHON_BINARY -m venv .
-source ./bin/activate
+ $PYTHON_BINARY -m venv venv_pipeline
+ source venv_pipeline/bin/activate
 
 pip install poetry
 
-poetry install --with test
+poetry lock --no-update
+
+poetry install --with test --with test_integration
 
 export MONGODB_ATLAS_URI=$(fetch_local_atlas_uri)
+export OPENAI_API_KEY=$openai_api_key
 
 make test
 
diff --git a/llama-index-python-kvstore/run.sh b/llama-index-python-kvstore/run.sh
@@ -4,7 +4,7 @@ set -x
 
 . $workdir/src/.evergreen/utils.sh
 
-CONN_STRING=$($atlas deployments connect $DIR --connectWith connectionString)
+CONN_STRING=$(fetch_local_atlas_uri)
 PYTHON_BINARY=$(find_python3)
 $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}')"
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"fields": [`
`3`	`3`	`{`
`4`		`- "numDimensions": 1536,`
	`4`	`+ "numDimensions": 5,`
`5`	`5`	`"path": "embedding",`
`6`	`6`	`"similarity": "cosine",`
`7`	`7`	`"type": "vector"`