diaspora-event-sdk 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

diaspora_event_sdk/sdk/_environments.py

@@ -1,7 +1,7 @@
 import os
 
 
-TOKEN_EXCHANGE = "http://3.220.110.101"
+TOKEN_EXCHANGE = "http://3.220.110.101/"
 DIASPORA_RESOURCE_SERVER = "2b9d2f5c-fa32-45b5-875b-b24cd343b917"
 
 

diaspora_event_sdk/sdk/client.py

@@ -89,16 +89,6 @@ class Client:
                 "endpoint": tokens["endpoint"],
             }
 
-    # @requires_login  # TODO
-    # def get_secret_key(self):
-    #     tokens = self.login_manager._token_storage.get_token_data(
-    #         DIASPORA_RESOURCE_SERVER
-    #     )
-    #     if tokens is None or "secret_key" not in tokens:
-    #         return None
-    #     else:
-    #         return tokens["secret_key"]
-
     @requires_login
     def put_secret_key(self, access_key, secret_key, endpoint):
         tokens = self.login_manager._token_storage.get_token_data(
@@ -133,81 +123,74 @@ class Client:
         """
         Registers a new topic under the user's OpenID.
         """
-        return self.web_client.register_topic(self.subject_openid, topic)
+        return self.web_client.register_topic(self.subject_openid, topic, "register")
 
     @requires_login
     def unregister_topic(self, topic):
         """
         Unregisters a topic from the user's OpenID.
         """
-        return self.web_client.unregister_topic(self.subject_openid, topic)
-
-    @requires_login
-    def register_topic_for_user(self, topic, user):
-        """
-        Registers a new topic under the user's OpenID.
-        """
-        return self.web_client.register_topic_for_user(self.subject_openid, topic, user)
+        return self.web_client.register_topic(self.subject_openid, topic, "unregister")
 
     @requires_login
-    def unregister_topic_for_user(self, topic, user):
+    def get_topic_configs(self, topic):
         """
-        Unregisters a topic from the user's OpenID.
+        Get topic configurations.
         """
-        return self.web_client.unregister_topic_for_user(self.subject_openid, topic, user)
+        return self.web_client.get_topic_configs(self.subject_openid, topic)
 
     @requires_login
-    def list_functions(self):
+    def update_topic_configs(self, topic, configs):
         """
-        Retrieves the list of functions associated with the user's OpenID.
+        Set topic configurations.
         """
-        return self.web_client.list_functions(self.subject_openid)
+        return self.web_client.update_topic_configs(self.subject_openid, topic, configs)
 
     @requires_login
-    def register_function(self, topic, function, function_configs):
+    def update_topic_partitions(self, topic, new_partitions):
         """
-        Registers a new functions under the user's OpenID.
+        Adjust topic number of partitions
         """
-        return self.web_client.register_function(self.subject_openid, topic, function, function_configs)
+        return self.web_client.update_topic_partitions(self.subject_openid, topic, new_partitions)
 
     @requires_login
-    def unregister_function(self, topic, function):
+    def grant_user_access(self, topic, user):
         """
-        Unregisters a functions from the user's OpenID.
+        Registers a new topic under the user's OpenID.
         """
-        return self.web_client.unregister_function(self.subject_openid, topic, function)
+        return self.web_client.grant_user_access(self.subject_openid, topic, user, "grant")
 
     @requires_login
-    def update_trigger_config(self, trigger_uuid, trigger_configs):
+    def revoke_user_access(self, topic, user):
         """
-        Update a functions's trigger'.
+        Unregisters a topic from the user's OpenID.
         """
-        return self.web_client.update_function_trigger(self.subject_openid, trigger_uuid, trigger_configs)
+        return self.web_client.grant_user_access(self.subject_openid, topic, user, "revoke")
 
     @requires_login
-    def get_identities(self):
+    def list_triggers(self):
         """
-        Get the user identities.
+        Retrieves the list of functions associated with the user's OpenID.
         """
-        return self.web_client.get_identities(self.subject_openid)
+        return self.web_client.list_triggers(self.subject_openid)
 
     @requires_login
-    def get_topic_configs(self, topic, configs):
+    def create_trigger(self, topic, function, function_configs):
         """
-        Get topic configurations.
+        Registers a new functions under the user's OpenID.
         """
-        return self.web_client.get_topic_configs(self.subject_openid, topic, configs)
+        return self.web_client.create_trigger(self.subject_openid, topic, function, "create", function_configs)
 
     @requires_login
-    def set_topic_configs(self, topic, configs):
+    def delete_trigger(self, topic, function):
         """
-        Set topic configurations.
+        Unregisters a functions from the user's OpenID.
         """
-        return self.web_client.set_topic_configs(self.subject_openid, topic, configs)
+        return self.web_client.create_trigger(self.subject_openid, topic, function, "delete", {})
 
     @requires_login
-    def create_partitions(self, topic, new_partitions):
+    def update_trigger(self, trigger_uuid, trigger_configs):
         """
-        Set topic configurations.
+        Update a functions's trigger'.
         """
-        return self.web_client.create_partitions(self.subject_openid, topic, new_partitions)
+        return self.web_client.update_trigger(self.subject_openid, trigger_uuid, trigger_configs)

diaspora_event_sdk/sdk/web_client.py

@@ -1,5 +1,5 @@
 from typing import Optional
-
+import json
 import globus_sdk
 from diaspora_event_sdk.sdk.utils.uuid_like import UUID_LIKE_T
 
@@ -24,104 +24,76 @@ class WebClient(globus_sdk.BaseClient):
         self.user_app_name = app_name
 
     def create_key(self, subject: UUID_LIKE_T) -> globus_sdk.GlobusHTTPResponse:
-        return self.post("/v1/create_key", headers={"Subject": str(subject)})
+        return self.get("/api/v2/create_key", headers={"Subject": str(subject)})
 
     def list_topics(self, subject: UUID_LIKE_T) -> globus_sdk.GlobusHTTPResponse:
-        return self.get("/v1/list_topics", headers={"Subject": str(subject)})
+        return self.get("/api/v2/topics", headers={"Subject": str(subject)})
 
     def register_topic(
-        self, subject: UUID_LIKE_T, topic: str
+        self, subject: UUID_LIKE_T, topic: str, action: str
     ) -> globus_sdk.GlobusHTTPResponse:
-        return self.post(
-            "/v1/register_topic", headers={"Subject": str(subject), "Topic": topic}
+        return self.put(
+            f"/api/v2/topic/{topic}", headers={"Subject": str(subject), "Action": action}
         )
 
-    def unregister_topic(
+    def get_topic_configs(
         self, subject: UUID_LIKE_T, topic: str
     ) -> globus_sdk.GlobusHTTPResponse:
-        return self.post(
-            "/v1/unregister_topic", headers={"Subject": str(subject), "Topic": topic}
-        )
-
-    def register_topic_for_user(
-        self, subject: UUID_LIKE_T, topic: str, user: UUID_LIKE_T
-    ) -> globus_sdk.GlobusHTTPResponse:
-        return self.post(
-            "/v1/register_topic_for_user",
-            headers={"Subject": str(
-                subject), "Topic": topic, "User": str(user)}
-        )
-
-    def unregister_topic_for_user(
-        self, subject: UUID_LIKE_T, topic: str, user: UUID_LIKE_T
-    ) -> globus_sdk.GlobusHTTPResponse:
-        return self.post(
-            "/v1/unregister_topic_for_user",
-            headers={"Subject": str(
-                subject), "Topic": topic, "User": str(user)}
+        return self.get(
+            f"/api/v2/topic/{topic}",
+            headers={"Subject": str(subject), "Topic": topic},
+            # data=json.dumps(configs).encode("utf-8")
         )
 
-    def list_functions(self, subject: UUID_LIKE_T) -> globus_sdk.GlobusHTTPResponse:
-        return self.get("/v1/list_functions", headers={"Subject": str(subject)})
-
-    def register_function(
-        self, subject: UUID_LIKE_T, topic: str, function: str,
-        function_configs: dict
+    def update_topic_configs(
+        self, subject: UUID_LIKE_T, topic: str, configs: dict
     ) -> globus_sdk.GlobusHTTPResponse:
         return self.post(
-            "/v1/register_function",
+            f"/api/v2/topic/{topic}",
             headers={"Subject": str(subject), "Topic": topic,
-                     "Function": function},
-            data=function_configs
-        )
-
-    def unregister_function(
-        self, subject: UUID_LIKE_T, topic: str, function: str
-    ) -> globus_sdk.GlobusHTTPResponse:
-        return self.post(
-            "/v1/unregister_function", headers={"Subject": str(subject), "Topic": topic, "Function": function}
+                     "Content-Type": "text/plain"},
+            data=json.dumps(configs).encode("utf-8")
         )
 
-    def update_function_trigger(
-        self, subject: UUID_LIKE_T, trigger_uuid: UUID_LIKE_T, trigger_configs: dict
+    def update_topic_partitions(
+        self, subject: UUID_LIKE_T, topic: str, new_partitions: int
     ) -> globus_sdk.GlobusHTTPResponse:
         return self.post(
-            "/v1/update_function_trigger",
-            headers={"Subject": str(subject), "Trigger": str(trigger_uuid)},
-            data=trigger_configs
+            f"/api/v2/topic/{topic}/partitions",
+            headers={"Subject": str(subject), "Topic": topic,
+                     "NewPartitions": str(new_partitions)},
         )
 
-    def get_identities(
-        self, subject: UUID_LIKE_T
+    def grant_user_access(
+        self, subject: UUID_LIKE_T, topic: str, user: UUID_LIKE_T, action: str
     ) -> globus_sdk.GlobusHTTPResponse:
         return self.post(
-            "/v1/get_identities",
-            headers={"Subject": str(subject)}
+            f"/api/v2/topic/{topic}/user",
+            headers={"Subject": str(subject), "Action": action,
+                     "Topic": topic, "User": str(user)}
         )
 
-    def get_topic_configs(
-        self, subject: UUID_LIKE_T, topic: str, configs: dict
-    ) -> globus_sdk.GlobusHTTPResponse:
-        return self.post(
-            "/v1/get_topic_configs",
-            headers={"Subject": str(subject), "Topic": topic},
-            data=configs
-        )
+    def list_triggers(self, subject: UUID_LIKE_T) -> globus_sdk.GlobusHTTPResponse:
+        return self.get("/api/v2/triggers", headers={"Subject": str(subject)})
 
-    def set_topic_configs(
-        self, subject: UUID_LIKE_T, topic: str, configs: dict
+    def create_trigger(
+        self, subject: UUID_LIKE_T, topic: str, function: str, action: str,
+        function_configs: dict
     ) -> globus_sdk.GlobusHTTPResponse:
-        return self.post(
-            "/v1/set_topic_configs",
-            headers={"Subject": str(subject), "Topic": topic},
-            data=configs
+        return self.put(
+            "/api/v2/trigger",
+            headers={"Subject": str(subject), "Topic": topic,
+                     "Trigger": function, "Action": action,
+                     "Content-Type": "text/plain"},
+            data=json.dumps(function_configs).encode("utf-8")
         )
 
-    def create_partitions(
-        self, subject: UUID_LIKE_T, topic: str, new_partitions: int
+    def update_trigger(
+        self, subject: UUID_LIKE_T, trigger_uuid: UUID_LIKE_T, trigger_configs: dict
     ) -> globus_sdk.GlobusHTTPResponse:
         return self.post(
-            "/v1/create_partitions",
-            headers={"Subject": str(subject), "Topic": topic,
-                     "NewPartitions": str(new_partitions)},
+            f"/api/v2/triggers/{trigger_uuid}",
+            headers={"Subject": str(subject), "Trigger_id": str(trigger_uuid),
+                     "Content-Type": "text/plain"},
+            data=json.dumps(trigger_configs).encode("utf-8")
         )

diaspora_event_sdk/version.py

@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.7"

{diaspora_event_sdk-0.1.6.dist-info → diaspora_event_sdk-0.1.7.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.1.6
+Version: 0.1.7
 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
+Platform: UNKNOWN
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: globus-sdk <4,>=3.20.1
@@ -47,3 +48,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.
+

{diaspora_event_sdk-0.1.6.dist-info → diaspora_event_sdk-0.1.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
 diaspora_event_sdk/__init__.py,sha256=v8IN3-WFpliakQKru8TAcmQ4IRdvRe_m9-abSDnGIFM,457
-diaspora_event_sdk/version.py,sha256=n3oM6B_EMz93NsTI18NNZd-jKFcUPzUkbIKj5VFK5ok,22
+diaspora_event_sdk/version.py,sha256=YpKDcdV7CqL8n45u267wKtyloM13FSVbOdrqgNZnSLM,22
 diaspora_event_sdk/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diaspora_event_sdk/sdk/_environments.py,sha256=Xeuzqnx1aGou01vsXgGwQkWhgIe3-PRgbOr1o5mZ3Mk,203
-diaspora_event_sdk/sdk/client.py,sha256=-JnvekXtq0U595Qrs7EmHqSmhjoJ8t3nz3JPwbqmO8c,7321
+diaspora_event_sdk/sdk/_environments.py,sha256=QyQA7dV4goUKUoxAoaes8OGv0xKxz2qiFBHNGr-vQNA,204
+diaspora_event_sdk/sdk/client.py,sha256=kEgcxdi2bwHXD1sVFZUZflPf9RD6FRhXteoe5A20n9s,6834
 diaspora_event_sdk/sdk/decorators.py,sha256=Gel8AyhIjbf4-FNintTNcOqvC9hHH_YwbOH257Nfmf0,884
 diaspora_event_sdk/sdk/kafka_client.py,sha256=G1kQQz2TWlahdd2TDdpvaQW7HD7gsuQCnr0tks54ISw,4361
-diaspora_event_sdk/sdk/web_client.py,sha256=AprVGjWo3Nw8c3-H3qMZxQV9q-cY0n0WoLcvq06kDx4,4332
+diaspora_event_sdk/sdk/web_client.py,sha256=6hijsiTF23miM3u2n6MRS4mQANi09M-5IKtlaTZjDqA,3630
 diaspora_event_sdk/sdk/login_manager/__init__.py,sha256=yeqVgjeHLMX0WZJu2feJmq-fbeXvSxWghVV81ygfY-w,239
 diaspora_event_sdk/sdk/login_manager/client_login.py,sha256=gvR4PkIqQpIywNieJQ_u11PHUmdLxQ0Ho-QgPSfu8bw,1798
 diaspora_event_sdk/sdk/login_manager/decorators.py,sha256=EFEp71d0oJ7vo2H8W7DJ2gPrDfGzeNXUNxri1C0l8h0,1047
@@ -18,8 +18,8 @@ diaspora_event_sdk/sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 diaspora_event_sdk/sdk/utils/uuid_like.py,sha256=xbxf0YXpDhdii16lwPLWRN21qFekHrNrqODSToMPtCg,470
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/test_client.py,sha256=alUC-XTRQn_Oz0RvmzXTal-ciSVtCpx5jm3NuStkt1E,2995
-diaspora_event_sdk-0.1.6.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-diaspora_event_sdk-0.1.6.dist-info/METADATA,sha256=iwcVD2QxphVBCOG5YZLxR-vXabGyu5t1x9ubDMQE8bA,2486
-diaspora_event_sdk-0.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-diaspora_event_sdk-0.1.6.dist-info/top_level.txt,sha256=OVun-67t3fkLFEIwvJuNINgFFvAc--bClYhXjLhMmvs,25
-diaspora_event_sdk-0.1.6.dist-info/RECORD,,
+diaspora_event_sdk-0.1.7.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+diaspora_event_sdk-0.1.7.dist-info/METADATA,sha256=FzdEwxOwp7qNG5hCokv4N803ritlaZt0bRy4j3rJmhU,2505
+diaspora_event_sdk-0.1.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+diaspora_event_sdk-0.1.7.dist-info/top_level.txt,sha256=OVun-67t3fkLFEIwvJuNINgFFvAc--bClYhXjLhMmvs,25
+diaspora_event_sdk-0.1.7.dist-info/RECORD,,