diff --git a/google/cloud/pubsublite/admin_client.py b/google/cloud/pubsublite/admin_client.py index 6c010e34..d1882ef8 100644 --- a/google/cloud/pubsublite/admin_client.py +++ b/google/cloud/pubsublite/admin_client.py @@ -1,8 +1,12 @@ from abc import ABC, abstractmethod from typing import List -from google.cloud.pubsublite.location import CloudRegion -from google.cloud.pubsublite.paths import TopicPath, LocationPath, SubscriptionPath +from google.cloud.pubsublite.types import ( + CloudRegion, + TopicPath, + LocationPath, + SubscriptionPath, +) from google.cloud.pubsublite_v1 import Topic, Subscription from google.protobuf.field_mask_pb2 import FieldMask diff --git a/google/cloud/pubsublite/cloudpubsub/internal/assigning_subscriber.py b/google/cloud/pubsublite/cloudpubsub/internal/assigning_subscriber.py index 9d667141..21a0cacb 100644 --- a/google/cloud/pubsublite/cloudpubsub/internal/assigning_subscriber.py +++ b/google/cloud/pubsublite/cloudpubsub/internal/assigning_subscriber.py @@ -7,7 +7,7 @@ from google.cloud.pubsublite.internal.wait_ignore_cancelled import wait_ignore_cancelled from google.cloud.pubsublite.internal.wire.assigner import Assigner from google.cloud.pubsublite.internal.wire.permanent_failable import PermanentFailable -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition PartitionSubscriberFactory = Callable[[Partition], AsyncSubscriber] diff --git a/google/cloud/pubsublite/cloudpubsub/make_publisher.py b/google/cloud/pubsublite/cloudpubsub/make_publisher.py index 487eea2d..390afbdf 100644 --- a/google/cloud/pubsublite/cloudpubsub/make_publisher.py +++ b/google/cloud/pubsublite/cloudpubsub/make_publisher.py @@ -15,7 +15,7 @@ ) from google.cloud.pubsublite.internal.wire.merge_metadata import merge_metadata from google.cloud.pubsublite.internal.wire.pubsub_context import pubsub_context -from google.cloud.pubsublite.paths import TopicPath +from google.cloud.pubsublite.types import TopicPath DEFAULT_BATCHING_SETTINGS = WIRE_DEFAULT_BATCHING diff --git a/google/cloud/pubsublite/cloudpubsub/make_subscriber.py b/google/cloud/pubsublite/cloudpubsub/make_subscriber.py index 01e3c486..3b59bf93 100644 --- a/google/cloud/pubsublite/cloudpubsub/make_subscriber.py +++ b/google/cloud/pubsublite/cloudpubsub/make_subscriber.py @@ -31,7 +31,7 @@ AsyncSubscriber, MessageCallback, ) -from google.cloud.pubsublite.endpoints import regional_endpoint +from google.cloud.pubsublite.internal.endpoints import regional_endpoint from google.cloud.pubsublite.internal.wire.assigner import Assigner from google.cloud.pubsublite.internal.wire.assigner_impl import AssignerImpl from google.cloud.pubsublite.internal.wire.committer_impl import CommitterImpl @@ -42,9 +42,10 @@ from google.cloud.pubsublite.internal.wire.merge_metadata import merge_metadata from google.cloud.pubsublite.internal.wire.pubsub_context import pubsub_context import google.cloud.pubsublite.internal.wire.subscriber_impl as wire_subscriber -from google.cloud.pubsublite.partition import Partition -from google.cloud.pubsublite.paths import SubscriptionPath -from google.cloud.pubsublite.routing_metadata import subscription_routing_metadata +from google.cloud.pubsublite.types import Partition, SubscriptionPath +from google.cloud.pubsublite.internal.routing_metadata import ( + subscription_routing_metadata, +) from google.cloud.pubsublite_v1 import ( SubscribeRequest, InitialSubscribeRequest, diff --git a/google/cloud/pubsublite/endpoints.py b/google/cloud/pubsublite/internal/endpoints.py similarity index 100% rename from google/cloud/pubsublite/endpoints.py rename to google/cloud/pubsublite/internal/endpoints.py diff --git a/google/cloud/pubsublite/routing_metadata.py b/google/cloud/pubsublite/internal/routing_metadata.py similarity index 100% rename from google/cloud/pubsublite/routing_metadata.py rename to google/cloud/pubsublite/internal/routing_metadata.py diff --git a/google/cloud/pubsublite/status_codes.py b/google/cloud/pubsublite/internal/status_codes.py similarity index 100% rename from google/cloud/pubsublite/status_codes.py rename to google/cloud/pubsublite/internal/status_codes.py diff --git a/google/cloud/pubsublite/internal/wire/admin_client_impl.py b/google/cloud/pubsublite/internal/wire/admin_client_impl.py index b254b1d7..5fd5b56f 100644 --- a/google/cloud/pubsublite/internal/wire/admin_client_impl.py +++ b/google/cloud/pubsublite/internal/wire/admin_client_impl.py @@ -3,8 +3,12 @@ from google.protobuf.field_mask_pb2 import FieldMask from google.cloud.pubsublite.admin_client import AdminClient -from google.cloud.pubsublite.location import CloudRegion -from google.cloud.pubsublite.paths import SubscriptionPath, LocationPath, TopicPath +from google.cloud.pubsublite.types import ( + CloudRegion, + SubscriptionPath, + LocationPath, + TopicPath, +) from google.cloud.pubsublite_v1 import ( Subscription, Topic, diff --git a/google/cloud/pubsublite/internal/wire/assigner.py b/google/cloud/pubsublite/internal/wire/assigner.py index 1bd1a8a3..9ab06991 100644 --- a/google/cloud/pubsublite/internal/wire/assigner.py +++ b/google/cloud/pubsublite/internal/wire/assigner.py @@ -1,7 +1,7 @@ from abc import abstractmethod from typing import AsyncContextManager, Set -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition class Assigner(AsyncContextManager): diff --git a/google/cloud/pubsublite/internal/wire/assigner_impl.py b/google/cloud/pubsublite/internal/wire/assigner_impl.py index 07a0acc1..fe6962b7 100644 --- a/google/cloud/pubsublite/internal/wire/assigner_impl.py +++ b/google/cloud/pubsublite/internal/wire/assigner_impl.py @@ -12,7 +12,7 @@ ConnectionReinitializer, ) from google.cloud.pubsublite.internal.wire.connection import Connection -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition from google.cloud.pubsublite_v1.types import ( PartitionAssignmentRequest, PartitionAssignment, diff --git a/google/cloud/pubsublite/internal/wire/default_routing_policy.py b/google/cloud/pubsublite/internal/wire/default_routing_policy.py index 90858ab9..75021c31 100644 --- a/google/cloud/pubsublite/internal/wire/default_routing_policy.py +++ b/google/cloud/pubsublite/internal/wire/default_routing_policy.py @@ -2,7 +2,7 @@ import random from google.cloud.pubsublite.internal.wire.routing_policy import RoutingPolicy -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition from google.cloud.pubsublite_v1.types import PubSubMessage diff --git a/google/cloud/pubsublite/internal/wire/fixed_set_assigner.py b/google/cloud/pubsublite/internal/wire/fixed_set_assigner.py index 2a77fe8c..dbe94e8f 100644 --- a/google/cloud/pubsublite/internal/wire/fixed_set_assigner.py +++ b/google/cloud/pubsublite/internal/wire/fixed_set_assigner.py @@ -2,7 +2,7 @@ from typing import Set from google.cloud.pubsublite.internal.wire.assigner import Assigner -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition class FixedSetAssigner(Assigner): diff --git a/google/cloud/pubsublite/internal/wire/make_publisher.py b/google/cloud/pubsublite/internal/wire/make_publisher.py index 7cd5d027..56e74162 100644 --- a/google/cloud/pubsublite/internal/wire/make_publisher.py +++ b/google/cloud/pubsublite/internal/wire/make_publisher.py @@ -3,7 +3,7 @@ from google.cloud.pubsub_v1.types import BatchSettings from google.cloud.pubsublite.make_admin_client import make_admin_client -from google.cloud.pubsublite.endpoints import regional_endpoint +from google.cloud.pubsublite.internal.endpoints import regional_endpoint from google.cloud.pubsublite.internal.wire.default_routing_policy import ( DefaultRoutingPolicy, ) @@ -16,9 +16,8 @@ from google.cloud.pubsublite.internal.wire.single_partition_publisher import ( SinglePartitionPublisher, ) -from google.cloud.pubsublite.partition import Partition -from google.cloud.pubsublite.paths import TopicPath -from google.cloud.pubsublite.routing_metadata import topic_routing_metadata +from google.cloud.pubsublite.types import Partition, TopicPath +from google.cloud.pubsublite.internal.routing_metadata import topic_routing_metadata from google.cloud.pubsublite_v1 import InitialPublishRequest, PublishRequest from google.cloud.pubsublite_v1.services.publisher_service import async_client from google.api_core.client_options import ClientOptions diff --git a/google/cloud/pubsublite/internal/wire/publisher.py b/google/cloud/pubsublite/internal/wire/publisher.py index 904d7d57..9ca07d7b 100644 --- a/google/cloud/pubsublite/internal/wire/publisher.py +++ b/google/cloud/pubsublite/internal/wire/publisher.py @@ -1,7 +1,7 @@ from abc import abstractmethod from typing import AsyncContextManager from google.cloud.pubsublite_v1.types import PubSubMessage -from google.cloud.pubsublite.publish_metadata import PublishMetadata +from google.cloud.pubsublite.types import PublishMetadata class Publisher(AsyncContextManager): diff --git a/google/cloud/pubsublite/internal/wire/retrying_connection.py b/google/cloud/pubsublite/internal/wire/retrying_connection.py index a5a633cc..2d543253 100644 --- a/google/cloud/pubsublite/internal/wire/retrying_connection.py +++ b/google/cloud/pubsublite/internal/wire/retrying_connection.py @@ -2,7 +2,7 @@ from typing import Awaitable, Optional from google.api_core.exceptions import GoogleAPICallError, Cancelled -from google.cloud.pubsublite.status_codes import is_retryable +from google.cloud.pubsublite.internal.status_codes import is_retryable from google.cloud.pubsublite.internal.wire.connection_reinitializer import ( ConnectionReinitializer, ) diff --git a/google/cloud/pubsublite/internal/wire/routing_policy.py b/google/cloud/pubsublite/internal/wire/routing_policy.py index 176b5914..8191fd8d 100644 --- a/google/cloud/pubsublite/internal/wire/routing_policy.py +++ b/google/cloud/pubsublite/internal/wire/routing_policy.py @@ -1,6 +1,6 @@ from abc import ABC, abstractmethod -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition from google.cloud.pubsublite_v1.types.common import PubSubMessage diff --git a/google/cloud/pubsublite/internal/wire/routing_publisher.py b/google/cloud/pubsublite/internal/wire/routing_publisher.py index e62d9453..7e60d86c 100644 --- a/google/cloud/pubsublite/internal/wire/routing_publisher.py +++ b/google/cloud/pubsublite/internal/wire/routing_publisher.py @@ -2,8 +2,7 @@ from google.cloud.pubsublite.internal.wire.publisher import Publisher from google.cloud.pubsublite.internal.wire.routing_policy import RoutingPolicy -from google.cloud.pubsublite.partition import Partition -from google.cloud.pubsublite.publish_metadata import PublishMetadata +from google.cloud.pubsublite.types import Partition, PublishMetadata from google.cloud.pubsublite_v1 import PubSubMessage diff --git a/google/cloud/pubsublite/internal/wire/single_partition_publisher.py b/google/cloud/pubsublite/internal/wire/single_partition_publisher.py index b0167e57..80596502 100644 --- a/google/cloud/pubsublite/internal/wire/single_partition_publisher.py +++ b/google/cloud/pubsublite/internal/wire/single_partition_publisher.py @@ -18,8 +18,7 @@ SerialBatcher, BatchTester, ) -from google.cloud.pubsublite.partition import Partition -from google.cloud.pubsublite.publish_metadata import PublishMetadata +from google.cloud.pubsublite.types import Partition, PublishMetadata from google.cloud.pubsublite_v1.types import ( PubSubMessage, Cursor, diff --git a/google/cloud/pubsublite/make_admin_client.py b/google/cloud/pubsublite/make_admin_client.py index b05f8b09..5e4779e4 100644 --- a/google/cloud/pubsublite/make_admin_client.py +++ b/google/cloud/pubsublite/make_admin_client.py @@ -3,9 +3,9 @@ from google.api_core.client_options import ClientOptions from google.cloud.pubsublite.admin_client import AdminClient -from google.cloud.pubsublite.endpoints import regional_endpoint +from google.cloud.pubsublite.internal.endpoints import regional_endpoint from google.cloud.pubsublite.internal.wire.admin_client_impl import AdminClientImpl -from google.cloud.pubsublite.location import CloudRegion +from google.cloud.pubsublite.types import CloudRegion from google.cloud.pubsublite_v1 import AdminServiceClient from google.auth.credentials import Credentials diff --git a/google/cloud/pubsublite/types/__init__.py b/google/cloud/pubsublite/types/__init__.py new file mode 100644 index 00000000..b94e0d78 --- /dev/null +++ b/google/cloud/pubsublite/types/__init__.py @@ -0,0 +1,4 @@ +from .location import CloudRegion, CloudZone +from .partition import Partition +from .paths import LocationPath, TopicPath, SubscriptionPath +from .publish_metadata import PublishMetadata diff --git a/google/cloud/pubsublite/location.py b/google/cloud/pubsublite/types/location.py similarity index 100% rename from google/cloud/pubsublite/location.py rename to google/cloud/pubsublite/types/location.py diff --git a/google/cloud/pubsublite/partition.py b/google/cloud/pubsublite/types/partition.py similarity index 100% rename from google/cloud/pubsublite/partition.py rename to google/cloud/pubsublite/types/partition.py diff --git a/google/cloud/pubsublite/paths.py b/google/cloud/pubsublite/types/paths.py similarity index 97% rename from google/cloud/pubsublite/paths.py rename to google/cloud/pubsublite/types/paths.py index d04945b5..66a09ba4 100644 --- a/google/cloud/pubsublite/paths.py +++ b/google/cloud/pubsublite/types/paths.py @@ -2,7 +2,7 @@ from google.api_core.exceptions import InvalidArgument -from google.cloud.pubsublite.location import CloudZone +from google.cloud.pubsublite.types.location import CloudZone class LocationPath(NamedTuple): diff --git a/google/cloud/pubsublite/publish_metadata.py b/google/cloud/pubsublite/types/publish_metadata.py similarity index 90% rename from google/cloud/pubsublite/publish_metadata.py rename to google/cloud/pubsublite/types/publish_metadata.py index fd4b57c6..869741e3 100644 --- a/google/cloud/pubsublite/publish_metadata.py +++ b/google/cloud/pubsublite/types/publish_metadata.py @@ -2,7 +2,7 @@ import json from google.cloud.pubsublite_v1.types.common import Cursor -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types.partition import Partition class PublishMetadata(NamedTuple): diff --git a/tests/unit/pubsublite/cloudpubsub/internal/assigning_subscriber_test.py b/tests/unit/pubsublite/cloudpubsub/internal/assigning_subscriber_test.py index 8d4314e9..a0185fe2 100644 --- a/tests/unit/pubsublite/cloudpubsub/internal/assigning_subscriber_test.py +++ b/tests/unit/pubsublite/cloudpubsub/internal/assigning_subscriber_test.py @@ -13,7 +13,7 @@ ) from google.cloud.pubsublite.cloudpubsub.subscriber import AsyncSubscriber from google.cloud.pubsublite.internal.wire.assigner import Assigner -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition from google.cloud.pubsublite.testing.test_utils import wire_queues, Box # All test coroutines will be treated as marked. diff --git a/tests/unit/pubsublite/internal/wire/assigner_impl_test.py b/tests/unit/pubsublite/internal/wire/assigner_impl_test.py index 6a6294af..e35d4432 100644 --- a/tests/unit/pubsublite/internal/wire/assigner_impl_test.py +++ b/tests/unit/pubsublite/internal/wire/assigner_impl_test.py @@ -14,7 +14,7 @@ ) from google.api_core.exceptions import InternalServerError -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition from google.cloud.pubsublite_v1.types.subscriber import ( PartitionAssignmentRequest, InitialPartitionAssignmentRequest, diff --git a/tests/unit/pubsublite/internal/wire/default_routing_policy_test.py b/tests/unit/pubsublite/internal/wire/default_routing_policy_test.py index 5d4db78d..9e7f0eff 100644 --- a/tests/unit/pubsublite/internal/wire/default_routing_policy_test.py +++ b/tests/unit/pubsublite/internal/wire/default_routing_policy_test.py @@ -1,7 +1,7 @@ import json import os -from google.cloud.pubsublite.partition import Partition +from google.cloud.pubsublite.types import Partition from google.cloud.pubsublite.internal.wire.default_routing_policy import ( DefaultRoutingPolicy,