Skip to content

Commit 6f4b352

Browse files
JibolaJibola
authored
Merge branch 'main' into semantic-kernel-python-import-fix
2 parents 4850505 + 8d42e48 commit 6f4b352

15 files changed

+99
-8
lines changed

‎.evergreen/config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,8 @@ buildvariants:
142142
display_name: Langchain RHEL Python
143143
expansions:
144144
DIR: langchain-python
145-
REPO_NAME: langchain
146-
# TODO - Replace with upstream when closing PYTHON-4435
147-
CLONE_URL: -b PYTHON-4435-explicit-ids --single-branch https://github.com/caseyclements/langchain.git
145+
REPO_NAME: langchain # TODO [PYTHON-4679] Merge change in this branch
146+
CLONE_URL: -b ci-on-local-atlas --single-branch https://github.com/caseyclements/langchain.git
148147
DATABASE: langchain_test_db
149148
run_on:
150149
- rhel87-small

‎.evergreen/provision-atlas.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ PYTHON_BINARY=$(find_python3)
88
EVERGREEN_PATH=$(pwd)/.evergreen
99
TARGET_DIR=$(pwd)/$DIR
1010
PING_ATLAS=$EVERGREEN_PATH/ping_atlas.py
11+
SCAFFOLD_SCRIPT=$EVERGREEN_PATH/scaffold_atlas.py
1112
DEPLOYMENT_NAME=$DIR
1213

1314
set -ex

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ mongo-c-driver-*
4646
# Benchmark and test output files
4747
results/*
4848
xunit-results/
49+
50+
# Miscellaneous
51+
.DS_Store
52+

‎langchain-python/database/langchain_test_chain_example.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎langchain-python/database/langchain_test_from_documents.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎langchain-python/database/langchain_test_from_texts.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎langchain-python/database/langchain_test_retrievers.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎langchain-python/indexes/langchain_test_chain_example_vector_index.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"fields": [
3+
{
4+
"numDimensions": 1536,
5+
"path": "embedding",
6+
"similarity": "cosine",
7+
"type": "vector"
8+
}
9+
],
10+
"name": "langchain-test-chain-example-vector-index",
11+
"type": "vectorSearch",
12+
"database": "langchain_test_db",
13+
"collectionName": "langchain_test_chain_example"
14+
}

‎langchain-python/indexes/langchain_test_from_documents.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"fields": [
3+
{
4+
"numDimensions": 5,
5+
"path": "embedding",
6+
"similarity": "cosine",
7+
"type": "vector"
8+
}
9+
],
10+
"name": "langchain-test-index-from-documents",
11+
"type": "vectorSearch",
12+
"database": "langchain_test_db",
13+
"collectionName": "langchain_test_from_documents"
14+
}

‎langchain-python/indexes/langchain_test_index_vectorstores.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"fields": [
33
{
4-
"numDimensions": 1536,
4+
"numDimensions": 5,
55
"path": "embedding",
66
"similarity": "cosine",
77
"type": "vector"

‎langchain-python/indexes/langchain_test_retrievers_fulltext_index.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"mappings": {
3+
"dynamic": false,
4+
"fields": {
5+
"text": [
6+
{
7+
"type": "string"
8+
}
9+
]
10+
}
11+
},
12+
"name": "text_index",
13+
"type": "search",
14+
"database": "langchain_test_db",
15+
"collectionName": "langchain_test_retrievers"
16+
}

‎langchain-python/indexes/langchain_test_retrievers_vector_index.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"fields": [
3+
{
4+
"numDimensions": 1536,
5+
"path": "embedding",
6+
"similarity": "dotProduct",
7+
"type": "vector"
8+
},
9+
{
10+
"path": "c",
11+
"type": "filter"
12+
}
13+
],
14+
"name": "vector_index",
15+
"type": "vectorSearch",
16+
"database": "langchain_test_db",
17+
"collectionName": "langchain_test_retrievers"
18+
}

‎langchain-python/indexes/langchain_test_vectorstores_from_texts.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"fields": [
3+
{
4+
"numDimensions": 5,
5+
"path": "embedding",
6+
"similarity": "dotProduct",
7+
"type": "vector"
8+
},
9+
{
10+
"path": "c",
11+
"type": "filter"
12+
}
13+
],
14+
"name": "langchain-test-index-from-texts",
15+
"type": "vectorSearch",
16+
"database": "langchain_test_db",
17+
"collectionName": "langchain_test_from_texts"
18+
}

‎langchain-python/run.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ PYTHON_BINARY=$(find_python3)
99

1010
cd libs/partners/mongodb
1111

12-
$PYTHON_BINARY -m venv .
13-
source ./bin/activate
12+
$PYTHON_BINARY -m venv venv_pipeline
13+
source venv_pipeline/bin/activate
1414

1515
pip install poetry
1616

17-
poetry install --with test
17+
poetry lock --no-update
18+
19+
poetry install --with test --with test_integration
1820

1921
export MONGODB_ATLAS_URI=$(fetch_local_atlas_uri)
22+
export OPENAI_API_KEY=$openai_api_key
2023

2124
make test
2225

‎llama-index-python-kvstore/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -x
44

55
. $workdir/src/.evergreen/utils.sh
66

7-
CONN_STRING=$($atlas deployments connect $DIR --connectWith connectionString)
7+
CONN_STRING=$(fetch_local_atlas_uri)
88
PYTHON_BINARY=$(find_python3)
99
$PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}')"
1010

0 commit comments

Comments
 (0)