Merge branch 'main' into fix/non-vertex-live-resumption

Author: rohityan

.github/workflows/check-file-contents.yml

@@ -19,6 +19,9 @@ on:
     paths:
       - '**.py'
 
+permissions:
+  contents: read
+
 jobs:
   check-file-contents:
     runs-on: ubuntu-latest

.github/workflows/discussion_answering.yml

@@ -6,6 +6,9 @@ on:
   discussion_comment:
     types: [created]
 
+permissions:
+  contents: read
+
 jobs:
   agent-answer-questions:
     if: >-

.github/workflows/mypy-new-errors.yml

@@ -7,6 +7,9 @@ on:
     branches: [ main ]
 
 
+permissions:
+  contents: read
+
 jobs:
   mypy-diff:
     runs-on: ubuntu-latest

.github/workflows/mypy.yml

@@ -3,6 +3,9 @@ name: Mypy Type Check
 on:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   mypy:
     runs-on: ubuntu-latest

.github/workflows/pre-commit.yml

@@ -28,6 +28,9 @@ on:
       - '.pre-commit-config.yaml'
       - 'pyproject.toml'
 
+permissions:
+  contents: read
+
 jobs:
   pre-commit:
     runs-on: ubuntu-latest

.github/workflows/python-unit-tests.yml

@@ -20,6 +20,9 @@ on:
   pull_request:
     branches: [ main ]
 
+permissions:
+  contents: read
+
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/upload-adk-docs-to-vertex-ai-search.yml

@@ -7,6 +7,9 @@ on:
   # Manual trigger for testing and fixing
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   upload-adk-docs-to-vertex-ai-search:
     if: github.repository == 'google/adk-python'

src/google/adk/models/google_llm.py

@@ -252,7 +252,8 @@ async def generate_content_async(
         aggregator = StreamingResponseAggregator()
         async with Aclosing(responses) as agen:
           async for response in agen:
-            logger.debug(_build_response_log(response))
+            if logger.isEnabledFor(logging.DEBUG):
+              logger.debug(_build_response_log(response))
             async with Aclosing(
                 aggregator.process_response(response)
             ) as aggregator_gen:
@@ -274,7 +275,8 @@ async def generate_content_async(
             config=llm_request.config,
         )
         logger.info('Response received from the model.')
-        logger.debug(_build_response_log(response))
+        if logger.isEnabledFor(logging.DEBUG):
+          logger.debug(_build_response_log(response))
 
         llm_response = LlmResponse.create(response)
         if cache_metadata:

src/google/adk/models/lite_llm.py

@@ -2224,7 +2224,8 @@ async def generate_content_async(
 
     self._maybe_append_user_content(llm_request)
     _append_fallback_user_content_if_missing(llm_request)
-    logger.debug(_build_request_log(llm_request))
+    if logger.isEnabledFor(logging.DEBUG):
+      logger.debug(_build_request_log(llm_request))
 
     effective_model = llm_request.model or self.model
     messages, tools, response_format, generation_params = (

tests/unittests/models/test_google_llm.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
 import os
 import sys
 from typing import Optional
@@ -2263,3 +2264,96 @@ async def __aexit__(self, *args):
       # Verify the final speech_config is still None
       assert config_arg.speech_config is None
       assert isinstance(connection, GeminiLlmConnection)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "log_level,should_call",
+    [
+        (logging.WARNING, False),
+        (logging.INFO, False),
+        (logging.DEBUG, True),
+    ],
+)
+async def test_generate_content_async_skips_response_log_build_above_debug(
+    gemini_llm,
+    llm_request,
+    generate_content_response,
+    log_level,
+    should_call,
+):
+  gemini_logger = logging.getLogger("google_adk.google.adk.models.google_llm")
+  original_level = gemini_logger.level
+  gemini_logger.setLevel(log_level)
+  try:
+    with mock.patch(
+        "google.adk.models.google_llm._build_response_log",
+        return_value="log",
+    ) as mock_build:
+      with mock.patch.object(gemini_llm, "api_client") as mock_client:
+
+        async def mock_coro():
+          return generate_content_response
+
+        mock_client.aio.models.generate_content.return_value = mock_coro()
+
+        async for _ in gemini_llm.generate_content_async(
+            llm_request, stream=False
+        ):
+          pass
+
+      assert mock_build.called is should_call
+  finally:
+    gemini_logger.setLevel(original_level)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "log_level,should_call",
+    [
+        (logging.WARNING, False),
+        (logging.INFO, False),
+        (logging.DEBUG, True),
+    ],
+)
+async def test_generate_content_async_stream_skips_response_log_build_above_debug(
+    gemini_llm, llm_request, log_level, should_call
+):
+  mock_responses = [
+      types.GenerateContentResponse(
+          candidates=[
+              types.Candidate(
+                  content=Content(
+                      role="model", parts=[Part.from_text(text="hi")]
+                  ),
+                  finish_reason=types.FinishReason.STOP,
+              )
+          ]
+      ),
+  ]
+
+  gemini_logger = logging.getLogger("google_adk.google.adk.models.google_llm")
+  original_level = gemini_logger.level
+  gemini_logger.setLevel(log_level)
+  try:
+    with mock.patch(
+        "google.adk.models.google_llm._build_response_log",
+        return_value="log",
+    ) as mock_build:
+      with mock.patch.object(gemini_llm, "api_client") as mock_client:
+
+        async def mock_coro():
+          return MockAsyncIterator(mock_responses)
+
+        mock_client.aio.models.generate_content_stream.return_value = (
+            mock_coro()
+        )
+
+        async for _ in gemini_llm.generate_content_async(
+            llm_request, stream=True
+        ):
+          pass
+
+      assert mock_build.called is should_call
+  finally:
+    gemini_logger.setLevel(original_level)