From 7ced0b4928a243e60542e674c623a856796d11d0 Mon Sep 17 00:00:00 2001 From: chattershuts <10526185@polimi.it> Date: Sat, 7 Sep 2024 23:21:02 +0200 Subject: [PATCH 1/5] feat: added ack deadline parameter to create_subscription --- samples/snippets/subscriber.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/snippets/subscriber.py b/samples/snippets/subscriber.py index 79cd0ebf1..1f79163b5 100644 --- a/samples/snippets/subscriber.py +++ b/samples/snippets/subscriber.py @@ -68,7 +68,7 @@ def list_subscriptions_in_project(project_id: str) -> None: # [END pubsub_list_subscriptions] -def create_subscription(project_id: str, topic_id: str, subscription_id: str) -> None: +def create_subscription(project_id: str, topic_id: str, subscription_id: str, ack_deadline_seconds: int = 60) -> None: """Create a new pull subscription on the given topic.""" # [START pubsub_create_pull_subscription] from google.cloud import pubsub_v1 @@ -87,7 +87,7 @@ def create_subscription(project_id: str, topic_id: str, subscription_id: str) -> # close the underlying gRPC channel when done. with subscriber: subscription = subscriber.create_subscription( - request={"name": subscription_path, "topic": topic_path} + request={"name": subscription_path, "topic": topic_path, "ack_deadline_seconds": ack_deadline_seconds} ) print(f"Subscription created: {subscription}") From ce8566b71b8f505bf37b7984f0a8313ef3ea1ee3 Mon Sep 17 00:00:00 2001 From: chattershuts <10526185@polimi.it> Date: Sat, 7 Sep 2024 23:29:19 +0200 Subject: [PATCH 2/5] feat: add ack_deadline_parameter to create_push_subscription --- samples/snippets/subscriber.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/snippets/subscriber.py b/samples/snippets/subscriber.py index 1f79163b5..7cbeb08db 100644 --- a/samples/snippets/subscriber.py +++ b/samples/snippets/subscriber.py @@ -232,7 +232,7 @@ def create_subscription_with_dead_letter_topic( def create_push_subscription( - project_id: str, topic_id: str, subscription_id: str, endpoint: str + project_id: str, topic_id: str, subscription_id: str, endpoint: str, ack_deadline_seconds: int = 60 ) -> None: """Create a new push subscription on the given topic.""" # [START pubsub_create_push_subscription] @@ -259,6 +259,7 @@ def create_push_subscription( "name": subscription_path, "topic": topic_path, "push_config": push_config, + "ack_deadline_seconds": ack_deadline_seconds } ) From d1c76496677ab4dfd77567d16d3fbe31dc1514ee Mon Sep 17 00:00:00 2001 From: chattershuts <10526185@polimi.it> Date: Sat, 7 Sep 2024 23:43:30 +0200 Subject: [PATCH 3/5] feat: removed ack_deadline_seconds argumento from create_subscription and added same argument to the parser of create_push_subscription --- samples/snippets/subscriber.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/snippets/subscriber.py b/samples/snippets/subscriber.py index 7cbeb08db..08ee782f1 100644 --- a/samples/snippets/subscriber.py +++ b/samples/snippets/subscriber.py @@ -68,7 +68,7 @@ def list_subscriptions_in_project(project_id: str) -> None: # [END pubsub_list_subscriptions] -def create_subscription(project_id: str, topic_id: str, subscription_id: str, ack_deadline_seconds: int = 60) -> None: +def create_subscription(project_id: str, topic_id: str, subscription_id: str) -> None: """Create a new pull subscription on the given topic.""" # [START pubsub_create_pull_subscription] from google.cloud import pubsub_v1 @@ -87,7 +87,7 @@ def create_subscription(project_id: str, topic_id: str, subscription_id: str, ac # close the underlying gRPC channel when done. with subscriber: subscription = subscriber.create_subscription( - request={"name": subscription_path, "topic": topic_path, "ack_deadline_seconds": ack_deadline_seconds} + request={"name": subscription_path, "topic": topic_path} ) print(f"Subscription created: {subscription}") @@ -1169,6 +1169,7 @@ def callback(message: pubsub_v1.subscriber.message.Message) -> None: create_push_parser.add_argument("topic_id") create_push_parser.add_argument("subscription_id") create_push_parser.add_argument("endpoint") + create_push_parser.add_argument("ack_deadline_seconds") create_push_no_wrapper_parser = subparsers.add_parser( "create-push-no-wrapper", help=create_push_no_wrapper_subscription.__doc__ From a0537f40f0bff2b4c7edf29a1270899d40a35688 Mon Sep 17 00:00:00 2001 From: chattershuts <10526185@polimi.it> Date: Sat, 7 Sep 2024 23:51:15 +0200 Subject: [PATCH 4/5] fix: correctly added ack_deadline_seconds as argparse arugment --- samples/snippets/subscriber.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/snippets/subscriber.py b/samples/snippets/subscriber.py index 08ee782f1..b32a31fd6 100644 --- a/samples/snippets/subscriber.py +++ b/samples/snippets/subscriber.py @@ -1169,7 +1169,8 @@ def callback(message: pubsub_v1.subscriber.message.Message) -> None: create_push_parser.add_argument("topic_id") create_push_parser.add_argument("subscription_id") create_push_parser.add_argument("endpoint") - create_push_parser.add_argument("ack_deadline_seconds") + create_push_parser.add_argument("ack_deadline_seconds", type=int) +) create_push_no_wrapper_parser = subparsers.add_parser( "create-push-no-wrapper", help=create_push_no_wrapper_subscription.__doc__ @@ -1348,7 +1349,7 @@ def callback(message: pubsub_v1.subscriber.message.Message) -> None: ) elif args.command == "create-push": create_push_subscription( - args.project_id, args.topic_id, args.subscription_id, args.endpoint + args.project_id, args.topic_id, args.subscription_id, args.endpoint, args.ack_deadline_seconds ) elif args.command == "create-push-no-wrapper": create_push_no_wrapper_subscription( From fcb5160440234569e4cde7bbe5ee925a4eb1ff32 Mon Sep 17 00:00:00 2001 From: chattershuts <10526185@polimi.it> Date: Sun, 8 Sep 2024 00:01:49 +0200 Subject: [PATCH 5/5] fix: removed a closed bracket. --- samples/snippets/subscriber.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/subscriber.py b/samples/snippets/subscriber.py index b32a31fd6..ef74b32cb 100644 --- a/samples/snippets/subscriber.py +++ b/samples/snippets/subscriber.py @@ -1170,7 +1170,7 @@ def callback(message: pubsub_v1.subscriber.message.Message) -> None: create_push_parser.add_argument("subscription_id") create_push_parser.add_argument("endpoint") create_push_parser.add_argument("ack_deadline_seconds", type=int) -) + create_push_no_wrapper_parser = subparsers.add_parser( "create-push-no-wrapper", help=create_push_no_wrapper_subscription.__doc__