Merge branch 'main' into feat/firestore

Author: ScottMansfield

src/google/adk/cli/cli_create.py

@@ -378,6 +378,27 @@ def _handle_login_with_google() -> (
             f"Express Mode project created: {project_id}",
             fg="green",
         )
+        current_proj = _get_gcp_project_from_gcloud()
+        if current_proj and current_proj != project_id:
+          click.secho(
+              "Warning: Your default gcloud project is set to"
+              f" '{current_proj}'. This might conflict with or override your"
+              f" Express Mode project '{project_id}'. We recommend"
+              " unsetting it.",
+              fg="yellow",
+          )
+          if click.confirm("Run 'gcloud config unset project'?", default=True):
+            try:
+              subprocess.run(
+                  ["gcloud", "config", "unset", "project"],
+                  check=True,
+                  capture_output=True,
+              )
+              click.secho("Unset default gcloud project.", fg="green")
+            except Exception:
+              click.secho(
+                  "Failed to unset project. Please do it manually.", fg="red"
+              )
         return api_key, project_id, region
 
     click.secho(_NOT_ELIGIBLE_MSG, fg="red")

src/google/adk/features/_feature_registry.py

@@ -99,10 +99,10 @@ class FeatureConfig:
         FeatureStage.EXPERIMENTAL, default_on=True
     ),
     FeatureName.BIG_QUERY_TOOLSET: FeatureConfig(
-        FeatureStage.EXPERIMENTAL, default_on=True
+        FeatureStage.STABLE, default_on=True
     ),
     FeatureName.BIG_QUERY_TOOL_CONFIG: FeatureConfig(
-        FeatureStage.EXPERIMENTAL, default_on=True
+        FeatureStage.STABLE, default_on=True
     ),
     FeatureName.BIGTABLE_TOOL_SETTINGS: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True

src/google/adk/models/gemma_llm.py

@@ -163,8 +163,8 @@ class GemmaFunctionCallModel(BaseModel):
 class Gemma(GemmaFunctionCallingMixin, Gemini):
   """Integration for Gemma models exposed via the Gemini API.
 
-  Only Gemma 3 models are supported at this time. For agentic use cases,
-  use of gemma-3-27b-it and gemma-3-12b-it are strongly recommended.
+  For agentic use cases, use of gemma-3-27b-it, gemma-3-12b-it, and
+  gemma-4-31b-it are strongly recommended.
 
   For full documentation, see: https://ai.google.dev/gemma/docs/core/
 
@@ -205,7 +205,7 @@ def supported_models(cls) -> list[str]:
     """
 
     return [
-        r'gemma-3.*',
+        r'gemma-.*',
     ]
 
   @cached_property

src/google/adk/tools/bigquery/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""BigQuery Tools (Experimental).
+"""BigQuery Tools.
 
 BigQuery Tools under this module are hand crafted and customized while the tools
 under google.adk.tools.google_api_tool are auto generated based on API

src/google/adk/tools/bigquery/bigquery_credentials.py

@@ -14,7 +14,6 @@
 
 from __future__ import annotations
 
-from ...features import experimental
 from ...features import FeatureName
 from .._google_credentials import BaseGoogleCredentialsConfig
 
@@ -26,9 +25,8 @@
 BIGQUERY_DEFAULT_SCOPE = ["https://www.googleapis.com/auth/bigquery"]
 
 
-@experimental(FeatureName.GOOGLE_CREDENTIALS_CONFIG)
 class BigQueryCredentialsConfig(BaseGoogleCredentialsConfig):
-  """BigQuery Credentials Configuration for Google API tools (Experimental).
+  """BigQuery Credentials Configuration for Google API tools.
 
   Please do not use this in production, as it may be deprecated later.
   """

src/google/adk/tools/bigquery/bigquery_toolset.py

@@ -25,7 +25,6 @@
 from . import metadata_tool
 from . import query_tool
 from . import search_tool
-from ...features import experimental
 from ...features import FeatureName
 from ...tools.base_tool import BaseTool
 from ...tools.base_toolset import BaseToolset
@@ -35,7 +34,6 @@
 from .config import BigQueryToolConfig
 
 
-@experimental(FeatureName.BIG_QUERY_TOOLSET)
 class BigQueryToolset(BaseToolset):
   """BigQuery Toolset contains tools for interacting with BigQuery data and metadata."""
 

src/google/adk/tools/bigquery/config.py

@@ -21,7 +21,6 @@
 from pydantic import ConfigDict
 from pydantic import field_validator
 
-from ...features import experimental
 from ...features import FeatureName
 
 
@@ -48,7 +47,6 @@ class WriteMode(Enum):
   """All write operations are allowed."""
 
 
-@experimental(FeatureName.BIG_QUERY_TOOL_CONFIG)
 class BigQueryToolConfig(BaseModel):
   """Configuration for BigQuery tools."""
 

tests/unittests/cli/utils/test_cli_create.py

@@ -417,6 +417,52 @@ def test_handle_login_with_google_option_2(
   assert region == "us-central1"
 
 
+def test_handle_login_with_google_option_2_unset_project(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+  """User selects 2, goes through express sign up, and unsets existing gcloud project."""
+  monkeypatch.setattr(gcp_utils, "check_adc", lambda: True)
+  monkeypatch.setattr(gcp_utils, "retrieve_express_project", lambda: None)
+  monkeypatch.setattr(gcp_utils, "list_gcp_projects", lambda limit: [])
+  monkeypatch.setattr(gcp_utils, "check_express_eligibility", lambda: True)
+
+  confirms = iter([True, True])
+  monkeypatch.setattr(click, "confirm", lambda *a, **k: next(confirms))
+
+  prompts = iter(["2", "1"])
+  monkeypatch.setattr(click, "prompt", lambda *a, **k: next(prompts))
+
+  monkeypatch.setattr(
+      gcp_utils,
+      "sign_up_express",
+      lambda location="us-central1": {
+          "api_key": "new-key",
+          "project_id": "new-proj",
+          "region": location,
+      },
+  )
+
+  monkeypatch.setattr(
+      cli_create, "_get_gcp_project_from_gcloud", lambda: "old-proj"
+  )
+
+  called = {}
+
+  def fake_run(cmd, **kwargs):
+    if cmd == ["gcloud", "config", "unset", "project"]:
+      called["unset"] = True
+      return subprocess.CompletedProcess(args=cmd, returncode=0)
+    raise ValueError(f"Unexpected command: {cmd}")
+
+  monkeypatch.setattr(subprocess, "run", fake_run)
+
+  api_key, proj, region = cli_create._handle_login_with_google()
+  assert api_key == "new-key"
+  assert proj == "new-proj"
+  assert region == "us-central1"
+  assert called.get("unset") is True
+
+
 def test_handle_login_with_google_option_3(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:

tests/unittests/models/test_gemma_llm.py

@@ -87,6 +87,16 @@ def llm_request_with_tools():
   )
 
 
+def test_supported_models_matches_gemma4():
+  """Gemma 4 model strings must resolve to the Gemma class via the registry."""
+  assert models.LLMRegistry.resolve("gemma-4-31b-it") is Gemma
+
+
+def test_supported_models_matches_gemma3():
+  """Gemma 3 model strings must continue to resolve to the Gemma class."""
+  assert models.LLMRegistry.resolve("gemma-3-27b-it") is Gemma
+
+
 @pytest.mark.asyncio
 async def test_not_gemma_model():
   llm = Gemma()

tests/unittests/tools/bigquery/test_bigquery_tool_config.py

@@ -27,14 +27,6 @@ def reset_warned_features():
   _WARNED_FEATURES.clear()
 
 
-def test_bigquery_tool_config_experimental_warning():
-  """Test BigQueryToolConfig experimental warning."""
-  with warnings.catch_warnings(record=True) as w:
-    BigQueryToolConfig()
-    assert len(w) == 1
-    assert "BIG_QUERY_TOOL_CONFIG is enabled." in str(w[0].message)
-
-
 def test_bigquery_tool_config_invalid_property():
   """Test BigQueryToolConfig raises exception when setting invalid property."""
   with pytest.raises(