diaspora-event-sdk 0.2.8__py3-none-any.whl → 0.3.0__py3-none-any.whl

diaspora_event_sdk/sdk/_environments.py

@@ -1,9 +1,20 @@
 import os
+from typing import Union
 
 
-TOKEN_EXCHANGE = "http://3.220.110.101/"
+# TOKEN_EXCHANGE = "http://3.220.110.101/"
 DIASPORA_RESOURCE_SERVER = "2b9d2f5c-fa32-45b5-875b-b24cd343b917"
 
 
 def _get_envname():
     return os.getenv("DIASPORA_SDK_ENVIRONMENT", "production")
+
+def get_web_service_url(envname: Union[str, None] = None) -> str:
+    env = envname or _get_envname()
+    urls = {
+        "production": "https://diaspora-web-service.ml22sevubfnks.us-east-1.cs.amazonlightsail.com",
+        "dev": "https://diaspora-web-service-dev.ml22sevubfnks.us-east-1.cs.amazonlightsail.com",
+        "local": "http://localhost:8000",
+    }
+
+    return urls.get(env, urls["production"])

diaspora_event_sdk/sdk/botocore/compat.py

@@ -96,7 +96,7 @@ try:
     import xml.etree.cElementTree as ETree
 except ImportError:
     # cElementTree does not exist from Python3.9+
-    import xml.etree.ElementTree as ETree
+    import xml.etree.ElementTree as ETree  # type: ignore
 XMLParseError = ETree.ParseError
 
 
@@ -110,7 +110,7 @@ XMLParseError = ETree.ParseError
 #     )
 
 
-@classmethod
+@classmethod  # type: ignore
 def from_dict(cls, d):
     new_instance = cls()
     for key, value in d.items():
@@ -118,7 +118,7 @@ def from_dict(cls, d):
     return new_instance
 
 
-@classmethod
+@classmethod  # type: ignore
 def from_pairs(cls, pairs):
     new_instance = cls()
     for key, value in pairs:
@@ -126,8 +126,8 @@ def from_pairs(cls, pairs):
     return new_instance
 
 
-HTTPHeaders.from_dict = from_dict
-HTTPHeaders.from_pairs = from_pairs
+HTTPHeaders.from_dict = from_dict  # type: ignore
+HTTPHeaders.from_pairs = from_pairs  # type: ignore
 
 
 def copy_kwargs(kwargs):
@@ -292,7 +292,7 @@ def _windows_shell_split(s):
 
 # Detect if CRT is available for use
 try:
-    import awscrt.auth
+    import awscrt.auth  # type: ignore[import]
 
     # Allow user opt-out if needed
     disabled = os.environ.get('BOTO_DISABLE_CRT', "false")

diaspora_event_sdk/sdk/client.py

@@ -7,7 +7,7 @@ from diaspora_event_sdk.sdk.login_manager import (
     requires_login,
 )
 
-from ._environments import DIASPORA_RESOURCE_SERVER, TOKEN_EXCHANGE
+from ._environments import DIASPORA_RESOURCE_SERVER, get_web_service_url
 
 
 class Client:
@@ -16,6 +16,8 @@ class Client:
         environment: Optional[str] = None,
         login_manager: Optional[LoginManagerProtocol] = None,
     ):
+        self.web_service_address = get_web_service_url(environment)
+
         # if a login manager was passed, no login flow is triggered
         if login_manager is not None:
             self.login_manager: LoginManagerProtocol = login_manager
@@ -26,7 +28,7 @@ class Client:
             self.login_manager.ensure_logged_in()
 
         self.web_client = self.login_manager.get_web_client(
-            base_url=TOKEN_EXCHANGE)
+            base_url=self.web_service_address)
         self.auth_client = self.login_manager.get_auth_client()
         self.subject_openid = self.auth_client.oauth2_userinfo()["sub"]
 

diaspora_event_sdk/sdk/login_manager/decorators.py

@@ -3,8 +3,6 @@ import logging
 
 import globus_sdk
 
-from .._environments import TOKEN_EXCHANGE
-
 log = logging.getLogger(__name__)
 
 
@@ -27,7 +25,7 @@ def requires_login(func):
                 self.login_manager.run_login_flow()
                 # Initiate a new web client with updated authorizer
                 self.web_client = self.login_manager.get_web_client(
-                    base_url=TOKEN_EXCHANGE
+                    base_url=self.web_service_address
                 )
                 return func(self, *args, **kwargs)
 

diaspora_event_sdk/sdk/web_client.py

@@ -5,7 +5,7 @@ import globus_sdk
 
 from diaspora_event_sdk.sdk.utils.uuid_like import UUID_LIKE_T
 
-from ._environments import TOKEN_EXCHANGE
+from ._environments import get_web_service_url
 
 
 class WebClient(globus_sdk.BaseClient):
@@ -18,7 +18,7 @@ class WebClient(globus_sdk.BaseClient):
         **kwargs,
     ):
         if base_url is None:
-            base_url = TOKEN_EXCHANGE
+            base_url = get_web_service_url(environment)
 
         super().__init__(environment=environment, base_url=base_url, **kwargs)
 

diaspora_event_sdk/version.py

@@ -1 +1 @@
-__version__ = "0.2.8"
+__version__ = "0.3.0"

{diaspora_event_sdk-0.2.8.dist-info → diaspora_event_sdk-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.2.8
+Version: 0.3.0
 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: Apache 2.0

{diaspora_event_sdk-0.2.8.dist-info → diaspora_event_sdk-0.3.0.dist-info}/RECORD

@@ -1,22 +1,22 @@
 diaspora_event_sdk/__init__.py,sha256=v8IN3-WFpliakQKru8TAcmQ4IRdvRe_m9-abSDnGIFM,457
-diaspora_event_sdk/version.py,sha256=G6Dbxq2ws-1ZAXwDD8q0KWueYtso_Y6Uyvtj8sRWsPI,22
+diaspora_event_sdk/version.py,sha256=VrXpHDu3erkzwl_WXrqINBm9xWkcyUy53IQOj042dOs,22
 diaspora_event_sdk/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diaspora_event_sdk/sdk/_environments.py,sha256=QyQA7dV4goUKUoxAoaes8OGv0xKxz2qiFBHNGr-vQNA,204
+diaspora_event_sdk/sdk/_environments.py,sha256=CcfgfxY2V4_XbEfHLvGkmfgBOcUgJorF2lueAhcWh9o,640
 diaspora_event_sdk/sdk/aws_iam_msk.py,sha256=rT6RipRVt-Zf7pTsMf9UhH2HDNC0FW28LhciVH_45bc,3942
-diaspora_event_sdk/sdk/client.py,sha256=fbjP_YRmGF2eItnMxNkdz5RIRvur0_P8DhE6AlYk4tM,8541
+diaspora_event_sdk/sdk/client.py,sha256=J-fm9at2de8qqUORckhFui4F5gLgczBizLLWIf5yi8s,8625
 diaspora_event_sdk/sdk/decorators.py,sha256=Gel8AyhIjbf4-FNintTNcOqvC9hHH_YwbOH257Nfmf0,884
 diaspora_event_sdk/sdk/kafka_client.py,sha256=xAxuPmMXIv0i_K_PFqc_BEG3wdGsFdYYvd7gUzeoLV8,4286
-diaspora_event_sdk/sdk/web_client.py,sha256=Rkp0ZUUXCeqbfVFUqX2oxvuLwqqW5_jsJJNN-v2L4FI,4770
+diaspora_event_sdk/sdk/web_client.py,sha256=hNbbd01ghKopf0RcyhD-89ISPLZEAISuO9rvgnxmBjY,4793
 diaspora_event_sdk/sdk/botocore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diaspora_event_sdk/sdk/botocore/auth.py,sha256=QXwCNMzM0wAqD64RlFd-K27atRpixti73VKConpb1kk,18699
 diaspora_event_sdk/sdk/botocore/awsrequest.py,sha256=fcR28YxbsCk2ZT1rGtgWxhje-sYt-SxIqixjOWAFLcM,9344
-diaspora_event_sdk/sdk/botocore/compat.py,sha256=Tfq_V6AnkTK13h9KgU8qzAP0okzD5lY_hqj3EhTckgs,11093
+diaspora_event_sdk/sdk/botocore/compat.py,sha256=5A-15L8yJhJLQaWvx3xvLfyf5-oO_Ejc-lK55aF0TjI,11197
 diaspora_event_sdk/sdk/botocore/credentials.py,sha256=upSYlgIcp8piSFtGay4ryiCMqNJD5fWFq802p0DWIfI,2455
 diaspora_event_sdk/sdk/botocore/exceptions.py,sha256=Wcu505IzZuyxOl4aE3iuXL-ByL6GDebWFrby7nACgqY,2002
 diaspora_event_sdk/sdk/botocore/utils.py,sha256=TCSvM3QmwVFTDWmU55c1FtAZS0zMWjTkyywmaL1qfCk,5370
 diaspora_event_sdk/sdk/login_manager/__init__.py,sha256=yeqVgjeHLMX0WZJu2feJmq-fbeXvSxWghVV81ygfY-w,239
 diaspora_event_sdk/sdk/login_manager/client_login.py,sha256=8ild28_cgPSrLtg3Jhmzpg3EymAvH2UdAhKY52oOB_c,1835
-diaspora_event_sdk/sdk/login_manager/decorators.py,sha256=EFEp71d0oJ7vo2H8W7DJ2gPrDfGzeNXUNxri1C0l8h0,1047
+diaspora_event_sdk/sdk/login_manager/decorators.py,sha256=JlCEwoceSMmFy6PLQ5kz5mpkKfitJgCVAA6I4I_k1nw,1013
 diaspora_event_sdk/sdk/login_manager/globus_auth.py,sha256=pbDy67Mdf4SKFf0IlXD3ZFGj4lG-xpzFTD1ygW-0H1k,430
 diaspora_event_sdk/sdk/login_manager/login_flow.py,sha256=6Vi_e3rACYdv4TRXPAvUv5xivCRkCo4DS841Ixu_r24,977
 diaspora_event_sdk/sdk/login_manager/manager.py,sha256=AD3f8rx154oesgkpqG0K-eZsEGjntr08Vgrxr1m6uao,7040
@@ -26,8 +26,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=sJUtPmnNGnohnP38RQrwcJ4D5j3-g1WFQ6gaKf520AQ,3019
-diaspora_event_sdk-0.2.8.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-diaspora_event_sdk-0.2.8.dist-info/METADATA,sha256=cqKmJm6hTB553c49iT7m92bNQWXI6WIp1tx_i6SCKDs,2449
-diaspora_event_sdk-0.2.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-diaspora_event_sdk-0.2.8.dist-info/top_level.txt,sha256=OVun-67t3fkLFEIwvJuNINgFFvAc--bClYhXjLhMmvs,25
-diaspora_event_sdk-0.2.8.dist-info/RECORD,,
+diaspora_event_sdk-0.3.0.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+diaspora_event_sdk-0.3.0.dist-info/METADATA,sha256=GYSCb3gnuUlp3H6NYaiu8SWavVfvlwkTYn6kibDBxqE,2449
+diaspora_event_sdk-0.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+diaspora_event_sdk-0.3.0.dist-info/top_level.txt,sha256=OVun-67t3fkLFEIwvJuNINgFFvAc--bClYhXjLhMmvs,25
+diaspora_event_sdk-0.3.0.dist-info/RECORD,,