Misc fixes for Python (#1085)

Author: kevinthecheung

Python/alerts-to-discord/main.py

@@ -82,7 +82,7 @@ def post_fatal_issue_to_discord(
     try:
         # [START v2SendToDiscord]
         response = post_message_to_discord(
-            "Crashlytics Bot", message, DISCORD_WEBHOOK_URL.value()
+            "Crashlytics Bot", message, DISCORD_WEBHOOK_URL.value
         )
         if response.ok:
             print(
@@ -115,14 +115,14 @@ def post_new_udid_to_discord(
     message = f"""
 📱 New iOS device registered by {app_dist.tester_name} <{app_dist.tester_email}> for {app_id}
 
-UDID **{app_dist.device_id}** for {app_dist.device_model}
+UDID **{app_dist.tester_device_identifier}** for {app_dist.tester_device_model_name}
 """.strip()
     # [END v2AppDistributionEventPayload]
 
     try:
         # [START v2SendNewTesterIosDeviceToDiscord]
         response = post_message_to_discord(
-            "App Distro Bot", message, DISCORD_WEBHOOK_URL.value()
+            "App Distro Bot", message, DISCORD_WEBHOOK_URL.value
         )
         if response.ok:
             print(
@@ -168,7 +168,7 @@ def post_performance_alert_to_discord(
     try:
         # [START v2SendPerformanceAlertToDiscord]
         response = post_message_to_discord(
-            "App Performance Bot", message, DISCORD_WEBHOOK_URL.value()
+            "App Performance Bot", message, DISCORD_WEBHOOK_URL.value
         )
         if response.ok:
             print(

Python/delete-unused-accounts-cron/main.py

@@ -30,10 +30,10 @@
 # [START accountcleanup]
 # Run once a day at midnight, to clean up inactive users.
 # Manually run the task here https://console.cloud.google.com/cloudscheduler
-@scheduler_fn.on_schedule("every day 00:00")
+@scheduler_fn.on_schedule(schedule="every day 00:00")
 def accountcleanup(event: scheduler_fn.ScheduledEvent) -> None:
     """Delete users who've been inactive for 30 days or more."""
-    user_page: auth.ListUsersPage = auth.list_users()
+    user_page: auth.ListUsersPage | None = auth.list_users()
     while user_page is not None:
         inactive_uids = [
             user.uid

Python/post-signup-event/main.py

@@ -59,7 +59,7 @@ def savegoogletoken(
 
         tasks_client = google.cloud.tasks_v2.CloudTasksClient()
         task_queue = tasks_client.queue_path(
-            params.PROJECT_ID.value(),
+            params.PROJECT_ID.value,
             options.SupportedRegion.US_CENTRAL1,
             "scheduleonboarding",
         )
@@ -105,7 +105,10 @@ def scheduleonboarding(request: tasks_fn.CallableRequest) -> https_fn.Response:
     user_info = (
         firestore_client.collection("user_info").document(uid).get().to_dict()
     )
-    if "calendar_access_token" not in user_info:
+    if (
+        not isinstance(user_info, dict)
+        or "calendar_access_token" not in user_info
+    ):
         return https_fn.Response(
             status=https_fn.FunctionsErrorCode.PERMISSION_DENIED,
             response="No Google OAuth token found.",
@@ -145,6 +148,8 @@ def scheduleonboarding(request: tasks_fn.CallableRequest) -> https_fn.Response:
         calendarId="primary", body=calendar_event
     ).execute()
 
+    return https_fn.Response("Success")
+
 
 # [END scheduleonboarding]
 

Python/quickstarts/auth-blocking-functions/main.py

@@ -111,7 +111,7 @@ def sendverification(
     event: identity_fn.AuthBlockingEvent,
 ) -> identity_fn.BeforeCreateResponse | None:
     if event.data.email is not None and not event.data.email_verified:
-        link = auth.generate_email_verification_link()
+        link = auth.generate_email_verification_link(event.data.email)
         send_verification_email_using_your_smtp_server(event.data.email, link)
 
 
@@ -171,6 +171,7 @@ def setemployeeid(
 ) -> identity_fn.BeforeCreateResponse | None:
     if (
         event.credential is not None
+        and event.credential.claims is not None
         and event.credential.provider_id == "saml.my-provider-id"
     ):
         return identity_fn.BeforeCreateResponse(
@@ -184,6 +185,7 @@ def copyclaimstosession(
 ) -> identity_fn.BeforeSignInResponse | None:
     if (
         event.credential is not None
+        and event.credential.claims is not None
         and event.credential.provider_id == "saml.my-provider-id"
     ):
         return identity_fn.BeforeSignInResponse(

Python/quickstarts/callable-functions/main.py

@@ -116,7 +116,7 @@ def addmessage(req: https_fn.CallableRequest) -> Any:
         # Saving the new message to the Realtime Database.
         sanitized_message = sanitize_text(text)  # Sanitize message.
         db.reference("/messages").push(
-            {
+            {  # type: ignore
                 "text": sanitized_message,
                 "author": {
                     "uid": uid,
@@ -135,7 +135,7 @@ def addmessage(req: https_fn.CallableRequest) -> Any:
         # Re-throwing the error as an HttpsError so that the client gets
         # the error details.
         raise https_fn.HttpsError(
-            code=https_fn.FunctionsErrorCode.UNKNOWN, message=e, details=e
+            code=https_fn.FunctionsErrorCode.UNKNOWN, message="Error", details=e
         )
 
 

Python/quickstarts/custom-events/main.py

@@ -30,6 +30,10 @@
 def onimageresized(event: eventarc_fn.CloudEvent) -> None:
     print("Received image resize completed event: ", event.type)
 
+    if not isinstance(event.subject, str):
+        print("No 'subject' data.")
+        return
+
     # For example, write resized image details into Firestore.
     firestore_client: google.cloud.firestore.Client = firestore.client()
     collection = firestore_client.collection("images")
@@ -51,6 +55,10 @@ def onimageresized(event: eventarc_fn.CloudEvent) -> None:
 def onimageresizedwest(event: eventarc_fn.CloudEvent) -> None:
     print("Received image resize completed event: ", event.type)
     # [START_EXCLUDE]
+    if not isinstance(event.subject, str):
+        print("No 'subject' data.")
+        return
+
     # For example, write resized image details into Firestore.
     firestore_client: google.cloud.firestore.Client = firestore.client()
     collection = firestore_client.collection("images")

Python/quickstarts/pubsub-helloworld/main.py

@@ -52,6 +52,8 @@ def hellopubsubjson(
     except ValueError:
         print("PubSub message was not JSON")
         return
+    if data is None:
+        return
     if "name" not in data:
         print("No 'name' key")
         return

Python/quickstarts/uppercase-firestore/main.py

@@ -56,13 +56,15 @@ def addmessage(req: https_fn.Request) -> https_fn.Response:
 # [START makeUppercase]
 @firestore_fn.on_document_created(document="messages/{pushId}")
 def makeuppercase(
-    event: firestore_fn.Event[firestore_fn.DocumentSnapshot],
+    event: firestore_fn.Event[firestore_fn.DocumentSnapshot | None],
 ) -> None:
     """Listens for new documents to be added to /messages. If the document has
     an "original" field, creates an "uppercase" field containg the contents of
     "original" in upper case."""
 
     # Get the value of "original" if it exists.
+    if event.data is None:
+        return
     try:
         original = event.data.get("original")
     except KeyError:

Python/quickstarts/uppercase-rtdb/main.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 # [START all]
+from typing import Any
 from urllib import parse as urllib_parse
 
 # [START import]
@@ -40,11 +41,12 @@ def addmessage(req: https_fn.Request) -> https_fn.Response:
     # [START adminSdkPush]
 
     # Push the new message into the Realtime Database using the Firebase Admin SDK.
-    ref = db.reference("/messages").push({"original": original})
+    ref = db.reference("/messages").push({"original": original})  # type: ignore
 
     # Redirect with 303 SEE OTHER to the URL of the pushed object.
-    scheme, location, path, query, fragment = urllib_parse.urlsplit(
-        app.options.get("databaseURL")
+    scheme, location, path, query, fragment = (
+        b.decode()
+        for b in urllib_parse.urlsplit(app.options.get("databaseURL"))
     )
     path = f"{ref.path}.json"
     return https_fn.Response(
@@ -63,21 +65,25 @@ def addmessage(req: https_fn.Request) -> https_fn.Response:
 
 # [START makeUppercase]
 @db_fn.on_value_created(reference="/messages/{pushId}/original")
-def makeuppercase(event: db_fn.Event[object]) -> None:
+def makeuppercase(event: db_fn.Event[Any]) -> None:
     """Listens for new messages added to /messages/{pushId}/original and
     creates an uppercase version of the message to /messages/{pushId}/uppercase
     """
 
     # Grab the value that was written to the Realtime Database.
     original = event.data
-    if not hasattr(original, "upper"):
+    if not isinstance(original, str):
         print(f"Not a string: {event.reference}")
         return
 
     # Use the Admin SDK to set an "uppercase" sibling.
     print(f"Uppercasing {event.params['pushId']}: {original}")
     upper = original.upper()
-    db.reference(event.reference).parent.child("uppercase").set(upper)
+    parent = db.reference(event.reference).parent
+    if parent is None:
+        print("Message can't be root node.")
+        return
+    parent.child("uppercase").set(upper)
 
 
 # [END makeUppercase]
@@ -107,7 +113,11 @@ def makeuppercase2(event: db_fn.Event[db_fn.Change]) -> None:
     # Use the Admin SDK to set an "uppercase" sibling.
     print(f"Uppercasing {event.params['pushId']}: {original}")
     upper = original.upper()
-    db.reference(event.reference).parent.child("uppercase").set(upper)
+    parent = db.reference(event.reference).parent
+    if parent is None:
+        print("Message can't be root node.")
+        return
+    parent.child("uppercase").set(upper)
 
 
 # [END makeUppercase2]

Python/taskqueues-backup-images/main.py

@@ -29,12 +29,13 @@
 app = initialize_app()
 
 BACKUP_START_DATE = datetime(1995, 6, 17)
-BACKUP_COUNT = params.IntParam("BACKUP_COUNT", default=100).value()
-HOURLY_BATCH_SIZE = params.IntParam("HOURLY_BATCH_SIZE", default=600).value()
+BACKUP_COUNT = params.IntParam("BACKUP_COUNT", default=100).value
+HOURLY_BATCH_SIZE = params.IntParam("HOURLY_BATCH_SIZE", default=600).value
 BACKUP_BUCKET = params.StringParam(
-    "BACKUP_BUCKET", input=params.ResourceInput
-).value()
-NASA_API_KEY = params.StringParam("NASA_API_KEY").value()
+    "BACKUP_BUCKET",
+    input=params.ResourceInput(type=params.ResourceType.STORAGE_BUCKET),
+).value
+NASA_API_KEY = params.StringParam("NASA_API_KEY").value
 
 
 # [START v2TaskFunctionSetup]
@@ -82,6 +83,8 @@ def backupapod(req: tasks_fn.CallableRequest) -> str:
     print(f"Got URL {pic_url} from NASA API for date {date}. Fetching...")
     pic_resp = requests.get(pic_url)
     pic_type = pic_resp.headers.get("Content-Type")
+    if pic_type is None:
+        pic_type = "image/jpeg"
 
     print("Uploading to Cloud Storage")
     bucket = storage.bucket(BACKUP_BUCKET)
@@ -105,7 +108,7 @@ def enqueuebackuptasks(_: https_fn.Request) -> https_fn.Response:
     """Adds backup tasks to a Cloud Tasks queue."""
     tasks_client = tasks_v2.CloudTasksClient()
     task_queue = tasks_client.queue_path(
-        params.PROJECT_ID.value(), SupportedRegion.US_CENTRAL1, "backupapod"
+        params.PROJECT_ID.value, SupportedRegion.US_CENTRAL1, "backupapod"
     )
     target_uri = get_function_url("backupapod")