diaspora-event-sdk 0.0.4__py3-none-any.whl → 0.0.5__py3-none-any.whl

diaspora_event_sdk/sdk/_environments.py

@@ -1,4 +1,11 @@
+import os
+
+
 TOKEN_EXCHANGE = "http://3.220.110.101"
 DIASPORA_RESOURCE_SERVER = '2b9d2f5c-fa32-45b5-875b-b24cd343b917'
 MSK_SCRAM_ENDPOINT = "b-1-public.diaspora.k6i387.c21.kafka.us-east-1.amazonaws.com:9196,b-2-public.diaspora.k6i387.c21.kafka.us-east-1.amazonaws.com:9196"
 MSK_IAM_ENDPOINT = "b-1-public.diaspora.k6i387.c21.kafka.us-east-1.amazonaws.com:9198,b-2-public.diaspora.k6i387.c21.kafka.us-east-1.amazonaws.com:9198"
+
+
+def _get_envname():
+    return os.getenv("DIASPORA_SDK_ENVIRONMENT", "production")

diaspora_event_sdk/sdk/client.py

@@ -1,8 +1,6 @@
 import json
 
-from diaspora_event_sdk.sdk.login_manager.manager import LoginManager
-from diaspora_event_sdk.sdk.login_manager import requires_login
-from globus_compute_sdk.sdk.login_manager import LoginManagerProtocol
+from diaspora_event_sdk.sdk.login_manager import LoginManager, LoginManagerProtocol, requires_login
 
 from ._environments import TOKEN_EXCHANGE, DIASPORA_RESOURCE_SERVER
 

diaspora_event_sdk/sdk/login_manager/__init__.py

@@ -1,7 +1,10 @@
 from .decorators import requires_login
 from .manager import DiasporaScopes, LoginManager
+from .protocol import LoginManagerProtocol
 
 __all__ = (
     "LoginManager",
     "DiasporaScopes",
-)
+    "LoginManagerProtocol",
+    "requires_login",
+)

diaspora_event_sdk/sdk/login_manager/manager.py

@@ -8,7 +8,7 @@ import typing as t
 
 import globus_sdk
 from globus_sdk.scopes import AuthScopes, ScopeBuilder
-from globus_compute_sdk.sdk.login_manager.tokenstore import get_token_storage_adapter
+from diaspora_event_sdk.sdk.login_manager.tokenstore import get_token_storage_adapter
 
 from .._environments import DIASPORA_RESOURCE_SERVER
 from ..web_client import WebClient

diaspora_event_sdk/sdk/login_manager/protocol.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+import sys
+
+import globus_sdk
+
+from ..web_client import WebClient
+
+# these were added to stdlib typing in 3.8, so the import must be conditional
+# mypy and other tools expect and document a sys.version_info check
+if sys.version_info >= (3, 8):
+    from typing import Protocol, runtime_checkable
+else:
+    from typing_extensions import Protocol, runtime_checkable
+
+
+@runtime_checkable
+class LoginManagerProtocol(Protocol):
+    def ensure_logged_in(self) -> None:
+        ...
+
+    def logout(self) -> bool:
+        ...
+
+    def get_auth_client(self) -> globus_sdk.AuthClient:
+        ...
+
+    def get_web_client(self, *, base_url: str | None = None) -> WebClient:
+        ...

diaspora_event_sdk/sdk/login_manager/tokenstore.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+
+import json
+import os
+import pathlib
+
+from globus_sdk.tokenstorage import SQLiteAdapter
+
+from .._environments import _get_envname
+from .client_login import get_client_login, is_client_login
+from .globus_auth import internal_auth_client
+
+
+def _home() -> pathlib.Path:
+    # this is a hook point for tests to patch over
+    # it just returns `pathlib.Path.home()`
+    # replace this with a mock to return some test directory
+    return pathlib.Path.home()
+
+
+def invalidate_old_config() -> None:
+    token_file = _home() / ".funcx" / "credentials" / "funcx_sdk_tokens.json"
+
+    if token_file.exists():
+        try:
+            auth_client = internal_auth_client()
+            with open(token_file) as fp:
+                data = json.load(fp)
+            for token_data in data.values():
+                if "access_token" in token_data:
+                    auth_client.oauth2_revoke_token(token_data["access_token"])
+                if "refresh_token" in token_data:
+                    auth_client.oauth2_revoke_token(
+                        token_data["refresh_token"])
+        finally:
+            os.remove(token_file)
+
+
+def ensure_compute_dir() -> pathlib.Path:
+    legacy_dirname = _home() / ".funcx"
+    dirname = _home() / ".globus_compute"
+
+    user_dir = os.getenv("GLOBUS_COMPUTE_USER_DIR")
+    if user_dir:
+        dirname = pathlib.Path(user_dir)
+
+    if dirname.is_dir():
+        pass
+    elif dirname.is_file():
+        raise FileExistsError(
+            f"Error creating directory {dirname}, "
+            "please remove or rename the conflicting file"
+        )
+    elif legacy_dirname.is_dir() and not user_dir:
+        legacy_dirname.replace(dirname)
+        legacy_dirname.symlink_to(dirname, target_is_directory=True)
+    else:
+        dirname.mkdir(mode=0o700, parents=True, exist_ok=True)
+
+    return dirname
+
+
+def _get_storage_filename():
+    datadir = ensure_compute_dir()
+    return os.path.join(datadir, "storage.db")
+
+
+def _resolve_namespace(environment: str | None) -> str:
+    """
+    Return the namespace used to save tokens. This will check
+    if a client login is being used and return either:
+      user/<envname>
+    or
+      clientprofile/<envname>/<clientid>
+
+    e.g.
+
+      user/production
+    """
+    env = environment if environment is not None else _get_envname()
+
+    if is_client_login():
+        client_id = get_client_login().client_id
+        return f"clientprofile/{env}/{client_id}"
+
+    return f"user/{env}"
+
+
+def get_token_storage_adapter(*, environment: str | None = None) -> SQLiteAdapter:
+    # when initializing the token storage adapter, check if the storage file exists
+    # if it does not, then use this as a flag to clean the old config
+    fname = _get_storage_filename()
+    if not os.path.exists(fname):
+        invalidate_old_config()
+    # namespace is equal to the current environment
+    return SQLiteAdapter(
+        fname,
+        namespace=_resolve_namespace(environment),
+        connect_params={"check_same_thread": False},
+    )

diaspora_event_sdk/sdk/utils/uuid_like.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+import typing as t
+import uuid
+
+# older pythons don't like aliases using |, even with a __future__ import
+UUID_LIKE_T = t.Union[uuid.UUID, str]
+
+
+def as_uuid(uuid_like: UUID_LIKE_T) -> uuid.UUID:
+    return uuid_like if isinstance(uuid_like, uuid.UUID) else uuid.UUID(uuid_like)
+
+
+def as_optional_uuid(optional_uuid_like: UUID_LIKE_T | None) -> uuid.UUID | None:
+    return as_uuid(optional_uuid_like) if optional_uuid_like else None

diaspora_event_sdk/sdk/web_client.py

@@ -2,8 +2,8 @@
 import typing as t
 
 import globus_sdk
-from globus_compute_sdk.sdk.utils.uuid_like import UUID_LIKE_T
 from globus_sdk.exc.api import GlobusAPIError
+from diaspora_event_sdk.sdk.utils.uuid_like import UUID_LIKE_T
 
 from ._environments import TOKEN_EXCHANGE
 

diaspora_event_sdk/version.py

@@ -1 +1 @@
-__version__ = "0.0.4"
+__version__ = "0.0.5"

{diaspora_event_sdk-0.0.4.dist-info → diaspora_event_sdk-0.0.5.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.0.4
+Version: 0.0.5
 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: globus-compute-sdk
+Requires-Dist: globus-sdk
 Requires-Dist: kafka-python
 
 # Diaspora Event Fabric: Resilience-enabling services for science from HPC to edge

diaspora_event_sdk-0.0.5.dist-info/RECORD

@@ -0,0 +1,23 @@
+diaspora_event_sdk/__init__.py,sha256=qLu5r-LxlQuJRJySWbiDGoaBL1A3STX9v5IrwvN1vtE,477
+diaspora_event_sdk/version.py,sha256=S7u1lbuWmM3A3ajykBialmPoJUK6Jg-WmNqM-9OZFdk,22
+diaspora_event_sdk/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+diaspora_event_sdk/sdk/_environments.py,sha256=X5TekWUUJ_cmgb3jdhK90dDlqj_AmAP5CnXw5ABjh_w,511
+diaspora_event_sdk/sdk/client.py,sha256=s3QrXcPb64oSgOaGGODTH9eV_1IVeZWi1ZDh6-dBIO4,3051
+diaspora_event_sdk/sdk/decorators.py,sha256=Gel8AyhIjbf4-FNintTNcOqvC9hHH_YwbOH257Nfmf0,884
+diaspora_event_sdk/sdk/kafka_client.py,sha256=xy-b7ZfNkgExwa5d65IlUOaAZYAqibyJLQ1v0ruJzV8,1457
+diaspora_event_sdk/sdk/web_client.py,sha256=rHYeEltujO191SksBXAMNrS6C_qasdf0xrFfBEcGhtQ,1349
+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
+diaspora_event_sdk/sdk/login_manager/globus_auth.py,sha256=9Hymp0tv91OI5dBMUgh4rGv_5xLVLhFEK7Hu0t8CJFQ,389
+diaspora_event_sdk/sdk/login_manager/login_flow.py,sha256=2TodgsvlEYPoZPQPkp6FHOC9IkSM07pS7MIVGS4MZNE,954
+diaspora_event_sdk/sdk/login_manager/manager.py,sha256=uJHosI7ipqGt5KiL-iv2IGB4bNyZ6jQZQi7g4ka0pts,7052
+diaspora_event_sdk/sdk/login_manager/protocol.py,sha256=RCuo2jy_XkpZvbxnKlDfTKs-L6b9_8_JR-Kq9wHwhoM,710
+diaspora_event_sdk/sdk/login_manager/tokenstore.py,sha256=7jRm01rzsbvniaCfYtDDWE3det_1_b6oQkS-YQ2Qjg4,3037
+diaspora_event_sdk/sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+diaspora_event_sdk/sdk/utils/uuid_like.py,sha256=xbxf0YXpDhdii16lwPLWRN21qFekHrNrqODSToMPtCg,470
+diaspora_event_sdk-0.0.5.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+diaspora_event_sdk-0.0.5.dist-info/METADATA,sha256=c1OJRiA1CgaM_Hmn-SFjHF6Xvbho4MBQhCgUC6pyEW4,2927
+diaspora_event_sdk-0.0.5.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+diaspora_event_sdk-0.0.5.dist-info/top_level.txt,sha256=_5Wx8F5rc9mpB093wvCXa6CArtWNXwek2T1LnmkS2vE,19
+diaspora_event_sdk-0.0.5.dist-info/RECORD,,

diaspora_event_sdk-0.0.4.dist-info/RECORD

@@ -1,19 +0,0 @@
-diaspora_event_sdk/__init__.py,sha256=qLu5r-LxlQuJRJySWbiDGoaBL1A3STX9v5IrwvN1vtE,477
-diaspora_event_sdk/version.py,sha256=1mptEzQihbdyqqzMgdns_j5ZGK9gz7hR2bsgA_TnjO4,22
-diaspora_event_sdk/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diaspora_event_sdk/sdk/_environments.py,sha256=4hJIrrdAHOt9qY74jnD5i2UvpBKkKqJ7Ys-bygGrP9k,414
-diaspora_event_sdk/sdk/client.py,sha256=94iWoxHaxibzIEJfZlUOzV7jJwt-AQnbFf2jZ1cwsyA,3155
-diaspora_event_sdk/sdk/decorators.py,sha256=Gel8AyhIjbf4-FNintTNcOqvC9hHH_YwbOH257Nfmf0,884
-diaspora_event_sdk/sdk/kafka_client.py,sha256=xy-b7ZfNkgExwa5d65IlUOaAZYAqibyJLQ1v0ruJzV8,1457
-diaspora_event_sdk/sdk/web_client.py,sha256=AbFJt9ZhG2l15qxxjpGY5DPq2P12THEAw2yjkWfJxvo,1349
-diaspora_event_sdk/sdk/login_manager/__init__.py,sha256=ErCNru31j_sSl_10uTXv8jsa16VW1LbPG-k3zxgAxZo,145
-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
-diaspora_event_sdk/sdk/login_manager/globus_auth.py,sha256=9Hymp0tv91OI5dBMUgh4rGv_5xLVLhFEK7Hu0t8CJFQ,389
-diaspora_event_sdk/sdk/login_manager/login_flow.py,sha256=2TodgsvlEYPoZPQPkp6FHOC9IkSM07pS7MIVGS4MZNE,954
-diaspora_event_sdk/sdk/login_manager/manager.py,sha256=ocrDlu_LITKGWV7kUAiMXdtnfTF9sDelniNc-06yux0,7052
-diaspora_event_sdk-0.0.4.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-diaspora_event_sdk-0.0.4.dist-info/METADATA,sha256=jLeUkQliQbIQP-rCkvjmrbK63z5Mb_ZZ7iIot6l3q1g,2935
-diaspora_event_sdk-0.0.4.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-diaspora_event_sdk-0.0.4.dist-info/top_level.txt,sha256=_5Wx8F5rc9mpB093wvCXa6CArtWNXwek2T1LnmkS2vE,19
-diaspora_event_sdk-0.0.4.dist-info/RECORD,,