cloudtoolbox 0.4.0__tar.gz → 0.6.0__tar.gz

{cloudtoolbox-0.4.0 → cloudtoolbox-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloudtoolbox
-Version: 0.4.0
+Version: 0.6.0
 Summary: Toolbox for the cloud.
 Author-email: Dotz Developers <devs-dotz@dotz.com>
 Project-URL: Repository, https://github.com/DotzInc/cloud-toolbox
@@ -28,6 +28,7 @@ Provides-Extra: all
 Requires-Dist: boto3; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
+Dynamic: license-file
 
 # Cloud Toolbox
 

cloudtoolbox-0.6.0/cloud/amazon/helpers.py

@@ -0,0 +1,22 @@
+from typing import Mapping, Union
+
+DataType = Union[str, bytes, int, float]
+MessageAttributes = Mapping[str, Mapping[str, DataType]]
+
+
+def build_attributes(data: Mapping[str, DataType]) -> MessageAttributes:
+    attrs = {}
+
+    for key, value in data.items():
+        if isinstance(value, str):
+            attr = {"StringValue": value, "DataType": "String"}
+        elif isinstance(value, bytes):
+            attr = {"BinaryValue": value, "DataType": "Binary"}
+        elif isinstance(value, (int, float)):
+            attr = {"StringValue": str(value), "DataType": "Number"}
+        else:
+            raise TypeError(f"{value} of type {type(value).__name__} is not supported")
+
+        attrs[key] = attr
+
+    return attrs

cloudtoolbox-0.6.0/cloud/amazon/sns.py

@@ -0,0 +1,32 @@
+import uuid
+from typing import Any, Mapping, Optional
+
+import boto3
+
+from cloud.amazon import helpers
+
+
+class Publisher:
+    def __init__(self, *args: Any, **kwargs: Any):
+        self.client = boto3.client("sns", *args, **kwargs)
+
+    def publish(
+        self,
+        recipient: str,
+        message: str,
+        /,
+        *,
+        group: str = "",
+        attrs: Optional[Mapping[str, Any]] = None,
+    ) -> str:
+        kwargs = {}
+
+        if group:
+            kwargs["MessageGroupId"] = group
+            kwargs["MessageDeduplicationId"] = str(uuid.uuid4())
+
+        if attrs:
+            kwargs["MessageAttributes"] = helpers.build_attributes(attrs)
+
+        response = self.client.publish(TargetArn=recipient, Message=message, **kwargs)
+        return response["MessageId"]

cloudtoolbox-0.6.0/cloud/amazon/sqs.py

@@ -0,0 +1,32 @@
+import uuid
+from typing import Any, Mapping, Optional
+
+import boto3
+
+from cloud.amazon import helpers
+
+
+class Publisher:
+    def __init__(self, *args: Any, **kwargs: Any):
+        self.client = boto3.client("sqs", *args, **kwargs)
+
+    def publish(
+        self,
+        recipient: str,
+        message: str,
+        /,
+        *,
+        group: str = "",
+        attrs: Optional[Mapping[str, Any]] = None,
+    ) -> str:
+        kwargs = {}
+
+        if group:
+            kwargs["MessageGroupId"] = group
+            kwargs["MessageDeduplicationId"] = str(uuid.uuid4())
+
+        if attrs:
+            kwargs["MessageAttributes"] = helpers.build_attributes(attrs)
+
+        response = self.client.send_message(QueueUrl=recipient, MessageBody=message, **kwargs)
+        return response["MessageId"]

cloudtoolbox-0.6.0/cloud/google/pubsub.py

@@ -0,0 +1,49 @@
+import os
+from threading import Lock
+from typing import Any, Dict, Hashable, Mapping, Optional
+
+from google.cloud import pubsub_v1
+
+
+class Publisher:
+    _clients: Dict[Hashable, pubsub_v1.PublisherClient] = {}
+    _lock = Lock()
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        self.client = self._shared_client(*args, **kwargs)
+
+    @classmethod
+    def _shared_client(cls, *args: Any, **kwargs: Any) -> pubsub_v1.PublisherClient:
+        try:
+            key = (os.getpid(), args, frozenset(kwargs.items()))
+            hash(key)
+        except TypeError:
+            return pubsub_v1.PublisherClient(*args, **kwargs)
+
+        client = cls._clients.get(key)
+        if client is None:
+            with cls._lock:
+                client = cls._clients.get(key)
+                if client is None:
+                    client = pubsub_v1.PublisherClient(*args, **kwargs)
+                    cls._clients[key] = client
+        return client
+
+    def publish(
+        self,
+        recipient: str,
+        message: str,
+        /,
+        *,
+        group: str = "",
+        attrs: Optional[Mapping[str, Any]] = None,
+    ) -> str:
+        kwargs = attrs or {}
+        future = self.client.publish(recipient, data=message.encode(), ordering_key=group, **kwargs)
+        return future.result()
+
+
+class OrderedPublisher(Publisher):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        opts = pubsub_v1.types.PublisherOptions(enable_message_ordering=True)
+        super().__init__(*args, publisher_options=opts, **kwargs)

{cloudtoolbox-0.4.0 → cloudtoolbox-0.6.0}/cloud/protocols.py

@@ -1,4 +1,4 @@
-from typing import Any, Protocol, runtime_checkable
+from typing import Any, Mapping, Optional, Protocol, runtime_checkable
 
 
 @runtime_checkable
@@ -25,4 +25,12 @@ class StorageURLSigner(Protocol):
 
 @runtime_checkable
 class MessagePublisher(Protocol):
-    def publish(self, recipient: str, message: str, **attrs: Any) -> str: ...
+    def publish(
+        self,
+        recipient: str,
+        message: str,
+        /,
+        *,
+        group: str = "",
+        attrs: Optional[Mapping[str, Any]] = None,
+    ) -> str: ...

{cloudtoolbox-0.4.0 → cloudtoolbox-0.6.0}/cloudtoolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloudtoolbox
-Version: 0.4.0
+Version: 0.6.0
 Summary: Toolbox for the cloud.
 Author-email: Dotz Developers <devs-dotz@dotz.com>
 Project-URL: Repository, https://github.com/DotzInc/cloud-toolbox
@@ -28,6 +28,7 @@ Provides-Extra: all
 Requires-Dist: boto3; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
+Dynamic: license-file
 
 # Cloud Toolbox
 

{cloudtoolbox-0.4.0 → cloudtoolbox-0.6.0}/cloudtoolbox.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ cloud/__init__.py
 cloud/factory.py
 cloud/protocols.py
 cloud/amazon/__init__.py
+cloud/amazon/helpers.py
 cloud/amazon/s3.py
 cloud/amazon/sns.py
 cloud/amazon/sqs.py

{cloudtoolbox-0.4.0 → cloudtoolbox-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cloudtoolbox"
-version = "0.4.0"
+version = "0.6.0"
 description = "Toolbox for the cloud."
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [{ name = "Dotz Developers", email = "devs-dotz@dotz.com" }]

{cloudtoolbox-0.4.0 → cloudtoolbox-0.6.0}/tests/test_factory.py

@@ -101,6 +101,19 @@ class TestStorageURLSigner(unittest.TestCase):
 
 
 class TestMessagePublisherFactory(unittest.TestCase):
+    def setUp(self):
+        pubsub.Publisher._clients.clear()
+
+    def tearDown(self):
+        pubsub.Publisher._clients.clear()
+
+    @mock.patch("google.cloud.pubsub_v1.PublisherClient")
+    def test_google_publisher_shares_client(self, client):
+        Publisher = factory.message_publisher(pubsub.Publisher)
+
+        self.assertIs(Publisher().client, Publisher().client)
+        client.assert_called_once_with()
+
     @mock.patch("google.cloud.pubsub_v1.PublisherClient")
     def test_google_publisher(self, _):
         Publisher = factory.message_publisher(pubsub.Publisher)
@@ -109,6 +122,14 @@ class TestMessagePublisherFactory(unittest.TestCase):
         self.assertIsInstance(publisher, MessagePublisher)
         self.assertIsInstance(publisher, pubsub.Publisher)
 
+    @mock.patch("google.cloud.pubsub_v1.PublisherClient")
+    def test_google_ordered_publisher(self, _):
+        OrderedPublisher = factory.message_publisher(pubsub.OrderedPublisher)
+        publisher = OrderedPublisher()
+
+        self.assertIsInstance(publisher, MessagePublisher)
+        self.assertIsInstance(publisher, pubsub.OrderedPublisher)
+
     @mock.patch("boto3.client")
     def test_amazon_publisher(self, _):
         for cls in (sns.Publisher, sqs.Publisher):

cloudtoolbox-0.4.0/cloud/amazon/sns.py

@@ -1,12 +0,0 @@
-from typing import Any
-
-import boto3
-
-
-class Publisher:
-    def __init__(self, *args: Any, **kwargs: Any):
-        self.client = boto3.client("sns", *args, **kwargs)
-
-    def publish(self, recipient: str, message: str, **attrs: Any) -> str:
-        response = self.client.publish(TargetArn=recipient, Message=message, **attrs)
-        return response["MessageId"]

cloudtoolbox-0.4.0/cloud/amazon/sqs.py

@@ -1,12 +0,0 @@
-from typing import Any
-
-import boto3
-
-
-class Publisher:
-    def __init__(self, *args: Any, **kwargs: Any):
-        self.client = boto3.client("sqs", *args, **kwargs)
-
-    def publish(self, recipient: str, message: str, **attrs: Any) -> str:
-        response = self.client.send_message(QueueUrl=recipient, MessageBody=message, **attrs)
-        return response["MessageId"]

cloudtoolbox-0.4.0/cloud/google/pubsub.py

@@ -1,12 +0,0 @@
-from typing import Any
-
-from google.cloud import pubsub_v1
-
-
-class Publisher:
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        self.client = pubsub_v1.PublisherClient(*args, **kwargs)
-
-    def publish(self, recipient: str, message: str, **attrs: Any) -> str:
-        future = self.client.publish(recipient, data=message.encode(), **attrs)
-        return future.result()