Merge branch 'main' into upgrade-github-actions-node24

Author: koverholt

docs/agents/config.md

@@ -1,15 +1,15 @@
 # Build agents with Agent Config
 
 <div class="language-support-tag">
-  <span class="lst-supported">Supported in ADK</span><span class="lst-python">Python v1.11.0</span><span class="lst-preview">Experimental</span>
+  <span class="lst-supported">Supported in ADK</span><span class="lst-python">Python v1.11.0</span><span class="lst-java">Java v0.3.0</span><span class="lst-preview">Experimental</span>
 </div>
 
 The ADK Agent Config feature lets you build an ADK workflow without writing
 code. An Agent Config uses a YAML format text file with a brief description of
 the agent, allowing just about anyone to assemble and run an ADK agent. The
 following is a simple example of a basic Agent Config definition:
 
-```
+```yaml
 name: assistant_agent
 model: gemini-2.5-flash
 description: A helper agent that can answer users' questions.
@@ -144,6 +144,41 @@ topic in the
 For more information about the ADK command line options, see the
 [ADK CLI reference](/adk-docs/api-reference/cli/).
 
+### Run programmatically
+
+You can also bypass the CLI and dynamically load and execute a configuration-based agent directly in your code. The utility loads the configuration and instantiates the proper agent class (such as `LlmAgent`) transparently as a `BaseAgent` subclass.
+
+=== "Python"
+
+    ```python
+    import asyncio
+    from google.adk.agents import config_agent_utils
+    from google.adk.agents import Runner
+
+    async def main():
+        # Load the agent directly from the YAML config file
+        agent = config_agent_utils.from_config("my_agent/root_agent.yaml")
+        # ...
+
+    if __name__ == "__main__":
+        asyncio.run(main())
+    ```
+
+=== "Java"
+
+    ```java
+    import com.google.adk.agents.BaseAgent;
+    import com.google.adk.agents.ConfigAgentUtils;
+
+    public class AgentApp {
+        public static void main(String[] args) throws Exception {
+            // Load the agent directly from the YAML config file
+            BaseAgent agent = ConfigAgentUtils.fromConfig("my_agent/root_agent.yaml");
+            // ...
+        }
+    }
+    ```
+
 ## Example configs
 
 This section shows examples of Agent Config files to get you started building
@@ -243,7 +278,7 @@ limitations:
 -   **Model support:** Only Gemini models are currently supported.
     Integration with third-party models is in progress.
 -   **Programming language:** The Agent Config feature currently supports
-    only Python code for tools and other functionality requiring programming code.
+    Python and Java code for tools and other functionality requiring programming code.
 -   **ADK Tool support:** The following ADK tools are supported by the Agent
     Config feature, but *not all tools are fully supported*:
     -   `google_search`

docs/agents/models/google-gemini.md

@@ -200,37 +200,89 @@ To mitigate this, you can do one of the following:
     You would use this option if you are instantiating this model adapter by
     yourself.
 
-    ```python
-    root_agent = Agent(
-        model='gemini-2.5-flash',
-        ...
-        generate_content_config=types.GenerateContentConfig(
-            ...
-            http_options=types.HttpOptions(
-                ...
-                retry_options=types.HttpRetryOptions(initial_delay=1, attempts=2),
-                ...
-            ),
-            ...
-        )
-    ```
+    === "Python"
+
+        ```python
+        root_agent = Agent(
+            model='gemini-2.5-flash',
+            # ...
+            generate_content_config=types.GenerateContentConfig(
+                # ...
+                http_options=types.HttpOptions(
+                    # ...
+                    retry_options=types.HttpRetryOptions(initial_delay=1, attempts=2),
+                    # ...
+                ),
+                # ...
+            )
+        ```
+
+    === "Java"
+
+        ```java
+        import com.google.adk.agents.LlmAgent;
+        import com.google.genai.types.GenerateContentConfig;
+        import com.google.genai.types.HttpOptions;
+        import com.google.genai.types.HttpRetryOptions;
+
+        // ...
+
+        LlmAgent rootAgent = LlmAgent.builder()
+            .model("gemini-2.5-flash")
+            // ...
+            .generateContentConfig(GenerateContentConfig.builder()
+                // ...
+                .httpOptions(HttpOptions.builder()
+                    // ...
+                    .retryOptions(HttpRetryOptions.builder().initialDelay(1.0).attempts(2).build())
+                    // ...
+                    .build())
+                // ...
+                .build())
+            .build();
+        ```
 
     **Option 2:** Retry options on this model adapter.
 
     You would use this option if you were instantiating the instance of adapter
     by yourself.
 
-    ```python
-    from google.genai import types
+    === "Python"
 
-    # ...
+        ```python
+        from google.genai import types
 
-    agent = Agent(
-        model=Gemini(
-        retry_options=types.HttpRetryOptions(initial_delay=1, attempts=2),
+        # ...
+
+        agent = Agent(
+            model=Gemini(
+            retry_options=types.HttpRetryOptions(initial_delay=1, attempts=2),
+            )
         )
-    )
-    ```
+        ```
+
+    === "Java"
+
+        ```java
+        import com.google.adk.agents.LlmAgent;
+        import com.google.adk.models.Gemini;
+        import com.google.genai.Client;
+        import com.google.genai.types.HttpOptions;
+        import com.google.genai.types.HttpRetryOptions;
+
+        // ...
+
+        LlmAgent agent = LlmAgent.builder()
+            .model(Gemini.builder()
+                .modelName("gemini-2.5-flash")
+                .apiClient(Client.builder()
+                    .httpOptions(HttpOptions.builder()
+                        .retryOptions(HttpRetryOptions.builder().initialDelay(1.0).attempts(2).build())
+                        .build())
+                    .build())
+                .build())
+            .build();
+        ```
 
 ## Gemini Interactions API {#interactions-api}
 
@@ -248,23 +300,45 @@ You can enable the Interactions API by setting the `use_interactions_api=True`
 parameter in the Gemini model configuration, as shown in the following code
 snippet:
 
-```python
-from google.adk.agents.llm_agent import Agent
-from google.adk.models.google_llm import Gemini
-from google.adk.tools.google_search_tool import GoogleSearchTool
+=== "Python"
 
-root_agent = Agent(
-    model=Gemini(
-        model="gemini-2.5-flash",
-        use_interactions_api=True,  # Enable Interactions API
-    ),
-    name="interactions_test_agent",
-    tools=[
-        GoogleSearchTool(bypass_multi_tools_limit=True),  # Converted to function tool
-        get_current_weather,  # Custom function tool
-    ],
-)
-```
+    ```python
+    from google.adk.agents.llm_agent import Agent
+    from google.adk.models.google_llm import Gemini
+    from google.adk.tools.google_search_tool import GoogleSearchTool
+
+    root_agent = Agent(
+        model=Gemini(
+            model="gemini-2.5-flash",
+            use_interactions_api=True,  # Enable Interactions API
+        ),
+        name="interactions_test_agent",
+        tools=[
+            GoogleSearchTool(bypass_multi_tools_limit=True),  # Converted to function tool
+            get_current_weather,  # Custom function tool
+        ],
+    )
+    ```
+
+=== "Java"
+
+    ```java
+    import com.google.adk.agents.LlmAgent;
+    import com.google.adk.models.Gemini;
+    import com.google.adk.tools.GoogleSearchTool;
+
+    // Note: Interactions API support in Java ADK is currently under development.
+    LlmAgent rootAgent = LlmAgent.builder()
+        .model(Gemini.builder()
+            .modelName("gemini-2.5-flash")
+            .build())
+        .name("interactions_test_agent")
+        .tools(
+            GoogleSearchTool.INSTANCE, // Search tool
+            getCurrentWeather // Custom function tool
+        )
+        .build();
+    ```
 
 For a complete code sample, see the
 [Interactions API sample](https://github.com/google/adk-python/tree/main/contributing/samples/interactions_api).
@@ -278,10 +352,20 @@ tool, within the same agent. You can work around this limitation by configuring
 the built-in tool to operate as a custom tool using the `bypass_multi_tools_limit`
 parameter:
 
-```python
-# Use bypass_multi_tools_limit=True to convert google_search to a function tool
-GoogleSearchTool(bypass_multi_tools_limit=True)
-```
+=== "Python"
+
+    ```python
+    # Use bypass_multi_tools_limit=True to convert google_search to a function tool
+    GoogleSearchTool(bypass_multi_tools_limit=True)
+    ```
+
+=== "Java"
+
+    ```java
+    // Note: bypassMultiToolsLimit is Python-specific.
+    // In Java, simply use the tool instance.
+    GoogleSearchTool.INSTANCE;
+    ```
 
 In this example, this option converts the built-in google_search to a function
 calling tool (via GoogleSearchAgentTool), which allows it to work alongside