nvidia-nat-adk 1.4.0a20251014__py3-none-any.whl → 1.4.0a20251021__py3-none-any.whl

nat/plugins/adk/adk_callback_handler.py

@@ -214,21 +214,23 @@ class ADKProfilerHandler(BaseProfilerCallback):
                     model_name = first
             model_name = model_name or ""
 
-            model_input = ""
+            model_input = []
             try:
                 for message in kwargs.get("messages", []):
                     content = message.get("content", "")
                     if isinstance(content, list):
                         for part in content:
                             if isinstance(part, dict):
-                                model_input += str(part.get("text", ""))  # text parts
+                                model_input.append(str(part.get("text", "")))  # text parts
                             else:
-                                model_input += str(part)
+                                model_input.append(str(part))
                     else:
-                        model_input += content or ""
+                        model_input.append("" if content is None else str(content))
             except Exception as _e:
                 logger.exception("Error getting model input")
 
+            model_input = "".join(model_input)
+
             # Record the start event
             input_stats = IntermediateStepPayload(
                 event_type=IntermediateStepType.LLM_START,
@@ -252,14 +254,16 @@ class ADKProfilerHandler(BaseProfilerCallback):
                 raise RuntimeError("Original LLM function is None - instrumentation may not have been set up correctly")
             output = await original_func(*args, **kwargs)
 
-            model_output = ""
+            model_output = []
             try:
                 for choice in output.choices:
                     msg = choice.message
-                    model_output += msg.content or ""
+                    model_output.append(msg.content or "")
             except Exception as _e:
                 logger.exception("Error getting model output")
 
+            model_output = "".join(model_output)
+
             now = time.time()
             # Record the end event
             # Prepare safe metadata and usage

nat/plugins/adk/llm.py

@@ -23,6 +23,7 @@ from nat.llm.azure_openai_llm import AzureOpenAIModelConfig
 from nat.llm.litellm_llm import LiteLlmModelConfig
 from nat.llm.nim_llm import NIMModelConfig
 from nat.llm.openai_llm import OpenAIModelConfig
+from nat.utils.responses_api import validate_no_responses_api
 
 logger = logging.getLogger(__name__)
 
@@ -37,8 +38,12 @@ async def azure_openai_adk(config: AzureOpenAIModelConfig, _builder: Builder):
     """
     from google.adk.models.lite_llm import LiteLlm
 
+    validate_no_responses_api(config, LLMFrameworkEnum.ADK)
+
     config_dict = config.model_dump(
-        exclude={"type", "max_retries", "thinking", "azure_endpoint", "azure_deployment", "model_name", "model"},
+        exclude={
+            "type", "max_retries", "thinking", "azure_endpoint", "azure_deployment", "model_name", "model", "api_type"
+        },
         by_alias=True,
         exclude_none=True,
     )
@@ -51,8 +56,11 @@ async def azure_openai_adk(config: AzureOpenAIModelConfig, _builder: Builder):
 @register_llm_client(config_type=LiteLlmModelConfig, wrapper_type=LLMFrameworkEnum.ADK)
 async def litellm_adk(litellm_config: LiteLlmModelConfig, _builder: Builder):
     from google.adk.models.lite_llm import LiteLlm
+
+    validate_no_responses_api(litellm_config, LLMFrameworkEnum.ADK)
+
     yield LiteLlm(**litellm_config.model_dump(
-        exclude={"type", "max_retries", "thinking"},
+        exclude={"type", "max_retries", "thinking", "api_type"},
         by_alias=True,
         exclude_none=True,
     ))
@@ -69,6 +77,8 @@ async def nim_adk(config: NIMModelConfig, _builder: Builder):
     import litellm
     from google.adk.models.lite_llm import LiteLlm
 
+    validate_no_responses_api(config, LLMFrameworkEnum.ADK)
+
     logger.warning("NIMs do not currently support tools with ADK. Tools will be ignored.")
     litellm.add_function_to_prompt = True
     litellm.drop_params = True
@@ -77,7 +87,7 @@ async def nim_adk(config: NIMModelConfig, _builder: Builder):
         os.environ["NVIDIA_NIM_API_KEY"] = api_key
 
     config_dict = config.model_dump(
-        exclude={"type", "max_retries", "thinking", "model_name", "model", "base_url"},
+        exclude={"type", "max_retries", "thinking", "model_name", "model", "base_url", "api_type"},
         by_alias=True,
         exclude_none=True,
     )
@@ -97,8 +107,10 @@ async def openai_adk(config: OpenAIModelConfig, _builder: Builder):
     """
     from google.adk.models.lite_llm import LiteLlm
 
+    validate_no_responses_api(config, LLMFrameworkEnum.ADK)
+
     config_dict = config.model_dump(
-        exclude={"type", "max_retries", "thinking", "model_name", "model", "base_url"},
+        exclude={"type", "max_retries", "thinking", "model_name", "model", "base_url", "api_type"},
         by_alias=True,
         exclude_none=True,
     )

{nvidia_nat_adk-1.4.0a20251014.dist-info → nvidia_nat_adk-1.4.0a20251021.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat-adk
-Version: 1.4.0a20251014
+Version: 1.4.0a20251021
 Summary: Subpackage for Google ADK integration in NeMo Agent Toolkit
 Author: NVIDIA Corporation
 Maintainer: NVIDIA Corporation
@@ -16,7 +16,7 @@ Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE-3rd-party.txt
 License-File: LICENSE.md
-Requires-Dist: nvidia-nat[litellm]==v1.4.0a20251014
+Requires-Dist: nvidia-nat[litellm]==v1.4.0a20251021
 Requires-Dist: google-adk~=1.14.1
 Dynamic: license-file
 

nvidia_nat_adk-1.4.0a20251021.dist-info/RECORD

@@ -0,0 +1,13 @@
+nat/meta/pypi.md,sha256=AOSYTEk4JQQeaQQ1fA7v__j9-5rchBPvvSAICORgttE,953
+nat/plugins/adk/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
+nat/plugins/adk/adk_callback_handler.py,sha256=JtyqakzOVGhnGQOZY7RRrWIO6rFNgsrC2j5Dv42HlkQ,12706
+nat/plugins/adk/llm.py,sha256=43UaoTcEnNmpLGX3VdYIL89jrpcudC2lUnpbcUTn5l4,4505
+nat/plugins/adk/register.py,sha256=q6ZOmldtbr_7Gr8iUS8xrhR8_FhSubwGqr7VJNrZg1A,809
+nat/plugins/adk/tool_wrapper.py,sha256=TroOo7tM6I3gOqMxOL7fQmPsyVKlntPPRNbYQMk6JHs,5779
+nvidia_nat_adk-1.4.0a20251021.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
+nvidia_nat_adk-1.4.0a20251021.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat_adk-1.4.0a20251021.dist-info/METADATA,sha256=b8G2mBiyIF2x-uwnIeJhzNnwdgGYLgyO9Ak14ZvgA60,1772
+nvidia_nat_adk-1.4.0a20251021.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat_adk-1.4.0a20251021.dist-info/entry_points.txt,sha256=K1K0clA1uqXk1Q0dh8ZaWNQyveaFx_XvgBWzCyGMYts,52
+nvidia_nat_adk-1.4.0a20251021.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat_adk-1.4.0a20251021.dist-info/RECORD,,

nvidia_nat_adk-1.4.0a20251014.dist-info/RECORD

@@ -1,13 +0,0 @@
-nat/meta/pypi.md,sha256=AOSYTEk4JQQeaQQ1fA7v__j9-5rchBPvvSAICORgttE,953
-nat/plugins/adk/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
-nat/plugins/adk/adk_callback_handler.py,sha256=MMjMp6WN1zCVOFqoJWC90H0GGCHs49qMgoHfMHFitsU,12562
-nat/plugins/adk/llm.py,sha256=glwlO9UQhfGagVDNbtw-bNQ7FVdJfs31v6rqd-MBJLY,4120
-nat/plugins/adk/register.py,sha256=q6ZOmldtbr_7Gr8iUS8xrhR8_FhSubwGqr7VJNrZg1A,809
-nat/plugins/adk/tool_wrapper.py,sha256=TroOo7tM6I3gOqMxOL7fQmPsyVKlntPPRNbYQMk6JHs,5779
-nvidia_nat_adk-1.4.0a20251014.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
-nvidia_nat_adk-1.4.0a20251014.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-nvidia_nat_adk-1.4.0a20251014.dist-info/METADATA,sha256=ISw6r3ibeWffJeOEtCw635OorSV6NyKT8Oj8QzV4_lM,1772
-nvidia_nat_adk-1.4.0a20251014.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat_adk-1.4.0a20251014.dist-info/entry_points.txt,sha256=K1K0clA1uqXk1Q0dh8ZaWNQyveaFx_XvgBWzCyGMYts,52
-nvidia_nat_adk-1.4.0a20251014.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
-nvidia_nat_adk-1.4.0a20251014.dist-info/RECORD,,