chore(functions): delete region tag and update sample for Python 3.9+ (#13240)

* chore(functions): update dependencies to support Python 3.13

* chore(functions): delete unneeded space and move function 'validate_message' for clearity

* chore(functions): fix unmatched quotes

Author: eapl-gemugami

functions/ocr/app/main.py

@@ -31,6 +31,29 @@
 project_id = os.environ["GCP_PROJECT"]
 # [END functions_ocr_setup]
 
+T = TypeVar("T")
+
+
+def validate_message(message: Dict[str, T], param: str) -> T:
+    """
+    Placeholder function for validating message parts.
+
+    Args:
+        message: message to be validated.
+        param: name of the message parameter to be validated.
+
+    Returns:
+        The value of message['param'] if it's valid. Throws ValueError
+        if it's not valid.
+    """
+    var = message.get(param)
+    if not var:
+        raise ValueError(
+            f"{param} is not provided. Make sure you have "
+            f"property {param} in the request"
+        )
+    return var
+
 
 # [START functions_ocr_detect]
 def detect_text(bucket: str, filename: str) -> None:
@@ -57,10 +80,12 @@ def detect_text(bucket: str, filename: str) -> None:
     )
     text_detection_response = vision_client.text_detection(image=image)
     annotations = text_detection_response.text_annotations
+
     if len(annotations) > 0:
         text = annotations[0].description
     else:
         text = ""
+
     print(f"Extracted text {text} from image ({len(text)} chars).")
 
     detect_language_response = translate_client.detect_language(text)
@@ -85,39 +110,8 @@ def detect_text(bucket: str, filename: str) -> None:
         futures.append(future)
     for future in futures:
         future.result()
-
-
 # [END functions_ocr_detect]
 
-T = TypeVar("T")
-
-
-# [START message_validatation_helper]
-def validate_message(message: Dict[str, T], param: str) -> T:
-    """
-    Placeholder function for validating message parts.
-
-    Args:
-        message: message to be validated.
-        param: name of the message parameter to be validated.
-
-    Returns:
-        The value of message['param'] if it's valid. Throws ValueError
-        if it's not valid.
-    """
-    var = message.get(param)
-    if not var:
-        raise ValueError(
-            "{} is not provided. Make sure you have \
-                          property {} in the request".format(
-                param, param
-            )
-        )
-    return var
-
-
-# [END message_validatation_helper]
-
 
 # [START functions_ocr_process]
 def process_image(file_info: dict, context: dict) -> None:
@@ -136,16 +130,13 @@ def process_image(file_info: dict, context: dict) -> None:
 
     detect_text(bucket, name)
 
-    print("File {} processed.".format(file_info["name"]))
-
-
+    print(f"File '{file_info['name']}' processed.")
 # [END functions_ocr_process]
 
 
 # [START functions_ocr_translate]
 def translate_text(event: dict, context: dict) -> None:
-    """
-    Cloud Function triggered by PubSub when a message is received from
+    """Cloud Function triggered by PubSub when a message is received from
     a subscription.
 
     Translates the text in the message from the specified source language
@@ -184,8 +175,6 @@ def translate_text(event: dict, context: dict) -> None:
     topic_path = publisher.topic_path(project_id, topic_name)
     future = publisher.publish(topic_path, data=encoded_message)
     future.result()
-
-
 # [END functions_ocr_translate]
 
 
@@ -224,6 +213,4 @@ def save_result(event: dict, context: dict) -> None:
     blob.upload_from_string(text)
 
     print("File saved.")
-
-
 # [END functions_ocr_save]

functions/ocr/app/noxfile_config.py

@@ -22,9 +22,7 @@
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
-    # google-cloud-translate==3.12.1 is incompatible with Python 12.
-    # Staying with 3.11 testing for now.
-    "ignored_versions": ["2.7", "3.7", "3.9", "3.10", "3.12", "3.13"],
+    "ignored_versions": ["2.7", "3.7", "3.8"],
     # Declare optional test sessions you want to opt-in. Currently we
     # have the following optional test sessions:
     #     'cloud_run' # Test session for Cloud Run application.

functions/ocr/app/requirements.txt

@@ -1,4 +1,4 @@
 google-cloud-pubsub==2.28.0
-google-cloud-storage==2.9.0
-google-cloud-translate==3.18.0
-google-cloud-vision==3.8.1
+google-cloud-storage==3.1.0
+google-cloud-translate==3.20.2
+google-cloud-vision==3.10.1