diff --git a/google/cloud/pubsublite/cloudpubsub/internal/single_partition_subscriber.py b/google/cloud/pubsublite/cloudpubsub/internal/single_partition_subscriber.py index eae568d8..94561584 100644 --- a/google/cloud/pubsublite/cloudpubsub/internal/single_partition_subscriber.py +++ b/google/cloud/pubsublite/cloudpubsub/internal/single_partition_subscriber.py @@ -6,9 +6,7 @@ from google.cloud.pubsub_v1.subscriber.message import Message from google.pubsub_v1 import PubsubMessage -from google.cloud.pubsublite.cloudpubsub.flow_control_settings import ( - FlowControlSettings, -) +from google.cloud.pubsublite.types import FlowControlSettings from google.cloud.pubsublite.cloudpubsub.internal.ack_set_tracker import AckSetTracker from google.cloud.pubsublite.cloudpubsub.message_transformer import MessageTransformer from google.cloud.pubsublite.cloudpubsub.nack_handler import NackHandler diff --git a/google/cloud/pubsublite/cloudpubsub/make_subscriber.py b/google/cloud/pubsublite/cloudpubsub/make_subscriber.py index 3b59bf93..8d729fea 100644 --- a/google/cloud/pubsublite/cloudpubsub/make_subscriber.py +++ b/google/cloud/pubsublite/cloudpubsub/make_subscriber.py @@ -5,9 +5,7 @@ from google.api_core.client_options import ClientOptions from google.auth.credentials import Credentials from google.cloud.pubsub_v1.subscriber.futures import StreamingPullFuture -from google.cloud.pubsublite.cloudpubsub.flow_control_settings import ( - FlowControlSettings, -) +from google.cloud.pubsublite.types import FlowControlSettings from google.cloud.pubsublite.cloudpubsub.internal.ack_set_tracker_impl import ( AckSetTrackerImpl, ) diff --git a/google/cloud/pubsublite/types/__init__.py b/google/cloud/pubsublite/types/__init__.py index b94e0d78..5103ec25 100644 --- a/google/cloud/pubsublite/types/__init__.py +++ b/google/cloud/pubsublite/types/__init__.py @@ -2,3 +2,4 @@ from .partition import Partition from .paths import LocationPath, TopicPath, SubscriptionPath from .publish_metadata import PublishMetadata +from .flow_control_settings import FlowControlSettings, DISABLED_FLOW_CONTROL diff --git a/google/cloud/pubsublite/cloudpubsub/flow_control_settings.py b/google/cloud/pubsublite/types/flow_control_settings.py similarity index 100% rename from google/cloud/pubsublite/cloudpubsub/flow_control_settings.py rename to google/cloud/pubsublite/types/flow_control_settings.py diff --git a/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py b/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py index 6d8342d6..b7a77e18 100644 --- a/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py +++ b/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py @@ -7,9 +7,7 @@ from google.cloud.pubsub_v1.subscriber.message import Message from google.pubsub_v1 import PubsubMessage -from google.cloud.pubsublite.cloudpubsub.flow_control_settings import ( - FlowControlSettings, -) +from google.cloud.pubsublite.types import FlowControlSettings from google.cloud.pubsublite.cloudpubsub.internal.ack_set_tracker import AckSetTracker from google.cloud.pubsublite.cloudpubsub.internal.single_partition_subscriber import ( SinglePartitionSubscriber,