diff --git a/README.md b/README.md
index 93db30a..a79da41 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,30 @@
-# Python App Engine app migration
-### To modern runtime, Cloud services, Python 3, and Cloud Run containers
+| :boom: ALERT!! |
+|:---------------------------|
+| This repo will soon be relocating to [GoogleCloudPlatform](https://github.com/GoogleCloudPlatform) as we better organize these code samples! Stay tuned as more info is coming soon. |
-[Google App Engine](https://cloud.google.com/appengine) (Standard) has undergone significant changes between the legacy and next generation platforms. To address this, we've created a set of codelabs (free, online, self-paced, hands-on tutorials) to show developers how to perform individual migrations they can apply to modernize their apps for the latest runtimes, with this repo managing the samples from those codelabs.
-Each codelab begins with a "START" code base then walks developers through that migration step, resulting in a "FINISH" repo. If you make any mistakes along the way, you can always go back to START or compare your code with what's in the FINISH folder to see the differences. We also want to help you port to the Python 3 runtime, so some codelabs contain a bonus section for that purpose.
+# Modernizing Google Cloud serverless compute applications
+### To the latest Cloud services and serverless platforms
-> **NOTE:** These migrations are *typically* aimed at Python 2 users
-> 1. *Python 3.x App Engine users*: You're *already* on the next-gen platform, so only for **non**-legacy service migrations
+This is the corresponding repository to the [Serverless Migration Station](https://bit.ly/3xk2Swi) video series whose goal is to help users on a Google Cloud serverless compute platform modernize to other Cloud or serverless products. Modernization steps generally feature a video, codelab (self-paced, hands-on tutorial), and code samples. The content initially focuses on App Engine and Google's earliest Cloud users. Read more about the [codelabs in this announcement](https://developers.googleblog.com/2021/03/modernizing-your-google-app-engine-applications.html?utm_source=ext&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_modernizegae_codelabsannounce_201031&utm_content=-) as well as [this one introducing the video series](https://developers.googleblog.com/2021/06/introducing-serverless-migration.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_smsintro_201023). This repo is for Python developers; there is another repo for Java developers.
+
+[Google App Engine](https://cloud.google.com/appengine) (Standard) has undergone significant changes between the legacy and next generation platforms. To address this, we've created a set of resources showing developers how to perform individual migrations that can be applied to modernize their apps for the latest runtimes, meaning to Python 3 even though [Google expressed long-term support for legacy runtimes](https://cloud.google.com/appengine/docs/standard/long-term-support) like Python 2. The content falls into one of these topics:
+
+1. Migrate from a legacy App Engine service to a similar Cloud product
+1. Shift to another Cloud serverless compute platform (e.g., from App Engine to Cloud Run)
+1. General app, data, or service migration steps and best practices
+
+Each codelab begins with a sample app in a "START" repo folder then walks developers through that migration, resulting in code in a "FINISH" repo. If you make mistakes along the way, you can always go back to START or compare your code with what's in the corresponding FINISH folder. The baseline apps are in Python 2, and since we also want to help you port to Python 3, some codelabs contain additional steps to do so.
+
+> **NOTEs:**
+> 1. These migrations are *typically* aimed at our earliest users, e.g., Python 2
+> 1. *Python 3.x App Engine users*: You're *already* on the next-gen platform, so you would focus on migrating away from the legacy bundled services
> 1. *Python 2.5 App Engine users*: to revive apps from the original 2.5 runtime, [deprecated in 2013](http://googleappengine.blogspot.com/2013/03/python-25-thanks-for-good-times.html) and [shutdown in 2017](https://cloud.google.com/appengine/docs/standard/python/python25), you must [migrate from `db` to `ndb`](http://cloud.google.com/appengine/docs/standard/python/ndb/db_to_ndb) and get those apps running on Python 2.7 before attempting these migrations.
## Prerequisites
-- A Google account (Google Workspace/G Suite accounts may require administrator approval)
-- A Google Cloud (GCP) project with an active billing account
+- A Google account and Cloud (GCP) project with an active billing account
- Familiarity with operating system terminal/shell commands
- Familiarity with developing & deploying Python 2 apps to App Engine
- General skills in Python 2 and 3
@@ -21,35 +32,35 @@ Each codelab begins with a "START" code base then walks developers through that
## Cost
-App Engine is not a free service. While you may not have needed to enable billing in App Engine's early days, [all applications now require an active billing account](https://cloud.google.com/appengine/docs/standard/payment-instrument) backed by a financial instrument (usually a credit card). Don't worry, App Engine (and other GCP products) still have an ["Always Free" tier](https://cloud.google.com/free/docs/gcp-free-tier#free-tier-usage-limits) and as long as you stay within those limits, you won't incur any charges. Also check the App Engine [pricing](https://cloud.google.com/appengine/pricing) and [quotas](https://cloud.google.com/appengine/quotas) pages for more information.
+App Engine, Cloud Functions, and Cloud Run are not free services. While you may not have enabled billing in App Engine's early days, [all applications now require an active billing account](https://cloud.google.com/appengine/docs/standard/payment-instrument) backed by a financial instrument (usually a credit card). Don't worry, App Engine (and other GCP products) still have an ["Always Free" tier](https://cloud.google.com/free/docs/gcp-free-tier#free-tier-usage-limits) and as long as you stay within those limits, you won't incur any charges. Also check the App Engine [pricing](https://cloud.google.com/appengine/pricing) and [quotas](https://cloud.google.com/appengine/quotas) pages for more information.
-Furthermore, deploying to GCP serverless platforms incur [minor build and storage costs](https://cloud.google.com/appengine/pricing#pricing-for-related-google-cloud-products). [Cloud Build](https://cloud.google.com/build/pricing) has its own free quota as does [Cloud Storage](https://cloud.google.com/storage/pricing#cloud-storage-always-free). For greater transparency, Cloud Build builds your application image which is than sent to the [Cloud Container Registry](https://cloud.google.com/container-registry/pricing); storage of that image uses up some of that (Cloud Storage) quota as does network egress when transferring that image to the service you're deploying to. However you may live in region that does not have such a free tier, so be aware of your storage usage to minimize potential costs. (You may look at what storage you're using and how much, including deleting build artifacts via [your Cloud Storage browser](https://console.cloud.google.com/storage/browser).)
+Furthermore, deploying to GCP serverless platforms incur [minor build and storage costs](https://cloud.google.com/appengine/pricing#pricing-for-related-google-cloud-products). [Cloud Build](https://cloud.google.com/build/pricing) has its own free quota as does [Cloud Storage](https://cloud.google.com/storage/pricing#cloud-storage-always-free). For greater transparency, Cloud Build builds your application image which is than sent to the [Cloud Container Registry](https://cloud.google.com/container-registry/pricing), or [Artifact Registry](https://cloud.google.com/artifact-registry/pricing), its successor; storage of that image uses up some of that (Cloud Storage) quota as does network egress when transferring that image to the service you're deploying to. However you may live in region that does not have such a free tier, so be aware of your storage usage to minimize potential costs. (You may look at what storage you're using and how much, including deleting build artifacts via [your Cloud Storage browser](https://console.cloud.google.com/storage/browser).)
## Why
-In App Engine's early days, users wanted Google to make the platform more flexible for developers and make their apps more portable. As a result, the team made significant changes to its 2nd-generation service which [launched in 2018](https://cloud.google.com/blog/products/gcp/introducing-app-engine-second-generation-runtimes-and-python-3-7). As a result, there are no longer any built-in services, allowing users to select from standalone GCP products or best-of-breed 3rd-party tools used by the broader community. Summary:
+App Engine initially [launched in 2008](http://googleappengine.blogspot.com/2008/04/introducing-google-app-engine-our-new.html) ([video](http://youtu.be/3Ztr-HhWX1c)), providing a suite of bundled services making it convenient for developers to access a database (Datastore), caching (Memcache), independent task execution (Task Queue), large "blob" storage (Blobstore) to allow for end-user file uploads or to serve large media files, and other companion services. However, apps leveraging those services can only run their apps on App Engine.
-- **Legacy platform**: *Python 2* only, legacy built-in services
-- **Next generation**: *Python 3* only, external services, flexible platform
-While the 2nd-gen platform is more flexible, users of the legacy platform have two challenges:
+To increase app portability, its 2nd-generation service [launched in 2018](https://cloud.google.com/blog/products/gcp/introducing-app-engine-second-generation-runtimes-and-python-3-7), initially removing those legacy bundled services. The main reason to move to the 2nd generation service is that it allows developers to upgrade to the latest language runtimes, such as moving from Python 2 to 3 or Java 8 to 17. Unfortunately, it was mutually exclusive to do so, meaning while you could upgrade language releases, you lost access to those bundled services, making it a showstopper for many users.
-1. Migrate to unbundled/standalone services
-1. Porting to a modern language release
+However, due to their popularity _and_ to help users upgrade, the App Engine team [restored access to many (but not all) of those services in Fall 2021](https://cloud.google.com/blog/products/serverless/support-for-app-engine-services-in-second-generation-runtimes). For more on this, see the [Legacy services](#accessing-legacy-services-in-second-generation) section below. As Google is continually striving to have the most [open cloud](https://cloud.google.com/open-cloud) on the market, and while many of those services are now available again, apps can _still_ be more portable if they migrated away from the legacy services to similar Cloud or 3rd-party offerings. Another issue with the bundled services is that they're only available in 2nd generation runtimes that have a 1st generation service (Python, Java, Go, PHP), excluding 2nd generation-only runtimes like Ruby and Node.js.
-Neither upgrade may be particularly straightforward and can only be done serially. On top of this, direct replacements are not available for all formerly built-in services; alternatives come in 3 flavors:
+Once apps have moved away from App Engine bundled services to similar Cloud or 3rd-party services. apps are portable enough to:
-1. **Direct replacement**: Legacy services which matured into their own Cloud products *(e.g., App Engine Datastore is now [Cloud Datastore](http://cloud.google.com/datastore))*
-1. **Partial replacement**: Some aspects of legacy services *(e.g., [Cloud Tasks](http://cloud.google.com/tasks) supports App Engine **push** tasks; for pull tasks, [Cloud Pub/Sub](http://cloud.google.com/pubsub) is recommended; use of [Cloud MemoryStore with REDIS](http://cloud.google.com/memorystore/docs/redis) as an alternative for Memcache)*
-1. **No replacement**: No direct replacement available, so third-party or other tools recommended *(e.g., Search, Images, Users, Email)*
+1. Run on the [2nd generation App Engine service](https://cloud.google.com/appengine/docs/standard/runtimes)
+1. Shift across to other serverless platforms, like [Cloud Functions](https://developers.googleblog.com/2022/04/how-can-app-engine-users-take-advantage-of-cloud-functions.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcloudfuncs_sms_202006) or Cloud Run ([with](https://developers.googleblog.com/2021/08/containerizing-google-app-engine-apps-for-cloud-run.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcrdckr_sms_201017) or [without](https://developers.googleblog.com/2021/09/an-easier-way-to-move-your-app-engine-to-cloud-run.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcrbdpk_sms_201031) Docker), or
+1. Move to VM-based services like [GKE](https://cloud.google.com/gke) or [Compute Engine](https://cloud.google.com/compute), or to other compute platforms
-These are the challenges developers are facing, so the purpose of this content is to reduce the friction in this process and make things more prescriptive. Review the [runtimes chart](https://cloud.google.com/appengine/docs/standard/runtimes) to see the legacy services and current migration recommendation. The [migration guide overview](https://cloud.google.com/appengine/docs/standard/python/migrate-to-python3/migrating-services) has more information.
+> **NOTEs:**
+> 1. App Engine ([Flexible](https://cloud.google.com/appengine/docs/flexible/python/runtime?hl=en#interpreter)) is a next-gen service but is not within the scope of these tutorials. Curious developers can compare App Engine [Standard vs. Flexible](https://cloud.google.com/appengine/docs/the-appengine-environments) to find out more.
+> 1. Many use cases for Flexible or a desire for containerization can be handled by [Cloud Run](http://cloud.run).
+> 1. Small apps or large monolithic apps broken up into multiple, independent microservices can consider migrating to [Cloud Functions](https://cloud.google.com/functions).
-> **NOTE:** App Engine ([Flexible](https://cloud.google.com/appengine/docs/flexible/python/runtime?hl=en#interpreter)) is a next-gen service but is not within the scope of these tutorials. Curious developers can compare App Engine [Standard vs. Flexible](https://cloud.google.com/appengine/docs/the-appengine-environments) to find out more. Also, many of the Flexible use cases can now be handled by [Cloud Run](http://cloud.google.com/run).
+## Progression (what order to do things)
-## Progression (START and FINISH)
+### "START" and "FINISH" repo folders
All codelabs begin with code in a START repo folder and end with code in a FINISH folder, implementing a single migration. Upon completion, users should confirm their code (for the most part) matches what's in the FINISH folder. The baseline migration sample app (Module 0; link below) is a barebones Python 2.7 App Engine app that uses the `webapp2` web framework plus the `ndb` Datastore library.
@@ -57,7 +68,24 @@ All codelabs begin with code in a START repo folder and end with code in a FINIS
1. Next, STARTing with the _Module 1_ application code (yours or ours), _Module 2_ migrates from `ndb` to Cloud NDB, ending with code matching the (Module 2) FINISH repo folder. There's also has a bonus migration to Python 3, resulting in another FINISH repo folder, this one deployed on the next-generation platform.
1. _Your_ Python 2 apps may be using other built-in services like Task Queues or Memcache, so additional migration modules follow, some more optional than others, and not all are available yet (keep checking back here for updates).
-Beyond Module 2, with some exceptions, **there is no specific order** of what migrations modules to tackle next. It depends on your needs (and your applications').
+### The order of migrations
+
+Beyond Module 2, with some exceptions, **there is no specific order** of what migrations modules to tackle next. It depends on your needs (and your applications'). However, there are related migrations where one or more modules must be completed beforehand. This table attempts to put an order on module subsets.
+
+Topic | Module ordering | Description
+--- | --- | ---
+Baseline | 0 ⇒ 1 | Not a migration but a description of the baseline application (review this material before doing any migrations)
+Web framework | 1 ⇒ _everything else_ | Current App Engine runtimes do not come with a web framework, so this must be the first migration performed. All migrations below can be performed after this one.
+Bundled services | 17 and 22 | These modules are for those who want to continue using Python bundled services from Python 3 App Engine.
+Datastore | 2 [⇒ 3 [⇒ 6]] | Moving off App Engine `ndb` makes your apps more portable, so the **Module 2** Cloud NDB migration is _recommended_. **Module 3:** Migrating to Cloud Datastore (Firestore in Datastore mode) is _optional_ and only recommended if you have other code using Cloud Datastore. **Module 6**: Migrating to Cloud Firestore (Native mode) is generally _not recommended_ unless you must have the Firebase features it has, and those features will eventually be integrated into Cloud Datastore.
+(Push) Task Queues | [7 ⇒] 8 [⇒ 9] | Moving off App Engine `taskqueue` makes your apps more portable, so the **Module 8** Cloud Tasks migration is _recommended_ for those using push tasks. Those unfamiliar with push tasks should do **Module 7** first to add push tasks to the sample app. **Module 9:** Migrating to Cloud Datastore (Firestore in Datastore mode), Cloud Tasks (v2), and Python 3 is _optional_ and only recommended if you have other code using Cloud Datastore and considering upgrading to Python 3.
+(Pull) Task Queues | [18 ⇒] 19 | Moving off App Engine `taskqueue` makes your apps more portable, so the **Module 19** Cloud Pub/Sub migration is _recommended_ for those using pull tasks. The app is also ported to Python 3. Those unfamiliar with pull tasks should do **Module 18** first to add pull tasks to the sample app.
+Memcache | [12 ⇒] 13 | Moving off App Engine `memcache` makes your apps more portable, so the **Module 13** Cloud Memorystore (for Redis) migration is _recommended_ for those using `memcache`. Those unfamiliar with `memcache` should do **Module 12** first to add its usage to the sample app.
+Cloud Functions | 11 | Cloud Functions does not support Python 2, so after the Module 1 migration, you need to upgrade your app to Python 3 before attempting this migration, recommended if you have a very small App Engine app, or it has only one function/feature.
+Cloud Run | 4 or 5 | **Module 4** covers migrating to Cloud Run with Docker. Those unfamiliar with containers or do not wish to create/maintain a `Dockerfile` should do **Module 5**. Those doing **Module 4** will get additional information about Cloud Run in **Module 5** not covered in **Module 4**.
+Blobstore | [15 ⇒] 16 | Moving off App Engine `blobstore` makes your apps more portable, so the **Module 16** Cloud Storage migration is _recommended_ for those using `blobstore`. Those unfamiliar with `blobstore` should do **Module 15** first to add its usage to the sample app.
+Users | [20 ⇒] 21 | Moving off App Engine `users` makes your apps more portable, so the **Module 21** Cloud Identity Platform migration is _recommended_ for those using `users`. Those unfamiliar with `users` should do **Module 20** first to add its usage to the sample app.
+General migration | 6 ⇒ 10 ⇒ 14 | This series is more generic and not targeting a specific feature migration, but rather if you need to migrate your App Engine apps from one running project to another. It starts with **Module 6** if you need to migrate your code, say from Datastore to Firestore. **Module 10** is if you need to migrate your data from one project to another, and finally, **Module 14** is after you're done migrating your app, your data, or both, and need to migrate a running service on one GCP project to another.
## Migration modules
@@ -67,20 +95,31 @@ The table below summarizes migration module resources currently available along
### Summary table
-Module | Topic | Codelab | START here | FINISH here
---- | --- | --- | --- | ---
-0|Baseline app| _N/A_ (no tutorial; just review the code) | _N/A_ | Module 0 [code](/mod0-baseline) (2.x)
-1|Migrate to Flask| [link](http://g.co/codelabs/pae-migrate-flask) | Module 0 [code](/mod0-baseline) (2.x) | Module 1 [code](/mod1-flask) (2.x)
-2|Migrate to Cloud NDB| [link](http://g.co/codelabs/pae-migrate-cloudndb) | Module 1 [code](/mod1-flask) (2.x) | Module 2 [code](/mod2a-cloudndb) (2.x) & [code](/mod2b-cloudndb) (3.x)
-3|Migrate to Cloud Datastore| [link](http://g.co/codelabs/pae-migrate-datastore) | Module 2 [code](/mod2a-cloudndb) (2.x) & [code](/mod2b-cloudndb) (3.x) | Module 3 [code](/mod3a-datastore) (2.x) & [code](/mod3b-datastore) (3.x)
-4|Migrate to Cloud Run with Docker| [link](http://g.co/codelabs/pae-migrate-rundocker) | Module 2 [code](/mod2a-cloudndb) (2.x) & Module 3 [code](/mod3b-datastore) (3.x) | Module 4 [code](/mod4a-rundocker) (2.x) & [code](/mod4b-rundocker) (3.x)
-5|Migrate to Cloud Run with Buildpacks| [link](http://g.co/codelabs/pae-migrate-runbldpks) | Module 2 [code](/mod2b-cloudndb) (3.x) | Module 5 [code](/mod5-runbldpks) (3.x)
-6|Migrate to Cloud Firestore (app)| [link](http://g.co/codelabs/pae-migrate-firestore) | Module 3 [code](/mod3b-datastore) (3.x) | Module 6 [code](/mod6-firestore) (3.x)
-7|Add App Engine push tasks| [link](http://g.co/codelabs/pae-migrate-gaetasks) | Module 1 [code]() (2.x) | Module 7 [code](/mod7-gaetasks) (2.x)
-8|Migrate to Cloud Tasks| [link](http://g.co/codelabs/pae-migrate-cloudtasks) | Module 7 [code](/mod7-gaetasks) (2.x) | Module 8 [code](/mod8-cloudtasks) (2.x)
-9|Migrate to Python 3 (Cloud Datastore & Cloud Tasks v2)| [link](http://g.co/codelabs/pae-migrate-py3dstasks) | Module 8 [code](/mod8-cloudtasks) (2.x) | Module 9 [code](/mod9-py3dstasks) (3.x)
-10|Migrate to Cloud Firestore (data)| _N/A_ | _N/A_ | _TBD_
-11|Migrate to Cloud Functions| _TBD_ | Module 2 [code](/mod2b-cloudndb) (3.x) | Module 11 [code](/mod11-functions) (3.x)
+Module | Topic | Video | Codelab | START here | FINISH here
+--- | --- | --- | --- | --- | ---
+0 | Baseline app| [link](https://developers.googleblog.com/2021/06/introducing-serverless-migration.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_smsintro_201023)| _N/A_ (no tutorial; just review the code) | _N/A_ | Module 0 [code](/mod0-baseline) (2.x)
+1 | Migrate to Flask | [link](https://developers.googleblog.com/2021/07/migrating-from-app-engine-webapp2-to-flask.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrwa2flsk_201008)| [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-1-flask?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrwa2flsk_201008&utm_content=-) | Module 0 [code](/mod0-baseline) (2.x) | Module 1 [code](/mod1-flask) (2.x) (and [code](/mod1b-flask) (3.x))
+2 | Migrate to Cloud NDB | [link](https://developers.googleblog.com/2021/07/migrating-from-app-engine-ndb-to-cloud-ndb.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcloudndb_201021)| [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-2-cloudndb?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudndb_201021&utm_content=-) | Module 1 [code](/mod1-flask) (2.x) | Module 2 [code](/mod2a-cloudndb) (2.x) & [code](/mod2b-cloudndb) (3.x)
+3 | Migrate to Cloud Datastore | [link](https://developers.googleblog.com/2021/08/cloud-ndb-to-cloud-datastore-migration.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcloudds_201003) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-3-datastore?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudds_201003&utm_content=-) | Module 2 [code](/mod2a-cloudndb) (2.x) & [code](/mod2b-cloudndb) (3.x) | Module 3 [code](/mod3a-datastore) (2.x) & [code](/mod3b-datastore) (3.x)
+4 | Migrate to Cloud Run with Docker | [link](https://developers.googleblog.com/2021/08/containerizing-google-app-engine-apps-for-cloud-run.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcrdckr_sms_201017) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-4-rundocker?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcrdckr_sms_201017&utm_content=-) | Module 2 [code](/mod2a-cloudndb) (2.x) & Module 3 [code](/mod3b-datastore) (3.x) | Module 4 [code](/mod4a-rundocker) (2.x) & [code](/mod4b-rundocker) (3.x)
+5 | Migrate to Cloud Run with Buildpacks | [link](https://developers.googleblog.com/2021/09/an-easier-way-to-move-your-app-engine-to-cloud-run.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcrbdpk_sms_201031) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-5-runbldpks?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcrbdpk_sms_201031&utm_content=-) | Module 2 [code](/mod2b-cloudndb) (3.x) | Module 5 [code](/mod5-runbldpks) (3.x)
+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://developers.googleblog.com/2021/09/how-to-use-app-engine-push-queues-in.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrgaetasks_sms_201028) | [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://developers.googleblog.com/2021/10/migrating-app-engine-push-queues-to.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcloudtasks_sms_201112) | [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_ | [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://developers.googleblog.com/2022/04/how-can-app-engine-users-take-advantage-of-cloud-functions.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcloudfuncs_sms_202006) | [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://developers.googleblog.com/2022/05/how-to-use-app-engine-memcache-in-flask-apps.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrmemcache_sms_202006) | [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)
+13 | Migrate to Cloud Memorystore | [link](https://developers.googleblog.com/2022/06/Migrating-from-App-Engine-Memcache-to-Cloud-Memorystore-Module-13.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrmemorystore_sms_202029) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-13-memorystore?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrmemorystore_sms_202029&utm_content=-) | Module 12 [code](/mod12-memcache) (2.x) & [code](/mod12b-memcache) (3.x) | Module 13 [code](/mod13a-memorystore) (2.x) & [code](/mod13b-memorystore) (3.x)
+14 | Migrate service between projects | _TBD_ | _TBD_ | _TBD_ | _TBD_
+15 | Add App Engine `blobstore` | [link](https://developers.googleblog.com/2022/07/how-to-use-app-engine-blobstore-Module15.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrblobstore_sms_202029) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-15-blobstore?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrblobstore_sms_202029&utm_content=-) | Module 0 [code](/mod0-baseline) (2.x) | Module 15 [code](/mod15-blobstore) (2.x)
+16 | Migrate to Cloud Storage | [link](https://developers.googleblog.com/2022/08/migrating-from-app-engine-blobstore-to-cloud-storage-module-16.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrcloudstorage_sms_202029) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-16-cloudstorage?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudstorage_sms_202029&utm_content=-) | Module 15 [code](/mod15-blobstore) (2.x) | Module 16 [code](/mod16-cloudstorage) (2.x & 3.x)
+17 | Migrate to Python 3 bundled services (Part 1) | [link](https://developers.googleblog.com/2022/10/extending-support-for-app-engine-bundled-services-module-17.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrwormhole_sms_202002) | [link](http://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-17-bundled?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrwormhole_sms_202002&utm_content=-) | Module 1 [code](/mod1-flask) (2.x) | Module 1 [code](/mod1b-flask) (3.x)
+18 | Add App Engine `taskqueue` pull tasks | [link](https://developers.googleblog.com/2022/11/how-to-use-app-engine-pull-tasks-module-18.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrgaepull_sms_202013) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-18-gaepull?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrgaepull_sms_202013&utm_content=-) | Module 1 [code](/mod1-flask) (2.x) | Module 18 [code](/mod18-gaepull) (2.x)
+19 | Migrate to Cloud Pub/Sub | [link](https://developers.googleblog.com/2022/12/migrating-from-app-engine-pull-tasks-to.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrpubsub_sms_202016) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-19-pubsub?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrpubsub_sms_202016&utm_content=-) | Module 18 [code](/mod18-gaepull) (2.x) | Module 19 [code](/mod19-pubsub) (2.x & 3.x)
+20 | Add App Engine `users` | [link](https://developers.googleblog.com/2022/12/how-to-use-app-engine-users-service-module-20.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgrgaeusers_sms_202119) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-20-gaeusers?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrgaeusers_sms_202119&utm_content=-)| Module 1 [code](/mod1-flask) (2.x) | Module 20 [code](/mod20-gaeusers) (2.x)
+21 | Migrate to Cloud Identity Platform | [link](https://developers.googleblog.com/2023/01/migrating-from-app-engine-users-to-cloud-identity-module-21.html?utm_source=blog&utm_medium=partner&utm_campaign=CDR_wes_aap-serverless_mgridenplat_sms_202119) | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-21-idenplat?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgridenplat_sms_202119&utm_content=-)| Module 20 [code](/mod20-gaeusers) (2.x) | Module 21 [code](/mod21a-idenplat) (2.x) & [code](/mod21b-idenplat) (3.x)
+22 | Migrate to Python 3 bundled services (Part 2) | [link](http://youtu.be/ZhEBSvnz_BQ?list=PL2pQQBHvYcs0PEecTcLD9_VaLvuhK0_VQ&utm_source=youtube&utm_medium=unpaidsoc&utm_campaign=CDR_wes_aap-serverless_mgrwormhole2_sms_202002&utm_content=info_card) | _N/A_ | Module 22 [code](/mod22-bundled) (2.x & 3.x) | _(⇐ same folder)_
### Table of contents
@@ -88,149 +127,197 @@ Module | Topic | Codelab | START here | FINISH here
If there is a logical codelab to do immediately after completing one, they will be designated as NEXT. Other recommended codelabs will be listed as RECOMMENDED, and the more optional ones will be labeled as OTHERS (and usually in some kind of priority order).
-- [Module 1 codelab](http://g.co/codelabs/pae-migrate-flask): **Migrate from `webapp2` to [Flask](https://flask.palletsprojects.com)**
+#### Migrations from legacy App Engine APIs/bundled services
+
+- [Module 1 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-1-flask?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrwa2flsk_201008&utm_content=-): **Migrate from `webapp2` to [Flask](https://flask.palletsprojects.com)**
- **Required** migration (can also pick your own framework)
- `webapp2` does not do routing thus unsupported by App Engine (even though a [3.x port exists](https://github.com/fili/webapp2-gae-python37))
- - Python 2 only
- - START: [Module 0 code - Baseline](/mod0-baseline) (2.x)
- - FINISH: [Module 1 code - Framework](/mod1-flask) (2.x)
+ - Python 2
+ - START: [Module 0 code - Baseline](/mod0-baseline)
+ - FINISH: [Module 1 code - Framework](/mod1-flask)
- NEXT:
- - Module 2 - migrate to Cloud NDB
-
+ - Module 2 - migrate from App Engine NDB to Cloud NDB (for Datastore access)
-- [Module 2 codelab](http://g.co/codelabs/pae-migrate-cloudndb): **Migrate from App Engine `ndb` to [Cloud NDB](https://googleapis.dev/python/python-ndb/latest)**
- - **Required** migration
- - Migration to Cloud NDB which is supported by Python 3 and the next-gen platform.
+- [Module 2 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-2-cloudndb?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudndb_201021&utm_content=-): **Migrate from App Engine `ndb` to [Cloud NDB](https://googleapis.dev/python/python-ndb/latest)**
- Python 2
- - START: [Module 1 code - Framework](/mod1-flask) (2.x)
- - FINISH: [Module 2 code - Cloud NDB](/mod2a-cloudndb) (2.x)
+ - START: [Module 1 code - Framework](/mod1-flask)
+ - FINISH: [Module 2 code - Cloud NDB](/mod2a-cloudndb)
- Codelab bonus port to Python 3.x
- FINISH: [Module 2 code - Cloud NDB](/mod2b-cloudndb) (3.x)
- RECOMMENDED:
- - Module 7 - add App Engine (push) tasks
- - OTHERS (somewhat priority order):
- - Module 11 - migrate to Cloud Functions
- - Module 5 - migrate to Cloud Run container with Cloud Buildpacks
- - Module 4 - migrate to Cloud Run container with Docker
- - Module 3 - migrate to Cloud Datastore
+ - Module 7 - add App Engine Task Queue push tasks (and migrate to Cloud Tasks in Module 8)
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 12 - add App Engine Memcache (and migrate to Cloud Memorystore in Module 13)
+ - Module 15 - add App Engine Blobstore (and migrate to Cloud Storage in Module 16)
+ - Module 20 - add App Engine Users (and migrate to Cloud Identity Platform in Module 21)
-- [Module 7 codelab](http://g.co/codelabs/pae-migrate-gaetasks): **Add App Engine (push) Task Queues to App Engine `ndb` Flask app**
+- [Module 7 codelab](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=-): **Add App Engine Task Queues push tasks to existing sample app**
- **Not a migration**: add GAE Task Queues to prepare for migration to Cloud Tasks
- Python 2
- - START: [Module 1 code - Framework](/mod1-flask) (2.x)
- - FINISH: [Module 7 code - GAE Task Queues](/mod7-gaetasks) (2.x)
- - NEXT: Module 8 - migrate App Engine push tasks to Cloud Tasks
-
-- [Module 8 codelab](http://g.co/codelabs/pae-migrate-cloudtasks): **Migrate from App Engine (push) Task Queues to [Cloud Tasks](http://cloud.google.com/tasks) v1**
- - **Required** migration
- - Migration to Cloud Tasks which is supported by Python 3 and the next-gen platform.
- - Note this is only push tasks... pull tasks will be handled in a different codelab.
+ - START: [Module 1 code - Framework](/mod1-flask)
+ - FINISH: [Module 7 code - GAE Task Queue push tasks](/mod7-gaetasks)
+ - NEXT:
+ - Module 8 - migrate App Engine Task Queue push tasks to Cloud Tasks
+
+- [Module 8 codelab](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=-): **Migrate from App Engine Task Queues push tasks to [Cloud Tasks](http://cloud.google.com/tasks) v1**
- Python 2
- - START: [Module 7 code - GAE Task Queues](/mod7-gaetasks) (2.x)
- - FINISH: [Module 8 code - Cloud Tasks](/mod8-cloudtasks) (2.x)
- - NEXT: Module 9 - migrate to Python 3 and Cloud Datastore
-
-- [Module 9 codelab](http://g.co/codelabs/pae-migrate-py3dstasks): **Migrate a Python 2 Cloud NDB & Cloud Tasks app to a Python 3 Cloud Datastore app**
- - **Mixed migration recommendation**
- - Migrating to Python 3 is required, but...
- - Migrating to Cloud Datastore is optional as Cloud NDB works on 3.x; it's to give you the experience of doing it
- - This codelab includes the [Module 3 migration codelab](http://g.co/codelabs/pae-migrate-datastore), so skip if you complete this one
+ - START: [Module 7 code - GAE Task Queue push tasks](/mod7-gaetasks)
+ - FINISH: [Module 8 code - Cloud Tasks](/mod8-cloudtasks)
+ - RECOMMENDED:
+ - Module 9 - migrate to Python 3 and Cloud Datastore
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 12 - add App Engine Memcache (and migrate to Cloud Memorystore in Module 13)
+ - Module 15 - add App Engine Blobstore (and migrate to Cloud Storage in Module 16)
+ - Module 20 - add App Engine Users (and migrate to Cloud Identity Platform in Module 21)
+
+- [Module 9 codelab](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=-): **Migrate a Python 2 Cloud NDB & Cloud Tasks (v1) app to a Python 3 Cloud Datastore & Cloud Tasks (v2) app**
+ - **Optional** migrations
+ - Migrating to Python 3 is not required but recommended as [Python 2 has been sunset](http://python.org/doc/sunset-python-2)
+ - Migrating to Cloud Datastore is optional as Cloud NDB works on 3.x
- Python 2
- - START: [Module 8 code - Cloud Tasks](/mod8-cloudtasks) (2.x)
+ - START: [Module 8 code - Cloud Tasks](/mod8-cloudtasks)
- Python 3
- - FINISH: [Module 9 code - Cloud Datastore & Tasks](/mod9-py3dstasks) (3.x)
+ - FINISH: _TBD_
- RECOMMENDED:
- - Module 11 - migrate to Cloud Functions
- - Module 5 - migrate to Cloud Run container with Cloud Buildpacks
- - Module 4 - migrate to Cloud Run container with Docker
- - Module 6 - migrate to Cloud Firestore (app)
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 12 - add App Engine Memcache (and migrate to Cloud Memorystore in Module 13)
+ - Module 15 - add App Engine Blobstore (and migrate to Cloud Storage in Module 16)
+ - Module 20 - add App Engine Users (and migrate to Cloud Identity Platform in Module 21)
-- [Module 4 codelab](http://g.co/codelabs/pae-migrate-rundocker): **Migrate from App Engine to [Cloud Run](http://cloud.google.com/run) with Docker**
- - **Optional** migration
- - "Containerize" your app (migrate your app to a container) with Docker
+- [Module 18 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-18-gaepull?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrgaepull_sms_202013&utm_content=-): **Add App Engine Task Queues pull tasks to existing sample app**
+ - **Not a migration**: add GAE Task Queues to prepare for migration to Cloud Tasks
- Python 2
- - START: [Module 2 code - Cloud NDB](/mod2a-cloudndb) (2.x)
- - FINISH: [Module 4 code - Cloud Run - Docker 3.x](/mod4a-rundocker) (2.x)
+ - START: [Module 1 code - Framework](/mod1-flask)
+ - FINISH: [Module 18 code - GAE Task Queue pull tasks](/mod18-gaepull)
+ - NEXT: Module 19 - migrate App Engine pull tasks to Cloud Pub/Sub
+
+- [Module 19 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-19-pubsub?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrpubsub_sms_202016&utm_content=-): **Migrate from App Engine Task Queues pull tasks to [Cloud Pub/Sub](http://cloud.google.com/pubsub)**
+ - Python 2
+ - START: [Module 18 code - GAE Task Queue pull tasks](/mod18-gaepull)
- Python 3
- - START: [Module 3 code - Cloud Datastore](/mod3b-datastore) (3.x)
- - FINISH: [Module 4 code - Cloud Run - Docker](/mod4b-rundocker) (3.x)
+ - FINISH: [Module 19 code - Cloud Pub/Sub](/mod19-pubsub)
- RECOMMENDED:
- - Module 5 - migrate to Cloud Run container with Cloud Buildpacks
- - OTHER OPTIONS (in somewhat priority order):
- - Module 7 - add App Engine (push) tasks
- - Module 11 - migrate to Cloud Functions
+ - Module 7 - add App Engine Task Queue push tasks (and migrate to Cloud Tasks in Module 8)
+ - Module 12 - add App Engine Memcache (and migrate to Cloud Memorystore in Module 13)
+ - Module 15 - add App Engine Blobstore (and migrate to Cloud Storage in Module 16)
+ - Module 20 - add App Engine `users` (and migrate to Cloud Identity Platform in Module 21)
-- [Module 5 codelab](http://g.co/codelabs/pae-migrate-runbldpks): **Migrate from App Engine to [Cloud Run](http://cloud.google.com/run) with Cloud Buildpacks**
- - **Optional** migration
- - "Containerize" your app (migrate your app to a container) with...
- - [Cloud Buildpacks]() which lets you containerize your app without `Dockerfile`s
- - Python 3 only
- - START: [Module 2 code - Cloud NDB](/mod2b-cloudndb) (3.x)
- - FINISH: [Module 5 code - Cloud Run - Buildpacks 3.x](/mod5-runbldpks) (3.x)
+- [Module 12 codelab](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=-): **Add App Engine Memcache to existing sample app**
+ - **Not a migration**: add GAE Memcache to prepare for migration to Cloud Memorystore
+ - Python 2
+ - START: [Module 1 code - Framework](/mod1-flask)
+ - FINISH: [Module 12 code - GAE Memcache](/mod12-memcache)
+ - NEXT: Module 13 - migrate App Engine Memcache to Cloud Memorystore
+
+- [Module 13 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-13-memorystore?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrmemorystore_sms_202029&utm_content=-): **Migrate from App Engine Memcache to [Cloud Memorystore (for Redis)](http://cloud.google.com/memorystore) v1**
+ - Python 2
+ - START: [Module 12 code - GAE Memcache](/mod12-memcache)
+ - FINISH: [Module 13 code - Cloud Tasks](/mod13a-memorystore)
+ - Python 3
+ - FINISH: [Module 13 code - Cloud Tasks](/mod13b-memorystore)
- RECOMMENDED:
- - Module 4 - migrate to Cloud Run container with Docker
- - OTHER OPTIONS (in somewhat priority order):
- - Module 7 - add App Engine (push) tasks
- - Module 11 - migrate to Cloud Functions
+ - Module 7 - add App Engine Task Queue push tasks (and migrate to Cloud Tasks in Module 8)
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 15 - add App Engine Blobstore (and migrate to Cloud Storage in Module 16)
+ - Module 20 - add App Engine `users` (and migrate to Cloud Identity Platform in Module 21)
+
+- [Module 15 codelab](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=-): **Add App Engine Blobstore to existing sample app**
+ - **Not a migration**: add GAE Blobstore to prepare for migration to Cloud Storage
+ - Python 2
+ - START: [Module 0 code - Baseline](/mod0-baseline)
+ - FINISH: [Module 15 code - GAE Blobstore](/mod15-blobstore)
+ - NEXT: Module 16 - migrate App Engine Blobstore to Cloud Storage
-- [Module 3 codelab](http://g.co/codelabs/pae-migrate-datastore): **Migrate from Cloud NDB to [Cloud Datastore](http://cloud.google.com/datastore)**
+- [Module 16 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-13-memorystore?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrmemorystore_sms_202029&utm_content=-): **Migrate from App Engine Blobstore to [Cloud Storage (for Redis)](http://cloud.google.com/storage) v1**
+ - Python 2
+ - START: [Module 15 code - GAE Blobstore](/mod15-blobstore)
+ - FINISH: [Module 16 code - Cloud Storage](/mod16-cloudstorage)
+ - Python 3
+ - FINISH: [Module 16 code - Cloud Storage](/mod16-cloudstorage) (_same as Python 2 version_)
+ - RECOMMENDED:
+ - Module 7 - add App Engine Task Queue push tasks (and migrate to Cloud Tasks in Module 8)
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 12 - add App Engine Memcache (and migrate to Cloud Memorystore in Module 13)
+ - Module 20 - add App Engine Users (and migrate to Cloud Identity Platform in Module 21)
+
+- [Module 20 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-20-gaeusers?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrgaeusers_sms_202119&utm_content=-): **Add App Engine Users to existing sample app**
+ - **Not a migration**: add GAE Users to prepare for migration to Cloud Identity Platform/Firebase Auth
+ - Python 2
+ - START: [Module 1 code - Framework](/mod1-flask)
+ - FINISH: [Module 20 code - GAE Users](/mod20-gaeusers)
+ - NEXT:
+ - Module 21 - migrate App Engine Users to Cloud Identity Platform/Firebase Auth
+
+- [Module 21 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-21-idenplat?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgridenplat_sms_202119&utm_content=-): **Migrate from App Engine Users to [Cloud Identity Platform](http://cloud.google.com/identity-platform)/Firebase Auth**
+ - Python 2
+ - START: [Module 20 code - GAE Users](/mod20-gaeusers)
+ - FINISH: [Module 21 code - Cloud Identity Platform](/mod21a-idenplat)/Firebase Auth
+ - Python 3
+ - FINISH: [Module 21 code - Cloud Identity Platform](/mod21b-idenplat)/Firebase Auth
+ - RECOMMENDED:
+ - Module 7 - add App Engine Task Queue push tasks (and migrate to Cloud Tasks in Module 8)
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 12 - add App Engine Memcache (and migrate to Cloud Memorystore in Module 13)
+ - Module 15 - add App Engine Blobstore (and migrate to Cloud Storage in Module 16)
+
+
+- [Module 3 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-3-datastore?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudds_201003&utm_content=-): **Migrate from Cloud NDB to [Cloud Datastore](http://cloud.google.com/datastore)**
- **Optional** migration
- Recommended only if using Cloud Datastore elsewhere (GAE *or* non-App Engine) apps
- Helps w/code consistency & reusability, reduces maintenance costs
- Python 2
- - START: [Module 2 code - Cloud NDB](/mod2a-cloudndb) (2.x)
- - FINISH: [Module 3 code - Cloud Datastore](/mod3a-datastore) (2.x)
+ - START: [Module 2 code - Cloud NDB](/mod2a-cloudndb)
+ - FINISH: [Module 3 code - Cloud Datastore](/mod3a-datastore)
- Python 3
- - START: [Module 2 code - Cloud NDB](/mod2b-cloudndb) (3.x)
- - FINISH: [Module 3 code - Cloud Datastore](/mod3b-datastore) (3.x)
+ - START: [Module 2 code - Cloud NDB](/mod2b-cloudndb)
+ - FINISH: [Module 3 code - Cloud Datastore](/mod3b-datastore)
- RECOMMENDED:
- - Module 7 - add App Engine (push) tasks
- - OTHER OPTIONS (in somewhat priority order):
- - Module 11 - migrate to Cloud Functions
- - Module 5 - migrate to Cloud Run container with Cloud Buildpacks
- - Module 4 - migrate to Cloud Run container with Docker
- - Module 6 - migrate to Cloud Firestore (app)
+ - Module 7 - add App Engine Task Queue push tasks (and migrate to Cloud Tasks in Module 8)
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 12 - add App Engine Memcache (and migrate to Cloud Memorystore in Module 13)
+ - Module 15 - add App Engine Blobstore (and migrate to Cloud Storage in Module 16)
+ - Module 20 - add App Engine Users (and migrate to Cloud Identity Platform in Module 21)
-- [Module 6 codelab](http://g.co/codelabs/pae-migrate-firestore): **Migrate from Cloud Datastore to [Cloud Firestore](http://cloud.google.com/firestore)** (app)
- - **Highly optional** migration
- - Requires new project & Datastore has better write performance (currently)
- - If you **must have** Firestore's Firebase features
- - Python 3 only
- - START: [Module 3 code - Cloud Datastore](/mod3b-datastore) (3.x)
- - FINISH: [Module 6 code - Cloud Firestore](/mod6-firestore) (3.x)
- - NEXT:
- - Module 10 - migrate to Cloud Firestore (data)
+
+#### Migrations to other Cloud serverless platforms
+
+- [Module 4 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-4-rundocker?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcrdckr_sms_201017&utm_content=-): **Migrate from App Engine to Cloud Run with Docker**
+ - **Optional** migration
+ - "Containerize" your app (migrate your app to a container) with Docker
+ - Python 2
+ - START: [Module 2 code - Cloud NDB](/mod2a-cloudndb)
+ - FINISH: [Module 4 code - Cloud Run - Docker 3.x](/mod4a-rundocker)
+ - Python 3
+ - START: [Module 3 code - Cloud Datastore](/mod3b-datastore)
+ - FINISH: [Module 4 code - Cloud Run - Docker](/mod4b-rundocker)
- RECOMMENDED:
- - Module 7 - add App Engine (push) tasks
- - OTHER OPTIONS (in somewhat priority order):
- - Module 11 - migrate to Cloud Functions
- Module 5 - migrate to Cloud Run container with Cloud Buildpacks
- - Module 4 - migrate to Cloud Run container with Docker
+ - Module 11 - migrate to Cloud Functions
-- **Module 10 codelab** (TBD): **Migrate from Cloud Datastore to [Cloud Firestore](http://cloud.google.com/firestore)** (data)
- - **Highly optional** migration
- - Requires new project & Datastore has better write performance (currently)
- - If you **must have** Firestore's Firebase features
+- [Module 5 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-5-runbldpks?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcrbdpk_sms_201031&utm_content=-): **Migrate from App Engine to Cloud Run with Cloud Buildpacks**
+ - **Optional** migration
+ - "Containerize" your app (migrate your app to a container) with...
+ - [Cloud Buildpacks]() which lets you containerize your app without `Dockerfile`s
- Python 3 only
+ - START: [Module 2 code - Cloud NDB](/mod2b-cloudndb)
+ - FINISH: [Module 5 code - Cloud Run - Buildpacks 3.x](/mod5-runbldpks)
- RECOMMENDED:
- - Module 7 - add App Engine (push) tasks
- - OTHER OPTIONS (in somewhat priority order):
- - Module 11 - migrate to Cloud Functions
- - Module 5 - migrate to Cloud Run container with Cloud Buildpacks
- Module 4 - migrate to Cloud Run container with Docker
+ - Module 11 - migrate to Cloud Functions
-- **Module 11 codelab** (TBD): **Migrate from App Engine to [Cloud Functions](http://cloud.google.com/run)**
+- [Module 11 codelab](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=-): **Migrate from App Engine to Cloud Functions**
- **Optional** migration
- - Recommende for small apps or for breaking up large apps into multiple microservices
+ - Recommended for small apps or for breaking up large apps into multiple microservices
- Python 3 only
- - START: [Module 2 code - Cloud NDB](/mod2b-cloudndb) (3.x)
- - FINISH: [Module 11 code - Cloud Firestore](/mod11-functions) (3.x)
+ - START: [Module 2 code - Cloud NDB](/mod2b-cloudndb)
+ - FINISH: [Module 11 code - Cloud Functions](/mod11-functions)
- RECOMMENDED:
- - Module 7 - add App Engine (push) tasks
+ - Module 7 - add App Engine Task Queue push tasks (and migrate to Cloud Tasks in Module 8)
+ - Module 18 - add App Engine Task Queue pull tasks (and migrate to Cloud Pub/Sub in Module 19)
+ - Module 12 - add App Engine `memcache` (and migrate to Cloud Memorystore in Module 13)
+ - Module 15 - add App Engine `blobstore` (and migrate to Cloud Storage in Module 16)
- OTHER OPTIONS (in somewhat priority order):
- Module 5 - migrate to Cloud Run container with Cloud Buildpacks
- - Module 4 - migrate to Cloud Run container with Docker
- - Module 3 - migrate to Cloud Datastore
## Considerations for mobile developers
@@ -243,13 +330,26 @@ If your original app users does *not* have a user interface, i.e., mobile backen
- [Firebase mobile & web app platform](https://firebase.google.com) (and [Cloud Functions for Firebase](https://firebase.google.com/products/functions) [customized for Firebase])
-### Canonical code samples
+## Canonical code samples
- This repo, along with corresponding codelabs & videos are complementary to the official docs & code samples.
- The [official Python 2 to 3 migration documentation](https://cloud.google.com/appengine/docs/standard/python/migrate-to-python3)
- [Canonical migration code samples repo](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/migration)
- - Example: [GAE `ndb` to Cloud NDB](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/migration/ndb/overview)
- - Example: [GAE `taskqueue` to Cloud Tasks](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/migration/taskqueue)
+ - *Example:* [GAE `ndb` to Cloud NDB](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/migration/ndb/overview) (similar to Module 2)
+ - *Example:* [GAE `taskqueue` to Cloud Tasks](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/migration/taskqueue) (similar to Module 8)
+
+
+## Accessing legacy services in second generation
+
+Many legacy App Engine first generation platform (Python 2, Java 8, PHP 5, and Go 1.11 & older) services are available ([as of Sep 2021](https://cloud.google.com/blog/products/serverless/support-for-app-engine-services-in-second-generation-runtimes) for second generation runtimes (Python 3, Java 11/17, PHP 7/8, and Go 1.12 & newer) in a public preview. There are no videos or codelabs yet, however the Module 1 Flask migration using App Engine `ndb` [Python 2 sample](/mod1-flask) is available in [Python 3](/mod1b-flask) if you have access. Similarly, Python 3 editions are also available for Modules 7 and 12 which add usage of App Engine `taskqueue` and `memcache`, respectively. Also see the [documentation on accessing bundled services from Python 3](https://cloud.google.com/appengine/docs/standard/python3/services/access).
+
+
+## Community
+
+Python App Engine developers hang out in various online communities, including these:
+- [Slack](https://googlecloud-community.slack.com) (`#app-engine`, `#python`, and other channels); visit [this link](https://join.slack.com/t/googlecloud-community/shared_invite/zt-ywj8ieuc-BrAaHC~qe5IgelXS9vzNRA) to join
+- [Reddit](http://reddit.com) in the [Google Cloud](https://reddit.com/googlecloud) or [App Engine](https://reddit.com/appengine) subs (subReddits).
+- [App Engine mailing list](http://groups.google.com/group/google-appengine)
## References
@@ -257,15 +357,14 @@ If your original app users does *not* have a user interface, i.e., mobile backen
- App Engine Migration
- [Migrate from Python 2 to 3](http://cloud.google.com/appengine/docs/standard/python/migrate-to-python3)
- [Migrate from App Engine `ndb` to Cloud NDB](http://cloud.google.com/appengine/docs/standard/python/migrate-to-python3/migrate-to-cloud-ndb) (Module 2)
- - [App Engine `ndb` to Cloud NDB official sample app](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/migration/ndb/overview) (Module 2)
- [Migrate from App Engine `taskqueue` to Cloud Tasks](http://cloud.google.com/appengine/docs/standard/python/migrate-to-python3/migrate-to-cloud-ndb) (Modules 7-9)
- - [App Engine `app.yaml` to Cloud Run `service.yaml` tool](http://googlecloudplatform.github.io/app-engine-cloud-run-converter) (Modules 4 and 5)
- [Migrate from App Engine `db` to `ndb`](http://cloud.google.com/appengine/docs/standard/python/ndb/db_to_ndb) ("Module -1"; only for reviving "dead" Python 2.5 apps for 2.7)
- [Community contributed migration samples](https://github.com/GoogleCloudPlatform/appengine-python2-3-migration)
- Python App Engine
- - [Python 2 App Engine (Standard)](https://cloud.google.com/appengine/docs/standard/python/runtime)
- - [Python 3 App Engine (Standard)](https://cloud.google.com/appengine/docs/standard/python3/runtime)
+ - [App Engine 1st vs. 2nd generation runtimes](https://cloud.google.com/appengine/docs/standard/runtimes)
+ - [Python 2 App Engine (Standard) runtime](https://cloud.google.com/appengine/docs/standard/python/runtime)
+ - [Python 3 App Engine (Standard) runtime](https://cloud.google.com/appengine/docs/standard/python3/runtime)
- [Python App Engine (Flexible)](https://cloud.google.com/appengine/docs/flexible/python)
- Google Cloud Platform (GCP)
diff --git a/mod0-baseline/.gcloudignore b/mod0-baseline/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod0-baseline/.gcloudignore
+++ b/mod0-baseline/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod0-baseline/app.yaml b/mod0-baseline/app.yaml
index 80fb603..0d4d8d6 100644
--- a/mod0-baseline/app.yaml
+++ b/mod0-baseline/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod0-baseline/main.py b/mod0-baseline/main.py
index f21d8b0..57e261c 100644
--- a/mod0-baseline/main.py
+++ b/mod0-baseline/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# [START mod0_baseline]
import os
import webapp2
from google.appengine.ext import ndb
@@ -28,8 +29,7 @@ def store_visit(remote_addr, user_agent):
def fetch_visits(limit):
'get most recent visits'
- return (v.to_dict() for v in Visit.query().order(
- -Visit.timestamp).fetch(limit))
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
class MainHandler(webapp2.RequestHandler):
'main application (GET) handler'
@@ -42,3 +42,4 @@ def get(self):
app = webapp2.WSGIApplication([
('/', MainHandler),
], debug=True)
+# [END mod0_baseline]
diff --git a/mod1-flask/.gcloudignore b/mod1-flask/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod1-flask/.gcloudignore
+++ b/mod1-flask/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod1-flask/app.yaml b/mod1-flask/app.yaml
index 80fb603..0d4d8d6 100644
--- a/mod1-flask/app.yaml
+++ b/mod1-flask/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod1-flask/main.py b/mod1-flask/main.py
index ecf425f..f36f3e5 100644
--- a/mod1-flask/main.py
+++ b/mod1-flask/main.py
@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
app = Flask(__name__)
+
class Visit(ndb.Model):
'Visit entity registers visitor IP address & timestamp'
visitor = ndb.StringProperty()
@@ -28,8 +29,8 @@ def store_visit(remote_addr, user_agent):
def fetch_visits(limit):
'get most recent visits'
- return (v.to_dict() for v in Visit.query().order(
- -Visit.timestamp).fetch(limit))
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
@app.route('/')
def root():
diff --git a/mod1-flask/requirements.txt b/mod1-flask/requirements.txt
index 5c508e5..7e10602 100644
--- a/mod1-flask/requirements.txt
+++ b/mod1-flask/requirements.txt
@@ -1 +1 @@
-flask==1.1.2
+flask
diff --git a/mod1-flask/templates/index.html b/mod1-flask/templates/index.html
index e140206..920068e 100644
--- a/mod1-flask/templates/index.html
+++ b/mod1-flask/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod11-functions/.gcloudignore b/mod11-functions/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod11-functions/.gcloudignore
+++ b/mod11-functions/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod11-functions/main.py b/mod11-functions/main.py
index 30e2f02..a71655f 100644
--- a/mod11-functions/main.py
+++ b/mod11-functions/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -30,8 +30,7 @@ def store_visit(remote_addr, user_agent):
def fetch_visits(limit):
'get most recent visits'
with ds_client.context():
- return (v.to_dict() for v in Visit.query().order(
- -Visit.timestamp).fetch(limit))
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
def visitme(request):
'main application (GET) handler'
diff --git a/mod11-functions/requirements.txt b/mod11-functions/requirements.txt
index c5fbb74..81ef820 100644
--- a/mod11-functions/requirements.txt
+++ b/mod11-functions/requirements.txt
@@ -1,2 +1,2 @@
-flask==1.1.2
-google-cloud-ndb==1.9.0
+flask
+google-cloud-ndb==1.11.1
diff --git a/mod11-functions/templates/index.html b/mod11-functions/templates/index.html
index e140206..920068e 100644
--- a/mod11-functions/templates/index.html
+++ b/mod11-functions/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod12-memcache/.gcloudignore b/mod12-memcache/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod12-memcache/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod12-memcache/README.md b/mod12-memcache/README.md
new file mode 100644
index 0000000..f4447f9
--- /dev/null
+++ b/mod12-memcache/README.md
@@ -0,0 +1,3 @@
+# Module 12 - Add usage of App Engine `memcache` to Flask `ndb` sample app
+
+This repo folder is the corresponding Python 2 code to the Module 12 codelab (TBD). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through adding usage of App Engine's `memcache`, culminating in the code in this folder.
diff --git a/mod12-memcache/app.yaml b/mod12-memcache/app.yaml
new file mode 100644
index 0000000..0d4d8d6
--- /dev/null
+++ b/mod12-memcache/app.yaml
@@ -0,0 +1,21 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
diff --git a/mod12-memcache/appengine_config.py b/mod12-memcache/appengine_config.py
new file mode 100644
index 0000000..9760ebb
--- /dev/null
+++ b/mod12-memcache/appengine_config.py
@@ -0,0 +1,20 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
diff --git a/mod12-memcache/main.py b/mod12-memcache/main.py
new file mode 100644
index 0000000..d183b12
--- /dev/null
+++ b/mod12-memcache/main.py
@@ -0,0 +1,49 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+from google.appengine.api import memcache
+from google.appengine.ext import ndb
+
+app = Flask(__name__)
+HOUR = 3600
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ # check for (hour-)cached visits
+ ip_addr, usr_agt = request.remote_addr, request.user_agent
+ visitor = '{}: {}'.format(ip_addr, usr_agt)
+ visits = memcache.get('visits')
+
+ # register visit & run DB query if cache empty or new visitor
+ if not visits or visits[0].visitor != visitor:
+ store_visit(ip_addr, usr_agt)
+ visits = list(fetch_visits(10))
+ memcache.set('visits', visits, HOUR) # set() not add()
+
+ return render_template('index.html', visits=visits)
diff --git a/mod12-memcache/requirements.txt b/mod12-memcache/requirements.txt
new file mode 100644
index 0000000..7e10602
--- /dev/null
+++ b/mod12-memcache/requirements.txt
@@ -0,0 +1 @@
+flask
diff --git a/mod12-memcache/templates/index.html b/mod12-memcache/templates/index.html
new file mode 100644
index 0000000..920068e
--- /dev/null
+++ b/mod12-memcache/templates/index.html
@@ -0,0 +1,17 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
diff --git a/mod12b-memcache/.gcloudignore b/mod12b-memcache/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod12b-memcache/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod12b-memcache/README.md b/mod12b-memcache/README.md
new file mode 100644
index 0000000..c66a990
--- /dev/null
+++ b/mod12b-memcache/README.md
@@ -0,0 +1,5 @@
+# Module 12 - Add usage of App Engine `memcache` to Flask `ndb` sample app
+
+This repo folder is the corresponding Python 3 code to the Module 12 codelab (TBD). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through adding usage of App Engine's `memcache`, followed by a bonus migration to Python 3, culminating in the code in this folder.
+
+> **LEGACY SERVICES PUBLIC PREVIEW**: Accessing legacy services such as App Engine `ndb` and `memcache` from Python 3 (and next generation App Engine in general) is available in a public preview. See the [Sep 2021 announcement](https://twitter.com/googledevs/status/1445916786755571712) for more information.
diff --git a/mod12b-memcache/app.yaml b/mod12b-memcache/app.yaml
new file mode 100644
index 0000000..4c77d5d
--- /dev/null
+++ b/mod12b-memcache/app.yaml
@@ -0,0 +1,16 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python39
+app_engine_apis: true
diff --git a/mod12b-memcache/main.py b/mod12b-memcache/main.py
new file mode 100644
index 0000000..ae7924b
--- /dev/null
+++ b/mod12b-memcache/main.py
@@ -0,0 +1,50 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+from google.appengine.api import memcache, wrap_wsgi_app
+from google.appengine.ext import ndb
+
+app = Flask(__name__)
+app.wsgi_app = wrap_wsgi_app(app.wsgi_app)
+HOUR = 3600
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ # check for (hour-)cached visits
+ ip_addr, usr_agt = request.remote_addr, request.user_agent
+ visitor = '{}: {}'.format(ip_addr, usr_agt)
+ visits = memcache.get('visits')
+
+ # register visit & run DB query if cache empty or new visitor
+ if not visits or visits[0].visitor != visitor:
+ store_visit(ip_addr, usr_agt)
+ visits = list(fetch_visits(10))
+ memcache.set('visits', visits, HOUR) # set() not add()
+
+ return render_template('index.html', visits=visits)
diff --git a/mod12b-memcache/requirements.txt b/mod12b-memcache/requirements.txt
new file mode 100644
index 0000000..a2e7c7f
--- /dev/null
+++ b/mod12b-memcache/requirements.txt
@@ -0,0 +1,2 @@
+flask
+appengine-python-standard
diff --git a/mod12b-memcache/templates/index.html b/mod12b-memcache/templates/index.html
new file mode 100644
index 0000000..920068e
--- /dev/null
+++ b/mod12b-memcache/templates/index.html
@@ -0,0 +1,17 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
diff --git a/mod13a-memorystore/.gcloudignore b/mod13a-memorystore/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod13a-memorystore/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod13a-memorystore/README.md b/mod13a-memorystore/README.md
new file mode 100644
index 0000000..126d96e
--- /dev/null
+++ b/mod13a-memorystore/README.md
@@ -0,0 +1,3 @@
+# Module 13 - Migrate from App Engine `memcache` to Cloud Memorystore
+
+This repo folder is the corresponding Python 2 code to the Module 13 codelab (TBD). The tutorial STARTs with the Python 2 code in the [Module 12 repo folder](/mod12-memcache) and leads developers through a migration to Cloud Memorystore, culminating in the code in this (`mod13a-memorystore`) folder. Also included is a migration from App Engine `ndb` to Google Cloud NDB, mirroring the content covered in [Module 2](http://g.co/codelabs/pae-migrate-cloudndb).
diff --git a/mod13a-memorystore/app.yaml b/mod13a-memorystore/app.yaml
new file mode 100644
index 0000000..9021a81
--- /dev/null
+++ b/mod13a-memorystore/app.yaml
@@ -0,0 +1,34 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
+
+libraries:
+- name: grpcio
+ version: latest
+- name: setuptools
+ version: latest
+
+env_variables:
+ REDIS_HOST: 'YOUR_REDIS_HOST'
+ REDIS_PORT: 'YOUR_REDIS_PORT'
+
+vpc_access_connector:
+ name: projects/PROJECT_ID/locations/REGION/connectors/CONNECTOR
diff --git a/mod13a-memorystore/appengine_config.py b/mod13a-memorystore/appengine_config.py
new file mode 100644
index 0000000..2a41fb4
--- /dev/null
+++ b/mod13a-memorystore/appengine_config.py
@@ -0,0 +1,23 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pkg_resources
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
+# Add libraries to pkg_resources working set to find the distribution.
+pkg_resources.working_set.add_entry(PATH)
diff --git a/mod13a-memorystore/main.py b/mod13a-memorystore/main.py
new file mode 100644
index 0000000..086c286
--- /dev/null
+++ b/mod13a-memorystore/main.py
@@ -0,0 +1,58 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import pickle
+from flask import Flask, render_template, request
+from google.cloud import ndb
+import redis
+
+app = Flask(__name__)
+ds_client = ndb.Client()
+HOUR = 3600
+REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
+REDIS_PORT = os.environ.get('REDIS_PORT', '6379')
+REDIS = redis.Redis(host=REDIS_HOST, port=REDIS_PORT)
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ with ds_client.context():
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ with ds_client.context():
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ # check for (hour-)cached visits
+ ip_addr, usr_agt = request.remote_addr, request.user_agent
+ visitor = '{}: {}'.format(ip_addr, usr_agt)
+ rsp = REDIS.get('visits')
+ visits = pickle.loads(rsp) if rsp else None
+
+ # register visit & run DB query if cache empty or new visitor
+ if not visits or visits[0].visitor != visitor:
+ store_visit(ip_addr, usr_agt)
+ visits = list(fetch_visits(10))
+ REDIS.set('visits', pickle.dumps(visits), ex=HOUR)
+
+ return render_template('index.html', visits=visits)
diff --git a/mod13a-memorystore/requirements.txt b/mod13a-memorystore/requirements.txt
new file mode 100644
index 0000000..1bdb2fd
--- /dev/null
+++ b/mod13a-memorystore/requirements.txt
@@ -0,0 +1,3 @@
+flask
+redis
+google-cloud-ndb
diff --git a/mod13a-memorystore/templates/index.html b/mod13a-memorystore/templates/index.html
new file mode 100644
index 0000000..920068e
--- /dev/null
+++ b/mod13a-memorystore/templates/index.html
@@ -0,0 +1,17 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
diff --git a/mod13b-memorystore/.gcloudignore b/mod13b-memorystore/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod13b-memorystore/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod13b-memorystore/README.md b/mod13b-memorystore/README.md
new file mode 100644
index 0000000..3d04f68
--- /dev/null
+++ b/mod13b-memorystore/README.md
@@ -0,0 +1,9 @@
+# Module 13 - Migrate from App Engine `memcache` to Cloud Memorystore
+
+This repo folder is the corresponding Python 3 version of the Module 13 app.
+
+- All files in this folder are identical to the _Python 2_ code in the [Module 13a repo folder](/mod13a-memorystore) **except**:
+ 1. `app.yaml` was modified for the Python 3 runtime.
+ 1. `appengine_config.py` is unused and thus deleted.
+- An optional migration from Cloud NDB to Cloud Datastore can be achieved via the content covered in [Module 3](http://g.co/codelabs/pae-migrate-datastore).
+- The _Python 3_ version of the Module 12 app ([Module 12b repo folder](/mod12b-memcache)) features additional code to support those App Engine legacy ("bundled") services (like `memcache`). Because the app in this folder does not use such services (moved to Cloud Memorystore), that extra support does not appear, so the code here should not be considered a direct migration of that app to Cloud Memorystore (and Cloud NDB), unlike the Python 2 equivalents (Modules [12a](/mod12-memcache) and [13a](/mod13a-memorystore)) which can.
diff --git a/mod13b-memorystore/app.yaml b/mod13b-memorystore/app.yaml
new file mode 100644
index 0000000..aa3960c
--- /dev/null
+++ b/mod13b-memorystore/app.yaml
@@ -0,0 +1,22 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python39
+
+env_variables:
+ REDIS_HOST: 'YOUR_REDIS_HOST'
+ REDIS_PORT: 'YOUR_REDIS_PORT'
+
+vpc_access_connector:
+ name: projects/PROJECT_ID/locations/REGION/connectors/CONNECTOR
diff --git a/mod13b-memorystore/main.py b/mod13b-memorystore/main.py
new file mode 100644
index 0000000..fb567e8
--- /dev/null
+++ b/mod13b-memorystore/main.py
@@ -0,0 +1,58 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import pickle
+from flask import Flask, render_template, request
+from google.cloud import ndb
+import redis
+
+app = Flask(__name__)
+ds_client = ndb.Client()
+HOUR = 3600
+REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
+REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
+REDIS = redis.Redis(host=REDIS_HOST, port=REDIS_PORT)
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ with ds_client.context():
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ with ds_client.context():
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ # check for (hour-)cached visits
+ ip_addr, usr_agt = request.remote_addr, request.user_agent
+ visitor = '{}: {}'.format(ip_addr, usr_agt)
+ rsp = REDIS.get('visits')
+ visits = pickle.loads(rsp) if rsp else None
+
+ # register visit & run DB query if cache empty or new visitor
+ if not visits or visits[0].visitor != visitor:
+ store_visit(ip_addr, usr_agt)
+ visits = list(fetch_visits(10))
+ REDIS.set('visits', pickle.dumps(visits), ex=HOUR)
+
+ return render_template('index.html', visits=visits)
diff --git a/mod13b-memorystore/requirements.txt b/mod13b-memorystore/requirements.txt
new file mode 100644
index 0000000..1bdb2fd
--- /dev/null
+++ b/mod13b-memorystore/requirements.txt
@@ -0,0 +1,3 @@
+flask
+redis
+google-cloud-ndb
diff --git a/mod13b-memorystore/templates/index.html b/mod13b-memorystore/templates/index.html
new file mode 100644
index 0000000..920068e
--- /dev/null
+++ b/mod13b-memorystore/templates/index.html
@@ -0,0 +1,17 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
diff --git a/mod15-blobstore/.gcloudignore b/mod15-blobstore/.gcloudignore
new file mode 100644
index 0000000..114f630
--- /dev/null
+++ b/mod15-blobstore/.gcloudignore
@@ -0,0 +1,82 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Special files in this dir
+main-gcs.py
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod15-blobstore/README.md b/mod15-blobstore/README.md
new file mode 100644
index 0000000..1228943
--- /dev/null
+++ b/mod15-blobstore/README.md
@@ -0,0 +1,9 @@
+# Module 15 - Add usage of App Engine `blobstore` to `webapp2 ndb` sample app
+
+This repo folder is the corresponding code to the [Module 15 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-15-blobstore?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrblobstore_sms_202029&utm_content=-). The tutorial STARTs with the Python 2 code in the [Module 0 repo folder](/mod0-baseline) and leads developers through adding use of App Engine `blobstore`, resulting in the code in _this_ folder. Unlike other sample apps, this does not use the default Django templating system, but instead, uses Jinja2, which is supported in `webapp2_extras`.
+
+Blobstore evolved into [Google Cloud Storage](https://cloud.google.com/storage), and all blobs/files created using the Blobstore API go into the default Cloud Storage bucket for your project. It's named the same as the `appspot` domain name given to your app. For example, if your project is named `my-project`, your default bucket would be `my-project.appspot.com`. The default GCS bucket name is programmatically accessible via `google.appengine.api.app_identity.get_default_gcs_bucket_name()`.
+
+The primary application file [`main.py`](main.py) writes files directly to the default bucket. If you want to customize the GCS location where App Engine writes files, see the alternative [`main-gcs.py`](main-gcs.py) file. In that file, the `gs_bucket_name` parameter is used when calling `google.appengine.ext.blobstore.create_upload_url()` to specify the bucket/location to write the file.
+
+Unlike some of the other migrations, Blobstore usage depends on `webapp` (where as the app uses the `webapp2` micro framework), so this migration must start at Module 0 rather than Module 1. One update however, is that this sample switches to the [Jinja2 templating system](https://jinja.palletsprojects.com) from the default Django template system used in Module 0. Jinja2 is supported as an App Engine [built-in library](https://cloud.google.com/appengine/docs/standard/python/tools/built-in-libraries-27) and accessed via the `webapp2_extras` package.
diff --git a/mod15-blobstore/app.yaml b/mod15-blobstore/app.yaml
new file mode 100644
index 0000000..09e8291
--- /dev/null
+++ b/mod15-blobstore/app.yaml
@@ -0,0 +1,25 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
+
+libraries:
+- name: jinja2
+ version: latest
diff --git a/mod15-blobstore/main-gcs.py b/mod15-blobstore/main-gcs.py
new file mode 100644
index 0000000..922a38e
--- /dev/null
+++ b/mod15-blobstore/main-gcs.py
@@ -0,0 +1,83 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import webapp2
+from webapp2_extras import jinja2
+from google.appengine.api import app_identity
+from google.appengine.ext import blobstore, ndb
+from google.appengine.ext.webapp import blobstore_handlers
+
+BUCKET = app_identity.get_default_gcs_bucket_name()
+
+
+class BaseHandler(webapp2.RequestHandler):
+ 'Derived request handler mixing-in Jinja2 support'
+ @webapp2.cached_property
+ def jinja2(self):
+ return jinja2.get_jinja2(app=self.app)
+
+ def render_response(self, _template, **context):
+ self.response.write(self.jinja2.render_template(_template, **context))
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+ file_blob = ndb.BlobKeyProperty()
+
+
+def store_visit(remote_addr, user_agent, upload_key):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent),
+ file_blob=upload_key).put()
+
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+class UploadHandler(blobstore_handlers.BlobstoreUploadHandler):
+ 'Upload blob (POST) handler'
+ def post(self):
+ uploads = self.get_uploads()
+ blob_id = uploads[0].key() if uploads else None
+ store_visit(self.request.remote_addr, self.request.user_agent, blob_id)
+ self.redirect('/', code=307)
+
+
+class ViewBlobHandler(blobstore_handlers.BlobstoreDownloadHandler):
+ 'view uploaded blob (GET) handler'
+ def get(self, blob_key):
+ self.send_blob(blob_key) if blobstore.get(blob_key) else self.error(404)
+
+
+class MainHandler(BaseHandler):
+ 'main application (GET/POST) handler'
+ def get(self):
+ self.render_response('index.html',
+ upload_url=blobstore.create_upload_url('/upload',
+ gs_bucket_name=BUCKET))
+
+ def post(self):
+ visits = fetch_visits(10)
+ self.render_response('index.html', visits=visits)
+
+
+app = webapp2.WSGIApplication([
+ ('/', MainHandler),
+ ('/upload', UploadHandler),
+ ('/view/([^/]+)?', ViewBlobHandler),
+], debug=True)
diff --git a/mod15-blobstore/main.py b/mod15-blobstore/main.py
new file mode 100644
index 0000000..f390a18
--- /dev/null
+++ b/mod15-blobstore/main.py
@@ -0,0 +1,79 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import webapp2
+from webapp2_extras import jinja2
+from google.appengine.ext import blobstore, ndb
+from google.appengine.ext.webapp import blobstore_handlers
+
+
+class BaseHandler(webapp2.RequestHandler):
+ 'Derived request handler mixing-in Jinja2 support'
+ @webapp2.cached_property
+ def jinja2(self):
+ return jinja2.get_jinja2(app=self.app)
+
+ def render_response(self, _template, **context):
+ self.response.write(self.jinja2.render_template(_template, **context))
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+ file_blob = ndb.BlobKeyProperty()
+
+
+def store_visit(remote_addr, user_agent, upload_key):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent),
+ file_blob=upload_key).put()
+
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+class UploadHandler(blobstore_handlers.BlobstoreUploadHandler):
+ 'Upload blob (POST) handler'
+ def post(self):
+ uploads = self.get_uploads()
+ blob_id = uploads[0].key() if uploads else None
+ store_visit(self.request.remote_addr, self.request.user_agent, blob_id)
+ self.redirect('/', code=307)
+
+
+class ViewBlobHandler(blobstore_handlers.BlobstoreDownloadHandler):
+ 'view uploaded blob (GET) handler'
+ def get(self, blob_key):
+ self.send_blob(blob_key) if blobstore.get(blob_key) else self.error(404)
+
+
+class MainHandler(BaseHandler):
+ 'main application (GET/POST) handler'
+ def get(self):
+ self.render_response('index.html',
+ upload_url=blobstore.create_upload_url('https://github.com/upload'))
+
+ def post(self):
+ visits = fetch_visits(10)
+ self.render_response('index.html', visits=visits)
+
+
+app = webapp2.WSGIApplication([
+ ('/', MainHandler),
+ ('/upload', UploadHandler),
+ ('/view/([^/]+)?', ViewBlobHandler),
+], debug=True)
diff --git a/mod15-blobstore/templates/index.html b/mod15-blobstore/templates/index.html
new file mode 100644
index 0000000..e0e6a75
--- /dev/null
+++ b/mod15-blobstore/templates/index.html
@@ -0,0 +1,38 @@
+
+
+
+VisitMe Example
+
+
+
+
+
+{% endif %}
+
+
+
diff --git a/mod15b-blobstore/README.md b/mod15b-blobstore/README.md
new file mode 100644
index 0000000..94b30ff
--- /dev/null
+++ b/mod15b-blobstore/README.md
@@ -0,0 +1,8 @@
+# Module 15b - Usage of App Engine `blobstore` with Flask framework in Python 3
+
+This repo folder is the corresponding Python 3 version of the Module 15 app.
+
+- All files in this folder are identical to the _Python 2_ code in the [Module 15 repo folder](/mod15-blobstore) **except**:
+ 1. `app.yaml` was modified for the Python 3 runtime.
+ 1. `appengine_config.py` is unused and thus deleted.
+- The _Python 3_ version of the Module 15 app ([Module 15 repo folder](/mod15-blobstore)) features the use of [Blobstore handlers classes](https://cloud.google.com/appengine/docs/standard/python3/services/blobstore).
\ No newline at end of file
diff --git a/mod15b-blobstore/app.yaml b/mod15b-blobstore/app.yaml
new file mode 100644
index 0000000..c623187
--- /dev/null
+++ b/mod15b-blobstore/app.yaml
@@ -0,0 +1,2 @@
+runtime: python310
+app_engine_apis: true
diff --git a/mod15b-blobstore/main.py b/mod15b-blobstore/main.py
new file mode 100644
index 0000000..fb2d633
--- /dev/null
+++ b/mod15b-blobstore/main.py
@@ -0,0 +1,82 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import io
+from flask import Flask, abort, redirect, request
+from google.appengine.api import wrap_wsgi_app
+from google.appengine.ext import blobstore, ndb
+
+app = Flask(__name__)
+app.wsgi_app = wrap_wsgi_app(app.wsgi_app, use_deferred=True)
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+ blob_key = ndb.BlobKeyProperty()
+
+
+def store_visit(remote_addr, user_agent, upload_key):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent),
+ file_blob = upload_key).put()
+
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+class UploadHandler(blobstore.BlobstoreUploadHandler):
+ 'Upload blob (POST) handler'
+ def post(self):
+ uploads = self.get_uploads(request.environ)
+ blob_id = uploads[0].key() if uploads else None
+ store_visit(self.request.remote_addr, self.request.user_agent, blob_id)
+ return redirect('/', code=307)
+
+class ViewBlobHandler(blobstore.BlobstoreDownloadHandler):
+ 'view uploaded blob (GET) handler'
+ def get(self, blob_key):
+ if not blobstore.get(blob_key):
+ return "Blobg key not found", 404
+ else:
+ headers = self.send_blob(request.environ, blob_key)
+
+ # Prevent Flask from setting a default content-type.
+ # GAE sets it to a guessed type if the header is not set.
+ headers['Content-Type'] = None
+ return '', headers
+
+@app.route('/view_photo/')
+def view_photo(photo_key):
+ """View photo given a key."""
+ return ViewBlobHandler().get(photo_key)
+
+
+@app.route('/upload_photo', methods=['POST'])
+def upload_photo():
+ """Upload handler called by blobstore when a blob is uploaded in the test."""
+ return UploadHandler().post()
+
+@app.route('/', methods=['GET', 'POST'])
+def root():
+ 'main application (GET/POST) handler'
+ context = {}
+ if request.method == 'GET':
+ context['upload_url'] = url_for('upload')
+ else:
+ context['visits'] = fetch_visits(10)
+ return render_template('index.html', **context)
\ No newline at end of file
diff --git a/mod15b-blobstore/requirements.txt b/mod15b-blobstore/requirements.txt
new file mode 100644
index 0000000..39d910c
--- /dev/null
+++ b/mod15b-blobstore/requirements.txt
@@ -0,0 +1,2 @@
+Flask==2.0.1
+appengine-python-standard>=1.0.0
\ No newline at end of file
diff --git a/mod15b-blobstore/templates/index.html b/mod15b-blobstore/templates/index.html
new file mode 100644
index 0000000..c6376a1
--- /dev/null
+++ b/mod15b-blobstore/templates/index.html
@@ -0,0 +1,38 @@
+
+
+
+VisitMe Example
+
+
+
+
+
+{% endif %}
+
+
+
\ No newline at end of file
diff --git a/mod16-cloudstorage/.gcloudignore b/mod16-cloudstorage/.gcloudignore
new file mode 100644
index 0000000..1133073
--- /dev/null
+++ b/mod16-cloudstorage/.gcloudignore
@@ -0,0 +1,82 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Special files in this dir
+main-migrate.py
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod16-cloudstorage/README.md b/mod16-cloudstorage/README.md
new file mode 100644
index 0000000..a051615
--- /dev/null
+++ b/mod16-cloudstorage/README.md
@@ -0,0 +1,26 @@
+# Module 16 - Migrate from App Engine `blobstore` to Cloud Storage
+
+## Migrations
+
+This repo folder is the corresponding code to the [Module 16 codelab](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-16-cloudstorage?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrcloudstorage_sms_202029&utm_content=-). The tutorial STARTs with the Python 2 code in the [Module 15 repo folder](/mod15-blobstore) and leads developers through a set of migrations, culminating in the code in _this_ folder. In addition to migrating to Cloud Storage, a few others are done to get from Modules 15 to 16... here is the complete list:
+
+1. Migrate from App Engine `webapp2` to Flask
+1. Migrate from App Engine `ndb` to Cloud NDB
+1. Migrate from App Engine `blobstore` to Cloud Storage
+
+The reason why the web framework requires migration is because `blobstore` has dependencies on `webapp` and `webapp2`, so we could not start directly from a Flask app.
+
+## Python compatibility
+
+This app is fully Python 2-3 compatible. To do a Python 3 deployment of this app:
+
+1. Edit `app.yaml` by enabling/uncommenting the `runtime: python39` line
+1. Delete all other lines in `app.yaml` and save
+1. Delete `lib` (if present) and `appengine_config.py` (neither used in Python 3)
+1. Deploy with `gcloud app deploy`
+
+## Backwards compatibility
+
+One catch with this migration is that `blobstore` has a dependency on `webapp`. By migrating to Cloud Storage, that dependency is not resolved because the app was also migrated from `webapp2` (and `webapp`) to Flask. In real life, there may not be an option to just discard all your data. The [`main.py`](main.py) in this folder is for the easy situation where you _can_, replacing `ndb.BlobKeyProperty` (for Blobstore files) with `ndb.StringProperty` (for Cloud Storage files) in the data model.
+
+For the rest of us, we may need [`main-migrate.py`](main-migrate.py), an alternative version of the application. The data model here maintains a `ndb.BlobKeyProperty` for backwards-compatibility and creates a 4th field for the Cloud Storage filename (`ndb.StringProperty`). Furthermore, an additional `etl_visits()` function is required to consolidate files created with Blobstore _and_ Cloud Storage without changing the HTML template.
diff --git a/mod16-cloudstorage/app.yaml b/mod16-cloudstorage/app.yaml
new file mode 100644
index 0000000..756abc0
--- /dev/null
+++ b/mod16-cloudstorage/app.yaml
@@ -0,0 +1,30 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#runtime: python39
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
+
+libraries:
+- name: grpcio
+ version: latest
+- name: setuptools
+ version: latest
+- name: ssl
+ version: latest
diff --git a/mod16-cloudstorage/appengine_config.py b/mod16-cloudstorage/appengine_config.py
new file mode 100644
index 0000000..2a41fb4
--- /dev/null
+++ b/mod16-cloudstorage/appengine_config.py
@@ -0,0 +1,23 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pkg_resources
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
+# Add libraries to pkg_resources working set to find the distribution.
+pkg_resources.working_set.add_entry(PATH)
diff --git a/mod16-cloudstorage/main-migrate.py b/mod16-cloudstorage/main-migrate.py
new file mode 100644
index 0000000..60a3448
--- /dev/null
+++ b/mod16-cloudstorage/main-migrate.py
@@ -0,0 +1,93 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import io
+
+from flask import (Flask, abort, redirect, render_template,
+ request, send_file, url_for)
+from werkzeug.utils import secure_filename
+
+import google.auth
+from google.cloud import exceptions, ndb, storage
+
+app = Flask(__name__)
+ds_client = ndb.Client()
+gcs_client = storage.Client()
+_, PROJECT_ID = google.auth.default()
+BUCKET = '%s.appspot.com' % PROJECT_ID
+
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+ file_blob = ndb.BlobKeyProperty() # backwards-compatibility
+ file_gcs = ndb.StringProperty()
+
+
+def store_visit(remote_addr, user_agent, upload_key):
+ 'create new Visit entity in Datastore'
+ with ds_client.context():
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent),
+ file_gcs=upload_key).put()
+
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ with ds_client.context():
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+@app.route('/upload', methods=['POST'])
+def upload():
+ 'Upload blob (POST) handler'
+ fname = None
+ upload = request.files.get('file', None)
+ if upload:
+ fname = secure_filename(upload.filename)
+ blob = gcs_client.bucket(BUCKET).blob(fname)
+ blob.upload_from_file(upload, content_type=upload.content_type)
+ store_visit(request.remote_addr, request.user_agent, fname)
+ return redirect(url_for('root'), code=307)
+
+
+@app.route('/view/')
+def view(fname):
+ 'view uploaded blob (GET) handler'
+ blob = gcs_client.bucket(BUCKET).blob(fname)
+ try:
+ media = blob.download_as_bytes()
+ except exceptions.NotFound:
+ abort(404)
+ return send_file(io.BytesIO(media), mimetype=blob.content_type)
+
+
+def etl_visits(visits):
+ return [{
+ 'visitor': v.visitor,
+ 'timestamp': v.timestamp,
+ 'file_blob': v.file_gcs if hasattr(v, 'file_gcs') and v.file_gcs else v.file_blob
+ } for v in visits]
+
+
+@app.route('/', methods=['GET', 'POST'])
+def root():
+ 'main application (GET/POST) handler'
+ context = {}
+ if request.method == 'GET':
+ context['upload_url'] = url_for('upload')
+ else:
+ context['visits'] = etl_visits(fetch_visits(10))
+ return render_template('index.html', **context)
diff --git a/mod16-cloudstorage/main.py b/mod16-cloudstorage/main.py
new file mode 100644
index 0000000..a3416bb
--- /dev/null
+++ b/mod16-cloudstorage/main.py
@@ -0,0 +1,84 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import io
+
+from flask import (Flask, abort, redirect, render_template,
+ request, send_file, url_for)
+from werkzeug.utils import secure_filename
+
+import google.auth
+from google.cloud import exceptions, ndb, storage
+
+app = Flask(__name__)
+ds_client = ndb.Client()
+gcs_client = storage.Client()
+_, PROJECT_ID = google.auth.default()
+BUCKET = '%s.appspot.com' % PROJECT_ID
+
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+ file_blob = ndb.StringProperty()
+
+
+def store_visit(remote_addr, user_agent, upload_key):
+ 'create new Visit entity in Datastore'
+ with ds_client.context():
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent),
+ file_blob=upload_key).put()
+
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ with ds_client.context():
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+@app.route('/upload', methods=['POST'])
+def upload():
+ 'Upload blob (POST) handler'
+ fname = None
+ upload = request.files.get('file', None)
+ if upload:
+ fname = secure_filename(upload.filename)
+ blob = gcs_client.bucket(BUCKET).blob(fname)
+ blob.upload_from_file(upload, content_type=upload.content_type)
+ store_visit(request.remote_addr, request.user_agent, fname)
+ return redirect(url_for('root'), code=307)
+
+
+@app.route('/view/')
+def view(fname):
+ 'view uploaded blob (GET) handler'
+ blob = gcs_client.bucket(BUCKET).blob(fname)
+ try:
+ media = blob.download_as_bytes()
+ except exceptions.NotFound:
+ abort(404)
+ return send_file(io.BytesIO(media), mimetype=blob.content_type)
+
+
+@app.route('/', methods=['GET', 'POST'])
+def root():
+ 'main application (GET/POST) handler'
+ context = {}
+ if request.method == 'GET':
+ context['upload_url'] = url_for('upload')
+ else:
+ context['visits'] = fetch_visits(10)
+ return render_template('index.html', **context)
diff --git a/mod16-cloudstorage/requirements.txt b/mod16-cloudstorage/requirements.txt
new file mode 100644
index 0000000..997c814
--- /dev/null
+++ b/mod16-cloudstorage/requirements.txt
@@ -0,0 +1,3 @@
+flask
+google-cloud-ndb
+google-cloud-storage
diff --git a/mod16-cloudstorage/templates/index.html b/mod16-cloudstorage/templates/index.html
new file mode 100644
index 0000000..e0e6a75
--- /dev/null
+++ b/mod16-cloudstorage/templates/index.html
@@ -0,0 +1,38 @@
+
+
+
+VisitMe Example
+
+
+
+
+
+{% endif %}
+
+
+
diff --git a/mod18-gaepull/.gcloudignore b/mod18-gaepull/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod18-gaepull/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod18-gaepull/README.md b/mod18-gaepull/README.md
new file mode 100644
index 0000000..19d98a3
--- /dev/null
+++ b/mod18-gaepull/README.md
@@ -0,0 +1,3 @@
+# Module 18 - Add usage of App Engine TaskQueue (pull tasks) to NDB Flask sample app
+
+This repo folder is the corresponding Python 2 code to the [Module 18 codelab](http://g.co/codelabs/pae-migrate-gaepull). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through adding usage of pull tasks via App Engine TaskQueue, culminating in the code in this folder.
diff --git a/mod18-gaepull/app.yaml b/mod18-gaepull/app.yaml
new file mode 100644
index 0000000..4b7d197
--- /dev/null
+++ b/mod18-gaepull/app.yaml
@@ -0,0 +1,21 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
diff --git a/mod18-gaepull/appengine_config.py b/mod18-gaepull/appengine_config.py
new file mode 100644
index 0000000..b0decff
--- /dev/null
+++ b/mod18-gaepull/appengine_config.py
@@ -0,0 +1,20 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
diff --git a/mod18-gaepull/main.py b/mod18-gaepull/main.py
new file mode 100644
index 0000000..ce0e1b8
--- /dev/null
+++ b/mod18-gaepull/main.py
@@ -0,0 +1,84 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+from google.appengine.api import taskqueue
+from google.appengine.ext import ndb
+
+HOUR = 3600
+TASKS = 1000
+LIMIT = 10
+QNAME = 'pullq'
+QUEUE = taskqueue.Queue(QNAME)
+app = Flask(__name__)
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+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()
+ QUEUE.add(taskqueue.Task(payload=remote_addr, method='PULL'))
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+class VisitorCount(ndb.Model):
+ visitor = ndb.StringProperty(repeated=False, required=True)
+ counter = ndb.IntegerProperty()
+
+def fetch_counts(limit):
+ 'get top visitors'
+ return VisitorCount.query().order(-VisitorCount.counter).fetch(limit)
+
+
+@app.route('/log')
+def log_visitors():
+ 'worker processes recent visitor counts and updates them in Datastore'
+ # tally recent visitor counts from queue then delete those tasks
+ tallies = {}
+ tasks = QUEUE.lease_tasks(HOUR, TASKS)
+ for task in tasks:
+ visitor = task.payload
+ tallies[visitor] = tallies.get(visitor, 0) + 1
+ if tasks:
+ QUEUE.delete_tasks(tasks)
+
+ # increment those counts in Datastore and return
+ for visitor in tallies:
+ counter = VisitorCount.query(VisitorCount.visitor == visitor).get()
+ if not counter:
+ counter = VisitorCount(visitor=visitor, counter=0)
+ counter.put()
+ counter.counter += tallies[visitor]
+ counter.put()
+ return 'DONE (with %d task[s] logging %d visitor[s])\r\n' % (
+ len(tasks), len(tallies))
+
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ store_visit(request.remote_addr, request.user_agent)
+ context = {
+ 'limit': LIMIT,
+ 'visits': fetch_visits(LIMIT),
+ 'counts': fetch_counts(LIMIT),
+ }
+ return render_template('index.html', **context)
diff --git a/mod18-gaepull/queue.yaml b/mod18-gaepull/queue.yaml
new file mode 100644
index 0000000..f78fe75
--- /dev/null
+++ b/mod18-gaepull/queue.yaml
@@ -0,0 +1,3 @@
+queue:
+- name: pullq
+ mode: pull
diff --git a/mod18-gaepull/requirements.txt b/mod18-gaepull/requirements.txt
new file mode 100644
index 0000000..7e10602
--- /dev/null
+++ b/mod18-gaepull/requirements.txt
@@ -0,0 +1 @@
+flask
diff --git a/mod18-gaepull/templates/index.html b/mod18-gaepull/templates/index.html
new file mode 100644
index 0000000..a280ed1
--- /dev/null
+++ b/mod18-gaepull/templates/index.html
@@ -0,0 +1,26 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
+
Top {{ limit }} visitors
+
+
Visitor
Visits
+{% for count in counts %}
+
{{ count.visitor|e }}
{{ count.counter }}
+{% endfor %}
+
+
+
Last {{ limit }} visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
diff --git a/mod19-pubsub/.gcloudignore b/mod19-pubsub/.gcloudignore
new file mode 100644
index 0000000..82df3a9
--- /dev/null
+++ b/mod19-pubsub/.gcloudignore
@@ -0,0 +1,82 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Special files in this dir
+maker.py
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod19-pubsub/README.md b/mod19-pubsub/README.md
new file mode 100644
index 0000000..737b286
--- /dev/null
+++ b/mod19-pubsub/README.md
@@ -0,0 +1,3 @@
+# Module 19 - Migrate from App Engine `taskqueue` (pull tasks) to Cloud Pub/Sub (and Python 3)
+
+This repo folder is the corresponding Python 2 and 3 code to the [Module 19 codelab](http://g.co/codelabs/pae-migrate-pubsub). The tutorial STARTs with the Python 2 code in the [Module 18 repo folder](/mod18-gaepull) and leads developers through its migration from pull tasks via App Engine `taskqueue` to Cloud Pub/Sub, culminating in the code in this folder. The code is both Python 2 and 3 compatible, and either uncomment the Python 3 runtime in `app.yaml` and delete all other lines, or just use `app3.yaml`, delete `appengine_config.py` and any `lib` folder. The migration from App Engine `ndb` to Cloud NDB, covered in Module 2, also takes place.
diff --git a/mod19-pubsub/app.yaml b/mod19-pubsub/app.yaml
new file mode 100644
index 0000000..81a4730
--- /dev/null
+++ b/mod19-pubsub/app.yaml
@@ -0,0 +1,28 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#runtime: python310
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
+
+libraries:
+- name: setuptools
+ version: latest
+- name: grpcio
+ version: latest
diff --git a/mod19-pubsub/app3.yaml b/mod19-pubsub/app3.yaml
new file mode 100644
index 0000000..9aac415
--- /dev/null
+++ b/mod19-pubsub/app3.yaml
@@ -0,0 +1,15 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python310
diff --git a/mod19-pubsub/appengine_config.py b/mod19-pubsub/appengine_config.py
new file mode 100644
index 0000000..3747d18
--- /dev/null
+++ b/mod19-pubsub/appengine_config.py
@@ -0,0 +1,23 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pkg_resources
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
+# Add libraries to pkg_resources working set to find the distribution.
+pkg_resources.working_set.add_entry(PATH)
diff --git a/mod19-pubsub/main.py b/mod19-pubsub/main.py
new file mode 100644
index 0000000..884b3e5
--- /dev/null
+++ b/mod19-pubsub/main.py
@@ -0,0 +1,102 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+import google.auth
+from google.cloud import ndb, pubsub
+
+TASKS = 1000
+LIMIT = 10
+TOPIC = 'pullq'
+SBSCR = 'worker'
+
+app = Flask(__name__)
+ds_client = ndb.Client()
+ppc_client = pubsub.PublisherClient()
+psc_client = pubsub.SubscriberClient()
+_, PROJECT_ID = google.auth.default()
+TOP_PATH = ppc_client.topic_path(PROJECT_ID, TOPIC)
+SUB_PATH = psc_client.subscription_path(PROJECT_ID, SBSCR)
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit in Datastore and queue request to bump visitor count'
+ with ds_client.context():
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+ ppc_client.publish(TOP_PATH, remote_addr.encode('utf-8'))
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ with ds_client.context():
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+class VisitorCount(ndb.Model):
+ visitor = ndb.StringProperty(repeated=False, required=True)
+ counter = ndb.IntegerProperty()
+
+def fetch_counts(limit):
+ 'get top visitors'
+ with ds_client.context():
+ return VisitorCount.query().order(-VisitorCount.counter).fetch(limit)
+
+
+@app.route('/log')
+def log_visitors():
+ 'worker processes recent visitor counts and updates them in Datastore'
+ # tally recent visitor counts from queue then delete those tasks
+ tallies = {}
+ acks = set()
+ rsp = psc_client.pull(subscription=SUB_PATH, max_messages=TASKS)
+ msgs = rsp.received_messages
+ for rcvd_msg in msgs:
+ acks.add(rcvd_msg.ack_id)
+ visitor = rcvd_msg.message.data.decode('utf-8')
+ tallies[visitor] = tallies.get(visitor, 0) + 1
+ if acks:
+ psc_client.acknowledge(subscription=SUB_PATH, ack_ids=acks)
+ try:
+ psc_client.close()
+ except AttributeError: # special Py2 handler for grpcio<1.12.0
+ pass
+
+ # increment those counts in Datastore and return
+ if tallies:
+ with ds_client.context():
+ for visitor in tallies:
+ counter = VisitorCount.query(VisitorCount.visitor == visitor).get()
+ if not counter:
+ counter = VisitorCount(visitor=visitor, counter=0)
+ counter.put()
+ counter.counter += tallies[visitor]
+ counter.put()
+ return 'DONE (with %d task[s] logging %d visitor[s])\r\n' % (
+ len(msgs), len(tallies))
+
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ store_visit(request.remote_addr, request.user_agent)
+ context = {
+ 'limit': LIMIT,
+ 'visits': fetch_visits(LIMIT),
+ 'counts': fetch_counts(LIMIT),
+ }
+ return render_template('index.html', **context)
diff --git a/mod19-pubsub/maker.py b/mod19-pubsub/maker.py
new file mode 100644
index 0000000..3635720
--- /dev/null
+++ b/mod19-pubsub/maker.py
@@ -0,0 +1,47 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import print_function
+import google.auth
+from google.api_core import exceptions
+from google.cloud import pubsub
+
+_, PROJECT_ID = google.auth.default()
+TOPIC = 'pullq'
+SBSCR = 'worker'
+ppc_client = pubsub.PublisherClient()
+psc_client = pubsub.SubscriberClient()
+TOP_PATH = ppc_client.topic_path(PROJECT_ID, TOPIC)
+SUB_PATH = psc_client.subscription_path(PROJECT_ID, SBSCR)
+
+def make_top():
+ try:
+ top = ppc_client.create_topic(name=TOP_PATH)
+ print('Created topic %r (%s)' % (TOPIC, top.name))
+ except exceptions.AlreadyExists:
+ print('Topic %r already exists at %r' % (TOPIC, TOP_PATH))
+
+def make_sub():
+ 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()
diff --git a/mod19-pubsub/requirements.txt b/mod19-pubsub/requirements.txt
new file mode 100644
index 0000000..3dec648
--- /dev/null
+++ b/mod19-pubsub/requirements.txt
@@ -0,0 +1,3 @@
+flask
+google-cloud-ndb
+google-cloud-pubsub
diff --git a/mod19-pubsub/templates/index.html b/mod19-pubsub/templates/index.html
new file mode 100644
index 0000000..06c7384
--- /dev/null
+++ b/mod19-pubsub/templates/index.html
@@ -0,0 +1,30 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
+
Top {{ limit }} visitors
+
+
Visitor
Visits
+{% if counts %}
+ {% for count in counts %}
+
{{ count.visitor|e }}
{{ count.counter }}
+ {% endfor %}
+{% else %}
+
(none yet; visit the /log endpoint)
+{% endif %}
+
+
+
Last {{ limit }} visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
diff --git a/mod1b-flask/.gcloudignore b/mod1b-flask/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod1b-flask/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod1b-flask/README.md b/mod1b-flask/README.md
new file mode 100644
index 0000000..b721e29
--- /dev/null
+++ b/mod1b-flask/README.md
@@ -0,0 +1,5 @@
+# Module 1 - Migrate from `webapp2` to Flask
+
+This repo folder is the corresponding Python 3 code to the [Module 1 codelab](http://g.co/codelabs/pae-migrate-flask). The tutorial STARTs with the Python 2 code in the [Module 0 repo folder](/mod0-baseline) and leads developers through migrating away from App Engine's `webapp2` web framework to Flask, culminating in the code in the [mod1-flask](/mod1-flask) folder. The codelab does **not** currently feature any bonus migration to Python 3, however doing so requires you to participate in the bundled services public preview program (see sidebar below) and which culminates in the code in *this* (`mod1b-flask`) folder. In the [next (Module 2) codelab](http://g.co/codelabs/pae-migrate-cloudndb), users will migrate (the original Python 2 version of) this app from App Engine `ndb` to Cloud NDB for Datastore access.
+
+> **LEGACY SERVICES PUBLIC PREVIEW**: Accessing legacy services such as App Engine `ndb` from Python 3 (and next generation App Engine in general) is available in a public preview. See the [Sep 2021 announcement](https://twitter.com/googledevs/status/1445916786755571712) for more information.
diff --git a/mod1b-flask/app.yaml b/mod1b-flask/app.yaml
new file mode 100644
index 0000000..4c77d5d
--- /dev/null
+++ b/mod1b-flask/app.yaml
@@ -0,0 +1,16 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python39
+app_engine_apis: true
diff --git a/mod1b-flask/main.py b/mod1b-flask/main.py
new file mode 100644
index 0000000..0508b53
--- /dev/null
+++ b/mod1b-flask/main.py
@@ -0,0 +1,44 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START mod1b_flask]
+from flask import Flask, render_template, request
+from google.appengine.api import wrap_wsgi_app
+from google.appengine.ext import ndb
+
+app = Flask(__name__)
+app.wsgi_app = wrap_wsgi_app(app.wsgi_app)
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ store_visit(request.remote_addr, request.user_agent)
+ visits = fetch_visits(10)
+ return render_template('index.html', visits=visits)
+# [END mod1b_flask]
diff --git a/mod1b-flask/requirements.txt b/mod1b-flask/requirements.txt
new file mode 100644
index 0000000..a2e7c7f
--- /dev/null
+++ b/mod1b-flask/requirements.txt
@@ -0,0 +1,2 @@
+flask
+appengine-python-standard
diff --git a/mod1b-flask/templates/index.html b/mod1b-flask/templates/index.html
new file mode 100644
index 0000000..920068e
--- /dev/null
+++ b/mod1b-flask/templates/index.html
@@ -0,0 +1,17 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
diff --git a/mod20-gaeusers/.gcloudignore b/mod20-gaeusers/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod20-gaeusers/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod20-gaeusers/README.md b/mod20-gaeusers/README.md
new file mode 100644
index 0000000..bc50f8e
--- /dev/null
+++ b/mod20-gaeusers/README.md
@@ -0,0 +1,3 @@
+# Module 20 - Add usage of App Engine `users` to Flask `ndb` sample app
+
+This repo folder is the corresponding (Python 2) code to the _forthcoming_ Module 20 codelab. The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through adding usage of the Users API via App Engine `users`, culminating in the code in this folder.
diff --git a/mod20-gaeusers/app.yaml b/mod20-gaeusers/app.yaml
new file mode 100644
index 0000000..0d4d8d6
--- /dev/null
+++ b/mod20-gaeusers/app.yaml
@@ -0,0 +1,21 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
diff --git a/mod20-gaeusers/appengine_config.py b/mod20-gaeusers/appengine_config.py
new file mode 100644
index 0000000..0ca8634
--- /dev/null
+++ b/mod20-gaeusers/appengine_config.py
@@ -0,0 +1,20 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
diff --git a/mod20-gaeusers/main.py b/mod20-gaeusers/main.py
new file mode 100644
index 0000000..14d9126
--- /dev/null
+++ b/mod20-gaeusers/main.py
@@ -0,0 +1,61 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+from google.appengine.api import users
+from google.appengine.ext import ndb
+
+app = Flask(__name__)
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ store_visit(request.remote_addr, request.user_agent)
+ visits = fetch_visits(10)
+
+ # put together users context for web template
+ user = users.get_current_user()
+ context = { # logged in
+ 'who': user.nickname(),
+ 'admin': '(admin)' if users.is_current_user_admin() else '',
+ 'sign': 'Logout',
+ 'link': '/_ah/logout?continue=%s://%s/' % (
+ request.environ['wsgi.url_scheme'],
+ request.environ['HTTP_HOST'],
+ ), # alternative to users.create_logout_url()
+ } if user else { # not logged in
+ 'who': 'user',
+ 'admin': '',
+ 'sign': 'Login',
+ 'link': users.create_login_url('https://github.com/'),
+ }
+
+ # add visits to context and render template
+ context['visits'] = visits # display whether logged in or not
+ return render_template('index.html', **context)
diff --git a/mod20-gaeusers/requirements.txt b/mod20-gaeusers/requirements.txt
new file mode 100644
index 0000000..7e10602
--- /dev/null
+++ b/mod20-gaeusers/requirements.txt
@@ -0,0 +1 @@
+flask
diff --git a/mod20-gaeusers/templates/index.html b/mod20-gaeusers/templates/index.html
new file mode 100644
index 0000000..13a7e37
--- /dev/null
+++ b/mod20-gaeusers/templates/index.html
@@ -0,0 +1,26 @@
+
+
+
+VisitMe Example
+
+
+
+Welcome, {{ who }} {{ admin }}
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
+
diff --git a/mod21a-idenplat/.gcloudignore b/mod21a-idenplat/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod21a-idenplat/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod21a-idenplat/README.md b/mod21a-idenplat/README.md
new file mode 100644
index 0000000..aa51a11
--- /dev/null
+++ b/mod21a-idenplat/README.md
@@ -0,0 +1,5 @@
+# Module 21 - Migrate from App Engine `users` to Cloud Identity Platform
+
+This repo folder is the corresponding Python 2 code to the _forthcoming_ Module 21 codelab. The tutorial STARTs with the Python 2 code in the [Module 20 repo folder](/mod20-gaeusers) and leads developers through a migration to Cloud Identity Platform, culminating in the code in this (`mod21a-idenplat`) folder. Also included is a migration from App Engine `ndb` to Google Cloud NDB, mirroring the content covered in [Module 2](http://g.co/codelabs/pae-migrate-cloudndb). There is also a Python 3 version of the app in the [Module 21b](/mod21b-idenplat) folder.
+
+NOTE: While we generally recommend using [Google Cloud client libraries](https://cloud.google.com/apis/docs/cloud-client-libraries) for GCP API access, we have an exception here because the [final Python 2 version](https://googleapis.dev/python/cloudresourcemanager/0.30.2) of the [Cloud Resource Manager client library](https://github.com/googleapis/python-resource-manager) (before the 2.x support was deprecated) did not have an implemented [get IAM policy](https://cloud.google.com/python/docs/reference/cloudresourcemanager/latest/google.cloud.resourcemanager_v3.services.projects.ProjectsClient#google_cloud_resourcemanager_v3_services_projects_ProjectsClient_get_iam_policy) feature, hence the need to use the [lower-level Google APIs client library](https://developers.google.com/api-client-library) to access this functionality from the API. See the [Python 3 `main.py`](/mod21b-idenplat/main.py) which uses latest Resource Manager client library.
diff --git a/mod21a-idenplat/app.yaml b/mod21a-idenplat/app.yaml
new file mode 100644
index 0000000..bec5174
--- /dev/null
+++ b/mod21a-idenplat/app.yaml
@@ -0,0 +1,29 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
+
+libraries:
+- name: grpcio
+ version: latest
+- name: setuptools
+ version: latest
+- name: ssl
+ version: latest
diff --git a/mod21a-idenplat/appengine_config.py b/mod21a-idenplat/appengine_config.py
new file mode 100644
index 0000000..2a41fb4
--- /dev/null
+++ b/mod21a-idenplat/appengine_config.py
@@ -0,0 +1,23 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pkg_resources
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
+# Add libraries to pkg_resources working set to find the distribution.
+pkg_resources.working_set.add_entry(PATH)
diff --git a/mod21a-idenplat/main.py b/mod21a-idenplat/main.py
new file mode 100644
index 0000000..967e0ee
--- /dev/null
+++ b/mod21a-idenplat/main.py
@@ -0,0 +1,81 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+from google.auth import default
+from google.cloud import ndb
+from googleapiclient import discovery
+from firebase_admin import auth, initialize_app
+
+# initialize Flask and Cloud NDB API client
+app = Flask(__name__)
+ds_client = ndb.Client()
+
+
+def _get_gae_admins():
+ 'return set of App Engine admins'
+ # setup constants for calling Cloud Resource Manager API
+ CREDS, PROJ_ID = default( # Application Default Credentials and project ID
+ ['https://www.googleapis.com/auth/cloudplatformprojects.readonly'])
+ rm_client = discovery.build('cloudresourcemanager', 'v1', credentials=CREDS)
+ _TARGETS = frozenset(( # App Engine admin roles
+ 'roles/viewer',
+ 'roles/editor',
+ 'roles/owner',
+ 'roles/appengine.appAdmin',
+ ))
+
+ # collate users who are members of at least one GAE admin role (_TARGETS)
+ admins = set() # set of all App Engine admins
+ allow_policy = rm_client.projects().getIamPolicy(resource=PROJ_ID).execute()
+ for b in allow_policy['bindings']: # bindings in IAM allow policy
+ if b['role'] in _TARGETS: # only look at GAE admin roles
+ admins.update(user.split(':', 1).pop() for user in b['members'])
+ return admins
+
+@app.route('/is_admin', methods=['POST'])
+def is_admin():
+ 'check if user (via their Firebase ID token) is GAE admin (POST) handler'
+ id_token = request.headers.get('Authorization')
+ email = auth.verify_id_token(id_token).get('email')
+ return {'admin': email in _ADMINS}, 200
+
+
+# initialize Firebase and fetch set of App Engine admins
+initialize_app()
+_ADMINS = _get_gae_admins()
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ with ds_client.context():
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ with ds_client.context():
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ store_visit(request.remote_addr, request.user_agent)
+ visits = fetch_visits(10)
+ return render_template('index.html', visits=visits)
diff --git a/mod21a-idenplat/requirements.txt b/mod21a-idenplat/requirements.txt
new file mode 100644
index 0000000..1840686
--- /dev/null
+++ b/mod21a-idenplat/requirements.txt
@@ -0,0 +1,13 @@
+grpcio==1.0.0
+protobuf<3.18.0
+six>=1.13.0
+flask
+google-gax<0.13.0
+google-api-core==1.31.1
+google-api-python-client<=1.11.0
+google-auth<2.0dev
+google-cloud-datastore==1.15.3
+google-cloud-firestore==1.9.0
+google-cloud-ndb
+google-cloud-pubsub==1.7.0
+firebase-admin
diff --git a/mod21a-idenplat/templates/index.html b/mod21a-idenplat/templates/index.html
new file mode 100644
index 0000000..2b7696c
--- /dev/null
+++ b/mod21a-idenplat/templates/index.html
@@ -0,0 +1,90 @@
+
+
+
+VisitMe Example
+
+
+
+
+
+
+Welcome, ! (admin)
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
+
diff --git a/mod21b-idenplat/.gcloudignore b/mod21b-idenplat/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod21b-idenplat/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod21b-idenplat/README.md b/mod21b-idenplat/README.md
new file mode 100644
index 0000000..e03bad5
--- /dev/null
+++ b/mod21b-idenplat/README.md
@@ -0,0 +1,9 @@
+# Module 21 - Migrate from App Engine `users` to Cloud Identity Platform
+
+This repo folder is the corresponding Python 3 version of the Module 21 app.
+
+- All files in this folder are identical to the _Python 2_ code in the [Module 21a repo folder](/mod21a-idenplat) **except**:
+ 1. `app.yaml` was modified for the Python 3 runtime.
+ 1. `appengine_config.py` is unused and thus deleted.
+- An optional migration from Cloud NDB to Cloud Datastore can be achieved via the content covered in [Module 3](http://g.co/codelabs/pae-migrate-datastore).
+- The _Python 3_ version of the Module 20 app ([Module 20b repo folder](/mod20b-gaeusers)) features additional code to support those App Engine legacy ("bundled") services (like `memcache`). Because the app in this folder does not use such services (moved to Cloud Memorystore), that extra support does not appear, so the code here should not be considered a direct migration of that app to Cloud Memorystore (and Cloud NDB), unlike the Python 2 equivalents (Modules [20](/mod20-gaeusers) and [21a](/mod21a-idenplat)) which can.
diff --git a/mod21b-idenplat/app.yaml b/mod21b-idenplat/app.yaml
new file mode 100644
index 0000000..9aac415
--- /dev/null
+++ b/mod21b-idenplat/app.yaml
@@ -0,0 +1,15 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python310
diff --git a/mod21b-idenplat/main.py b/mod21b-idenplat/main.py
new file mode 100644
index 0000000..10fe5cb
--- /dev/null
+++ b/mod21b-idenplat/main.py
@@ -0,0 +1,80 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+from google.auth import default
+from google.cloud import ndb, resourcemanager
+from firebase_admin import auth, initialize_app
+
+# initialize Flask and Cloud NDB API client
+app = Flask(__name__)
+ds_client = ndb.Client()
+
+
+def _get_gae_admins():
+ 'return set of App Engine admins'
+ # setup constants for calling Cloud Resource Manager API
+ _, PROJ_ID = default( # Application Default Credentials and project ID
+ ['https://www.googleapis.com/auth/cloudplatformprojects.readonly'])
+ rm_client = resourcemanager.ProjectsClient()
+ _TARGETS = frozenset(( # App Engine admin roles
+ 'roles/viewer',
+ 'roles/editor',
+ 'roles/owner',
+ 'roles/appengine.appAdmin',
+ ))
+
+ # collate users who are members of at least one GAE admin role (_TARGETS)
+ admins = set() # set of all App Engine admins
+ allow_policy = rm_client.get_iam_policy(resource='projects/%s' % PROJ_ID)
+ for b in allow_policy.bindings: # bindings in IAM allow policy
+ if b.role in _TARGETS: # only look at GAE admin roles
+ admins.update(user.split(':', 1).pop() for user in b.members)
+ return admins
+
+@app.route('/is_admin', methods=['POST'])
+def is_admin():
+ 'check if user (via their Firebase ID token) is GAE admin (POST) handler'
+ id_token = request.headers.get('Authorization')
+ email = auth.verify_id_token(id_token).get('email')
+ return {'admin': email in _ADMINS}, 200
+
+
+# initialize Firebase and fetch set of App Engine admins
+initialize_app()
+_ADMINS = _get_gae_admins()
+
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ with ds_client.context():
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits'
+ with ds_client.context():
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
+
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ store_visit(request.remote_addr, request.user_agent)
+ visits = fetch_visits(10)
+ return render_template('index.html', visits=visits)
diff --git a/mod21b-idenplat/requirements.txt b/mod21b-idenplat/requirements.txt
new file mode 100644
index 0000000..e0008d7
--- /dev/null
+++ b/mod21b-idenplat/requirements.txt
@@ -0,0 +1,5 @@
+flask
+google-auth
+google-cloud-ndb
+google-cloud-resource-manager
+firebase-admin
diff --git a/mod21b-idenplat/templates/index.html b/mod21b-idenplat/templates/index.html
new file mode 100644
index 0000000..2b7696c
--- /dev/null
+++ b/mod21b-idenplat/templates/index.html
@@ -0,0 +1,90 @@
+
+
+
+VisitMe Example
+
+
+
+
+
+
+Welcome, ! (admin)
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+
+
+
diff --git a/mod22-bundled/README.md b/mod22-bundled/README.md
new file mode 100644
index 0000000..8b8b87a
--- /dev/null
+++ b/mod22-bundled/README.md
@@ -0,0 +1,9 @@
+# Module 22 - Extending support for App Engine bundled services in Python 3
+
+There are six folders in this directory that contain (complete) basic applications using the Blobstore, Deferred, and Mail bundled services. A Python 2 version using the `webapp2` framework is provided along with a modernized Python 3 equivalent using the Flask web framework and the App Engine SDK.
+
+Bundled service | Python 2 `webapp2` | Python 3 Flask
+--- | --- | ---
+Blobstore | [code](blobstore2) | [code](blobstore3)
+Deferred | [code](deferred2) | [code](deferred3)
+Mail | [code](mail2) | [code](mail3)
diff --git a/mod22-bundled/blobstore2/.gcloudignore b/mod22-bundled/blobstore2/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod22-bundled/blobstore2/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod22-bundled/blobstore2/README.md b/mod22-bundled/blobstore2/README.md
new file mode 100644
index 0000000..183853f
--- /dev/null
+++ b/mod22-bundled/blobstore2/README.md
@@ -0,0 +1,8 @@
+# Module 22 - Using Blobstore bundled service (Python 2)
+
+This repo folder represents the Module 22 Python 2 sample app for the Blobstore bundled service.
+
+- The app lets end-users upload one photo then displays it to confirm the upload was successful.
+- The Python 2 version of the app uses the `webapp2` framework while the Python 3 version uses Flask and the App Engine SDK to access the bundled services.
+- Also check out both `app.yaml` files for additional changes between runtimes.
+- The Python 3 version of the app uses 3rd-party packages, and as such, has a `requirements.txt` file.
diff --git a/mod22-bundled/blobstore2/app.yaml b/mod22-bundled/blobstore2/app.yaml
new file mode 100644
index 0000000..4b7d197
--- /dev/null
+++ b/mod22-bundled/blobstore2/app.yaml
@@ -0,0 +1,21 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
diff --git a/mod22-bundled/blobstore2/main.py b/mod22-bundled/blobstore2/main.py
new file mode 100644
index 0000000..f245455
--- /dev/null
+++ b/mod22-bundled/blobstore2/main.py
@@ -0,0 +1,58 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import webapp2
+from google.appengine.ext import blobstore, ndb
+from google.appengine.ext.webapp import blobstore_handlers
+
+UPLOAD_FORM = '''\
+Module 22 Blobstore sample app
+
Upload photo:
+'''
+
+
+class PhotoUpload(ndb.Model):
+ 'PhotoUpload entity for registering a photo'
+ blob_key = ndb.BlobKeyProperty()
+
+
+class PhotoUploadHandler(blobstore_handlers.BlobstoreUploadHandler):
+ 'PhotoUploadHandler handles a photo upload (POST)'
+ def post(self):
+ uploads = self.get_uploads()
+ blob_id = uploads[0].key() if uploads else None
+ PhotoUpload(blob_key=blob_id).put()
+ self.redirect('/view_photo/%s' % blob_id)
+
+
+class ViewPhotoHandler(blobstore_handlers.BlobstoreDownloadHandler):
+ 'ViewPhotoHandler handles a photo view/download (GET)'
+ def get(self, blob_key):
+ self.send_blob(blob_key) if blobstore.get(blob_key) else self.error(404)
+
+
+class MainHandler(webapp2.RequestHandler):
+ 'main application (GET) handler'
+ def get(self):
+ self.response.write(
+ UPLOAD_FORM % blobstore.create_upload_url('https://github.com/upload_photo'))
+
+
+app = webapp2.WSGIApplication([
+ ('/', MainHandler),
+ ('/upload_photo', PhotoUploadHandler),
+ ('/view_photo/([^/]+)?', ViewPhotoHandler),
+], debug=True)
diff --git a/mod22-bundled/blobstore3/.gcloudignore b/mod22-bundled/blobstore3/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod22-bundled/blobstore3/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod22-bundled/blobstore3/README.md b/mod22-bundled/blobstore3/README.md
new file mode 100644
index 0000000..bd891d7
--- /dev/null
+++ b/mod22-bundled/blobstore3/README.md
@@ -0,0 +1,8 @@
+# Module 22 - Using Blobstore bundled service (Python 3)
+
+This repo folder represents the Module 22 Python 3 sample app for the Blobstore bundled service.
+
+- The app lets end-users upload one photo then displays it to confirm the upload was successful.
+- The Python 2 version of the app uses the `webapp2` framework while the Python 3 version uses Flask and the App Engine SDK to access the bundled services.
+- Also check out both `app.yaml` files for additional changes between runtimes.
+- The Python 3 version of the app uses 3rd-party packages, and as such, has a `requirements.txt` file.
diff --git a/mod22-bundled/blobstore3/app.yaml b/mod22-bundled/blobstore3/app.yaml
new file mode 100644
index 0000000..bfda3ee
--- /dev/null
+++ b/mod22-bundled/blobstore3/app.yaml
@@ -0,0 +1,19 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python310
+app_engine_apis: true
+
+env_variables:
+ NDB_USE_CROSS_COMPATIBLE_PICKLE_PROTOCOL: 'True'
diff --git a/mod22-bundled/blobstore3/main.py b/mod22-bundled/blobstore3/main.py
new file mode 100644
index 0000000..7f3bca8
--- /dev/null
+++ b/mod22-bundled/blobstore3/main.py
@@ -0,0 +1,67 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, abort, redirect, request
+from google.appengine.api import wrap_wsgi_app
+from google.appengine.ext import blobstore, ndb
+
+UPLOAD_FORM = '''\
+Module 22 Blobstore sample app
+
Upload photo:
+'''
+
+app = Flask(__name__)
+app.wsgi_app = wrap_wsgi_app(app.wsgi_app)
+
+
+class PhotoUpload(ndb.Model):
+ 'PhotoUpload entity for registering a photo'
+ blob_key = ndb.BlobKeyProperty()
+
+
+class PhotoUploadHandler(blobstore.BlobstoreUploadHandler):
+ 'PhotoUploadHandler handles a photo upload (POST)'
+ def post(self):
+ uploads = self.get_uploads(request.environ)
+ blob_id = uploads[0].key() if uploads else None
+ PhotoUpload(blob_key=blob_id).put()
+ return redirect('/view_photo/%s' % blob_id)
+
+@app.route('/upload_photo', methods=['POST'])
+def upload_photo():
+ 'call upload handler for upload (POST) request'
+ return PhotoUploadHandler().post()
+
+
+class ViewPhotoHandler(blobstore.BlobstoreDownloadHandler):
+ 'ViewPhotoHandler handles a photo view/download (GET)'
+ def get(self, blob_key):
+ if blobstore.get(blob_key):
+ headers = self.send_blob(request.environ, blob_key)
+ headers['Content-Type'] = None
+ return '', headers
+ abort(404)
+
+@app.route('/view_photo/')
+def view_photo(photo_key):
+ 'call download handler for view (GET) request'
+ return ViewPhotoHandler().get(photo_key)
+
+
+@app.route('/')
+def upload_form():
+ 'display photo upload HTML form'
+ return UPLOAD_FORM % blobstore.create_upload_url('https://github.com/upload_photo')
diff --git a/mod22-bundled/blobstore3/requirements.txt b/mod22-bundled/blobstore3/requirements.txt
new file mode 100644
index 0000000..a2e7c7f
--- /dev/null
+++ b/mod22-bundled/blobstore3/requirements.txt
@@ -0,0 +1,2 @@
+flask
+appengine-python-standard
diff --git a/mod22-bundled/deferred2/.gcloudignore b/mod22-bundled/deferred2/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod22-bundled/deferred2/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod22-bundled/deferred2/README.md b/mod22-bundled/deferred2/README.md
new file mode 100644
index 0000000..7cb066e
--- /dev/null
+++ b/mod22-bundled/deferred2/README.md
@@ -0,0 +1,8 @@
+# Module 22 - Using Deferred bundled service (Python 2)
+
+This repo folder represents the Module 22 Python 2 sample app for the Deferred bundled service.
+
+- The app implements a simple autoincrement counter which gets bumped for every page visit. The visit displays the current counter value then spawns a deferred task to bump it.
+- The Python 2 version of the app uses the `webapp2` framework while the Python 3 version uses Flask and the App Engine SDK to access the bundled services.
+- Also check out both `app.yaml` files for additional changes between runtimes.
+- The Python 3 version of the app uses 3rd-party packages, and as such, has a `requirements.txt` file.
diff --git a/mod22-bundled/deferred2/app.yaml b/mod22-bundled/deferred2/app.yaml
new file mode 100644
index 0000000..f3128d1
--- /dev/null
+++ b/mod22-bundled/deferred2/app.yaml
@@ -0,0 +1,28 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+builtins:
+- deferred: on
+
+handlers:
+- url: /_ah/queue/deferred
+ script: google.appengine.ext.deferred.deferred.application
+ login: admin
+
+- url: /.*
+ script: main.app
diff --git a/mod22-bundled/deferred2/main.py b/mod22-bundled/deferred2/main.py
new file mode 100644
index 0000000..dbe78c7
--- /dev/null
+++ b/mod22-bundled/deferred2/main.py
@@ -0,0 +1,46 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import webapp2
+from google.appengine.ext import deferred, ndb
+
+KEY_NAME = 'SECRET'
+OUTPUT = '''\
+Module 22 Deferred sample app
+Counter at %d... bump requested.
+'''
+
+class Counter(ndb.Model):
+ 'Counter entity: autoincrement integer'
+ count = ndb.IntegerProperty(indexed=False)
+
+
+def bump_counter_later(key):
+ 'bump counter in (push) task'
+ entity = Counter.get_or_insert(key, count=0)
+ entity.count += 1
+ entity.put()
+
+
+class MainHandler(webapp2.RequestHandler):
+ def get(self):
+ 'main application (GET) handler'
+ entity = Counter.get_by_id(KEY_NAME)
+ self.response.write(OUTPUT % (entity.count if entity else 0))
+ deferred.defer(bump_counter_later, KEY_NAME)
+
+
+app = webapp2.WSGIApplication([
+ ('/', MainHandler),
+], debug=True)
diff --git a/mod22-bundled/deferred3/.gcloudignore b/mod22-bundled/deferred3/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod22-bundled/deferred3/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod22-bundled/deferred3/README.md b/mod22-bundled/deferred3/README.md
new file mode 100644
index 0000000..540a471
--- /dev/null
+++ b/mod22-bundled/deferred3/README.md
@@ -0,0 +1,8 @@
+# Module 22 - Using Deferred bundled service (Python 3)
+
+This repo folder represents the Module 22 Python 3 sample app for the Deferred bundled service.
+
+- The app implements a simple autoincrement counter which gets bumped for every page visit. The visit displays the current counter value then spawns a deferred task to bump it.
+- The Python 2 version of the app uses the `webapp2` framework while the Python 3 version uses Flask and the App Engine SDK to access the bundled services.
+- Also check out both `app.yaml` files for additional changes between runtimes.
+- The Python 3 version of the app uses 3rd-party packages, and as such, has a `requirements.txt` file.
diff --git a/mod22-bundled/deferred3/app.yaml b/mod22-bundled/deferred3/app.yaml
new file mode 100644
index 0000000..bfda3ee
--- /dev/null
+++ b/mod22-bundled/deferred3/app.yaml
@@ -0,0 +1,19 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python310
+app_engine_apis: true
+
+env_variables:
+ NDB_USE_CROSS_COMPATIBLE_PICKLE_PROTOCOL: 'True'
diff --git a/mod22-bundled/deferred3/main.py b/mod22-bundled/deferred3/main.py
new file mode 100644
index 0000000..a32e007
--- /dev/null
+++ b/mod22-bundled/deferred3/main.py
@@ -0,0 +1,45 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask
+from google.appengine.api import wrap_wsgi_app
+from google.appengine.ext import deferred, ndb
+
+KEY_NAME = 'SECRET'
+OUTPUT = '''\
+Module 22 Deferred sample app
+Counter at %d... bump requested.
+'''
+app = Flask(__name__)
+app.wsgi_app = wrap_wsgi_app(app.wsgi_app, use_deferred=True)
+
+class Counter(ndb.Model):
+ 'Counter entity: autoincrement integer'
+ count = ndb.IntegerProperty(indexed=False)
+
+
+def bump_counter_later(key):
+ 'bump counter in (push) task'
+ entity = Counter.get_or_insert(key, count=0)
+ entity.count += 1
+ entity.put()
+
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ entity = Counter.get_by_id(KEY_NAME)
+ output = OUTPUT % (entity.count if entity else 0)
+ deferred.defer(bump_counter_later, KEY_NAME)
+ return output
diff --git a/mod22-bundled/deferred3/requirements.txt b/mod22-bundled/deferred3/requirements.txt
new file mode 100644
index 0000000..a2e7c7f
--- /dev/null
+++ b/mod22-bundled/deferred3/requirements.txt
@@ -0,0 +1,2 @@
+flask
+appengine-python-standard
diff --git a/mod22-bundled/mail2/.gcloudignore b/mod22-bundled/mail2/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod22-bundled/mail2/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod22-bundled/mail2/README.md b/mod22-bundled/mail2/README.md
new file mode 100644
index 0000000..c499f6a
--- /dev/null
+++ b/mod22-bundled/mail2/README.md
@@ -0,0 +1,8 @@
+# Module 22 - Using Mail bundled service (Python 2)
+
+This repo folder represents the Module 22 Python 2 sample app for the Mail bundled service.
+
+- The app can receive email, saving only the most recent message received in Datastore. Visiting the app displays that message along with associated metadata (date, subject, sender).
+- The Python 2 version of the app uses the `webapp2` framework while the Python 3 version uses Flask and the App Engine SDK to access the bundled services.
+- Also check out both `app.yaml` files for additional changes between runtimes.
+- The Python 3 version of the app uses 3rd-party packages, and as such, has a `requirements.txt` file.
diff --git a/mod22-bundled/mail2/app.yaml b/mod22-bundled/mail2/app.yaml
new file mode 100644
index 0000000..26a9d41
--- /dev/null
+++ b/mod22-bundled/mail2/app.yaml
@@ -0,0 +1,24 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+inbound_services:
+- mail
+
+handlers:
+- url: /.*
+ script: main.app
diff --git a/mod22-bundled/mail2/main.py b/mod22-bundled/mail2/main.py
new file mode 100644
index 0000000..fe72c37
--- /dev/null
+++ b/mod22-bundled/mail2/main.py
@@ -0,0 +1,77 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from cgi import escape
+import webapp2
+from google.appengine.ext import ndb
+from google.appengine.ext.webapp import mail_handlers
+
+KEY_NAME = 'SECRET'
+FIELDS = frozenset(('sender', 'subject', 'date'))
+MSG_TMPL = '''\
+Module 22 Mail sample app
+
+'''
+
+class LastMsg(ndb.Model):
+ 'LastMsg entity for registering last-received email message'
+ sender = ndb.StringProperty(indexed=False)
+ subject = ndb.StringProperty(indexed=False)
+ date = ndb.StringProperty(indexed=False)
+ body = ndb.StringProperty(indexed=False)
+
+
+class EmailHandler(mail_handlers.InboundMailHandler):
+ '''
+ email receipt (POST) handler:
+ - extract email message from request payload
+ - get last message singleton entity (or create empty one)
+ - add core values: sender, subject, date
+ - extract and decode text (from first plain text body)
+ - save entity and return
+ '''
+ def receive(self, msg):
+ last_msg = LastMsg.get_or_insert(KEY_NAME, sender='')
+ # quick loop to assign last_msg.FIELD = msg.FIELD for each field
+ for field in FIELDS:
+ setattr(last_msg, field, getattr(msg, field))
+ last_msg.body = (msg.bodies('text/plain').next())[1].decode()
+ last_msg.put()
+
+
+class MainHandler(webapp2.RequestHandler):
+ '''
+ main application (GET) handler:
+ - get last-message entity from Datastore
+ - convert to dict then escape special characters
+ - drop values into template and return
+ '''
+ def get(self):
+ last_msg = LastMsg.get_by_id(KEY_NAME)
+ msg_dict = last_msg.to_dict()
+ self.response.write(MSG_TMPL %
+ dict((k, escape(msg_dict[k])) for k in msg_dict))
+
+
+app = webapp2.WSGIApplication([
+ ('/', MainHandler),
+ ('/_ah/mail/.+', EmailHandler),
+], debug=True)
diff --git a/mod22-bundled/mail3/.gcloudignore b/mod22-bundled/mail3/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod22-bundled/mail3/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod22-bundled/mail3/README.md b/mod22-bundled/mail3/README.md
new file mode 100644
index 0000000..2a0e3f6
--- /dev/null
+++ b/mod22-bundled/mail3/README.md
@@ -0,0 +1,8 @@
+# Module 22 - Using Mail bundled service (Python 3)
+
+This repo folder represents the Module 22 Python 3 sample app for the Mail bundled service.
+
+- The app can receive email, saving only the most recent message received in Datastore. Visiting the app displays that message along with associated metadata (date, subject, sender).
+- The Python 2 version of the app uses the `webapp2` framework while the Python 3 version uses Flask and the App Engine SDK to access the bundled services.
+- Also check out both `app.yaml` files for additional changes between runtimes.
+- The Python 3 version of the app uses 3rd-party packages, and as such, has a `requirements.txt` file.
diff --git a/mod22-bundled/mail3/app.yaml b/mod22-bundled/mail3/app.yaml
new file mode 100644
index 0000000..80be05e
--- /dev/null
+++ b/mod22-bundled/mail3/app.yaml
@@ -0,0 +1,22 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python310
+app_engine_apis: true
+
+inbound_services:
+- mail
+
+env_variables:
+ NDB_USE_CROSS_COMPATIBLE_PICKLE_PROTOCOL: 'True'
diff --git a/mod22-bundled/mail3/main.py b/mod22-bundled/mail3/main.py
new file mode 100644
index 0000000..28b6cb8
--- /dev/null
+++ b/mod22-bundled/mail3/main.py
@@ -0,0 +1,75 @@
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from html import escape
+from flask import Flask, request
+from google.appengine.api import mail, wrap_wsgi_app
+from google.appengine.ext import ndb
+
+KEY_NAME = 'SECRET'
+FIELDS = frozenset(('sender', 'subject', 'date'))
+MSG_TMPL = '''\
+Module 22 Mail sample app
+
+'''
+
+app = Flask(__name__)
+app.wsgi_app = wrap_wsgi_app(app.wsgi_app)
+
+class LastMsg(ndb.Model):
+ 'LastMsg entity for registering last-received email message'
+ sender = ndb.StringProperty(indexed=False)
+ subject = ndb.StringProperty(indexed=False)
+ date = ndb.StringProperty(indexed=False)
+ body = ndb.StringProperty(indexed=False)
+
+
+@app.route('/_ah/mail/', methods=['POST'])
+def receive(path):
+ '''
+ email receipt (POST) handler:
+ - extract email message from request payload
+ - get last message singleton entity (or create empty one)
+ - add core values: sender, subject, date
+ - extract and decode text (from first plain text body)
+ - save entity and return
+ '''
+ msg = mail.InboundEmailMessage(request.get_data())
+ last_msg = LastMsg.get_or_insert(KEY_NAME, sender='')
+ # quick loop to assign last_msg.FIELD = msg.FIELD for each field
+ for field in FIELDS:
+ setattr(last_msg, field, getattr(msg, field))
+ last_msg.body = next(msg.bodies('text/plain'))[1].decode()
+ last_msg.put()
+ return ''
+
+
+@app.route('/')
+def root():
+ '''
+ main application (GET) handler:
+ - get last-message entity from Datastore
+ - convert to dict then escape special characters
+ - drop values into template and return
+ '''
+ last_msg = LastMsg.get_by_id(KEY_NAME)
+ msg_dict = last_msg.to_dict()
+ return MSG_TMPL % {k: escape(msg_dict[k]) for k in msg_dict}
diff --git a/mod22-bundled/mail3/requirements.txt b/mod22-bundled/mail3/requirements.txt
new file mode 100644
index 0000000..a2e7c7f
--- /dev/null
+++ b/mod22-bundled/mail3/requirements.txt
@@ -0,0 +1,2 @@
+flask
+appengine-python-standard
diff --git a/mod2a-cloudndb/.gcloudignore b/mod2a-cloudndb/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod2a-cloudndb/.gcloudignore
+++ b/mod2a-cloudndb/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod2a-cloudndb/README.md b/mod2a-cloudndb/README.md
index a94baf5..9d63ae1 100644
--- a/mod2a-cloudndb/README.md
+++ b/mod2a-cloudndb/README.md
@@ -1,3 +1,3 @@
-# Module 2 - Migrate from App Engine `ndb` to Google Cloud NDB
+# Module 2 - Migrate from App Engine `ndb` to Cloud NDB
-This repo folder is the corresponding Python 2 code to the [Module 2 codelab](http://g.co/codelabs/pae-migrate-cloudndb). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through migrating away from App Engine's `ndb` to Cloud NDB to access Datastore, culminating in the code in this folder.
+This repo folder is the corresponding Python 2 code to the [Module 2 codelab](http://g.co/codelabs/pae-migrate-cloudndb). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through migrating away from App Engine's `ndb` to Cloud NDB to access Datastore, culminating in the code in this (`mod2a-cloudndb`) folder.
diff --git a/mod2a-cloudndb/app.yaml b/mod2a-cloudndb/app.yaml
index 03e7e70..ba543cd 100644
--- a/mod2a-cloudndb/app.yaml
+++ b/mod2a-cloudndb/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ handlers:
libraries:
- name: grpcio
- version: 1.0.0
+ version: latest
- name: setuptools
- version: 36.6.0
+ version: latest
diff --git a/mod2a-cloudndb/appengine_config.py b/mod2a-cloudndb/appengine_config.py
index 4773cd7..2a41fb4 100644
--- a/mod2a-cloudndb/appengine_config.py
+++ b/mod2a-cloudndb/appengine_config.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod2a-cloudndb/main.py b/mod2a-cloudndb/main.py
index 1d95ed7..36834ef 100644
--- a/mod2a-cloudndb/main.py
+++ b/mod2a-cloudndb/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ def store_visit(remote_addr, user_agent):
def fetch_visits(limit):
'get most recent visits'
with ds_client.context():
- return (v.to_dict() for v in Visit.query().order(
- -Visit.timestamp).fetch(limit))
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
@app.route('/')
def root():
diff --git a/mod2a-cloudndb/requirements.txt b/mod2a-cloudndb/requirements.txt
index c5fbb74..84932a7 100644
--- a/mod2a-cloudndb/requirements.txt
+++ b/mod2a-cloudndb/requirements.txt
@@ -1,2 +1,2 @@
-flask==1.1.2
-google-cloud-ndb==1.9.0
+flask
+google-cloud-ndb
diff --git a/mod2a-cloudndb/templates/index.html b/mod2a-cloudndb/templates/index.html
index e140206..920068e 100644
--- a/mod2a-cloudndb/templates/index.html
+++ b/mod2a-cloudndb/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod2b-cloudndb/.gcloudignore b/mod2b-cloudndb/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod2b-cloudndb/.gcloudignore
+++ b/mod2b-cloudndb/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod2b-cloudndb/README.md b/mod2b-cloudndb/README.md
index a67f223..19d56c1 100644
--- a/mod2b-cloudndb/README.md
+++ b/mod2b-cloudndb/README.md
@@ -1,3 +1,3 @@
-# Module 2 - Migrate from App Engine `ndb` to Google Cloud NDB
+# Module 2 - Migrate from App Engine `ndb` to Cloud NDB
-This repo folder is the corresponding Python 3 code to the [Module 2 codelab](http://g.co/codelabs/pae-migrate-cloudndb). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through migrating away from App Engine's `ndb` to Cloud NDB to access Datastore culminating in the code in the [mod2a-cloudndb](/mod2a-cloudndb) folder. That is followed by a BONUS migration to Python 3, thus the code in *this* (`mod2b-cloudndb`) folder.
+This repo folder is the corresponding Python 3 code to the [Module 2 codelab](http://g.co/codelabs/pae-migrate-cloudndb). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through migrating away from App Engine's `ndb` to Cloud NDB to access Datastore culminating in the code in the [mod2a-cloudndb](/mod2a-cloudndb) folder. That is followed by a BONUS migration to Python 3, culminating in the code in *this* (`mod2b-cloudndb`) folder.
diff --git a/mod2b-cloudndb/app.yaml b/mod2b-cloudndb/app.yaml
index a74df21..a926609 100644
--- a/mod2b-cloudndb/app.yaml
+++ b/mod2b-cloudndb/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-runtime: python38
+runtime: python39
diff --git a/mod2b-cloudndb/main.py b/mod2b-cloudndb/main.py
index 1d95ed7..36834ef 100644
--- a/mod2b-cloudndb/main.py
+++ b/mod2b-cloudndb/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ def store_visit(remote_addr, user_agent):
def fetch_visits(limit):
'get most recent visits'
with ds_client.context():
- return (v.to_dict() for v in Visit.query().order(
- -Visit.timestamp).fetch(limit))
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
@app.route('/')
def root():
diff --git a/mod2b-cloudndb/requirements.txt b/mod2b-cloudndb/requirements.txt
index c5fbb74..84932a7 100644
--- a/mod2b-cloudndb/requirements.txt
+++ b/mod2b-cloudndb/requirements.txt
@@ -1,2 +1,2 @@
-flask==1.1.2
-google-cloud-ndb==1.9.0
+flask
+google-cloud-ndb
diff --git a/mod2b-cloudndb/templates/index.html b/mod2b-cloudndb/templates/index.html
index e140206..920068e 100644
--- a/mod2b-cloudndb/templates/index.html
+++ b/mod2b-cloudndb/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod3a-datastore/.gcloudignore b/mod3a-datastore/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod3a-datastore/.gcloudignore
+++ b/mod3a-datastore/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod3a-datastore/app.yaml b/mod3a-datastore/app.yaml
index 03e7e70..ba543cd 100644
--- a/mod3a-datastore/app.yaml
+++ b/mod3a-datastore/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ handlers:
libraries:
- name: grpcio
- version: 1.0.0
+ version: latest
- name: setuptools
- version: 36.6.0
+ version: latest
diff --git a/mod3a-datastore/appengine_config.py b/mod3a-datastore/appengine_config.py
index 4773cd7..2a41fb4 100644
--- a/mod3a-datastore/appengine_config.py
+++ b/mod3a-datastore/appengine_config.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod3a-datastore/main.py b/mod3a-datastore/main.py
index 4eaa4dd..73a8eeb 100644
--- a/mod3a-datastore/main.py
+++ b/mod3a-datastore/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod3a-datastore/requirements.txt b/mod3a-datastore/requirements.txt
index 7092ef7..78086d0 100644
--- a/mod3a-datastore/requirements.txt
+++ b/mod3a-datastore/requirements.txt
@@ -1,2 +1,2 @@
-flask==1.1.2
+flask
google-cloud-datastore==1.15.3
diff --git a/mod3a-datastore/templates/index.html b/mod3a-datastore/templates/index.html
index e140206..920068e 100644
--- a/mod3a-datastore/templates/index.html
+++ b/mod3a-datastore/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod3b-datastore/.gcloudignore b/mod3b-datastore/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod3b-datastore/.gcloudignore
+++ b/mod3b-datastore/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod3b-datastore/app.yaml b/mod3b-datastore/app.yaml
index a74df21..a926609 100644
--- a/mod3b-datastore/app.yaml
+++ b/mod3b-datastore/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-runtime: python38
+runtime: python39
diff --git a/mod3b-datastore/main.py b/mod3b-datastore/main.py
index 4eaa4dd..73a8eeb 100644
--- a/mod3b-datastore/main.py
+++ b/mod3b-datastore/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod3b-datastore/requirements.txt b/mod3b-datastore/requirements.txt
index f174e5c..3718741 100644
--- a/mod3b-datastore/requirements.txt
+++ b/mod3b-datastore/requirements.txt
@@ -1,2 +1,2 @@
flask==1.1.2
-google-cloud-datastore==2.1.3
+google-cloud-datastore==2.3.0
diff --git a/mod3b-datastore/templates/index.html b/mod3b-datastore/templates/index.html
index e140206..920068e 100644
--- a/mod3b-datastore/templates/index.html
+++ b/mod3b-datastore/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod4a-rundocker/.gcloudignore b/mod4a-rundocker/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod4a-rundocker/.gcloudignore
+++ b/mod4a-rundocker/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod4a-rundocker/Dockerfile b/mod4a-rundocker/Dockerfile
index caa4522..e7edb64 100644
--- a/mod4a-rundocker/Dockerfile
+++ b/mod4a-rundocker/Dockerfile
@@ -1,5 +1,5 @@
FROM python:2-slim
WORKDIR /app
-COPY . .
RUN pip install -r requirements.txt
+COPY . .
ENTRYPOINT exec gunicorn -b :$PORT -w 2 main:app
diff --git a/mod4a-rundocker/main.py b/mod4a-rundocker/main.py
index 1d95ed7..36834ef 100644
--- a/mod4a-rundocker/main.py
+++ b/mod4a-rundocker/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ def store_visit(remote_addr, user_agent):
def fetch_visits(limit):
'get most recent visits'
with ds_client.context():
- return (v.to_dict() for v in Visit.query().order(
- -Visit.timestamp).fetch(limit))
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
@app.route('/')
def root():
diff --git a/mod4a-rundocker/requirements.txt b/mod4a-rundocker/requirements.txt
index 7bdc163..7890c49 100644
--- a/mod4a-rundocker/requirements.txt
+++ b/mod4a-rundocker/requirements.txt
@@ -1,3 +1,3 @@
-gunicorn==19.10.0
-flask==1.1.2
-google-cloud-ndb==1.9.0
+gunicorn
+flask
+google-cloud-ndb==1.11.1
diff --git a/mod4a-rundocker/templates/index.html b/mod4a-rundocker/templates/index.html
index e140206..920068e 100644
--- a/mod4a-rundocker/templates/index.html
+++ b/mod4a-rundocker/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod4b-rundocker/.gcloudignore b/mod4b-rundocker/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod4b-rundocker/.gcloudignore
+++ b/mod4b-rundocker/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod4b-rundocker/Dockerfile b/mod4b-rundocker/Dockerfile
index 8abd3d0..40b803a 100644
--- a/mod4b-rundocker/Dockerfile
+++ b/mod4b-rundocker/Dockerfile
@@ -1,5 +1,5 @@
FROM python:3-slim
WORKDIR /app
-COPY . .
RUN pip install -r requirements.txt
+COPY . .
ENTRYPOINT exec gunicorn -b :$PORT -w 2 main:app
diff --git a/mod4b-rundocker/main.py b/mod4b-rundocker/main.py
index 4eaa4dd..73a8eeb 100644
--- a/mod4b-rundocker/main.py
+++ b/mod4b-rundocker/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod4b-rundocker/requirements.txt b/mod4b-rundocker/requirements.txt
index 3f9026e..5780c7e 100644
--- a/mod4b-rundocker/requirements.txt
+++ b/mod4b-rundocker/requirements.txt
@@ -1,3 +1,3 @@
-gunicorn==20.1.0
-flask==1.1.2
-google-cloud-datastore==2.1.3
+gunicorn
+flask
+google-cloud-datastore==2.3.0
diff --git a/mod4b-rundocker/templates/index.html b/mod4b-rundocker/templates/index.html
index e140206..920068e 100644
--- a/mod4b-rundocker/templates/index.html
+++ b/mod4b-rundocker/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod5-runbldpks/.gcloudignore b/mod5-runbldpks/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod5-runbldpks/.gcloudignore
+++ b/mod5-runbldpks/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod5-runbldpks/main.py b/mod5-runbldpks/main.py
index 1d95ed7..36834ef 100644
--- a/mod5-runbldpks/main.py
+++ b/mod5-runbldpks/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ def store_visit(remote_addr, user_agent):
def fetch_visits(limit):
'get most recent visits'
with ds_client.context():
- return (v.to_dict() for v in Visit.query().order(
- -Visit.timestamp).fetch(limit))
+ return Visit.query().order(-Visit.timestamp).fetch(limit)
@app.route('/')
def root():
diff --git a/mod5-runbldpks/requirements.txt b/mod5-runbldpks/requirements.txt
index 3a4be91..60bbd95 100644
--- a/mod5-runbldpks/requirements.txt
+++ b/mod5-runbldpks/requirements.txt
@@ -1,3 +1,3 @@
-gunicorn==20.1.0
-flask==1.1.2
-google-cloud-ndb==1.9.0
+gunicorn
+flask
+google-cloud-ndb
diff --git a/mod5-runbldpks/templates/index.html b/mod5-runbldpks/templates/index.html
index e140206..920068e 100644
--- a/mod5-runbldpks/templates/index.html
+++ b/mod5-runbldpks/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod6-firestore/.gcloudignore b/mod6-firestore/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod6-firestore/.gcloudignore
+++ b/mod6-firestore/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod6-firestore/app.yaml b/mod6-firestore/app.yaml
index a173c6e..a3d0c92 100644
--- a/mod6-firestore/app.yaml
+++ b/mod6-firestore/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-runtime: python38
+runtime: python39
handlers:
- url: /.*
diff --git a/mod6-firestore/main.py b/mod6-firestore/main.py
index 5db626b..b9a83a7 100644
--- a/mod6-firestore/main.py
+++ b/mod6-firestore/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod6-firestore/requirements.txt b/mod6-firestore/requirements.txt
index 72ec3d4..b8191d9 100644
--- a/mod6-firestore/requirements.txt
+++ b/mod6-firestore/requirements.txt
@@ -1,2 +1,2 @@
-flask==1.1.2
-google-cloud-firestore==2.0.2
+flask
+google-cloud-firestore==2.3.4
diff --git a/mod6-firestore/templates/index.html b/mod6-firestore/templates/index.html
index e140206..920068e 100644
--- a/mod6-firestore/templates/index.html
+++ b/mod6-firestore/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
diff --git a/mod7-gaetasks/.gcloudignore b/mod7-gaetasks/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod7-gaetasks/.gcloudignore
+++ b/mod7-gaetasks/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod7-gaetasks/README.md b/mod7-gaetasks/README.md
index f9c4658..d76f17e 100644
--- a/mod7-gaetasks/README.md
+++ b/mod7-gaetasks/README.md
@@ -1,3 +1,3 @@
-# Module 7 - Add usage of App Engine `taskqueue` to Flask `ndb` sample app
+# Module 7 - Add usage of App Engine TaskQueue (push tasks) to NDB Flask sample app
-This repo folder is the corresponding Python 2 code to the [Module 7 codelab](http://g.co/codelabs/pae-migrate-gaetasks). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through adding usage of App Engine's `taskqueue`, culminating in the code in this folder.
+This repo folder is the corresponding Python 2 code to the [Module 7 codelab](http://g.co/codelabs/pae-migrate-gaetasks). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through adding usage of push tasks via App Engine TaskQueue, culminating in the code in this folder.
diff --git a/mod7-gaetasks/app.yaml b/mod7-gaetasks/app.yaml
index 80fb603..0d4d8d6 100644
--- a/mod7-gaetasks/app.yaml
+++ b/mod7-gaetasks/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod7-gaetasks/appengine_config.py b/mod7-gaetasks/appengine_config.py
index 0ca8634..9760ebb 100644
--- a/mod7-gaetasks/appengine_config.py
+++ b/mod7-gaetasks/appengine_config.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod7-gaetasks/main.py b/mod7-gaetasks/main.py
index 289bd28..b329961 100644
--- a/mod7-gaetasks/main.py
+++ b/mod7-gaetasks/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ def fetch_visits(limit):
oldest_str = time.ctime(oldest)
logging.info('Delete entities older than %s' % oldest_str)
taskqueue.add(url='/trim', params={'oldest': oldest})
- return (v.to_dict() for v in data), oldest_str
+ return data, oldest_str
@app.route('/trim', methods=['POST'])
def trim():
diff --git a/mod7-gaetasks/requirements.txt b/mod7-gaetasks/requirements.txt
index 5c508e5..7e10602 100644
--- a/mod7-gaetasks/requirements.txt
+++ b/mod7-gaetasks/requirements.txt
@@ -1 +1 @@
-flask==1.1.2
+flask
diff --git a/mod7-gaetasks/templates/index.html b/mod7-gaetasks/templates/index.html
index 9f33130..8a0b9cb 100644
--- a/mod7-gaetasks/templates/index.html
+++ b/mod7-gaetasks/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
@@ -12,7 +13,7 @@
Last 10 visits
{% endfor %}
-{% if oldest %}
+{% if oldest is defined %}
Deleting visits older than: {{ oldest }}
{% endif %}
diff --git a/mod7b-gaetasks/.gcloudignore b/mod7b-gaetasks/.gcloudignore
new file mode 100644
index 0000000..af73b5d
--- /dev/null
+++ b/mod7b-gaetasks/.gcloudignore
@@ -0,0 +1,79 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+
+# Source code control files
+.git/
+.gitignore
+.hgignore
+.hg/
+
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
+__pycache__/
+/setup.cfg
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod7b-gaetasks/README.md b/mod7b-gaetasks/README.md
new file mode 100644
index 0000000..fa767aa
--- /dev/null
+++ b/mod7b-gaetasks/README.md
@@ -0,0 +1,5 @@
+# Module 7 - Add usage of App Engine `taskqueue` to Flask `ndb` sample app
+
+This repo folder is the corresponding Python 3 code to the [Module 7 codelab](http://g.co/codelabs/pae-migrate-gaetasks). The tutorial STARTs with the Python 2 code in the [Module 1 repo folder](/mod1-flask) and leads developers through adding usage of App Engine's `taskqueue`, culminating in the code in the [mod7-gaetasks](/mod7-gaetasks) folder. The codelab does **not** currently feature any bonus migration to Python 3, however to do so requires you to participate in the bundled services public preview program (see sidebar below) and which culminates in the code in *this* (`mod7b-gaetasks`) folder. In the [next (Module 8) codelab](http://g.co/codelabs/pae-migrate-cloudtasks), users will migrate (the original Python 2 version of) this app from App Engine `taskqueue` to Cloud Tasks.
+
+> **LEGACY SERVICES PUBLIC PREVIEW**: Accessing legacy services such as App Engine `ndb` and `taskqueue` from Python 3 (and next generation App Engine in general) is available in a public preview. See the [Sep 2021 announcement](https://twitter.com/googledevs/status/1445916786755571712) for more information.
diff --git a/mod7b-gaetasks/app.yaml b/mod7b-gaetasks/app.yaml
new file mode 100644
index 0000000..4c77d5d
--- /dev/null
+++ b/mod7b-gaetasks/app.yaml
@@ -0,0 +1,16 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python39
+app_engine_apis: true
diff --git a/mod7b-gaetasks/main.py b/mod7b-gaetasks/main.py
new file mode 100644
index 0000000..af356de
--- /dev/null
+++ b/mod7b-gaetasks/main.py
@@ -0,0 +1,66 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from datetime import datetime
+import logging
+import time
+from flask import Flask, render_template, request
+from google.appengine.api import taskqueue, wrap_wsgi_app
+from google.appengine.ext import ndb
+
+app = Flask(__name__)
+app.wsgi_app = wrap_wsgi_app(app.wsgi_app)
+
+class Visit(ndb.Model):
+ 'Visit entity registers visitor IP address & timestamp'
+ visitor = ndb.StringProperty()
+ timestamp = ndb.DateTimeProperty(auto_now_add=True)
+
+def store_visit(remote_addr, user_agent):
+ 'create new Visit entity in Datastore'
+ Visit(visitor='{}: {}'.format(remote_addr, user_agent)).put()
+
+def fetch_visits(limit):
+ 'get most recent visits & add task to delete older visits'
+ data = Visit.query().order(-Visit.timestamp).fetch(limit)
+ oldest = time.mktime(data[-1].timestamp.timetuple())
+ oldest_str = time.ctime(oldest)
+ logging.info('Delete entities older than %s' % oldest_str)
+ taskqueue.add(url='/trim', params={'oldest': oldest})
+ return data, oldest_str
+
+@app.route('/trim', methods=['POST'])
+def trim():
+ '(push) task queue handler to delete oldest visits'
+ oldest = request.form.get('oldest', type=float)
+ keys = Visit.query(
+ Visit.timestamp < datetime.fromtimestamp(oldest)
+ ).fetch(keys_only=True)
+ nkeys = len(keys)
+ if nkeys:
+ logging.info('Deleting %d entities: %s' % (
+ nkeys, ', '.join(str(k.id()) for k in keys)))
+ ndb.delete_multi(keys)
+ else:
+ logging.info(
+ 'No entities older than: %s' % time.ctime(oldest))
+ return '' # need to return SOME string w/200
+
+@app.route('/')
+def root():
+ 'main application (GET) handler'
+ store_visit(request.remote_addr, request.user_agent)
+ visits, oldest = fetch_visits(10)
+ context = {'visits': visits, 'oldest': oldest}
+ return render_template('index.html', **context)
diff --git a/mod7b-gaetasks/requirements.txt b/mod7b-gaetasks/requirements.txt
new file mode 100644
index 0000000..a2e7c7f
--- /dev/null
+++ b/mod7b-gaetasks/requirements.txt
@@ -0,0 +1,2 @@
+flask
+appengine-python-standard
diff --git a/mod7b-gaetasks/templates/index.html b/mod7b-gaetasks/templates/index.html
new file mode 100644
index 0000000..8a0b9cb
--- /dev/null
+++ b/mod7b-gaetasks/templates/index.html
@@ -0,0 +1,20 @@
+
+
+
+VisitMe Example
+
+
+
+
VisitMe example
+
Last 10 visits
+
+{% for visit in visits %}
+
{{ visit.timestamp.ctime() }} from {{ visit.visitor }}
+{% endfor %}
+
+
+{% if oldest is defined %}
+ Deleting visits older than: {{ oldest }}
+{% endif %}
+
+
diff --git a/mod8-cloudtasks/.gcloudignore b/mod8-cloudtasks/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod8-cloudtasks/.gcloudignore
+++ b/mod8-cloudtasks/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod8-cloudtasks/README.md b/mod8-cloudtasks/README.md
index 10c0351..789d37c 100644
--- a/mod8-cloudtasks/README.md
+++ b/mod8-cloudtasks/README.md
@@ -1,3 +1,3 @@
-# Module 8 - Migrate from App Engine `taskqueue` to Google Cloud Tasks
+# Module 8 - Migrate from App Engine `taskqueue` to Cloud Tasks
This repo folder is the corresponding Python 2 code to the [Module 8 codelab](http://g.co/codelabs/pae-migrate-cloudtasks). The tutorial STARTs with the Python 2 code in the [Module 7 repo folder](/mod7-gaetasks) and leads developers through migrating from `taskqueue` to Cloud Tasks, culminating in the code in this folder.
diff --git a/mod8-cloudtasks/app.yaml b/mod8-cloudtasks/app.yaml
index 03e7e70..ba543cd 100644
--- a/mod8-cloudtasks/app.yaml
+++ b/mod8-cloudtasks/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ handlers:
libraries:
- name: grpcio
- version: 1.0.0
+ version: latest
- name: setuptools
- version: 36.6.0
+ version: latest
diff --git a/mod8-cloudtasks/appengine_config.py b/mod8-cloudtasks/appengine_config.py
index 4773cd7..2a41fb4 100644
--- a/mod8-cloudtasks/appengine_config.py
+++ b/mod8-cloudtasks/appengine_config.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/mod8-cloudtasks/main.py b/mod8-cloudtasks/main.py
index 9150967..15361e9 100644
--- a/mod8-cloudtasks/main.py
+++ b/mod8-cloudtasks/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
import logging
import time
from flask import Flask, render_template, request
+import google.auth
from google.cloud import ndb, tasks
app = Flask(__name__)
ds_client = ndb.Client()
ts_client = tasks.CloudTasksClient()
-PROJECT_ID = 'PROJECT_ID' # replace w/your own
+_, PROJECT_ID = google.auth.default()
REGION_ID = 'REGION_ID' # replace w/your own
QUEUE_NAME = 'default' # replace w/your own
QUEUE_PATH = ts_client.queue_path(PROJECT_ID, REGION_ID, QUEUE_NAME)
@@ -55,7 +56,7 @@ def fetch_visits(limit):
}
}
ts_client.create_task(parent=QUEUE_PATH, task=task)
- return (v.to_dict() for v in data), oldest_str
+ return data, oldest_str
@app.route('/trim', methods=['POST'])
def trim():
diff --git a/mod8-cloudtasks/requirements.txt b/mod8-cloudtasks/requirements.txt
index 6241dea..67c24bf 100644
--- a/mod8-cloudtasks/requirements.txt
+++ b/mod8-cloudtasks/requirements.txt
@@ -1,3 +1,3 @@
-flask==1.1.2
-google-cloud-ndb==1.7.1
-google-cloud-tasks==1.5.0
+flask
+google-cloud-ndb
+google-cloud-tasks
diff --git a/mod8-cloudtasks/templates/index.html b/mod8-cloudtasks/templates/index.html
index 9f33130..8a0b9cb 100644
--- a/mod8-cloudtasks/templates/index.html
+++ b/mod8-cloudtasks/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
@@ -12,7 +13,7 @@
Last 10 visits
{% endfor %}
-{% if oldest %}
+{% if oldest is defined %}
Deleting visits older than: {{ oldest }}
{% endif %}
diff --git a/mod9-py3dstasks/.gcloudignore b/mod9-py3dstasks/.gcloudignore
index bcf97a8..af73b5d 100644
--- a/mod9-py3dstasks/.gcloudignore
+++ b/mod9-py3dstasks/.gcloudignore
@@ -8,17 +8,72 @@
#
.gcloudignore
-# Ignore source code control maintenance files
-.git
+# Source code control files
+.git/
.gitignore
.hgignore
.hg/
-# Python files
-*.pyc
-*.pyo
+# README/text files
+LICENSE
+*.md
+
+# Tests/results (not in .gitignore)
+noxfile.py
+pylintrc
+pylintrc.test
+
+# most of .gitignore (except `lib`)
+#
+# Python
+*.py[cod]
__pycache__/
/setup.cfg
-# no need to upload README
-README.md
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib64
+*.tgz
+
+# Installer logs
+pip-log.txt
+
+# Tests/results
+.nox/
+.pytest_cache/
+.cache
+.pytype
+.coverage
+coverage.xml
+*sponge_log.xml
+system_tests/local_test_setup
+
+# Mac
+.DS_Store
+
+# IDEs/editors
+*.sw[op]
+*~
+.vscode
+.idea
+
+# Built documentation
+docs/_build
+docs.metadata
+
+# Virtual environment
+env/
diff --git a/mod9-py3dstasks/README.md b/mod9-py3dstasks/README.md
index 613ea03..1146d79 100644
--- a/mod9-py3dstasks/README.md
+++ b/mod9-py3dstasks/README.md
@@ -1,3 +1,11 @@
# Module 9 - Migrate from Python 2 to 3 and Cloud NDB to Cloud Datastore
-This repo folder is the corresponding Python 3 code to the [Module 9 codelab](http://g.co/codelabs/pae-migrate-py3dstasks). The tutorial STARTs with the Python 2 code in the [Module 8 repo folder](/mod7-cloudtasks) and leads developers through migrating from Python 2 to 3, Cloud NDB to Cloud Datastore (plus any changes from Cloud Tasks v1 to v2), culminating in the code in this folder.
+This repo folder is the corresponding Python 3 code to the Module 9 codelab (_TBD_). The tutorial STARTs with the Python 2 code in the [Module 8 repo folder](/mod7-cloudtasks) and leads developers through migrating from Python 2 to 3, Cloud NDB to Cloud Datastore plus any changes from Cloud Tasks v1 to v2, culminating in the code in this folder. One major addition to look for here vs. Module 8 is that App Engine `taskqueue` creates a `default` push queue while Cloud Tasks does not, so that now has to be done in code.
+
+**NOTE: Backport to Python 2**: When migrating this app to Python 3, we added a Python 3 dependency: the `print()` function. If for any reason you need to get back on Python 2 App Engine, you would have to:
+
+ 1. Decide on your logging strategy. The Python 2 App Engine runtime now allows writing to `stdout`, so you don't have to revert back to `logging.info()` (or preferred logging level), however writing to `stdout` defaults to `logging.error()`. If that is acceptable and to continue with `print()`, add this import (above all others) at top of `main.py`:
+
+ from __future__ import print_function
+
+ 2. Revert back to your Python 2 configuration files. For this app, it would be the Module 8 [`app.yaml`](/blob/master/mod8-cloudtasks/app.yaml) and [`appengine_config.py`](/blob/master/mod8-cloudtasks/appengine_config.py) files.
diff --git a/mod9-py3dstasks/app.yaml b/mod9-py3dstasks/app.yaml
index a74df21..16a11a3 100644
--- a/mod9-py3dstasks/app.yaml
+++ b/mod9-py3dstasks/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-runtime: python38
+runtime: python310
diff --git a/mod9-py3dstasks/main.py b/mod9-py3dstasks/main.py
index e4222cf..f444830 100644
--- a/mod9-py3dstasks/main.py
+++ b/mod9-py3dstasks/main.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,16 +16,18 @@
import json
import time
from flask import Flask, render_template, request
+import google.auth
from google.cloud import datastore, tasks
app = Flask(__name__)
ds_client = datastore.Client()
ts_client = tasks.CloudTasksClient()
-PROJECT_ID = 'PROJECT_ID' # replace w/your own
+_, PROJECT_ID = google.auth.default()
REGION_ID = 'REGION_ID' # replace w/your own
QUEUE_NAME = 'default' # replace w/your own
QUEUE_PATH = ts_client.queue_path(PROJECT_ID, REGION_ID, QUEUE_NAME)
+PATH_PREFIX = QUEUE_PATH.rsplit('/', 2)[0]
def store_visit(remote_addr, user_agent):
'create new Visit entity in Datastore'
@@ -36,12 +38,22 @@ def store_visit(remote_addr, user_agent):
})
ds_client.put(entity)
+def _create_queue_if():
+ 'app-internal function creating default queue if it does not exist'
+ try:
+ ts_client.get_queue(name=QUEUE_PATH)
+ except Exception as e:
+ if 'does not exist' in str(e):
+ ts_client.create_queue(parent=PATH_PREFIX,
+ queue={'name': QUEUE_PATH})
+ return True
+
def fetch_visits(limit):
'get most recent visits & add task to delete older visits'
query = ds_client.query(kind='Visit')
query.order = ['-timestamp']
- data = list(query.fetch(limit=limit))
- oldest = time.mktime(data[-1]['timestamp'].timetuple())
+ visits = list(query.fetch(limit=limit))
+ oldest = time.mktime(visits[-1]['timestamp'].timetuple())
oldest_str = time.ctime(oldest)
print('Delete entities older than %s' % oldest_str)
task = {
@@ -53,8 +65,9 @@ def fetch_visits(limit):
},
}
}
- ts_client.create_task(parent=QUEUE_PATH, task=task)
- return data, oldest_str
+ if _create_queue_if():
+ ts_client.create_task(parent=QUEUE_PATH, task=task)
+ return visits, oldest_str
@app.route('/trim', methods=['POST'])
def trim():
diff --git a/mod9-py3dstasks/requirements.txt b/mod9-py3dstasks/requirements.txt
index acc1e1b..be6794c 100644
--- a/mod9-py3dstasks/requirements.txt
+++ b/mod9-py3dstasks/requirements.txt
@@ -1,3 +1,3 @@
-flask==1.1.2
-google-cloud-datastore==2.1.3
-google-cloud-tasks==2.3.0
+flask
+google-cloud-datastore
+google-cloud-tasks
diff --git a/mod9-py3dstasks/templates/index.html b/mod9-py3dstasks/templates/index.html
index 9f33130..8a0b9cb 100644
--- a/mod9-py3dstasks/templates/index.html
+++ b/mod9-py3dstasks/templates/index.html
@@ -2,6 +2,7 @@
VisitMe Example
+
VisitMe example
@@ -12,7 +13,7 @@
Last 10 visits
{% endfor %}
-{% if oldest %}
+{% if oldest is defined %}
Deleting visits older than: {{ oldest }}
{% endif %}