haplohub-cli 2.4.0__tar.gz → 2.5.0__tar.gz

{haplohub_cli-2.4.0 → haplohub_cli-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haplohub-cli
-Version: 2.4.0
+Version: 2.5.0
 Summary: HaploHub Command Line Interface
 Author-email: Mike Polcari <mike@haplotype-labs.com>, Ilya Khrustalev <ilya@haplotype-labs.com>
 Requires-Python: >=3.8

{haplohub_cli-2.4.0 → haplohub_cli-2.5.0}/haplohub_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.4.0'
-__version_tuple__ = version_tuple = (2, 4, 0)
+__version__ = version = '2.5.0'
+__version_tuple__ = version_tuple = (2, 5, 0)
 
-__commit_id__ = commit_id = 'gc36ea6d15'
+__commit_id__ = commit_id = 'gcd8a204d2'

{haplohub_cli-2.4.0 → haplohub_cli-2.5.0}/haplohub_cli/auth/auth.py

@@ -20,7 +20,7 @@ def token_login(api_key: str):
 
     response.raise_for_status()
 
-    oauth_client.token_storage.store_credentials({"api_key": api_key})
+    oauth_client.token_storage.store_credentials(api_url, {"api_key": api_key})
     click.echo("Successfully authenticated with HaploHub.")
 
 
@@ -47,4 +47,4 @@ def interactive_login():
     credentials = auth_request.exchange_code(auth_code)
 
     click.echo("Successfully authenticated with HaploHub.")
-    oauth_client.token_storage.store_credentials(credentials)
+    oauth_client.token_storage.store_credentials(config_manager.config.api_url, credentials)

haplohub_cli-2.5.0/haplohub_cli/auth/tests/test_token_storage.py

@@ -0,0 +1,74 @@
+import json
+
+import pytest
+from pyfakefs.fake_filesystem_unittest import TestCase
+
+from haplohub_cli.auth.token_storage import CREDENTIALS_VERSION, TokenStorage, normalize_api_url
+
+
+class TokenStorageTestCase(TestCase):
+    def setUp(self):
+        self.setUpPyfakefs()
+        self.instance = TokenStorage("/tmp/test_token_storage.json")
+
+    def test_credentials_exist_should_return_false_when_file_does_not_exist(self):
+        self.assertFalse(self.instance.credentials_exist("https://api.example.com"))
+
+    def test_store_credentials_should_save_versioned_credentials(self):
+        self.instance.store_credentials("https://api.example.com", {"access_token": "123456"})
+
+        with open(self.instance.token_file) as f:
+            self.assertEqual(
+                json.load(f),
+                {
+                    "version": CREDENTIALS_VERSION,
+                    "environments": {"https://api.example.com": {"access_token": "123456"}},
+                },
+            )
+
+    def test_credentials_are_isolated_by_environment(self):
+        self.instance.store_credentials("https://api-a.example.com", {"access_token": "token-a"})
+        self.instance.store_credentials("https://api-b.example.com", {"api_key": "key-b"})
+
+        self.assertEqual(self.instance.get_access_token("https://api-a.example.com"), "token-a")
+        self.assertEqual(self.instance.get_api_key("https://api-b.example.com"), "key-b")
+        self.assertFalse(self.instance.has_api_key("https://api-a.example.com"))
+        self.assertTrue(self.instance.has_api_key("https://api-b.example.com"))
+
+    def test_get_credentials_should_fail_for_unknown_environment(self):
+        self.instance.store_credentials("https://api-a.example.com", {"access_token": "token-a"})
+
+        with pytest.raises(KeyError):
+            self.instance.get_credentials("https://api-b.example.com")
+
+    def test_legacy_credentials_are_migrated_to_current_environment(self):
+        credentials = {"access_token": "123456", "refresh_token": "refresh-123456"}
+        with open(self.instance.token_file, "w") as f:
+            json.dump(credentials, f)
+
+        self.assertTrue(self.instance.migrate("https://api.example.com/"))
+        self.assertEqual(self.instance.get_credentials("https://api.example.com"), credentials)
+
+        with open(self.instance.token_file) as f:
+            self.assertEqual(
+                json.load(f),
+                {
+                    "version": CREDENTIALS_VERSION,
+                    "environments": {"https://api.example.com": credentials},
+                },
+            )
+
+    def test_versioned_credentials_are_not_migrated_again(self):
+        self.instance.store_credentials("https://api-a.example.com", {"access_token": "token-a"})
+
+        self.assertFalse(self.instance.migrate("https://api-b.example.com"))
+        self.assertFalse(self.instance.credentials_exist("https://api-b.example.com"))
+
+    def test_get_refresh_token_should_return_none_when_missing(self):
+        self.instance.store_credentials("https://api.example.com", {"access_token": "123456"})
+
+        self.assertIsNone(self.instance.get_refresh_token("https://api.example.com"))
+
+
+def test_normalize_api_url():
+    assert normalize_api_url(" HTTPS://API.Example.COM/base/ ") == "https://api.example.com/base"

haplohub_cli-2.5.0/haplohub_cli/auth/token_storage.py

@@ -0,0 +1,107 @@
+import json
+import os
+import tempfile
+from genericpath import exists
+from os import path
+from typing import Dict, Tuple
+from urllib.parse import urlsplit, urlunsplit
+
+from haplohub_cli import settings
+
+CREDENTIALS_VERSION = 2
+
+
+def normalize_api_url(api_url: str) -> str:
+    api_url = api_url.strip()
+    parsed = urlsplit(api_url)
+
+    if not parsed.scheme or not parsed.netloc:
+        return api_url.rstrip("/")
+
+    return urlunsplit(
+        (
+            parsed.scheme.lower(),
+            parsed.netloc.lower(),
+            parsed.path.rstrip("/"),
+            parsed.query,
+            parsed.fragment,
+        )
+    )
+
+
+class TokenStorage:
+    def __init__(self, token_file: str):
+        self.token_file = token_file
+
+    def migrate(self, api_url: str) -> bool:
+        _, migrated = self._load(api_url)
+        return migrated
+
+    def credentials_exist(self, api_url: str) -> bool:
+        data, _ = self._load(api_url)
+        return normalize_api_url(api_url) in data["environments"]
+
+    def store_credentials(self, api_url: str, credentials: dict):
+        data, _ = self._load(api_url)
+        data["environments"][normalize_api_url(api_url)] = credentials
+        self._save(data)
+
+    def get_credentials(self, api_url: str) -> dict:
+        data, _ = self._load(api_url)
+        return data["environments"][normalize_api_url(api_url)]
+
+    def get_access_token(self, api_url: str):
+        return self.get_credentials(api_url)["access_token"]
+
+    def get_api_key(self, api_url: str):
+        return self.get_credentials(api_url)["api_key"]
+
+    def get_refresh_token(self, api_url: str):
+        return self.get_credentials(api_url).get("refresh_token")
+
+    def has_api_key(self, api_url: str) -> bool:
+        return self.credentials_exist(api_url) and "api_key" in self.get_credentials(api_url)
+
+    def _load(self, migration_api_url: str) -> Tuple[Dict[str, object], bool]:
+        if not exists(self.token_file):
+            return self._empty_store(), False
+
+        with open(self.token_file) as f:
+            data = json.load(f)
+
+        if data.get("version") == CREDENTIALS_VERSION:
+            if not isinstance(data.get("environments"), dict):
+                raise ValueError("Invalid credentials file: 'environments' must be an object")
+            return data, False
+
+        if "version" in data:
+            raise ValueError(f"Unsupported credentials file version: {data['version']}")
+
+        migrated = self._empty_store()
+        migrated["environments"][normalize_api_url(migration_api_url)] = data
+        self._save(migrated)
+        return migrated, True
+
+    def _save(self, data: Dict[str, object]):
+        directory = path.dirname(self.token_file) or "."
+        os.makedirs(directory, exist_ok=True)
+
+        temporary_file = None
+        try:
+            with tempfile.NamedTemporaryFile("w", dir=directory, delete=False) as f:
+                temporary_file = f.name
+                json.dump(data, f, indent=4)
+                f.write("\n")
+
+            os.chmod(temporary_file, 0o600)
+            os.replace(temporary_file, self.token_file)
+        finally:
+            if temporary_file and exists(temporary_file):
+                os.unlink(temporary_file)
+
+    @staticmethod
+    def _empty_store() -> Dict[str, object]:
+        return {"version": CREDENTIALS_VERSION, "environments": {}}
+
+
+token_storage = TokenStorage(settings.CREDENTIALS_FILE)

{haplohub_cli-2.4.0 → haplohub_cli-2.5.0}/haplohub_cli/commands/config.py

@@ -1,5 +1,6 @@
 import click
 
+from haplohub_cli.auth.token_storage import token_storage
 from haplohub_cli.config.config_manager import config_manager
 
 
@@ -28,6 +29,7 @@ def set(key, value):
 @config.command()
 @click.argument("api_url", type=click.STRING)
 def switch(api_url):
+    token_storage.migrate(config_manager.config.api_url)
     config_manager.switch_environment(api_url)
     return config_manager.config
 

{haplohub_cli-2.4.0 → haplohub_cli-2.5.0}/haplohub_cli/config/config_manager.py

@@ -37,6 +37,7 @@ class ConfigManager:
             return self._config
 
     def switch_environment(self, api_url: str):
+        api_url = api_url.strip().rstrip("/")
         response = requests.get(f"{api_url}/api/v1/config/")
         response.raise_for_status()
         data = response.json()
@@ -44,7 +45,7 @@ class ConfigManager:
         if data["status"] != "success":
             raise Exception(data.get("error", "Unknown error"))
 
-        new_config = {"redirect_port": settings.REDIRECT_PORT, "api_url": api_url, **data["result"]["cli"]}
+        new_config = {**data["result"]["cli"], "redirect_port": settings.REDIRECT_PORT, "api_url": api_url}
 
         self._config = Config(**new_config)
 

{haplohub_cli-2.4.0 → haplohub_cli-2.5.0}/haplohub_cli/core/api/client.py

@@ -1,5 +1,6 @@
 from functools import cached_property
 
+import click
 from haplohub import (
     AlgorithmApi,
     AlgorithmResultApi,
@@ -25,15 +26,20 @@ class Client:
 
     @cached_property
     def client(self):
-        if self.token_storage.has_api_key:
+        api_url = config_manager.config.api_url
+
+        if not self.token_storage.credentials_exist(api_url):
+            raise click.ClickException(f"No credentials found for {api_url}. Run `haplohub login` first.")
+
+        if self.token_storage.has_api_key(api_url):
             config = Configuration(
-                host=config_manager.config.api_url,
-                api_key={"ApiKeyAuth": self.token_storage.get_api_key()},
+                host=api_url,
+                api_key={"ApiKeyAuth": self.token_storage.get_api_key(api_url)},
             )
         else:
             config = Configuration(
-                host=config_manager.config.api_url,
-                access_token=self.token_storage.get_access_token(),
+                host=api_url,
+                access_token=self.token_storage.get_access_token(api_url),
             )
         return ApiClient(config)
 

{haplohub_cli-2.4.0 → haplohub_cli-2.5.0}/haplohub_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haplohub-cli
-Version: 2.4.0
+Version: 2.5.0
 Summary: HaploHub Command Line Interface
 Author-email: Mike Polcari <mike@haplotype-labs.com>, Ilya Khrustalev <ilya@haplotype-labs.com>
 Requires-Python: >=3.8

haplohub_cli-2.5.0/haplohub_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.5.0",
+  "distance": 0,
+  "node": "gcd8a204d2e893b5eed8f318fb0e8fb3ed1a25d32",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-14"
+}

haplohub_cli-2.4.0/haplohub_cli/auth/tests/test_token_storage.py

@@ -1,64 +0,0 @@
-import json
-
-from pyfakefs.fake_filesystem_unittest import TestCase
-
-from haplohub_cli.auth.token_storage import TokenStorage
-
-
-class TokenStorageTestCase(TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.setUpClassPyfakefs()
-        cls.instance = TokenStorage("/tmp/test_token_storage.json")
-
-    def test_credentials_exist_should_return_false_when_file_does_not_exist(self):
-        self.assertFalse(self.instance.credentials_exist)
-
-    def test_credentials_exist_should_return_true_when_file_exists(self):
-        with open(self.instance.token_file, "w"):
-            pass
-
-        self.assertTrue(self.instance.credentials_exist)
-
-    def test_store_credentials_should_save_credentials_to_file(self):
-        creds = {"test": True}
-
-        self.instance.store_credentials(creds)
-
-        with open(self.instance.token_file, "r") as f:
-            self.assertEqual(json.load(f), creds)
-
-    def test_get_credentials_should_return_credentials_from_file(self):
-        creds = {"test": True}
-
-        self.instance.store_credentials(creds)
-
-        self.assertEqual(self.instance.get_credentials(), creds)
-
-    def test_get_access_token_should_return_access_token_from_credentials(self):
-        creds = {"access_token": "123456"}
-
-        self.instance.store_credentials(creds)
-
-        self.assertEqual(self.instance.get_access_token(), "123456")
-
-    def test_get_api_key_should_return_api_key_from_credentials(self):
-        creds = {"api_key": "ak_789"}
-
-        self.instance.store_credentials(creds)
-
-        self.assertEqual(self.instance.get_api_key(), "ak_789")
-
-    def test_has_api_key_should_return_true_when_api_key_exists(self):
-        creds = {"api_key": "ak_789"}
-
-        self.instance.store_credentials(creds)
-
-        self.assertTrue(self.instance.has_api_key)
-
-    def test_has_api_key_should_return_false_when_access_token_credentials(self):
-        creds = {"access_token": "123456"}
-
-        self.instance.store_credentials(creds)
-
-        self.assertFalse(self.instance.has_api_key)

haplohub_cli-2.4.0/haplohub_cli/auth/token_storage.py

@@ -1,37 +0,0 @@
-import json
-from genericpath import exists
-
-from haplohub_cli import settings
-
-
-class TokenStorage:
-    def __init__(self, token_file: str):
-        self.token_file = token_file
-
-    @property
-    def credentials_exist(self):
-        return exists(self.token_file)
-
-    def store_credentials(self, credentials: dict):
-        with open(self.token_file, "w") as f:
-            json.dump(credentials, f)
-
-    def get_credentials(self):
-        with open(self.token_file, "r") as f:
-            return json.load(f)
-
-    def get_access_token(self):
-        return self.get_credentials()["access_token"]
-
-    def get_api_key(self):
-        return self.get_credentials()["api_key"]
-
-    def get_refresh_token(self):
-        return self.get_credentials().get("refresh_token")
-
-    @property
-    def has_api_key(self):
-        return self.credentials_exist and "api_key" in self.get_credentials()
-
-
-token_storage = TokenStorage(settings.CREDENTIALS_FILE)

haplohub_cli-2.4.0/haplohub_cli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2.4.0",
-  "distance": 0,
-  "node": "gc36ea6d15ff868d555dd324ddcb48108cc132a63",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-04"
-}