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.

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

google-vertexai[patch]: serializable citation metadata, release 0.0.4 #17145

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Any, Callable, Dict, Optional, Union

import google.api_core
import proto # type: ignore[import-untyped]
from google.api_core.gapic_v1.client_info import ClientInfo
from google.cloud import storage
from langchain_core.callbacks import (
Expand Down Expand Up @@ -114,7 +115,11 @@ def get_generation_info(
}
for rating in candidate.safety_ratings
],
"citation_metadata": candidate.citation_metadata,
"citation_metadata": (
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits: could it be proto.Message.to_dict(candidate.citation_metadata) instead?

proto.Message.to_dict(candidate.citation_metadata)
if candidate.citation_metadata
else None
),
}
# https://cloud.google.com/vertex-ai/docs/generative-ai/model-reference/text-chat#response_body
else:
Expand Down
2 changes: 1 addition & 1 deletion libs/partners/google-vertexai/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "langchain-google-vertexai"
version = "0.0.3"
version = "0.0.4"
description = "An integration package connecting GoogleVertexAI and LangChain"
authors = []
readme = "README.md"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import re
from typing import List, Union
from typing import Any, List, Union

from langchain_core.agents import AgentAction, AgentActionMessageLog, AgentFinish
from langchain_core.messages import AIMessageChunk
Expand Down Expand Up @@ -44,11 +44,11 @@ def parse(self, text: str) -> Union[AgentAction, AgentFinish]:


def test_tools() -> None:
from langchain.agents import AgentExecutor # type: ignore[import-not-found]
from langchain.agents.format_scratchpad import ( # type: ignore[import-not-found]
from langchain.agents import AgentExecutor
from langchain.agents.format_scratchpad import (
format_to_openai_function_messages,
)
from langchain.chains import LLMMathChain # type: ignore[import-not-found]
from langchain.chains import LLMMathChain

llm = ChatVertexAI(model_name="gemini-pro")
math_chain = LLMMathChain.from_llm(llm=llm)
Expand All @@ -67,8 +67,8 @@ def test_tools() -> None:
)
llm_with_tools = llm.bind(functions=tools)

agent = (
{ # type: ignore[var-annotated]
agent: Any = (
{
"input": lambda x: x["input"],
"agent_scratchpad": lambda x: format_to_openai_function_messages(
x["intermediate_steps"]
Expand Down Expand Up @@ -115,7 +115,7 @@ def test_multiple_tools() -> None:
from langchain.agents import AgentExecutor
from langchain.agents.format_scratchpad import format_to_openai_function_messages
from langchain.chains import LLMMathChain
from langchain.utilities import ( # type: ignore[import-not-found]
from langchain.utilities import (
GoogleSearchAPIWrapper,
)

Expand Down Expand Up @@ -149,8 +149,8 @@ def test_multiple_tools() -> None:
)
llm_with_tools = llm.bind(functions=tools)

agent = (
{ # type: ignore[var-annotated]
agent: Any = (
{
"input": lambda x: x["input"],
"agent_scratchpad": lambda x: format_to_openai_function_messages(
x["intermediate_steps"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def test_default_params_gemini() -> None:
StubGeminiResponse(
text="Goodbye",
content=Mock(parts=[Mock(function_call=None)]),
citation_metadata=Mock(),
citation_metadata=None,
)
]
mock_chat = MagicMock()
Expand Down