Merge branch 'main' into owl-bot-copy

Author: sasha-gitg

.kokoro/release.sh

@@ -22,8 +22,16 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /
 # Disable buffering, so that the logs stream through.
 export PYTHONUNBUFFERED=1
 
-# Move into the package, build the distribution and upload.
-TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
+# Move into the `google-cloud-aiplatform` package, build the distribution and upload.
+GCA_TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
 cd github/python-aiplatform
 python3 setup.py sdist bdist_wheel
-twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*
+twine upload --username __token__ --password "${GCA_TWINE_PASSWORD}" dist/*
+
+# Move into the `vertexai` package, build the distribution and upload.
+VERTEXAI_TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_vertexai-pypi-token-1")
+cd github/python-aiplatform/pypi/_vertex_ai_placeholder
+python3 -m build
+twine upload --username __token__ --password "${VERTEXAI_TWINE_PASSWORD}" dist/*
+
+

.kokoro/release/common.cfg

@@ -23,7 +23,7 @@ env_vars: {
     value: "github/python-aiplatform/.kokoro/release.sh"
 }
 
-# Fetch PyPI password
+# Fetch google-cloud-aiplatform PyPI password
 before_action {
   fetch_keystore {
     keystore_resource {
@@ -33,6 +33,16 @@ before_action {
   }
 }
 
+# Fetch vertexai PyPI password
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "vertexai-pypi-token-1"
+    }
+  }
+}
+
 # Tokens needed to report release status back to GitHub
 env_vars: {
   key: "SECRET_MANAGER_KEYS"

.kokoro/requirements.in

@@ -8,3 +8,4 @@ setuptools
 nox>=2022.11.21 # required to remove dependency on py
 charset-normalizer<3
 click<8.1.0
+build

.kokoro/requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes requirements.in
@@ -12,6 +12,10 @@ attrs==23.1.0 \
     --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \
     --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
     # via gcp-releasetool
+build==1.2.1 \
+    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
+    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
+    # via -r requirements.in
 cachetools==5.3.2 \
     --hash=sha256:086ee420196f7b2ab9ca2db2520aca326318b68fe5ba8bc4d49cca91add450f2 \
     --hash=sha256:861f35a13a451f94e301ce2bec7cac63e881232ccce7ed67fab9b5df4d3beaa1
@@ -373,6 +377,7 @@ packaging==23.2 \
     --hash=sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 \
     --hash=sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7
     # via
+    #   build
     #   gcp-releasetool
     #   nox
 pkginfo==1.9.6 \
@@ -438,6 +443,10 @@ pyjwt==2.8.0 \
 pyperclip==1.8.2 \
     --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57
     # via gcp-releasetool
+pyproject-hooks==1.0.0 \
+    --hash=sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8 \
+    --hash=sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5
+    # via build
 python-dateutil==2.8.2 \
     --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \
     --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9

owlbot.py

@@ -112,6 +112,7 @@
             ".kokoro/continuous/prerelease-deps.cfg",
             ".kokoro/presubmit/prerelease-deps.cfg",
             ".kokoro/docs/docs-presubmit.cfg",
+            ".kokoro/release.sh",
             # exclude sample configs so periodic samples are tested against main
             # instead of pypi
             ".kokoro/samples/python3.7/common.cfg",

samples/model-builder/conftest.py

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 from google.cloud import aiplatform
+import vertexai
 from vertexai.resources import preview as preview_resources
 import pytest
 
@@ -25,6 +27,12 @@ def mock_sdk_init():
         yield mock
 
 
+@pytest.fixture
+def mock_vertexai_init():
+    with patch.object(vertexai, "init") as mock:
+        yield mock
+
+
 """
 ----------------------------------------------------------------------------
 Dataset Fixtures

samples/model-builder/init_sample.py

@@ -28,9 +28,9 @@ def init_sample(
     service_account: Optional[str] = None,
 ):
 
-    from google.cloud import aiplatform
+    import vertexai
 
-    aiplatform.init(
+    vertexai.init(
         project=project,
         location=location,
         experiment=experiment,

samples/model-builder/init_sample_test.py

@@ -17,7 +17,7 @@
 import test_constants as constants
 
 
-def test_init_sample(mock_sdk_init):
+def test_init_sample(mock_vertexai_init):
 
     init_sample.init_sample(
         project=constants.PROJECT,
@@ -29,7 +29,7 @@ def test_init_sample(mock_sdk_init):
         service_account=constants.SERVICE_ACCOUNT,
     )
 
-    mock_sdk_init.assert_called_once_with(
+    mock_vertexai_init.assert_called_once_with(
         project=constants.PROJECT,
         location=constants.LOCATION_EUROPE,
         experiment=constants.EXPERIMENT_NAME,

tests/unit/vertex_langchain/test_reasoning_engine_templates_langchain.py

@@ -38,6 +38,7 @@
 _TEST_LOCATION = "us-central1"
 _TEST_PROJECT = "test-project"
 _TEST_MODEL = "gemini-1.0-pro"
+_TEST_SYSTEM_INSTRUCTION = "You are a helpful bot."
 
 
 def place_tool_query(
@@ -173,6 +174,7 @@ def test_initialization_with_tools(self, mock_chatvertexai):
         ]
         agent = reasoning_engines.LangchainAgent(
             model=_TEST_MODEL,
+            system_instruction=_TEST_SYSTEM_INSTRUCTION,
             tools=tools,
         )
         for tool, agent_tool in zip(tools, agent._tools):
@@ -255,11 +257,6 @@ def test_enable_tracing_warning(self, caplog, langchain_instrumentor_none_mock):
         assert "enable_tracing=True but proceeding with tracing disabled" in caplog.text
 
 
-class TestConvertToolsOrRaise:
-    def test_convert_tools_or_raise(self, vertexai_init_mock):
-        pass
-
-
 def _return_input_no_typing(input_):
     """Returns input back to user."""
     return input_
@@ -272,3 +269,20 @@ def test_raise_untyped_input_args(self, vertexai_init_mock):
                 model=_TEST_MODEL,
                 tools=[_return_input_no_typing],
             )
+
+
+class TestSystemInstructionAndPromptRaisesErrors:
+    def test_raise_both_system_instruction_and_prompt_error(self, vertexai_init_mock):
+        with pytest.raises(
+            ValueError,
+            match=r"Only one of `prompt` or `system_instruction` should be specified.",
+        ):
+            reasoning_engines.LangchainAgent(
+                model=_TEST_MODEL,
+                system_instruction=_TEST_SYSTEM_INSTRUCTION,
+                prompt=prompts.ChatPromptTemplate.from_messages(
+                    [
+                        ("user", "{input}"),
+                    ]
+                ),
+            )

vertexai/preview/reasoning_engines/templates/langchain.py

@@ -114,6 +114,7 @@ def _default_model_builder(
 def _default_runnable_builder(
     model: "BaseLanguageModel",
     *,
+    system_instruction: Optional[str] = None,
     tools: Optional[Sequence["_ToolLike"]] = None,
     prompt: Optional["RunnableSerializable"] = None,
     output_parser: Optional["RunnableSerializable"] = None,
@@ -131,7 +132,10 @@ def _default_runnable_builder(
     # user would reflect that is by setting chat_history (which defaults to
     # None).
     has_history: bool = chat_history is not None
-    prompt = prompt or _default_prompt(has_history)
+    prompt = prompt or _default_prompt(
+        has_history=has_history,
+        system_instruction=system_instruction,
+    )
     output_parser = output_parser or _default_output_parser()
     model_tool_kwargs = model_tool_kwargs or {}
     agent_executor_kwargs = agent_executor_kwargs or {}
@@ -162,7 +166,10 @@ def _default_runnable_builder(
     return agent_executor
 
 
-def _default_prompt(has_history: bool) -> "RunnableSerializable":
+def _default_prompt(
+    has_history: bool,
+    system_instruction: Optional[str] = None,
+) -> "RunnableSerializable":
     from langchain_core import prompts
 
     try:
@@ -173,6 +180,10 @@ def _default_prompt(has_history: bool) -> "RunnableSerializable":
             format_to_openai_tool_messages as format_to_tool_messages,
         )
 
+    system_instructions = []
+    if system_instruction:
+        system_instructions = [("system", system_instruction)]
+
     if has_history:
         return {
             "history": lambda x: x["history"],
@@ -181,7 +192,8 @@ def _default_prompt(has_history: bool) -> "RunnableSerializable":
                 lambda x: format_to_tool_messages(x["intermediate_steps"])
             ),
         } | prompts.ChatPromptTemplate.from_messages(
-            [
+            system_instructions
+            + [
                 prompts.MessagesPlaceholder(variable_name="history"),
                 ("user", "{input}"),
                 prompts.MessagesPlaceholder(variable_name="agent_scratchpad"),
@@ -194,7 +206,8 @@ def _default_prompt(has_history: bool) -> "RunnableSerializable":
                 lambda x: format_to_tool_messages(x["intermediate_steps"])
             ),
         } | prompts.ChatPromptTemplate.from_messages(
-            [
+            system_instructions
+            + [
                 ("user", "{input}"),
                 prompts.MessagesPlaceholder(variable_name="agent_scratchpad"),
             ]
@@ -265,6 +278,7 @@ def __init__(
         self,
         model: str,
         *,
+        system_instruction: Optional[str] = None,
         prompt: Optional["RunnableSerializable"] = None,
         tools: Optional[Sequence["_ToolLike"]] = None,
         output_parser: Optional["RunnableSerializable"] = None,
@@ -319,6 +333,9 @@ def __init__(
         Args:
             model (str):
                 Optional. The name of the model (e.g. "gemini-1.0-pro").
+            system_instruction (str):
+                Optional. The system instruction to use for the agent. This
+                argument should not be specified if `prompt` is specified.
             prompt (langchain_core.runnables.RunnableSerializable):
                 Optional. The prompt template for the model. Defaults to a
                 ChatPromptTemplate.
@@ -394,6 +411,7 @@ def __init__(
                 False.
 
         Raises:
+            ValueError: If both `prompt` and `system_instruction` are specified.
             TypeError: If there is an invalid tool (e.g. function with an input
             that did not specify its type).
         """
@@ -407,7 +425,14 @@ def __init__(
             # they are deployed.
             _validate_tools(tools)
             self._tools = tools
+        if prompt and system_instruction:
+            raise ValueError(
+                "Only one of `prompt` or `system_instruction` should be specified. "
+                "Consider incorporating the system instruction into the prompt "
+                "rather than passing it separately as an argument."
+            )
         self._model_name = model
+        self._system_instruction = system_instruction
         self._prompt = prompt
         self._output_parser = output_parser
         self._chat_history = chat_history
@@ -528,6 +553,7 @@ def set_up(self):
             prompt=self._prompt,
             model=self._model,
             tools=self._tools,
+            system_instruction=self._system_instruction,
             output_parser=self._output_parser,
             chat_history=self._chat_history,
             model_tool_kwargs=self._model_tool_kwargs,