Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Python: Add Azure Cognitive Search vector connector #1103

Merged
merged 37 commits into from
Jun 14, 2023
Merged

Python: Add Azure Cognitive Search vector connector #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
96d811e
Initial commit for Azure Cognitive Search Vector connector-TEW
tawalke May 19, 2023
71ec8ff
Update cog_search memory store-TEW
tawalke May 19, 2023
4e323bf
Merge branch 'main' into azure-search-connector
tawalke May 19, 2023
eced0b0
Add memory store init,add baseline test, update memory store and util…
tawalke May 19, 2023
5edfcc7
Merge branch 'main' into azure-search-connector
tawalke May 19, 2023
7f2cd5d
Merge branch 'main' into azure-search-connector
tawalke May 19, 2023
6dbb28b
Merge branch 'main' into azure-search-connector
tawalke May 19, 2023
309f156
Updating poetry.lock to sync with project-TEW
tawalke May 19, 2023
ddd555a
Update acs memory store w/azure-sdk call for collection/vector retrie…
tawalke May 20, 2023
71fb205
Merge branch 'main' into azure-search-connector
tawalke May 20, 2023
8de86fd
Merge branch 'main' into azure-search-connector
tawalke May 20, 2023
6af3961
PR: Update to memory store and resolve poetry.lock conflict-TEW
tawalke May 22, 2023
0654936
Updated to memory store connector per ACS team convo-TEW
tawalke May 31, 2023
5659a24
PR Feedback: per ACS team (part 1) - Update to MemoryStore to support…
tawalke Jun 8, 2023
ca595c5
PR Feedback: per ACS team (part 2); Add search client lookup and/or c…
tawalke Jun 8, 2023
061c09a
PR Feedback: Resolve main & branch conflicts in yml & toml files-TEW
tawalke Jun 8, 2023
11a91e2
PR: Merging Main, resolving conflicts-TEW
tawalke Jun 9, 2023
85d79ec
Merge branch 'main' into azure-search-connector
tawalke Jun 9, 2023
088f120
PR Feedback: Unused variables/libs cleanup & Update to acs memory sto…
tawalke Jun 9, 2023
ac36852
Merge branch 'azure-search-connector' of https://github.com/tawalke/s…
tawalke Jun 9, 2023
183af99
PR Feedback: Update search fields based upon ACS schema and with_embe…
tawalke Jun 9, 2023
ee478d8
PR: Clean up/format code files-TEW
tawalke Jun 9, 2023
7a22026
PR: Removed unused variables & libraries-TEW
tawalke Jun 9, 2023
1cfd7d2
Merge branch 'main' into azure-search-connector
tawalke Jun 9, 2023
2a09200
PR: Move ACS Fields Schema to utils -TEW
tawalke Jun 12, 2023
0f23ce3
Merge branch 'main' into azure-search-connector
tawalke Jun 12, 2023
239adf9
Merge branch 'azure-search-connector' of https://github.com/tawalke/s…
tawalke Jun 12, 2023
65597e2
PR Feedback: Ensure error if ACS API key is not passed or set in Env …
tawalke Jun 12, 2023
6a70766
PR Feedback: Update with additonal_metadata field per new Memorystore…
tawalke Jun 12, 2023
0ba0493
Merge branch 'main' into azure-search-connector
lemillermicrosoft Jun 12, 2023
fbb5b69
Merge branch 'azure-search-connector' of https://github.com/tawalke/s…
tawalke Jun 12, 2023
3f11ab2
Merge branch 'main' into azure-search-connector
tawalke Jun 12, 2023
9e43dce
Merge branch 'main' into azure-search-connector
tawalke Jun 12, 2023
1a981f0
Merge branch 'feature-azure-search' into azure-search-connector
tawalke Jun 13, 2023
b8cb4e1
PR: Testing update-TEW
tawalke Jun 13, 2023
6ea2894
Merge branch 'azure-search-connector' of https://github.com/tawalke/s…
tawalke Jun 13, 2023
8f69c2a
Merge branch 'feature-azure-search' into azure-search-connector
dluc Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/python-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ jobs:
export HNSWLIB_NO_NATIVE=1
python -m pip install --upgrade pip setuptools wheel
python -m pip install poetry pytest
cd python && poetry install --with hugging_face --with chromadb --with weaviate
poetry add azure-search-documents==11.4.0a20230509004 --source azure-sdk-dev
cd python && poetry install --with hugging_face --with chromadb --with weaviate --with azure_cognitive_search
- name: Install dependencies wtih hnswlib native enabled
if: matrix.os != 'macos-latest' || matrix.python-version != '3.11'
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install poetry pytest
cd python && poetry install --with hugging_face --with chromadb --with weaviate
poetry add azure-search-documents==11.4.0a20230509004 --source azure-sdk-dev
cd python && poetry install --with hugging_face --with chromadb --with weaviate --with azure_cognitive_search
- name: Run Integration Tests
shell: bash
env: # Set Azure credentials secret as an input
Expand Down
2 changes: 2 additions & 0 deletions python/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ OPENAI_ORG_ID=""
AZURE_OPENAI_DEPLOYMENT_NAME=""
AZURE_OPENAI_ENDPOINT=""
AZURE_OPENAI_API_KEY=""
AZURE_SEARCH_SERVICE_ENDPOINT=""
AZURE_SEARCH_ADMIN_KEY=""
Loading
Loading