add Mod9 codelab; Mod18 & 19 app fixes

Author: wescpy

README.md

@@ -105,7 +105,7 @@ Module | Topic | Video | Codelab | START here | FINISH here
 6|Migrate to Cloud Firestore| _N/A_ | _N/A_ | Module 3 [code](/mod3b-datastore) (3.x) | _no work required; [Datastore upgrade automatic](https://cloud.google.com/datastore/docs/upgrade-to-firestore)_
 7|Add App Engine `taskqueue` push tasks| [link](https://twitter.com/googledevs/status/1443410302113099778?utm_source=twitter&utm_medium=unpaidsoc&utm_campaign=CDR_wes_aap-serverless_mgrgaetasks_sms_201028&utm_content=-) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-7-gaetasks?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrgaetasks_sms_201028&utm_content=-) | Module 1 [code](/mod1-flask) (2.x) | Module 7 [code](/mod7-gaetasks) (2.x) & [code](/mod7b-gaetasks) (3.x)
 8|Migrate to Cloud Tasks| [link](https://twitter.com/googledevs/status/1450960021018267656?utm_source=twitter&utm_medium=unpaidsoc&utm_campaign=CDR_wes_aap-serverless_mgrcloudtasks_sms_201112&utm_content=-) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-8-cloudtasks?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudtasks_sms_201112&utm_content=-) | Module 7 [code](/mod7-gaetasks) (2.x) | Module 8 [code](/mod8-cloudtasks) (2.x)
-9|Migrate to Python 3, Cloud Datastore & Cloud Tasks v2| _TBD_ | _TBD_ | Module 8 [code](/mod8-cloudtasks) (2.x) | Module 9 [code](/mod9-py3dstasks)
+9|Migrate to Python 3, Cloud Datastore & Cloud Tasks v2| _TBD_ | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-9-py3dstasks?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrpy3fstasks_sms_201126&utm_content=-) | Module 8 [code](/mod8-cloudtasks) (2.x) | Module 9 [code](/mod9-py3dstasks)
 10|Migrate Datastore/Firestore data to another project| _TBD_ | _N/A_ | _N/A_ | _TBD_
 11|Migrate to Cloud Functions| [link](https://twitter.com/googledevs/status/1520206298834481153?utm_source=twitter&utm_medium=unpaidsoc&utm_campaign=CDR_wes_aap-serverless_mgrcloudfuncs_sms_202006&utm_content=-) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-11-functions?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudfuncs_sms_202006&utm_content=-) | Module 2 [code](/mod2b-cloudndb) (3.x) | Module 11 [code](/mod11-functions) (3.x)
 12|Add App Engine `memcache`| [link](https://twitter.com/googledevs/status/1527303061953126402?utm_source=twitter&utm_medium=unpaidsoc&utm_campaign=CDR_wes_aap-serverless_mgrmemcache_sms_202006&utm_content=-) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-12-memcache?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrmemcache_sms_202006&utm_content=-) | Module 1 [code](/mod1-flask) (2.x) | Module 12 [code](/mod12-memcache) (2.x) & [code](/mod12b-memcache) (3.x)

mod18-gaepull/main.py

@@ -19,7 +19,8 @@
 HOUR = 3600
 LIMIT = 10
 TASKS = 1000
-QUEUE = 'pullq'
+QNAME = 'pullq'
+QUEUE = taskqueue.Queue(QNAME)
 app = Flask(__name__)
 
 
@@ -31,8 +32,7 @@ class Visit(ndb.Model):
 def store_visit(remote_addr, user_agent):
     'create new Visit in Datastore and queue request to bump visitor count'
     Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
-    q = taskqueue.Queue(QUEUE)
-    q.add(taskqueue.Task(payload=remote_addr, method='PULL'))
+    QUEUE.add(taskqueue.Task(payload=remote_addr, method='PULL'))
 
 def fetch_visits(limit):
     'get most recent visits'
@@ -53,13 +53,12 @@ def log_visitors():
     'worker processes recent visitor counts and updates them in Datastore'
     # tally recent visitor counts from queue then delete those tasks
     tallies = {}
-    q = taskqueue.Queue(QUEUE)
-    tasks = q.lease_tasks(HOUR, TASKS)
+    tasks = QUEUE.lease_tasks(HOUR, TASKS)
     for task in tasks:
         visitor = task.payload
         tallies[visitor] = tallies.get(visitor, 0) + 1
     if tasks:
-        q.delete_tasks(tasks)
+        QUEUE.delete_tasks(tasks)
 
     # increment those counts in Datastore and return
     for visitor in tallies:

mod19-pubsub/appengine_config.py

@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

mod19-pubsub/main.py

@@ -73,7 +73,7 @@ def log_visitors():
         psc_client.acknowledge(subscription=SUB_PATH, ack_ids=acks)
     try:
         psc_client.close()
-    except AttributeError:  # special handler for grpcio<1.12.0
+    except AttributeError:  # special Py2 handler for grpcio<1.12.0
         pass
 
     # increment those counts in Datastore and return

mod19-pubsub/maker.py

@@ -33,12 +33,15 @@ def make_top():
         print('Topic %r already exists at %r' % (TOPIC, TOP_PATH))
 
 def make_sub():
-    with psc_client:
-        try:
-            sub = psc_client.create_subscription(name=SUB_PATH, topic=TOP_PATH)
-            print('Subscription created %r (%s)' % (SBSCR, sub.name))
-        except exceptions.AlreadyExists:
-            print('Subscription %r already exists at %r' % (SBSCR, SUB_PATH))
+    try:
+        sub = psc_client.create_subscription(name=SUB_PATH, topic=TOP_PATH)
+        print('Subscription created %r (%s)' % (SBSCR, sub.name))
+    except exceptions.AlreadyExists:
+        print('Subscription %r already exists at %r' % (SBSCR, SUB_PATH))
+    try:
+        psc_client.close()
+    except AttributeError:  # special Py2 handler for grpcio<1.12.0
+        pass
 
 make_top()
 make_sub()