8000 Merge pull request #1137 from andrewsg/tasks · johnmanong/python-docs-samples@e1f6883 · GitHub
[go: up one dir, main page]
Skip to content

Commit e1f6883

Browse files
andrewsgandrewsg
authored
Merge pull request GoogleCloudPlatform#1137 from andrewsg/tasks
Update Task Queue samples for beta
2 parents b94b7f4 + aa6c226 commit e1f6883

File tree

3 files changed

+21
-32
lines changed

3 files changed

+21
-32
lines changed

‎appengine/flexible/tasks/create_app_engine_queue_task.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import datetime
2020
import json
2121

22-
from googleapiclient import discovery
23-
2422

2523
def seconds_from_now_to_rfc3339_datetime(seconds):
2624
"""Return an RFC 3339 datetime string for a number of seconds from now."""
@@ -31,16 +29,15 @@ def seconds_from_now_to_rfc3339_datetime(seconds):
3129
def create_task(project, queue, location, payload=None, in_seconds=None):
3230
"""Create a task for a given queue with an arbitrary payload."""
3331

32+
import googleapiclient.discovery
33+
3434
# Create a client.
35-
DISCOVERY_URL = (
36-
'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
37-
client = discovery.build(
38-
'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
35+
client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
3936

4037
url = '/log_payload'
4138
body = {
4239
'task': {
43-
'app_engine_task_target': {
40+
'app_engine_http_request': {
4441
'http_method': 'POST',
4542
'relative_url': url
4643
}
@@ -50,7 +47,7 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
5047
if payload is not None:
5148
# Payload is a string (unicode), and must be encoded for base64.
5249
# The finished request body is JSON, which requires unicode.
53-
body['task']['app_engine_task_target']['payload'] = base64.b64encode(
50+
body['task']['app_engine_http_request']['payload'] = base64.b64encode(
5451
payload.encode()).decode()
5552

5653
if in_seconds is not None:
@@ -65,10 +62,6 @@ def create_task(project, queue, location, payload=None, in_seconds=None):
6562
response = client.projects().locations().queues().tasks().create(
6663
parent=queue_name, body=body).execute()
6764

68-
# By default CreateTaskRequest.responseView is BASIC, so not all
69-
# information is retrieved by default because some data, such as payloads,
70-
# might be desirable to return only when needed because of its large size
71-
# or because of the sensitivity of data that it contains.
7265
print('Created task {}'.format(response['name']))
7366
return response
7467

‎appengine/flexible/tasks/main.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
"""App Engine app to serve as an endpoint for App Engine queue samples."""
1616

17-
import logging
18-
1917
from flask import Flask, request
2018

2119
app = Flask(__name__)
@@ -24,9 +22,9 @@
2422
@app.route('/log_payload', methods=['POST'])
2523
def log_payload():
2624
"""Log the request payload."""
27-
payload = request.data or "empty payload"
28-
logging.warn(payload)
29-
return 'Logged request payload: {}'.format(payload)
25+
payload = request.get_data(as_text=True) or '(empty payload)'
26+
print('Received task with payload: {}'.format(payload))
27+
return 'Printed task payload: {}'.format(payload)
3028

3129

3230
@app.route('/')

‎tasks/pull_queue_snippets.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,19 @@
2323
import argparse
2424
import base64
2525

26-
from googleapiclient import discovery
27-
2826

2927
def create_task(project, queue, location):
3028
"""Create a task for a given queue with an arbitrary payload."""
3129

32-
DISCOVERY_URL = (
33-
'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
34-
client = discovery.build(
35-
'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
30+
import googleapiclient.discovery
31+
32+
# Create a client.
33+
client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
3634

3735
payload = 'a message for the recipient'
3836
task = {
3937
'task': {
40-
'pull_task_target': {
38+
'pull_message': {
4139
'payload': base64.b64encode(payload.encode()).decode()
4240
}
4341
}
@@ -56,10 +54,10 @@ def create_task(project, queue, location):
5654
def pull_task(project, queue, location):
5755
"""Pull a single task from a given queue and lease it for 10 minutes."""
5856

59-
DISCOVERY_URL = (
60-
'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
61-
client = discovery.build(
62-
'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
57+
import googleapiclient.discovery
58+
59+
# Create a client.
60+
client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
6361

6462
duration_seconds = '600s'
6563
pull_options = {
@@ -81,10 +79,10 @@ def pull_task(project, queue, location):
8179
def acknowledge_task(task):
8280
"""Acknowledge a given task."""
8381

84-
DISCOVERY_URL = (
85-
'https://cloudtasks.googleapis.com/$discovery/rest?version=v2beta2')
86-
client = discovery.build(
87-
'cloudtasks', 'v2beta2', discoveryServiceUrl=DISCOVERY_URL)
82+
import googleapiclient.discovery
83+
84+
# Create a client.
85+
client = googleapiclient.discovery.build('cloudtasks', 'v2beta2')
8886

8987
body = {'scheduleTime': task['scheduleTime']}
9088
client.projects().locations().queues().tasks().acknowledge(

0 commit comments

Comments
 (0)
0