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

cohere: Improve integration test stability, fix documents bug #19929

Merged
merged 1 commit into from
Apr 2, 2024
Merged

cohere: Improve integration test stability, fix documents bug #19929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 13 additions & 9 deletions libs/partners/cohere/langchain_cohere/chat_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def get_cohere_chat_request(
"Received documents both as a keyword argument and as an prompt additional keyword argument. Please choose only one option." # noqa: E501
)

parsed_docs: Optional[List[Document]] = None
parsed_docs: Optional[Union[List[Document], List[Dict]]] = None
if "documents" in additional_kwargs:
parsed_docs = (
additional_kwargs["documents"]
Expand All @@ -108,14 +108,18 @@ def get_cohere_chat_request(
parsed_docs = documents

formatted_docs: Optional[List[Dict[str, Any]]] = None
if parsed_docs is not None:
formatted_docs = [
{
"text": doc.page_content,
"id": doc.metadata.get("id") or f"doc-{str(i)}",
}
for i, doc in enumerate(parsed_docs)
]
if parsed_docs:
formatted_docs = []
for i, parsed_doc in enumerate(parsed_docs):
if isinstance(parsed_doc, Document):
formatted_docs.append(
{
"text": parsed_doc.page_content,
"id": parsed_doc.metadata.get("id") or f"doc-{str(i)}",
}
)
elif isinstance(parsed_doc, dict):
formatted_docs.append(parsed_doc)

# by enabling automatic prompt truncation, the probability of request failure is
# reduced with minimal impact on response quality
Expand Down
8 changes: 4 additions & 4 deletions libs/partners/cohere/tests/integration_tests/test_chat_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ def test_streaming_tool_call() -> None:
llm = ChatCohere(temperature=0)

class Person(BaseModel):
name: str
age: int
name: str = Field(type=str, description="The name of the person")
age: int = Field(type=int, description="The age of the person")

tool_llm = llm.bind_tools([Person])

Expand Down Expand Up @@ -129,8 +129,8 @@ def test_streaming_tool_call_no_tool_calls() -> None:
llm = ChatCohere(temperature=0)

class Person(BaseModel):
name: str
age: int
name: str = Field(type=str, description="The name of the person")
age: int = Field(type=int, description="The age of the person")

tool_llm = llm.bind_tools([Person])

Expand Down