Merge pull request #329 from OpenFreeEnergy/feature/replace-keyedchai…

…n-import Replace the alchemiscale KeyedChain with new gufe KeyedChain
OpenFreeEnergy · Nov 20, 2024 · 11eda18 · 11eda18
2 parents 7099ce6 + 3ee96c4
commit 11eda18
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 135 deletions.
diff --git a/alchemiscale/base/api.py b/alchemiscale/base/api.py
@@ -14,7 +14,7 @@
 from fastapi import status as http_status
 from fastapi.routing import APIRoute
 from fastapi.security import OAuth2PasswordRequestForm
-from gufe.tokenization import JSON_HANDLER, GufeTokenizable
+from gufe.tokenization import JSON_HANDLER, GufeTokenizable, KeyedChain
 
 from ..settings import (
     JWTSettings,
@@ -32,7 +32,6 @@
     oauth2_scheme,
 )
 from ..security.models import Token, TokenData, CredentialedEntity
-from ..keyedchain import KeyedChain
 
 
 def validate_scopes(scope: Scope, token: TokenData) -> None:

diff --git a/alchemiscale/interface/api.py b/alchemiscale/interface/api.py
@@ -12,7 +12,7 @@
 from fastapi.middleware.gzip import GZipMiddleware
 
 import json
-from gufe.tokenization import JSON_HANDLER
+from gufe.tokenization import JSON_HANDLER, KeyedChain
 
 from ..base.api import (
     GufeJSONResponse,
@@ -34,7 +34,6 @@
 from ..storage.models import TaskStatusEnum
 from ..models import Scope, ScopedKey
 from ..security.models import TokenData, CredentialedUserIdentity
-from ..keyedchain import KeyedChain
 
 
 app = FastAPI(title="AlchemiscaleAPI")

diff --git a/alchemiscale/interface/client.py b/alchemiscale/interface/client.py
@@ -13,7 +13,7 @@
 from async_lru import alru_cache
 import networkx as nx
 from gufe import AlchemicalNetwork, Transformation, ChemicalSystem
-from gufe.tokenization import GufeTokenizable, JSON_HANDLER
+from gufe.tokenization import GufeTokenizable, JSON_HANDLER, KeyedChain
 from gufe.protocols import ProtocolResult, ProtocolDAGResult
 
 
@@ -29,7 +29,6 @@
 )
 from ..strategies import Strategy
 from ..validators import validate_network_nonself
-from ..keyedchain import KeyedChain
 
 from warnings import warn
 

diff --git a/alchemiscale/keyedchain.py b/alchemiscale/keyedchain.py
diff --git a/alchemiscale/tests/integration/interface/test_api.py b/alchemiscale/tests/integration/interface/test_api.py
@@ -2,10 +2,9 @@
 import json
 
 from gufe import AlchemicalNetwork, ChemicalSystem, Transformation
-from gufe.tokenization import JSON_HANDLER, GufeTokenizable
+from gufe.tokenization import JSON_HANDLER, GufeTokenizable, KeyedChain
 
 from alchemiscale.models import ScopedKey
-from alchemiscale.keyedchain import KeyedChain
 
 
 def pre_load_payload(network, scope, name="incomplete 2"):

diff --git a/alchemiscale/tests/unit/test_keyedchain.py b/alchemiscale/tests/unit/test_keyedchain.py