chore: upgrade dependencies and switch to us-east1 for brand-aligner-agent (#1744)

mohabfekry · happyhuman · web-flow · commit e194d3da57c6 · 2026-04-30T11:23:02.000-07:00
Co-authored-by: Shahin Saadati &lt;happyhuman@users.noreply.github.com&gt;
diff --git a/python/agents/brand-aligner/.env.template b/python/agents/brand-aligner/.env.template
@@ -1,5 +1,5 @@
 GOOGLE_CLOUD_PROJECT="your-project-id"
-GOOGLE_CLOUD_LOCATION="us-central1"
+GOOGLE_CLOUD_LOCATION="us-east1"
 GOOGLE_GENAI_USE_VERTEXAI=True
 
 GOOGLE_CLOUD_AGENT_ENGINE_ENABLE_TELEMETRY="true"
diff --git a/python/agents/brand-aligner/README.md b/python/agents/brand-aligner/README.md
@@ -148,5 +148,5 @@ The agent relies on the following key environment variables (defined in `.env`):
 * `MODEL_NAME`: The name of the generative model to use for agent reasoning and evaluation (for example, `gemini-2.5-flash`).
 * `GCS_BUCKET_NAME`: The GCS bucket for storing artifacts and processed files.
 * `PROJECT_ID`: The Google Cloud Project ID.
-* `LOCATION`: The Google Cloud region (for example, `us-central1`).
+* `LOCATION`: The Google Cloud region (for example, `us-east1`).
 * `AUTH_ID`, `OAUTH_CLIENT_ID`, `OAUTH_CLIENT_SECRET`: Authentication credentials for the OAuth2 flow (if running in standalone mode).
diff --git a/python/agents/brand-aligner/brand_aligner_agent/__init__.py b/python/agents/brand-aligner/brand_aligner_agent/__init__.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
+
 import google.auth
 from dotenv import load_dotenv
 
@@ -23,4 +24,4 @@
 os.environ.setdefault("GOOGLE_CLOUD_LOCATION", "global")
 os.environ.setdefault("GOOGLE_GENAI_USE_VERTEXAI", "True")
 
-from . import agent
+from . import agent  # noqa: E402
diff --git a/python/agents/brand-aligner/brand_aligner_agent/agent.py b/python/agents/brand-aligner/brand_aligner_agent/agent.py
@@ -27,7 +27,7 @@
 )
 from .utils import after_model_callback
 
-MODEL_NAME = os.getenv("MODEL_NAME")
+MODEL_NAME = os.getenv("MODEL_NAME", "gemini-2.5-flash")
 
 # --- AGENT DEFINITIONS ---
 
diff --git a/python/agents/brand-aligner/brand_aligner_agent/auth.py b/python/agents/brand-aligner/brand_aligner_agent/auth.py
@@ -35,29 +35,21 @@
 from .utils import logger
 
 # --- Environment Variables ---
-AUTH_ID = os.getenv("AUTH_ID")
-MODE = os.getenv("MODE")
-
-OAUTH_TOKEN_URI = os.getenv("OAUTH_TOKEN_URI")
-OAUTH_AUTH_URI_BASE = os.getenv("OAUTH_AUTH_URI_BASE")
-
-OAUTH_CLIENT_ID = os.getenv("OAUTH_CLIENT_ID")
-OAUTH_CLIENT_SECRET = os.getenv("OAUTH_CLIENT_SECRET")
-
-# --- Auth Initialization ---
-if not all(
-    [
-        AUTH_ID,
-        MODE,
-        OAUTH_CLIENT_ID,
-        OAUTH_CLIENT_SECRET,
-        OAUTH_TOKEN_URI,
-        OAUTH_AUTH_URI_BASE,
-    ]
-):
-    raise OSError(
-        "Required environment variables for auth are not set. Please set AUTH_ID, MODE, OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET, OAUTH_TOKEN_URI and OAUTH_AUTH_URI_BASE."
-    )
+AUTH_ID = os.getenv(
+    "AUTH_ID",
+    f"{os.getenv('GOOGLE_CLOUD_PROJECT')}-brand-aligner-agent-oauth-id",
+)
+MODE = os.getenv("MODE", "production")
+
+OAUTH_TOKEN_URI = os.getenv(
+    "OAUTH_TOKEN_URI", "https://oauth2.googleapis.com/token"
+)
+OAUTH_AUTH_URI_BASE = os.getenv(
+    "OAUTH_AUTH_URI_BASE", "https://accounts.google.com/o/oauth2/v2/auth"
+)
+
+OAUTH_CLIENT_ID = os.getenv("OAUTH_CLIENT_ID", "")
+OAUTH_CLIENT_SECRET = os.getenv("OAUTH_CLIENT_SECRET", "")
 
 # --- Auth Configuration - relevant only for ADK ---
 # --- Token retrieval is managed directly by Gemini Enterprise as part of agent registration ---
diff --git a/python/agents/brand-aligner/brand_aligner_agent/models.py b/python/agents/brand-aligner/brand_aligner_agent/models.py
@@ -20,7 +20,6 @@
 
 
 class Severity(StrEnum):
-
     BLOCKER = "BLOCKER"
     WARNING = "WARNING"
 
diff --git a/python/agents/brand-aligner/brand_aligner_agent/tools.py b/python/agents/brand-aligner/brand_aligner_agent/tools.py
@@ -38,23 +38,14 @@
 from .utils import generate_radar_chart, logger
 
 # --- Environment Variables ---
-PROJECT_ID = os.getenv("PROJECT_ID") or os.getenv("GOOGLE_CLOUD_PROJECT")
-LOCATION = os.getenv("LOCATION") or os.getenv("GOOGLE_CLOUD_LOCATION")
-MODEL_NAME = os.getenv("MODEL_NAME")
-GCS_BUCKET = os.getenv("GCS_BUCKET_NAME")
-
-# --- Service Initialization ---
-if not all(
-    [
-        PROJECT_ID,
-        LOCATION,
-        MODEL_NAME,
-        GCS_BUCKET,
-    ]
-):
-    raise OSError(
-        "Required environment variables for services are not set. Please set PROJECT_ID, LOCATION, MODEL_NAME and GCS_BUCKET."
-    )
+PROJECT_ID = os.getenv("PROJECT_ID", os.getenv("GOOGLE_CLOUD_PROJECT"))
+LOCATION = os.getenv("LOCATION", os.getenv("GOOGLE_CLOUD_LOCATION"))
+MODEL_NAME = os.getenv("MODEL_NAME", "gemini-2.5-flash")
+GCS_BUCKET = os.getenv(
+    "GCS_BUCKET_NAME",
+    f"{os.getenv('GOOGLE_CLOUD_PROJECT')}-brandaligner-agent-assets",
+)
+
 guideline_service = GuidelineService(
     project_id=PROJECT_ID, location=LOCATION, model_name=MODEL_NAME
 )
diff --git a/python/agents/brand-aligner/brand_aligner_agent/utils.py b/python/agents/brand-aligner/brand_aligner_agent/utils.py
@@ -32,9 +32,9 @@
 matplotlib.use("Agg")
 
 # --- Environment Variables ---
-PROJECT_ID = os.getenv("PROJECT_ID") or os.getenv("GOOGLE_CLOUD_PROJECT")
-LOCATION = os.getenv("LOCATION") or os.getenv("GOOGLE_CLOUD_LOCATION")
-MODEL_NAME = os.getenv("MODEL_NAME")
+PROJECT_ID = os.getenv("PROJECT_ID", os.getenv("GOOGLE_CLOUD_PROJECT"))
+LOCATION = os.getenv("LOCATION", os.getenv("GOOGLE_CLOUD_LOCATION"))
+MODEL_NAME = os.getenv("MODEL_NAME", "gemini-2.5-flash")
 
 RADAR_CHART_GROUPING_PROMPT = """
 You are a data visualization expert. You are given a list of several criterion categories extracted from brand guidelines.
diff --git a/python/agents/brand-aligner/deployment/deploy.py b/python/agents/brand-aligner/deployment/deploy.py
@@ -61,18 +61,18 @@
     ],
     "requirements": [
         "cloudpickle>=3.1.2",
-        "fastapi>=0.121.0",
-        "google-adk==1.16.0",
-        "google-api-python-client>=2.187.0",
-        "google-auth>=2.43.0",
-        "google-auth-oauthlib>=1.2.2",
-        "google-cloud-aiplatform[adk,agent-engines,evaluation]==1.126.1",
-        "google-cloud-storage<=3.5.0,>=2.9.1",
-        "google-genai==1.49.0",
-        "matplotlib>=3.10.7",
-        "numpy>=2.3.2",
-        "pandas>=2.3.2",
-        "pydantic==2.12.4",
+        "fastapi>=0.136.1",
+        "google-adk==1.31.1",
+        "google-api-python-client>=2.194.0",
+        "google-auth>=2.49.2",
+        "google-auth-oauthlib>=1.3.1",
+        "google-cloud-aiplatform[adk,agent-engines,evaluation]>=1.148.0,<2.0.0",
+        "google-cloud-storage==3.10.1",
+        "google-genai>=1.73.0",
+        "matplotlib>=3.10.9",
+        "numpy>=2.4.4",
+        "pandas>=3.0.2",
+        "pydantic==2.13.3",
     ],
     "env_vars": {
         "PROJECT_ID": PROJECT_ID,
diff --git a/python/agents/brand-aligner/pyproject.toml b/python/agents/brand-aligner/pyproject.toml
@@ -5,19 +5,19 @@ description = "Brand Aligner Agent"
 authors = [{ name = "Mohab Fekry", email = "mfekry@google.com" }]
 license = {text = "Apache License 2.0"}
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 dependencies = [
-  "fastapi>=0.121.0",
-  "google-adk==1.17.0",
-  "google-api-python-client>=2.187.0",
-  "google-auth>=2.43.0",
-  "google-auth-oauthlib>=1.2.2",
-  "google-cloud-aiplatform[adk,agent-engines,evaluation]<=1.126.1,>1.118.0",
-  "google-cloud-storage<=3.5.0,>=2.9.1",
-  "google-genai>=1.49.0",
-  "matplotlib>=3.10.7",
-  "numpy>=2.3.2",
-  "pandas>=2.3.2",
+  "fastapi>=0.136.1",
+  "google-adk==1.31.1",
+  "google-api-python-client>=2.194.0",
+  "google-auth>=2.49.2",
+  "google-auth-oauthlib>=1.3.1",
+  "google-cloud-aiplatform[adk,agent-engines,evaluation]>=1.148.0,<2.0.0",
+  "google-cloud-storage==3.10.1",
+  "google-genai>=1.73.0",
+  "matplotlib>=3.10.9",
+  "numpy>=2.4.4",
+  "pandas>=3.0.2",
 ]
 
 [dependency-groups]
@@ -91,4 +91,4 @@ agent_directory = "brand_aligner_agent"
 
 [[tool.uv.index]]
 url = "https://pypi.org/simple"
-default = true
+default = true
diff --git a/python/agents/brand-aligner/tests/__init__.py b/python/agents/brand-aligner/tests/__init__.py
diff --git a/python/agents/brand-aligner/tests/integration/test_agent.py b/python/agents/brand-aligner/tests/integration/test_agent.py
@@ -0,0 +1,66 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.adk.agents.run_config import RunConfig, StreamingMode
+from google.adk.artifacts import InMemoryArtifactService
+from google.adk.runners import Runner
+from google.adk.sessions import InMemorySessionService
+from google.genai import types
+
+from brand_aligner_agent.agent import root_agent
+
+
+def test_agent_stream() -> None:
+    """
+    Integration test for the agent stream functionality.
+    Tests that the agent returns valid streaming responses.
+    """
+
+    session_service = InMemorySessionService()
+    artifact_service = InMemoryArtifactService()
+
+    session = session_service.create_session_sync(
+        user_id="test_user", app_name="test"
+    )
+    runner = Runner(
+        agent=root_agent,
+        session_service=session_service,
+        app_name="test",
+        artifact_service=artifact_service,
+    )
+
+    message = types.Content(
+        role="user", parts=[types.Part.from_text(text="Hi!")]
+    )
+
+    events = list(
+        runner.run(
+            new_message=message,
+            user_id="test_user",
+            session_id=session.id,
+            run_config=RunConfig(streaming_mode=StreamingMode.SSE),
+        )
+    )
+    assert len(events) > 0, "Expected at least one message"
+
+    has_text_content = False
+    for event in events:
+        if (
+            event.content
+            and event.content.parts
+            and any(part.text for part in event.content.parts)
+        ):
+            has_text_content = True
+            break
+    assert has_text_content, "Expected at least one message with text content"
diff --git a/python/agents/brand-aligner/tests/unit/test_services.py b/python/agents/brand-aligner/tests/unit/test_services.py
diff --git a/python/agents/brand-aligner/tests/unit/test_tools.py b/python/agents/brand-aligner/tests/unit/test_tools.py
diff --git a/python/agents/brand-aligner/tests/unit/test_utils.py b/python/agents/brand-aligner/tests/unit/test_utils.py
diff --git a/python/agents/brand-aligner/uv.lock b/python/agents/brand-aligner/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`)`
`28`	`28`	`from .utils import after_model_callback`
`29`	`29`
`30`		`-MODEL_NAME = os.getenv("MODEL_NAME")`
	`30`	`+MODEL_NAME = os.getenv("MODEL_NAME", "gemini-2.5-flash")`
`31`	`31`
`32`	`32`	`# --- AGENT DEFINITIONS ---`
`33`	`33`