Fix issues 8253, 12325, 11942, 11566, 12580, 14117

AUTHORING_GUIDE.md

@@ -27,8 +27,8 @@ as covered below.
 
 We recommend referencing the following samples and sample tests:
 
-* [Storage client
-   samples](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/storage/cloud-client)
+* [BigQuery client
+   samples](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/bigquery/cloud-client)
 
 ### Where should I put my samples?
 

cloud-sql/mysql/sqlalchemy/connect_tcp.py

@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# TODO (https://github.com/GoogleCloudPlatform/python-docs-samples/issues/8253): remove old region tags
 # [START cloud_sql_mysql_sqlalchemy_connect_tcp]
-# [START cloud_sql_mysql_sqlalchemy_sslcerts]
 # [START cloud_sql_mysql_sqlalchemy_connect_tcp_sslcerts]
 import os
 
@@ -94,5 +92,4 @@ def connect_tcp_socket() -> sqlalchemy.engine.base.Engine:
 
 
 # [END cloud_sql_mysql_sqlalchemy_connect_tcp_sslcerts]
-# [END cloud_sql_mysql_sqlalchemy_sslcerts]
 # [END cloud_sql_mysql_sqlalchemy_connect_tcp]

cloud-sql/postgres/sqlalchemy/connect_tcp.py

@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# TODO (https://github.com/GoogleCloudPlatform/python-docs-samples/issues/8253): remove old region tags
 # [START cloud_sql_postgres_sqlalchemy_connect_tcp]
-# [START cloud_sql_postgres_sqlalchemy_sslcerts]
 # [START cloud_sql_postgres_sqlalchemy_connect_tcp_sslcerts]
 import os
 import ssl
@@ -98,5 +96,4 @@ def connect_tcp_socket() -> sqlalchemy.engine.base.Engine:
 
 
 # [END cloud_sql_postgres_sqlalchemy_connect_tcp_sslcerts]
-# [END cloud_sql_postgres_sqlalchemy_sslcerts]
 # [END cloud_sql_postgres_sqlalchemy_connect_tcp]

cloud-sql/sql-server/sqlalchemy/connect_tcp.py

@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# TODO (https://github.com/GoogleCloudPlatform/python-docs-samples/issues/8253): remove old region tags
 # [START cloud_sql_sqlserver_sqlalchemy_connect_tcp]
-# [START cloud_sql_sqlserver_sqlalchemy_sslcerts]
 # [START cloud_sql_sqlserver_sqlalchemy_connect_tcp_sslcerts]
 import os
 
@@ -100,5 +98,4 @@ def connect_tcp_socket() -> sqlalchemy.engine.base.Engine:
 
 
 # [END cloud_sql_sqlserver_sqlalchemy_connect_tcp_sslcerts]
-# [END cloud_sql_sqlserver_sqlalchemy_sslcerts]
 # [END cloud_sql_sqlserver_sqlalchemy_connect_tcp]

composer/tools/composer_dags.py

@@ -32,8 +32,13 @@
 class DAG:
     """Provides necessary utils for Composer DAGs."""
 
+    # The Composer portion of the image version (e.g. "2.9.1" or just "3") and
+    # the Airflow patch number (e.g. the trailing ".3" in "2.9.3") are both
+    # optional in some image version strings, such as "composer-3-airflow-2.10"
+    # or "composer-2.9.1-airflow-2.9". Both are matched as optional groups so
+    # the regex still matches those versions instead of returning None.
     COMPOSER_AF_VERSION_RE = re.compile(
-        "composer-(\d+)(?:\.(\d+)\.(\d+))?.*?-airflow-(\d+)\.(\d+)\.(\d+)"
+        r"composer-(\d+)(?:\.(\d+)\.(\d+))?.*?-airflow-(\d+)\.(\d+)(?:\.(\d+))?"
     )
 
     @staticmethod
@@ -162,14 +167,17 @@ def main(
         location=location,
         sdk_endpoint=sdk_endpoint,
     )
-    versions = DAG.COMPOSER_AF_VERSION_RE.match(
-        environment_info["config"]["softwareConfig"]["imageVersion"]
-    ).groups()
-    logger.info(
-        "Image version: %s",
-        environment_info["config"]["softwareConfig"]["imageVersion"],
-    )
-    airflow_version = (int(versions[3]), int(versions[4]), int(versions[5]))
+    image_version = environment_info["config"]["softwareConfig"]["imageVersion"]
+    version_match = DAG.COMPOSER_AF_VERSION_RE.match(image_version)
+    if not version_match:
+        raise ValueError(
+            f"Could not parse Airflow version out of image version: {image_version!r}"
+        )
+    versions = version_match.groups()
+    logger.info("Image version: %s", image_version)
+    # The Airflow patch number is optional in the image version string, so it
+    # may be None; default it to 0 in that case (e.g. "2.9" -> (2, 9, 0)).
+    airflow_version = (int(versions[3]), int(versions[4]), int(versions[5] or 0))
     list_of_dags = DAG.get_list_of_dags(
         project_name=project_name,
         environment=environment,

eventarc/storage_handler/Dockerfile

@@ -0,0 +1,38 @@
+# Copyright 2020 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.
+
+# Use the official Python image.
+# https://hub.docker.com/_/python
+FROM python:3.14-slim
+
+# Allow statements and log messages to immediately appear in the Cloud Run logs
+ENV PYTHONUNBUFFERED True
+
+# Copy application dependency manifests to the container image.
+# Copying this separately prevents re-running pip install on every code change.
+COPY requirements.txt ./
+
+# Install production dependencies.
+RUN pip install -r requirements.txt
+
+# Copy local code to the container image.
+ENV APP_HOME /app
+WORKDIR $APP_HOME
+COPY . ./
+
+# Run the web service on container startup.
+# Use gunicorn webserver with one worker process and 8 threads.
+# For environments with multiple CPU cores, increase the number of workers
+# to be equal to the cores available.
+CMD exec gunicorn --bind :$PORT --workers 1 --threads 8 --timeout 0 main:app

generative_ai/chat_completions/chat_completions_credentials_refresher.py

@@ -55,7 +55,7 @@ def generate_text(project_id: str, location: str = "us-central1") -> object:
     )
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=[{"role": "user", "content": "Why is the sky blue?"}],
     )
 

generative_ai/chat_completions/chat_completions_function_calling_basic.py

@@ -68,7 +68,7 @@ def generate_text() -> object:
     messages.append({"role": "user", "content": "What is the weather in Boston?"})
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=messages,
         tools=tools,
     )

generative_ai/chat_completions/chat_completions_function_calling_config.py

@@ -68,7 +68,7 @@ def generate_text() -> object:
     messages.append({"role": "user", "content": "What is the weather in Boston, MA?"})
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=messages,
         tools=tools,
         tool_choice="auto",

generative_ai/chat_completions/chat_completions_non_streaming_image.py

@@ -36,7 +36,7 @@ def generate_text(project_id: str, location: str = "us-central1") -> object:
     )
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=[
             {
                 "role": "user",

generative_ai/chat_completions/chat_completions_non_streaming_text.py

@@ -35,7 +35,7 @@ def generate_text(project_id: str, location: str = "us-central1") -> object:
     )
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=[{"role": "user", "content": "Why is the sky blue?"}],
     )
 

generative_ai/chat_completions/chat_completions_streaming_image.py

@@ -35,7 +35,7 @@ def generate_text(project_id: str, location: str = "us-central1") -> object:
     )
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=[
             {
                 "role": "user",

generative_ai/chat_completions/chat_completions_streaming_text.py

@@ -35,7 +35,7 @@ def generate_text(project_id: str, location: str = "us-central1") -> object:
     )
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=[{"role": "user", "content": "Why is the sky blue?"}],
         stream=True,
     )

generative_ai/function_calling/chat_function_calling_basic.py

@@ -71,7 +71,7 @@ def generate_text() -> object:
     messages.append({"role": "user", "content": "What is the weather in Boston?"})
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=messages,
         tools=tools,
     )

generative_ai/function_calling/chat_function_calling_config.py

@@ -71,7 +71,7 @@ def generate_text() -> object:
     messages.append({"role": "user", "content": "What is the weather in Boston, MA?"})
 
     response = client.chat.completions.create(
-        model="google/gemini-2.0-flash-001",
+        model="google/gemini-2.5-flash",
         messages=messages,
         tools=tools,
         tool_choice="auto",

generative_ai/prompts/prompt_create.py

@@ -39,7 +39,7 @@ def prompt_create() -> Prompt:
             {"movie1": "The Lion King", "movie2": "Frozen"},
             {"movie1": "Inception", "movie2": "Interstellar"},
         ],
-        model_name="gemini-2.0-flash-001",
+        model_name="gemini-2.5-flash",
         system_instruction="You are a movie critic. Answer in a short sentence.",
         # generation_config=GenerationConfig, # Optional,
         # safety_settings=SafetySetting, # Optional,

generative_ai/prompts/prompt_delete.py

@@ -35,7 +35,7 @@ def delete_prompt() -> None:
             {"movie1": "The Lion King", "movie2": "Frozen"},
             {"movie1": "Inception", "movie2": "Interstellar"},
         ],
-        model_name="gemini-2.0-flash-001",
+        model_name="gemini-2.5-flash",
         system_instruction="You are a movie critic. Answer in a short sentence.",
 
     )

generative_ai/prompts/prompt_get.py

@@ -33,7 +33,7 @@ def get_prompt() -> Prompt:
     prompt = Prompt(
         prompt_name="meteorologist",
         prompt_data="How should I dress for weather in August?",
-        model_name="gemini-2.0-flash-001",
+        model_name="gemini-2.5-flash",
         system_instruction="You are a meteorologist. Answer in a short sentence.",
 
     )

generative_ai/prompts/prompt_list_version.py

@@ -32,7 +32,7 @@ def list_prompt_version() -> list:
     prompt = Prompt(
         prompt_name="zoologist",
         prompt_data="Which animal is the fastest on earth?",
-        model_name="gemini-2.0-flash-001",
+        model_name="gemini-2.5-flash",
         system_instruction="You are a zoologist. Answer in a short sentence.",
     )
     # Save Prompt to online resource.

generative_ai/prompts/prompt_restore_version.py

@@ -32,7 +32,7 @@
 #     prompt = Prompt(
 #         prompt_name="zoologist",
 #         prompt_data="Which animal is the fastest on earth?",
-#         model_name="gemini-2.0-flash-001",
+#         model_name="gemini-2.5-flash",
 #         system_instruction="You are a zoologist. Answer in a short sentence.",
 #     )
 #     # Save Prompt to online resource.

generative_ai/prompts/prompt_template.py

@@ -38,7 +38,7 @@ def prompt_template_example() -> list[GenerationResponse]:
     # define prompt template
     prompt = Prompt(
         prompt_data="Do {animal} {activity}?",
-        model_name="gemini-2.0-flash-001",
+        model_name="gemini-2.5-flash",
         variables=variables,
         system_instruction="You are a helpful zoologist"
         # generation_config=generation_config, # Optional

generative_ai/prompts/test_resources/sample_configuration.json

@@ -2,7 +2,7 @@
 "project": "$PROJECT_ID",
 "system_instruction_path": "gs://$CLOUD_BUCKET/sample_system_instruction.txt",
 "prompt_template_path": "gs://$CLOUD_BUCKET/sample_prompt_template.txt",
-"target_model": "gemini-2.0-flash-001",
+"target_model": "gemini-2.5-flash",
 "eval_metrics_types": ["safety"],
 "optimization_mode": "instruction",
 "input_data_path": "gs://$CLOUD_BUCKET/sample_prompts.jsonl",

logging/cloud-client/requirements.txt

@@ -0,0 +1 @@
+google-cloud-logging>=3.4.0