Merge branch 'main' into langchain-vertexai

Author: glasnt

.kokoro/docker/cloudbuild.yaml

@@ -22,3 +22,6 @@ steps:
       args: ['tag', 'gcr.io/$PROJECT_ID/python-samples-testing-docker', 'gcr.io/$PROJECT_ID/python-samples-testing-docker:$SHORT_SHA']
 images:
      - 'gcr.io/$PROJECT_ID/python-samples-testing-docker'
+
+options:
+  logging: CLOUD_LOGGING_ONLY

appengine/flexible/scipy/requirements.txt

@@ -7,4 +7,4 @@ numpy==1.26.4; python_version == '3.9'
 numpy==1.24.4; python_version == '3.8'
 pillow==10.3.0
 scipy==1.10.1; python_version <= '3.9'
-scipy==1.14.0; python_version > '3.9'
+scipy==1.14.1; python_version > '3.9'

appengine/flexible_python37_and_earlier/scipy/requirements.txt

@@ -7,5 +7,5 @@ numpy==1.26.4; python_version == '3.9'
 numpy==1.24.4; python_version == '3.8'
 numpy==1.21.6; python_version == '3.7'
 pillow==10.3.0
-scipy==1.14.0
+scipy==1.14.1
 Werkzeug==3.0.3

appengine/standard/images/api/blobstore.py

@@ -18,8 +18,8 @@
 For more information, see README.md.
 """
 
-# [START all]
-# [START thumbnailer]
+# [START gae_images_api_blobstore]
+# [START gae_images_api_blobstore_thumbnailer]
 from google.appengine.api import images
 from google.appengine.ext import blobstore
 
@@ -47,7 +47,7 @@ def get(self):
         self.error(404)
 
 
-# [END thumbnailer]
+# [END gae_images_api_blobstore_thumbnailer]
 
 
 class ServingUrlRedirect(webapp2.RequestHandler):
@@ -73,4 +73,4 @@ def get(self):
 app = webapp2.WSGIApplication(
     [("/img", Thumbnailer), ("/redirect", ServingUrlRedirect)], debug=True
 )
-# [END all]
+# [END gae_images_api_blobstore]

appengine/standard/images/api/main.py

@@ -18,8 +18,8 @@
 For more information, see README.md.
 """
 
-# [START all]
-# [START thumbnailer]
+# [START gae_images_api_ndb]
+# [START gae_images_api_ndb_thumbnailer]
 from google.appengine.api import images
 from google.appengine.ext import ndb
 
@@ -51,8 +51,8 @@ def get(self):
         self.error(404)
 
 
-# [END thumbnailer]
+# [END gae_images_api_ndb_thumbnailer]
 
 
 app = webapp2.WSGIApplication([("/img", Thumbnailer)], debug=True)
-# [END all]
+# [END gae_images_api_ndb]

appengine/standard/mail/app.yaml

@@ -16,11 +16,11 @@ runtime: python27
 api_version: 1
 threadsafe: yes
 
-# [START mail_service]
+# [START gae_mail_service_yaml_python]
 inbound_services:
 - mail
 - mail_bounce # Handle bounced mail notifications
-# [END mail_service]
+# [END gae_mail_service_yaml_python]
 
 handlers:
 - url: /user/.+
@@ -29,12 +29,12 @@ handlers:
   script: send_mail.app
 - url: /send_message
   script: send_message.app
-# [START handle_incoming_email]
+# [START gae_handle_incoming_email_yaml_python]
 - url: /_ah/mail/.+
   script: handle_incoming_email.app
   login: admin
-# [END handle_incoming_email]
-# [START handle_all_email]
+# [END gae_handle_incoming_email_yaml_python]
+# [START gae_handle_all_email_yaml_python]
 - url: /_ah/mail/owner@.*your_app_id\.appspotmail\.com
   script: handle_owner.app
   login: admin
@@ -44,12 +44,12 @@ handlers:
 - url: /_ah/mail/.+
   script: handle_catchall.app
   login: admin
-# [END handle_all_email]
-# [START handle_bounced_email]
+# [END gae_handle_all_email_yaml_python]
+# [START gae_handle_bounced_email_yaml_python]
 - url: /_ah/bounce
   script: handle_bounced_email.app
   login: admin
-# [END handle_bounced_email]
+# [END gae_handle_bounced_email_yaml_python]
 - url: /attachment
   script: attachment.app
 - url: /header

appengine/standard/migration/ndb/redis_cache/README.md

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START all]
+# [START gae_ndb_redis_cache]
 import logging
 
 from flask import Flask, redirect, render_template, request
@@ -33,15 +33,15 @@
     global_cache = None
 
 
-# [START greeting]
+# [START gae_ndb_redis_cache_greeting]
 class Greeting(ndb.Model):
     """Models an individual Guestbook entry with content and date."""
 
     content = ndb.StringProperty()
     date = ndb.DateTimeProperty(auto_now_add=True)
-    # [END greeting]
+    # [END gae_ndb_redis_cache_greeting]
 
-    # [START query]
+    # [START gae_ndb_redis_cache_query]
     with client.context(global_cache=global_cache):
 
         @classmethod
@@ -56,7 +56,7 @@ def display_guestbook():
     with client.context(global_cache=global_cache):
         ancestor_key = ndb.Key("Book", guestbook_name or "*notitle*")
         greetings = Greeting.query_book(ancestor_key).fetch(20)
-    # [END query]
+    # [END gae_ndb_redis_cache_query]
 
     greeting_blockquotes = [greeting.content for greeting in greetings]
     return render_template(
@@ -66,7 +66,7 @@ def display_guestbook():
     )
 
 
-# [START submit]
+# [START gae_ndb_redis_cache_submit]
 @app.route("/sign", methods=["POST"])
 def update_guestbook():
     # We set the parent key on each 'Greeting' to ensure each guestbook's
@@ -81,12 +81,12 @@ def update_guestbook():
             content=request.form.get("content", None),
         )
         greeting.put()
-    # [END submit]
+    # [END gae_ndb_redis_cache_submit]
 
     return redirect("/?" + urlencode({"guestbook_name": guestbook_name}))
 
 
 if __name__ == "__main__":
     # This is used when running locally.
     app.run(host="127.0.0.1", port=8080, debug=True)
-# [END all]
+# [END gae_ndb_redis_cache]

appengine/standard/migration/ndb/redis_cache/main.py

@@ -1,2 +1,7 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
+
+# 2025-01-14 Adds support for Python3.
+pytest==8.3.2; python_version >= '3.0'
+WebTest==3.0.1; python_version >= '3.0'
+six==1.16.0

appengine/standard/migration/ndb/redis_cache/requirements-test.txt

@@ -19,7 +19,7 @@
 For more information, see README.md.
 """
 
-# [START all]
+# [START gae_multitenancy_datastore]
 from google.appengine.api import namespace_manager
 from google.appengine.ext import ndb
 import webapp2
@@ -73,4 +73,4 @@ def get(self, namespace="default"):
     ],
     debug=True,
 )
-# [END all]
+# [END gae_multitenancy_datastore]