coiled 1.122.0__tar.gz → 1.123.0__tar.gz

{coiled-1.122.0 → coiled-1.123.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coiled
-Version: 1.122.0
+Version: 1.123.0
 Summary: Python client for coiled.io dask clusters
 Project-URL: Homepage, https://coiled.io
 Maintainer-email: Coiled <info@coiled.io>

{coiled-1.122.0 → coiled-1.123.0}/coiled/software_utils.py

@@ -55,6 +55,7 @@ subdir_datas = {}
 
 ANY_AVAILABLE = "ANY-AVAILABLE"
 AUTH_BEARER_USERNAME = "AUTH_BEARER_TOKEN"
+CONDA_TOKEN_USERNAME = "CONDA_TOKEN"
 COILED_LOCAL_PACKAGE_PREFIX = "coiled_local_"
 DEFAULT_JSON_PYPI_URL = "https://pypi.org/pypi"
 DEFAULT_PYPI_URL = "https://pypi.org/simple"
@@ -573,7 +574,9 @@ def get_mamba_auth_dict(home_dir: Path | None = None) -> dict[str, tuple[str, st
             auth_data = json.load(f)
             for domain, auth in auth_data.items():
                 auth_type = auth.get("type")
-                if auth_type == "CondaToken" or auth_type == "BearerToken":
+                if auth_type == "CondaToken":
+                    domain_auth[domain] = (CONDA_TOKEN_USERNAME, auth["token"])
+                elif auth_type == "BearerToken":
                     domain_auth[domain] = (AUTH_BEARER_USERNAME, auth["token"])
                 elif auth_type == "BasicHTTPAuthentication":
                     domain_auth[domain] = (
@@ -706,7 +709,7 @@ print(json.dumps(auth_parts))
                 return None
 
     if auth_type == "token":
-        username = AUTH_BEARER_USERNAME
+        username = CONDA_TOKEN_USERNAME
 
     if not username and not password:
         return None
@@ -759,7 +762,7 @@ def set_auth_for_url(url: Url | str) -> str:
         )
         if auth_parts is not None:
             username, password = auth_parts
-        if username == AUTH_BEARER_USERNAME:
+        if username == CONDA_TOKEN_USERNAME:
             # If the username indicates this is a token (which only happens for mamba auth)
             # the token should be embedded directly in the URL and not in the auth portion
 
@@ -775,8 +778,11 @@ def set_auth_for_url(url: Url | str) -> str:
         elif username or password:
             parsed_url = parsed_url._replace(auth=f"{username or ''}:{password or ''}")
 
-        if username and username != AUTH_BEARER_USERNAME and not password:
-            logger.info(f"No password found for {parsed_url.url}")
+        if username and username != CONDA_TOKEN_USERNAME and not password:
+            if username == AUTH_BEARER_USERNAME:
+                logger.warning(f"No bearer token found for {parsed_url.url}")
+            else:
+                logger.info(f"No password found for {parsed_url.url}")
         elif not username:
             logger.info(f"No username or password found for {parsed_url.url}")