Skip to content

[BEAM-3744] Python PubSub API Fixes and Tests #5952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charlesccychen merged 5 commits into from
Jul 26, 2018
Merged

[BEAM-3744] Python PubSub API Fixes and Tests #5952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7334e56
Python PubSub updates:
udim Jun 27, 2018
b77d2fd
Fix lint errors and clarify PubsubMessage docs.
udim Jul 23, 2018
9153fa2
Skip unit test if pubsub is not installed.
udim Jul 24, 2018
0d781c3
Fix docstring indentation.
udim Jul 24, 2018
64120d6
Minor fixes.
udim Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdks/python/apache_beam/examples/complete/game/game_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,10 @@ def run(argv=None):
# Read game events from Pub/Sub using custom timestamps, which
# are extracted from the data elements, and parse the data.
if args.subscription:
scores = p | 'ReadPubSub' >> beam.io.ReadStringsFromPubSub(
scores = p | 'ReadPubSub' >> beam.io.ReadFromPubSub(
subscription=args.subscription)
else:
scores = p | 'ReadPubSub' >> beam.io.ReadStringsFromPubSub(
scores = p | 'ReadPubSub' >> beam.io.ReadFromPubSub(
topic=args.topic)
raw_events = (
scores
Expand Down
4 changes: 2 additions & 2 deletions sdks/python/apache_beam/examples/complete/game/leader_board.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,10 @@ def run(argv=None):

# Read from PubSub into a PCollection.
if args.subscription:
scores = p | 'ReadPubSub' >> beam.io.ReadStringsFromPubSub(
scores = p | 'ReadPubSub' >> beam.io.ReadFromPubSub(
subscription=args.subscription)
else:
scores = p | 'ReadPubSub' >> beam.io.ReadStringsFromPubSub(
scores = p | 'ReadPubSub' >> beam.io.ReadFromPubSub(
topic=args.topic)

events = (
Expand Down
10 changes: 5 additions & 5 deletions sdks/python/apache_beam/examples/streaming_wordcount.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import argparse
import logging

from past.builtins import unicode
import six

import apache_beam as beam
import apache_beam.transforms.window as window
Expand Down Expand Up @@ -60,10 +60,10 @@ def run(argv=None):

# Read from PubSub into a PCollection.
if known_args.input_subscription:
lines = p | beam.io.ReadStringsFromPubSub(
lines = p | beam.io.ReadFromPubSub(
subscription=known_args.input_subscription)
else:
lines = p | beam.io.ReadStringsFromPubSub(topic=known_args.input_topic)
lines = p | beam.io.ReadFromPubSub(topic=known_args.input_topic)

# Count the occurrences of each word.
def count_ones(word_ones):
Expand All @@ -72,7 +72,7 @@ def count_ones(word_ones):

counts = (lines
| 'split' >> (beam.ParDo(WordExtractingDoFn())
.with_output_types(unicode))
.with_output_types(six.text_type))
| 'pair_with_one' >> beam.Map(lambda x: (x, 1))
| beam.WindowInto(window.FixedWindows(15, 0))
| 'group' >> beam.GroupByKey()
Expand All @@ -87,7 +87,7 @@ def format_result(word_count):

# Write to PubSub.
# pylint: disable=expression-not-assigned
output | beam.io.WriteStringsToPubSub(known_args.output_topic)
output | beam.io.WriteToPubSub(known_args.output_topic)

result = p.run()
result.wait_until_finish()
Expand Down
4 changes: 2 additions & 2 deletions sdks/python/apache_beam/examples/streaming_wordcount_debugging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ def run(argv=None):

# Read from PubSub into a PCollection.
if known_args.input_subscription:
lines = p | beam.io.ReadStringsFromPubSub(
lines = p | beam.io.ReadFromPubSub(
subscription=known_args.input_subscription)
else:
lines = p | beam.io.ReadStringsFromPubSub(topic=known_args.input_topic)
lines = p | beam.io.ReadFromPubSub(topic=known_args.input_topic)

# Count the occurrences of each word.
def count_ones(word_ones):
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/apache_beam/examples/windowed_wordcount.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def run(argv=None):
with beam.Pipeline(argv=pipeline_args) as p:

# Read the text from PubSub messages.
lines = p | beam.io.ReadStringsFromPubSub(known_args.input_topic)
lines = p | beam.io.ReadFromPubSub(known_args.input_topic)

# Get the number of appearances of a word.
def count_ones(word_ones):
Expand Down
Loading