chore(gae): rename and delete region tags in standard/ndb/ (#13190)

* chore(gae): fix region tags in ndb/async/shopping_cart.py

* chore(gae): fix region tags in ndb/queries/snippets.py

* chore(gae): fix region tags in ndb/properties/snippets.py

* chore(gae): rename region tags in ndb/transactions/main.py

* chore(gae): unify prefixes for region tags

* chore(gae): add missing prefix

Author: eapl-gemugami

appengine/standard/ndb/async/shopping_cart.py

@@ -15,7 +15,7 @@
 from google.appengine.ext import ndb
 
 
-# [START models]
+# [START gae_ndb_async_model_classes]
 class Account(ndb.Model):
     pass
 
@@ -32,9 +32,7 @@ class CartItem(ndb.Model):
 
 class SpecialOffer(ndb.Model):
     inventory = ndb.KeyProperty(kind=InventoryItem)
-
-
-# [END models]
+# [END gae_ndb_async_model_classes]
 
 
 def get_cart_plus_offers(acct):
@@ -57,7 +55,7 @@ def get_cart_plus_offers_async(acct):
     return cart, offers
 
 
-# [START cart_offers_tasklets]
+# [START gae_ndb_async_cart_offers_tasklets]
 @ndb.tasklet
 def get_cart_tasklet(acct):
     cart = yield CartItem.query(CartItem.account == acct.key).fetch_async()
@@ -76,9 +74,7 @@ def get_offers_tasklet(acct):
 def get_cart_plus_offers_tasklet(acct):
     cart, offers = yield get_cart_tasklet(acct), get_offers_tasklet(acct)
     raise ndb.Return((cart, offers))
-
-
-# [END cart_offers_tasklets]
+# [END gae_ndb_async_cart_offers_tasklets]
 
 
 @ndb.tasklet

appengine/standard/ndb/properties/snippets.py

@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START notestore_imports]
+# [START gae_ndb_properties_note_store_imports]
 from google.appengine.ext import ndb
 from google.appengine.ext.ndb import msgprop
+# [END gae_ndb_properties_note_store_imports]
 
-# [END notestore_imports]
 from protorpc import messages
 
 

appengine/standard/ndb/queries/snippets.py

@@ -60,12 +60,12 @@ def query_article_inequality_explicit():
 
 
 def articles_with_tags_example():
-    # [START included_in_inequality]
+    # [START gae_ndb_query_included_in_inequality]
     Article(title="Perl + Python = Parrot", stars=5, tags=["python", "perl"])
-    # [END included_in_inequality]
-    # [START excluded_from_inequality]
+    # [END gae_ndb_query_included_in_inequality]
+    # [START gae_ndb_query_excluded_from_inequality]
     Article(title="Introduction to Perl", stars=3, tags=["perl"])
-    # [END excluded_from_inequality]
+    # [END gae_ndb_query_excluded_from_inequality]
 
 
 def query_article_in():
@@ -104,15 +104,14 @@ def query_greeting_multiple_orders():
 
 
 def query_purchase_with_customer_key():
-    # [START purchase_with_customer_key_models]
+    # [START gae_ndb_query_purchase_with_customer_key_models]
     class Customer(ndb.Model):
         name = ndb.StringProperty()
 
     class Purchase(ndb.Model):
         customer = ndb.KeyProperty(kind=Customer)
         price = ndb.IntegerProperty()
-
-    # [END purchase_with_customer_key_models]
+    # [END gae_ndb_query_purchase_with_customer_key_models]
 
     def query_purchases_for_customer_via_key(customer_entity):
         purchases = Purchase.query(Purchase.customer == customer_entity.key).fetch()
@@ -122,14 +121,13 @@ def query_purchases_for_customer_via_key(customer_entity):
 
 
 def query_purchase_with_ancestor_key():
-    # [START purchase_with_ancestor_key_models]
+    # [START gae_ndb_query_purchase_with_ancestor_key_models]
     class Customer(ndb.Model):
         name = ndb.StringProperty()
 
     class Purchase(ndb.Model):
         price = ndb.IntegerProperty()
-
-    # [END purchase_with_ancestor_key_models]
+    # [END gae_ndb_query_purchase_with_ancestor_key_models]
 
     def create_purchase_for_customer_with_ancestor(customer_entity):
         purchase = Purchase(parent=customer_entity.key)

appengine/standard/ndb/transactions/main.py

@@ -18,11 +18,10 @@
 
 import flask
 
-# [START taskq-imp]
+# [START gae_ndb_transactions_import]
 from google.appengine.api import taskqueue
 from google.appengine.ext import ndb
-
-# [END taskq-imp]
+# [END gae_ndb_transactions_import]
 
 
 class Note(ndb.Model):
@@ -73,72 +72,70 @@ def main_page():
     return response
 
 
-# [START standard]
+# [START gae_ndb_transactions_insert_standard]
 @ndb.transactional
 def insert_if_absent(note_key, note):
     fetch = note_key.get()
     if fetch is None:
         note.put()
         return True
     return False
+# [END gae_ndb_transactions_insert_standard]
 
 
-# [END standard]
-
-
-# [START two-tries]
+# [START gae_ndb_transactions_insert_two_tries]
 @ndb.transactional(retries=1)
 def insert_if_absent_2_retries(note_key, note):
     # do insert
-    # [END two-tries]
+    # [END gae_ndb_transactions_insert_two_tries]
     fetch = note_key.get()
     if fetch is None:
         note.put()
         return True
     return False
 
 
-# [START cross-group]
+# [START gae_ndb_transactions_insert_cross_group]
 @ndb.transactional(xg=True)
 def insert_if_absent_xg(note_key, note):
     # do insert
-    # [END cross-group]
+    # [END gae_ndb_transactions_insert_cross_group]
     fetch = note_key.get()
     if fetch is None:
         note.put()
         return True
     return False
 
 
-# [START sometimes]
+# [START gae_ndb_transactions_insert_sometimes]
 def insert_if_absent_sometimes(note_key, note):
     # do insert
-    # [END sometimes]
+    # [END gae_ndb_transactions_insert_sometimes]
     fetch = note_key.get()
     if fetch is None:
         note.put()
         return True
     return False
 
 
-# [START indep]
+# [START gae_ndb_transactions_insert_independent]
 @ndb.transactional(propagation=ndb.TransactionOptions.INDEPENDENT)
 def insert_if_absent_indep(note_key, note):
     # do insert
-    # [END indep]
+    # [END gae_ndb_transactions_insert_independent]
     fetch = note_key.get()
     if fetch is None:
         note.put()
         return True
     return False
 
 
-# [START taskq]
+# [START gae_ndb_transactions_insert_task_queue]
 @ndb.transactional
 def insert_if_absent_taskq(note_key, note):
     taskqueue.add(url=flask.url_for("taskq_worker"), transactional=True)
     # do insert
-    # [END taskq]
+    # [END gae_ndb_transactions_insert_task_queue]
     fetch = note_key.get()
     if fetch is None:
         note.put()
@@ -154,17 +151,17 @@ def taskq_worker():
 def pick_random_insert(note_key, note):
     choice = random.randint(0, 5)
     if choice == 0:
-        # [START calling2]
+        # [START gae_ndb_transactions_insert_standard_calling_2]
         inserted = insert_if_absent(note_key, note)
-        # [END calling2]
+        # [END gae_ndb_transactions_insert_standard_calling_2]
     elif choice == 1:
         inserted = insert_if_absent_2_retries(note_key, note)
     elif choice == 2:
         inserted = insert_if_absent_xg(note_key, note)
     elif choice == 3:
-        # [START sometimes-call]
+        # [START gae_ndb_transactions_insert_sometimes_callback]
         inserted = ndb.transaction(lambda: insert_if_absent_sometimes(note_key, note))
-        # [END sometimes-call]
+        # [END gae_ndb_transactions_insert_sometimes_callback]
     elif choice == 4:
         inserted = insert_if_absent_indep(note_key, note)
     elif choice == 5:
@@ -183,10 +180,10 @@ def add_note():
     choice = random.randint(0, 1)
     if choice == 0:
         # Use transactional function
-        # [START calling]
+        # [START gae_ndb_transactions_insert_standard_calling_1]
         note_key = ndb.Key(Note, note_title, parent=parent)
         note = Note(key=note_key, content=note_text)
-        # [END calling]
+        # [END gae_ndb_transactions_insert_standard_calling_1]
         if pick_random_insert(note_key, note) is False:
             return 'Already there<br><a href="%s">Return</a>' % flask.url_for(
                 "main_page", page_name=page_name

appengine/standard/ndb/transactions/requirements-test.txt

@@ -1,2 +1,6 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
+
+# pytest==8.3.4 and six==1.17.0 for Python3.
+pytest==8.3.4; python_version >= '3.0'
+six==1.17.0