Merge branch 'main' into documentai-training-samples

Author: holtskinner

appengine/standard_python3/bundled-services/blobstore/django/main_test.py

@@ -65,6 +65,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/")
 
     yield project_id, version_id
 

appengine/standard_python3/bundled-services/blobstore/flask/main_test.py

@@ -65,6 +65,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/")
 
     yield project_id, version_id
 

appengine/standard_python3/bundled-services/blobstore/wsgi/main_test.py

@@ -15,7 +15,6 @@
 import json
 import re
 import subprocess
-import time
 import uuid
 
 import backoff
@@ -66,8 +65,16 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/")
 
-    time.sleep(10)      # There may be a short delay before responsive
     yield project_id, version_id
 
     gcloud_cli(f"app versions delete {version_id}")

appengine/standard_python3/bundled-services/deferred/django/main_test.py

@@ -65,6 +65,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/counter/get")
 
     yield project_id, version_id
 

appengine/standard_python3/bundled-services/deferred/flask/main_test.py

@@ -65,6 +65,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/counter/get")
 
     yield project_id, version_id
 

appengine/standard_python3/bundled-services/deferred/wsgi/main_test.py

@@ -65,6 +65,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/counter/get")
 
     yield project_id, version_id
 

appengine/standard_python3/bundled-services/mail/django/main_test.py

@@ -65,6 +65,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/")
 
     yield project_id, version_id
 

appengine/standard_python3/bundled-services/mail/flask/main_test.py

@@ -64,6 +64,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/")
 
     yield project_id, version_id
 

appengine/standard_python3/bundled-services/mail/wsgi/main_test.py

@@ -65,6 +65,15 @@ def version():
     result = gcloud_cli(f"app deploy --no-promote --version={uuid.uuid4().hex}")
     version_id = result["versions"][0]["id"]
     project_id = result["versions"][0]["project"]
+    version_hostname = f"{version_id}-dot-{project_id}.appspot.com"
+
+    # Wait for app to initialize
+    @backoff.on_exception(backoff.expo, requests.exceptions.HTTPError, max_tries=3)
+    def wait_for_app(url):
+        r = requests.get(url)
+        r.raise_for_status()
+
+    wait_for_app(f"https://{version_hostname}/")
 
     yield project_id, version_id
 

composer/workflows/requirements.txt

@@ -2,7 +2,7 @@
 # see https://airflow.apache.org/docs/apache-airflow/stable/installation/installing-from-pypi.html#constraints-files
 apache-airflow==2.3.3
 apache-airflow-providers-apache-beam==4.1.0
-apache-airflow-providers-cncf-kubernetes==5.1.0
+apache-airflow-providers-cncf-kubernetes==5.0.0
 apache-airflow-providers-google==8.3.0
 scipy==1.8.1; python_version > '3.0'
 apache-airflow-providers-amazon==4.0.0

functions/http/main.py

@@ -21,6 +21,17 @@
 import tempfile
 # [END functions_http_form_data]
 
+# [START functions_http_cors]
+# [START functions_http_cors_auth]
+# [START functions_http_xml]
+# [START functions_http_form_data]
+import functions_framework
+
+# [END functions_http_form_data]
+# [END functions_http_xml]
+# [END functions_http_cors_auth]
+# [END functions_http_cors]
+
 # [START functions_http_form_data]
 from werkzeug.utils import secure_filename
 # [END functions_http_form_data]
@@ -31,7 +42,7 @@
 
 
 # [START functions_http_xml]
-
+@functions_framework.http
 def parse_xml(request):
     """ Parses a document of type 'text/xml'
     Args:
@@ -56,6 +67,7 @@ def get_file_path(filename):
     return os.path.join(tempfile.gettempdir(), file_name)
 
 
+@functions_framework.http
 def parse_multipart(request):
     """ Parses a 'multipart/form-data' upload request
     Args:
@@ -92,6 +104,7 @@ def parse_multipart(request):
 
 
 # [START functions_http_cors]
+@functions_framework.http
 def cors_enabled_function(request):
     # For more information about CORS and CORS preflight requests, see:
     # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
@@ -119,6 +132,7 @@ def cors_enabled_function(request):
 
 
 # [START functions_http_cors_auth]
+@functions_framework.http
 def cors_enabled_function_auth(request):
     # For more information about CORS and CORS preflight requests, see
     # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request

functions/http/requirements.txt

@@ -1,3 +1,4 @@
+functions-framework==3.3.0
 google-cloud-storage==2.0.0; python_version < '3.7'
 google-cloud-storage==2.1.0; python_version > '3.6'
 xmltodict==0.13.0

retail/interactive-tutorials/README.md

@@ -1,6 +1,6 @@
-#Retail Search Interactive Tutorials
+# Retail Search Interactive Tutorials
 
-##Run tutorials in Cloud Shell
+## Run tutorials in Cloud Shell
 
 To advance with the interactive tutorials, use Retail Search step-by-step manuals on the right side of the Cloud Shell IDE: 
 ![Interactive tutorials](images/tutorial1.png)
@@ -185,4 +185,4 @@ python product/import_products_gcs.py
 Run the sample in a terminal with the following command:
 ```bash
 python search/search_with_boost_spec.py
-```
+```