Merge branch 'main' into fix/eval-user-content-validation-error

Author: rohityan

src/google/adk/integrations/api_registry/api_registry.py

@@ -61,7 +61,10 @@ def __init__(
       page_token = None
       with httpx.Client() as client:
         while True:
-          params = {}
+          params = {
+              # Include all the apis including disabled ones. API registry no longer supports enabling APIs.
+              "filter": "enabled=false"
+          }
           if page_token:
             params["pageToken"] = page_token
 

src/google/adk/tools/skill_toolset.py

@@ -669,7 +669,10 @@ def _build_wrapper_code(
         "      full_path = os.path.join(os.path.abspath(td), norm_rel)",
         "      os.makedirs(os.path.dirname(full_path), exist_ok=True)",
         "      mode = 'wb' if isinstance(content, bytes) else 'w'",
-        "      with open(full_path, mode) as f:",
+        (
+            "      with open(full_path, mode, encoding='utf-8' if mode == 'w'"
+            " else None) as f:"
+        ),
         "        f.write(content)",
         "    os.chdir(td)",
         "    try:",

tests/unittests/integrations/api_registry/test_api_registry.py

@@ -91,7 +91,7 @@ def test_init_success(self, MockHttpClient):
             "Authorization": "Bearer mock_token",
             "Content-Type": "application/json",
         },
-        params={},
+        params={"filter": "enabled=false"},
     )
 
   @patch("httpx.Client", autospec=True)
@@ -120,7 +120,7 @@ def test_init_with_quota_project_id_success(self, MockHttpClient):
             "Content-Type": "application/json",
             "x-goog-user-project": "quota-project",
         },
-        params={},
+        params={"filter": "enabled=false"},
     )
 
   @patch("httpx.Client", autospec=True)
@@ -176,15 +176,15 @@ def test_init_with_pagination_success(self, MockHttpClient):
             "Authorization": "Bearer mock_token",
             "Content-Type": "application/json",
         },
-        params={},
+        params={"filter": "enabled=false"},
     )
     mock_client_instance.get.assert_called_with(
         f"https://cloudapiregistry.googleapis.com/v1beta/projects/{self.project_id}/locations/{self.location}/mcpServers",
         headers={
             "Authorization": "Bearer mock_token",
             "Content-Type": "application/json",
         },
-        params={"pageToken": "next_page_token"},
+        params={"filter": "enabled=false", "pageToken": "next_page_token"},
     )
 
   @patch("httpx.Client", autospec=True)

tests/unittests/tools/test_skill_toolset.py

@@ -817,6 +817,31 @@ async def test_execute_script_shell_success(mock_skill1):
   assert "__shell_result__" in code_input.code
 
 
+@pytest.mark.asyncio
+async def test_build_wrapper_code_with_unicode(mock_skill1):
+  """Verify that generated code uses utf-8 encoding for materializing files."""
+  # Add unicode content to mock_skill1 resources
+  unicode_content = "你好"
+  mock_skill1.resources.list_references.return_value = ["unicode.txt"]
+  mock_skill1.resources.get_reference.side_effect = lambda name: (
+      unicode_content if name == "unicode.txt" else None
+  )
+
+  executor = _make_mock_executor()
+  toolset = skill_toolset.SkillToolset([mock_skill1], code_executor=executor)
+  tool = skill_toolset.RunSkillScriptTool(toolset)
+  ctx = _make_tool_context_with_agent()
+  await tool.run_async(
+      args={"skill_name": "skill1", "file_path": "run.py"},
+      tool_context=ctx,
+  )
+
+  call_args = executor.execute_code.call_args
+  code_input = call_args[0][1]
+  assert "encoding='utf-8' if mode == 'w' else None" in code_input.code
+  assert unicode_content in code_input.code
+
+
 @pytest.mark.asyncio
 async def test_execute_script_with_input_args_python(mock_skill1):
   executor = _make_mock_executor(stdout="done\n")
@@ -1251,6 +1276,35 @@ async def test_integration_python_stdout():
   assert result["stderr"] == ""
 
 
+@pytest.mark.asyncio
+async def test_integration_python_unicode_materialization():
+  """Real executor: Python script with unicode resources."""
+  script = models.Script(
+      src=(
+          "with open('references/unicode.txt', 'r', encoding='utf-8') as f:"
+          " print(f.read())"
+      )
+  )
+  skill = _make_skill_with_script("test_skill", "unicode.py", script)
+  skill.resources.get_reference.side_effect = lambda n: (
+      "你好，世界" if n == "unicode.txt" else None
+  )
+  skill.resources.list_references.return_value = ["unicode.txt"]
+  toolset = _make_real_executor_toolset([skill])
+  tool = skill_toolset.RunSkillScriptTool(toolset)
+  ctx = _make_tool_context_with_agent()
+  result = await tool.run_async(
+      args={
+          "skill_name": "test_skill",
+          "file_path": "unicode.py",
+      },
+      tool_context=ctx,
+  )
+  assert "status" in result, f"Result missing status: {result}"
+  assert result["status"] == "success"
+  assert "你好，世界" in result["stdout"]
+
+
 @pytest.mark.asyncio
 async def test_integration_python_imports_sibling_script_module():
   """Real executor: Python scripts can import helpers from scripts/."""