diaspora-event-sdk 0.2.4__tar.gz → 0.2.6__tar.gz

{diaspora-event-sdk-0.2.4/diaspora_event_sdk.egg-info → diaspora-event-sdk-0.2.6}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.2.4
+Version: 0.2.6
 Summary: SDK of Diaspora Event Fabric: Resilience-enabling services for science from HPC to edge
 Home-page: https://github.com/globus-labs/diaspora-event-sdk
-License: LICENSE
+License: Apache 2.0
 Platform: UNKNOWN
 Description-Content-Type: text/markdown
 Provides-Extra: kafka-python
 Provides-Extra: test
 License-File: LICENSE
 
-# Diaspora: Resilience-enabling services for science from HPC to edge
+# Diaspora: Hybrid Event-Driven Architecture for Distributed Scientific Computing
 
 ## Event Fabric SDK Installation Guide
 ### Recommended Method: Use with `kafka-python`
@@ -40,3 +40,4 @@ Note: This method does not include dependencies for `KafkaProducer` and `KafkaCo
 
 **Advanced Consumer Functions**: See our [Colab example](https://colab.research.google.com/drive/1tPKfxU2qPsLvNTreF6nKINU62k7pQWxa?usp=sharing) for demonstration.
 
+

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6}/README.md

@@ -1,4 +1,4 @@
-# Diaspora: Resilience-enabling services for science from HPC to edge
+# Diaspora: Hybrid Event-Driven Architecture for Distributed Scientific Computing
 
 ## Event Fabric SDK Installation Guide
 ### Recommended Method: Use with `kafka-python`
@@ -26,4 +26,4 @@ Note: This method does not include dependencies for `KafkaProducer` and `KafkaCo
 
 **Advanced Consumers with Faust**: Explore the [Faust Streaming Guide](docs/faust_weather_app.md) for advanced event streaming with Faust.
 
-**Advanced Consumer Functions**: See our [Colab example](https://colab.research.google.com/drive/1tPKfxU2qPsLvNTreF6nKINU62k7pQWxa?usp=sharing) for demonstration.
+**Advanced Consumer Functions**: See our [Colab example](https://colab.research.google.com/drive/1tPKfxU2qPsLvNTreF6nKINU62k7pQWxa?usp=sharing) for demonstration.

diaspora-event-sdk-0.2.6/diaspora_event_sdk/sdk/aws_iam_msk.py

@@ -0,0 +1,119 @@
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  SPDX-License-Identifier: Apache-2.0
+
+import base64
+# import logging
+from datetime import datetime, timezone
+from urllib.parse import parse_qs, urlparse
+
+# import boto3
+# import botocore.session
+# import pkg_resources
+from .botocore.auth import SigV4QueryAuth
+from .botocore.awsrequest import AWSRequest
+# from botocore.config import Config
+from .botocore.credentials import Credentials
+
+ENDPOINT_URL_TEMPLATE = "https://kafka.{}.amazonaws.com/"
+DEFAULT_TOKEN_EXPIRY_SECONDS = 900
+DEFAULT_STS_SESSION_NAME = "MSKSASLDefaultSession"
+ACTION_TYPE = "Action"
+ACTION_NAME = "kafka-cluster:Connect"
+SIGNING_NAME = "kafka-cluster"
+USER_AGENT_KEY = "User-Agent"
+LIB_NAME = "aws-msk-iam-sasl-signer-python"
+
+
+def __get_user_agent__():
+    return (f"{LIB_NAME}/1.0.1")
+
+
+def __get_expiration_time_ms(request):
+    """
+    Private function that parses the url and gets the expiration time
+
+    Args: request (AWSRequest): The signed aws request object
+    """
+    # Parse the signed request
+    parsed_url = urlparse(request.url)
+    parsed_ul_params = parse_qs(parsed_url.query)
+    parsed_signing_time = datetime.strptime(parsed_ul_params['X-Amz-Date'][0],
+                                            "%Y%m%dT%H%M%SZ")
+
+    # Make the datetime object timezone-aware
+    signing_time = parsed_signing_time.replace(tzinfo=timezone.utc)
+
+    # Convert the Unix timestamp to milliseconds
+    expiration_timestamp_seconds = int(
+        signing_time.timestamp()) + DEFAULT_TOKEN_EXPIRY_SECONDS
+
+    # Get lifetime of token
+    expiration_timestamp_ms = expiration_timestamp_seconds * 1000
+
+    return expiration_timestamp_ms
+
+
+def __construct_auth_token(region, aws_credentials):
+    """
+    Private function that constructs the authorization token using IAM
+    Credentials.
+
+    Args: region (str): The AWS region where the cluster is located.
+    aws_credentials (dict): The credentials to be used to generate signed
+    url. Returns: str: A base64-encoded authorization token.
+    """
+    # Validate credentials are not empty
+    if not aws_credentials.access_key or not aws_credentials.secret_key:
+        raise ValueError("AWS Credentials can not be empty")
+
+    # Extract endpoint URL
+    endpoint_url = ENDPOINT_URL_TEMPLATE.format(region)
+
+    # Set up resource path and query parameters
+    query_params = {ACTION_TYPE: ACTION_NAME}
+
+    # Create SigV4 instance
+    sig_v4 = SigV4QueryAuth(
+        aws_credentials, SIGNING_NAME, region,
+        expires=DEFAULT_TOKEN_EXPIRY_SECONDS
+    )
+
+    # Create request with url and parameters
+    request = AWSRequest(method="GET", url=endpoint_url, params=query_params)
+
+    # Add auth to the request and prepare the request
+    sig_v4.add_auth(request)
+    query_params = {USER_AGENT_KEY: __get_user_agent__()}
+    request.params = query_params
+    prepped = request.prepare()
+
+    # Get the signed url
+    signed_url = prepped.url
+
+    # Base 64 encode and remove the padding from the end
+    signed_url_bytes = signed_url.encode("utf-8")
+    base64_bytes = base64.urlsafe_b64encode(signed_url_bytes)
+    base64_encoded_signed_url = base64_bytes.decode("utf-8").rstrip("=")
+    return base64_encoded_signed_url, __get_expiration_time_ms(request)
+
+
+def generate_auth_token(region, aws_debug_creds=False):
+    """
+    Generates an base64-encoded signed url as auth token to authenticate
+    with an Amazon MSK cluster using default IAM credentials.
+
+    Args:
+        region (str): The AWS region where the cluster is located.
+    Returns:
+        str: A base64-encoded authorization token.
+    """
+
+    # Load credentials
+    import os
+    assert os.environ["AWS_ACCESS_KEY_ID"]
+    assert os.environ["AWS_SECRET_ACCESS_KEY"]
+
+    aws_credentials = Credentials(os.environ["AWS_ACCESS_KEY_ID"],
+                                  os.environ["AWS_SECRET_ACCESS_KEY"])
+
+    return __construct_auth_token(region, aws_credentials)

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6}/diaspora_event_sdk/sdk/client.py

@@ -153,6 +153,13 @@ class Client:
         """
         return self.web_client.update_topic_partitions(self.subject_openid, topic, new_partitions)
 
+    @requires_login
+    def reset_topic(self, topic):
+        """
+        Deletes and recreates the topic, removing all messages and restoring the topic to the default configurations while user access is not affected.
+        """
+        return self.web_client.reset_topic(self.subject_openid, topic)
+
     @requires_login
     def grant_user_access(self, topic, user):
         """
@@ -167,6 +174,13 @@ class Client:
         """
         return self.web_client.grant_user_access(self.subject_openid, topic, user, "revoke")
 
+    @requires_login
+    def list_topic_users(self, topic):
+        """
+        Returns a list of users that have access to the topic.
+        """
+        return self.web_client.list_topic_users(self.subject_openid, topic)
+
     @requires_login
     def list_triggers(self):
         """

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6}/diaspora_event_sdk/sdk/kafka_client.py

@@ -4,20 +4,20 @@ import warnings
 import time
 
 from .client import Client
+from .aws_iam_msk import generate_auth_token
 
 # If kafka-python is not installed, Kafka functionality is not available through diaspora-event-sdk.
 kafka_available = True
 try:
     from kafka import KafkaProducer as KProd  # type: ignore[import,import-not-found]
     from kafka import KafkaConsumer as KCons  # type: ignore[import,import-not-found]
-    from aws_msk_iam_sasl_signer import MSKAuthTokenProvider  # type: ignore[import,import-not-found]
     import os
 
     class MSKTokenProvider:
         def token(self):
-            token, _ = MSKAuthTokenProvider.generate_auth_token("us-east-1")
+            token, _ = generate_auth_token("us-east-1")
             return token
-except ImportError:
+except Exception as e:
     kafka_available = False
 
 

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6}/diaspora_event_sdk/sdk/web_client.py

@@ -66,6 +66,15 @@ class WebClient(globus_sdk.BaseClient):
                      "NewPartitions": str(new_partitions)}
         )
 
+    def reset_topic(
+        self, subject: UUID_LIKE_T, topic: str
+    ) -> globus_sdk.GlobusHTTPResponse:
+        return self.post(
+            f"/api/v2/topic/{topic}/reset",
+            headers={"Subject": str(subject),
+                     "Topic": topic}
+        )
+
     def grant_user_access(
         self, subject: UUID_LIKE_T, topic: str, user: UUID_LIKE_T, action: str
     ) -> globus_sdk.GlobusHTTPResponse:
@@ -75,6 +84,15 @@ class WebClient(globus_sdk.BaseClient):
                      "Topic": topic, "User": str(user)}
         )
 
+    def list_topic_users(
+        self, subject: UUID_LIKE_T, topic: str
+    ) -> globus_sdk.GlobusHTTPResponse:
+        return self.get(
+            f"/api/v2/topic/{topic}/users",
+            headers={"Subject": str(subject),
+                     "Topic": topic}
+        )
+
     def list_triggers(self, subject: UUID_LIKE_T) -> globus_sdk.GlobusHTTPResponse:
         return self.get("/api/v2/triggers", headers={"Subject": str(subject)})
 

diaspora-event-sdk-0.2.6/diaspora_event_sdk/version.py

@@ -0,0 +1 @@
+__version__ = "0.2.6"

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6/diaspora_event_sdk.egg-info}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.2.4
+Version: 0.2.6
 Summary: SDK of Diaspora Event Fabric: Resilience-enabling services for science from HPC to edge
 Home-page: https://github.com/globus-labs/diaspora-event-sdk
-License: LICENSE
+License: Apache 2.0
 Platform: UNKNOWN
 Description-Content-Type: text/markdown
 Provides-Extra: kafka-python
 Provides-Extra: test
 License-File: LICENSE
 
-# Diaspora: Resilience-enabling services for science from HPC to edge
+# Diaspora: Hybrid Event-Driven Architecture for Distributed Scientific Computing
 
 ## Event Fabric SDK Installation Guide
 ### Recommended Method: Use with `kafka-python`
@@ -40,3 +40,4 @@ Note: This method does not include dependencies for `KafkaProducer` and `KafkaCo
 
 **Advanced Consumer Functions**: See our [Colab example](https://colab.research.google.com/drive/1tPKfxU2qPsLvNTreF6nKINU62k7pQWxa?usp=sharing) for demonstration.
 
+

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6}/diaspora_event_sdk.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ diaspora_event_sdk.egg-info/requires.txt
 diaspora_event_sdk.egg-info/top_level.txt
 diaspora_event_sdk/sdk/__init__.py
 diaspora_event_sdk/sdk/_environments.py
+diaspora_event_sdk/sdk/aws_iam_msk.py
 diaspora_event_sdk/sdk/client.py
 diaspora_event_sdk/sdk/decorators.py
 diaspora_event_sdk/sdk/kafka_client.py

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6}/diaspora_event_sdk.egg-info/requires.txt

@@ -2,7 +2,6 @@ globus-sdk<4,>=3.20.1
 
 [kafka-python]
 kafka-python
-aws-msk-iam-sasl-signer-python
 
 [test]
 pytest

{diaspora-event-sdk-0.2.4 → diaspora-event-sdk-0.2.6}/setup.py

@@ -33,13 +33,13 @@ setup(
     long_description_content_type="text/markdown",
     packages=find_packages(),
     include_package_data=True,
-    license="LICENSE",
+    license="Apache 2.0",
     url="https://github.com/globus-labs/diaspora-event-sdk",
     install_requires=[
         "globus-sdk>=3.20.1,<4",
     ],
     extras_require={
-        "kafka-python": ["kafka-python", "aws-msk-iam-sasl-signer-python"],
+        "kafka-python": ["kafka-python"],
         "test": TEST_REQUIRES,
     },
 )

diaspora-event-sdk-0.2.4/diaspora_event_sdk/version.py

@@ -1 +0,0 @@
-__version__ = "0.2.4"