mirror of
https://github.com/hwchase17/langchain
synced 2024-11-02 09:40:22 +00:00
4035a1d234
Thank you for contributing to LangChain! - [X] **PR title**: "community: Add source metadata to bedrock retriever response" - [X] **PR message**: - **Description:** Bedrock retrieve API returns extra metadata in the response which is currently not returned in the retriever response - **Issue:** The change adds the metadata from bedrock retrieve API response to the bedrock retriever in a backward compatible way. Renamed metadata to sourceMetadata as metadata term is being used in the Document already. This is in sync with what we are doing in llama-index as well. - **Dependencies:** No - [X] **Add tests and docs**: 1. Added unit tests 2. Notebook already exists and does not need any change 3. Response from end to end testing, just to ensure backward compatibility: `[Document(page_content='Exoplanets.', metadata={'location': {'s3Location': {'uri': 's3://bucket/file_name.txt'}, 'type': 'S3'}, 'score': 0.46886647, 'source_metadata': {'x-amz-bedrock-kb-source-uri': 's3://bucket/file_name.txt', 'tag': 'space', 'team': 'Nasa', 'year': 1946.0}})]` - [X] **Lint and test**: Run `make format`, `make lint` and `make test` from the root of the package(s) you've modified. See contribution guidelines for more: https://python.langchain.com/docs/contributing/ Additional guidelines: - Make sure optional dependencies are imported within a function. - Please do not add dependencies to pyproject.toml files (even optional ones) unless they are required for unit tests. - Most PRs should not touch more than one package. - Changes should be backwards compatible. - If you are adding something to community, do not re-import it in langchain. If no one reviews your PR within a few days, please @-mention one of baskaryan, efriis, eyurtsev, hwchase17. --------- Co-authored-by: Piyush Jain <piyushjain@duck.com>
132 lines
4.7 KiB
Python
132 lines
4.7 KiB
Python
from typing import Any, Dict, List, Optional
|
|
|
|
from langchain_core.callbacks import CallbackManagerForRetrieverRun
|
|
from langchain_core.documents import Document
|
|
from langchain_core.pydantic_v1 import BaseModel, root_validator
|
|
from langchain_core.retrievers import BaseRetriever
|
|
|
|
|
|
class VectorSearchConfig(BaseModel, extra="allow"): # type: ignore[call-arg]
|
|
"""Configuration for vector search."""
|
|
|
|
numberOfResults: int = 4
|
|
|
|
|
|
class RetrievalConfig(BaseModel, extra="allow"): # type: ignore[call-arg]
|
|
"""Configuration for retrieval."""
|
|
|
|
vectorSearchConfiguration: VectorSearchConfig
|
|
|
|
|
|
class AmazonKnowledgeBasesRetriever(BaseRetriever):
|
|
"""`Amazon Bedrock Knowledge Bases` retrieval.
|
|
|
|
See https://aws.amazon.com/bedrock/knowledge-bases for more info.
|
|
|
|
Args:
|
|
knowledge_base_id: Knowledge Base ID.
|
|
region_name: The aws region e.g., `us-west-2`.
|
|
Fallback to AWS_DEFAULT_REGION env variable or region specified in
|
|
~/.aws/config.
|
|
credentials_profile_name: The name of the profile in the ~/.aws/credentials
|
|
or ~/.aws/config files, which has either access keys or role information
|
|
specified. If not specified, the default credential profile or, if on an
|
|
EC2 instance, credentials from IMDS will be used.
|
|
client: boto3 client for bedrock agent runtime.
|
|
retrieval_config: Configuration for retrieval.
|
|
|
|
Example:
|
|
.. code-block:: python
|
|
|
|
from langchain_community.retrievers import AmazonKnowledgeBasesRetriever
|
|
|
|
retriever = AmazonKnowledgeBasesRetriever(
|
|
knowledge_base_id="<knowledge-base-id>",
|
|
retrieval_config={
|
|
"vectorSearchConfiguration": {
|
|
"numberOfResults": 4
|
|
}
|
|
},
|
|
)
|
|
"""
|
|
|
|
knowledge_base_id: str
|
|
region_name: Optional[str] = None
|
|
credentials_profile_name: Optional[str] = None
|
|
endpoint_url: Optional[str] = None
|
|
client: Any
|
|
retrieval_config: RetrievalConfig
|
|
|
|
@root_validator(pre=True)
|
|
def create_client(cls, values: Dict[str, Any]) -> Dict[str, Any]:
|
|
if values.get("client") is not None:
|
|
return values
|
|
|
|
try:
|
|
import boto3
|
|
from botocore.client import Config
|
|
from botocore.exceptions import UnknownServiceError
|
|
|
|
if values.get("credentials_profile_name"):
|
|
session = boto3.Session(profile_name=values["credentials_profile_name"])
|
|
else:
|
|
# use default credentials
|
|
session = boto3.Session()
|
|
|
|
client_params = {
|
|
"config": Config(
|
|
connect_timeout=120, read_timeout=120, retries={"max_attempts": 0}
|
|
)
|
|
}
|
|
if values.get("region_name"):
|
|
client_params["region_name"] = values["region_name"]
|
|
|
|
if values.get("endpoint_url"):
|
|
client_params["endpoint_url"] = values["endpoint_url"]
|
|
|
|
values["client"] = session.client("bedrock-agent-runtime", **client_params)
|
|
|
|
return values
|
|
except ImportError:
|
|
raise ImportError(
|
|
"Could not import boto3 python package. "
|
|
"Please install it with `pip install boto3`."
|
|
)
|
|
except UnknownServiceError as e:
|
|
raise ImportError(
|
|
"Ensure that you have installed the latest boto3 package "
|
|
"that contains the API for `bedrock-runtime-agent`."
|
|
) from e
|
|
except Exception as e:
|
|
raise ValueError(
|
|
"Could not load credentials to authenticate with AWS client. "
|
|
"Please check that credentials in the specified "
|
|
"profile name are valid."
|
|
) from e
|
|
|
|
def _get_relevant_documents(
|
|
self, query: str, *, run_manager: CallbackManagerForRetrieverRun
|
|
) -> List[Document]:
|
|
response = self.client.retrieve(
|
|
retrievalQuery={"text": query.strip()},
|
|
knowledgeBaseId=self.knowledge_base_id,
|
|
retrievalConfiguration=self.retrieval_config.dict(),
|
|
)
|
|
results = response["retrievalResults"]
|
|
documents = []
|
|
for result in results:
|
|
content = result["content"]["text"]
|
|
result.pop("content")
|
|
if "score" not in result:
|
|
result["score"] = 0
|
|
if "metadata" in result:
|
|
result["source_metadata"] = result.pop("metadata")
|
|
documents.append(
|
|
Document(
|
|
page_content=content,
|
|
metadata=result,
|
|
)
|
|
)
|
|
|
|
return documents
|