chore: Make runnable_name required.

PiperOrigin-RevId: 731445881

Author: shawn-yang-google

tests/unit/vertex_ag2/test_reasoning_engine_templates_ag2.py

@@ -31,6 +31,7 @@
 _TEST_LOCATION = "us-central1"
 _TEST_PROJECT = "test-project"
 _TEST_MODEL = "gemini-1.0-pro"
+_TEST_RUNNABLE_NAME = "test-runnable"
 _TEST_SYSTEM_INSTRUCTION = "You are a helpful bot."
 
 
@@ -127,8 +128,11 @@ def teardown_method(self):
         initializer.global_pool.shutdown(wait=True)
 
     def test_initialization(self):
-        agent = reasoning_engines.AG2Agent(model=_TEST_MODEL)
+        agent = reasoning_engines.AG2Agent(
+            model=_TEST_MODEL, runnable_name=_TEST_RUNNABLE_NAME
+        )
         assert agent._model_name == _TEST_MODEL
+        assert agent._runnable_name == _TEST_RUNNABLE_NAME
         assert agent._project == _TEST_PROJECT
         assert agent._location == _TEST_LOCATION
         assert agent._runnable is None
@@ -140,6 +144,7 @@ def test_initialization_with_tools(self, autogen_tools_mock):
         ]
         agent = reasoning_engines.AG2Agent(
             model=_TEST_MODEL,
+            runnable_name=_TEST_RUNNABLE_NAME,
             system_instruction=_TEST_SYSTEM_INSTRUCTION,
             tools=tools,
             runnable_builder=lambda **kwargs: kwargs,
@@ -154,6 +159,7 @@ def test_initialization_with_tools(self, autogen_tools_mock):
     def test_set_up(self):
         agent = reasoning_engines.AG2Agent(
             model=_TEST_MODEL,
+            runnable_name=_TEST_RUNNABLE_NAME,
             runnable_builder=lambda **kwargs: kwargs,
         )
         assert agent._runnable is None
@@ -163,6 +169,7 @@ def test_set_up(self):
     def test_clone(self):
         agent = reasoning_engines.AG2Agent(
             model=_TEST_MODEL,
+            runnable_name=_TEST_RUNNABLE_NAME,
             runnable_builder=lambda **kwargs: kwargs,
         )
         agent.set_up()
@@ -176,6 +183,7 @@ def test_clone(self):
     def test_query(self, dataclasses_asdict_mock):
         agent = reasoning_engines.AG2Agent(
             model=_TEST_MODEL,
+            runnable_name=_TEST_RUNNABLE_NAME,
         )
         agent._runnable = mock.Mock()
         mocks = mock.Mock()
@@ -202,6 +210,7 @@ def test_enable_tracing(
     ):
         agent = reasoning_engines.AG2Agent(
             model=_TEST_MODEL,
+            runnable_name=_TEST_RUNNABLE_NAME,
             enable_tracing=True,
         )
         assert agent._enable_tracing is True
@@ -220,5 +229,6 @@ def test_raise_untyped_input_args(self, vertexai_init_mock):
         with pytest.raises(TypeError, match=r"has untyped input_arg"):
             reasoning_engines.AG2Agent(
                 model=_TEST_MODEL,
+                runnable_name=_TEST_RUNNABLE_NAME,
                 tools=[_return_input_no_typing],
             )

vertexai/preview/reasoning_engines/templates/ag2.py

@@ -71,7 +71,7 @@ def _prepare_runnable_kwargs(
     if "system_message" not in runnable_kwargs and system_instruction:
         runnable_kwargs["system_message"] = system_instruction
 
-    if "name" not in runnable_kwargs and runnable_name:
+    if "name" not in runnable_kwargs:
         runnable_kwargs["name"] = runnable_name
 
     if "llm_config" not in runnable_kwargs:
@@ -146,11 +146,11 @@ class AG2Agent:
     def __init__(
         self,
         model: str,
+        runnable_name: str,
         *,
         api_type: Optional[str] = None,
         llm_config: Optional[Mapping[str, Any]] = None,
         system_instruction: Optional[str] = None,
-        runnable_name: Optional[str] = None,
         runnable_kwargs: Optional[Mapping[str, Any]] = None,
         runnable_builder: Optional[Callable[..., "ConversableAgent"]] = None,
         tools: Optional[Sequence[Callable[..., Any]]] = None,
@@ -201,6 +201,11 @@ def __init__(
                 Required. The name of the model (e.g. "gemini-1.0-pro").
                 Used to create a default `llm_config` if one is not provided.
                 This parameter is ignored if `llm_config` is provided.
+            runnable_name (str):
+                Required. The name of the runnable.
+                This name is used as the default `runnable_kwargs["name"]`
+                unless `runnable_kwargs` already contains a "name", in which
+                case the provided `runnable_kwargs["name"]` will be used.
             api_type (str):
                 Optional. The API type to use for the language model.
                 Used to create a default `llm_config` if one is not provided.
@@ -219,11 +224,6 @@ def __init__(
                 `runnable_kwargs["system_message"]` unless `runnable_kwargs`
                 already contains a "system_message", in which case the provided
                 `runnable_kwargs["system_message"]` will be used.
-            runnable_name (str):
-                Optional. The name of the runnable.
-                This name is used as the default `runnable_kwargs["name"]`
-                unless `runnable_kwargs` already contains a "name", in which
-                case the provided `runnable_kwargs["name"]` will be used.
             runnable_kwargs (Mapping[str, Any]):
                 Optional. Additional keyword arguments for the constructor of
                 the runnable. Details of the kwargs can be found in