github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-07-09 14:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support Azure gov cloud in Azure Cognitive Search retriever (#13695)

Browse Source 
<!-- Thank you for contributing to LangChain!

Replace this entire comment with:
- **Description:** The existing version hardcoded search.windows.net in
the base url. This is not compatible with the gov cloud. I am allowing
the user to override the default for gov cloud support.,
  - **Issue:** N/A, did not write up in an issue,
  - **Dependencies:** None

Please make sure your PR is passing linting and testing before
submitting. Run `make format`, `make lint` and `make test` to check this
locally.

See contribution guidelines for more information on how to write/run
tests, lint, etc:

https://github.com/langchain-ai/langchain/blob/master/.github/CONTRIBUTING.md

If you're adding a new integration, please include:
1. a test for the integration, preferably unit tests that do not rely on
network access,
2. an example notebook showing its use. It lives in `docs/extras`
directory.

If no one reviews your PR within a few days, please @-mention one of
@baskaryan, @eyurtsev, @hwchase17.
 -->

---------

Co-authored-by: Nicholas Ceccarelli <nceccarelli2@moog.com>
Co-authored-by: Harrison Chase <hw.chase.17@gmail.com>
This commit is contained in:
nceccarelli 2023-12-04 15:56:35 -05:00 committed by GitHub
parent e09b876863
commit 5fea63327b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/langchain/langchain/retrievers/azure_cognitive_search.py
View File

@ -13,7 +13,10 @@ from langchain.callbacks.manager import (
AsyncCallbackManagerForRetrieverRun, AsyncCallbackManagerForRetrieverRun,
CallbackManagerForRetrieverRun, CallbackManagerForRetrieverRun,
) )
from langchain.utils import get_from_dict_or_env from langchain.utils import get_from_dict_or_env, get_from_env
DEFAULT_URL_SUFFIX = "search.windows.net"
"""Default URL Suffix for endpoint connection - commercial cloud"""
class AzureCognitiveSearchRetriever(BaseRetriever): class AzureCognitiveSearchRetriever(BaseRetriever):
@ -54,7 +57,10 @@ class AzureCognitiveSearchRetriever(BaseRetriever):
return values return values
def _build_search_url(self, query: str) -> str: def _build_search_url(self, query: str) -> str:
base_url = f"https://{self.service_name}.search.windows.net/" url_suffix = get_from_env(
"", "AZURE_COGNITIVE_SEARCH_URL_SUFFIX", DEFAULT_URL_SUFFIX
)
base_url = f"https://{self.service_name}.{url_suffix}/"
endpoint_path = f"indexes/{self.index_name}/docs?api-version={self.api_version}" endpoint_path = f"indexes/{self.index_name}/docs?api-version={self.api_version}"
top_param = f"&$top={self.top_k}" if self.top_k else "" top_param = f"&$top={self.top_k}" if self.top_k else ""
return base_url + endpoint_path + f"&search={query}" + top_param return base_url + endpoint_path + f"&search={query}" + top_param