coiled 1.128.3.dev6__py3-none-any.whl → 1.129.3.dev10__py3-none-any.whl

coiled/capture_environment.py

@@ -1,6 +1,4 @@
-import asyncio
 import contextlib
-import logging
 import platform
 import sys
 import typing
@@ -69,49 +67,52 @@ async def approximate_packages(
     architecture: ArchitectureTypesEnum = ArchitectureTypesEnum.X86_64,
     pip_check_errors: Optional[Dict[str, List[str]]] = None,
     gpu_enabled: bool = False,
+    use_uv_installer: bool = True,
 ) -> typing.List[ResolvedPackageInfo]:
     user_conda_installed_python = next((p for p in packages if p["name"] == "python"), None)
-    user_conda_installed_pip = next(
-        (i for i, p in enumerate(packages) if p["name"] == "pip" and p["source"] == "conda"),
-        None,
-    )
-    if not user_conda_installed_pip:
-        # This means pip was installed by pip, or the system
-        # package manager
-        # Insert a conda version of pip to be installed first, it will
-        # then be used to install the users version of pip
-        pip = next(
-            (p for p in packages if p["name"] == "pip" and p["source"] == "pip"),
+    # Only add pip if we need it
+    if not use_uv_installer:
+        user_conda_installed_pip = next(
+            (i for i, p in enumerate(packages) if p["name"] == "pip" and p["source"] == "conda"),
             None,
         )
-        if not pip:
-            # insert a modern version and hope it does not introduce conflicts
-            packages.append({
-                "name": "pip",
-                "path": None,
-                "source": "conda",
-                "channel_url": "https://conda.anaconda.org/conda-forge/",
-                "channel": "conda-forge",
-                "subdir": "noarch",
-                "conda_name": "pip",
-                "version": "22.3.1",
-                "wheel_target": None,
-                "requested": False,
-            })
-        else:
-            # insert the users pip version and hope it exists on conda-forge
-            packages.append({
-                "name": "pip",
-                "path": None,
-                "source": "conda",
-                "channel_url": "https://conda.anaconda.org/conda-forge/",
-                "channel": "conda-forge",
-                "subdir": "noarch",
-                "conda_name": "pip",
-                "version": pip["version"],
-                "wheel_target": None,
-                "requested": True,
-            })
+        if not user_conda_installed_pip:
+            # This means pip was installed by pip, or the system
+            # package manager
+            # Insert a conda version of pip to be installed first, it will
+            # then be used to install the users version of pip
+            pip = next(
+                (p for p in packages if p["name"] == "pip" and p["source"] == "pip"),
+                None,
+            )
+            if not pip:
+                # insert a modern version and hope it does not introduce conflicts
+                packages.append({
+                    "name": "pip",
+                    "path": None,
+                    "source": "conda",
+                    "channel_url": "https://conda.anaconda.org/conda-forge/",
+                    "channel": "conda-forge",
+                    "subdir": "noarch",
+                    "conda_name": "pip",
+                    "version": "22.3.1",
+                    "wheel_target": None,
+                    "requested": False,
+                })
+            else:
+                # insert the users pip version and hope it exists on conda-forge
+                packages.append({
+                    "name": "pip",
+                    "path": None,
+                    "source": "conda",
+                    "channel_url": "https://conda.anaconda.org/conda-forge/",
+                    "channel": "conda-forge",
+                    "subdir": "noarch",
+                    "conda_name": "pip",
+                    "version": pip["version"],
+                    "wheel_target": None,
+                    "requested": True,
+                })
     coiled_selected_python = None
     if not user_conda_installed_python:
         # insert a special python package
@@ -208,6 +209,7 @@ async def create_environment_approximation(
     progress: Optional[Progress] = None,
     architecture: ArchitectureTypesEnum = ArchitectureTypesEnum.X86_64,
     gpu_enabled: bool = False,
+    use_uv_installer: bool = True,
 ) -> typing.List[ResolvedPackageInfo]:
     packages = await scan_prefix(progress=progress)
     pip_check_errors = await check_pip_happy(progress)
@@ -237,6 +239,7 @@ async def create_environment_approximation(
         architecture=architecture,
         pip_check_errors=pip_check_errors,
         gpu_enabled=gpu_enabled,
+        use_uv_installer=use_uv_installer,
     )
     return result
 
@@ -306,6 +309,7 @@ async def scan_and_create(
                 architecture=architecture,
                 gpu_enabled=gpu_enabled,
                 conda_extras=package_sync_conda_extras,
+                use_uv_installer=use_uv_installer,
             )
 
         if not package_sync_only:
@@ -427,39 +431,3 @@ If you use pip, venv, uv, pixi, etc. create a new environment and then:
 
 See https://docs.coiled.io/user_guide/software/package_sync_best_practices.html
 for more best practices. If that doesn't solve your issue, please contact support@coiled.io.""")
-
-
-if __name__ == "__main__":
-    from logging import basicConfig
-
-    basicConfig(level=logging.INFO)
-
-    from rich.console import Console
-    from rich.table import Table
-
-    async def run():
-        async with CloudV2(asynchronous=True) as cloud:
-            return await create_environment_approximation(
-                cloud=cloud,
-                priorities={
-                    ("dask", "conda"): PackageLevelEnum.CRITICAL,
-                    ("twisted", "conda"): PackageLevelEnum.IGNORE,
-                    ("graphviz", "conda"): PackageLevelEnum.LOOSE,
-                    ("icu", "conda"): PackageLevelEnum.LOOSE,
-                },
-            )
-
-    result = asyncio.run(run())
-
-    table = Table(title="Packages")
-    keys = ("name", "source", "include", "client_version", "specifier", "error", "note")
-
-    for key in keys:
-        table.add_column(key)
-
-    for pkg in result:
-        row_values = [str(pkg.get(key, "")) for key in keys]
-        table.add_row(*row_values)
-    console = Console()
-    console.print(table)
-    console.print(table)

coiled/cli/setup/azure.py

@@ -175,8 +175,21 @@ coiled curl -X POST "${SETUP_ENDPOINT}" --json --data "{\\"credentials\\": {\\"t
         "service principal for Coiled to use."
     ),
 )
+@click.option(
+    "--refresh-for-app-id", default=None, help="Refresh the secret key used by Coiled for specified Application ID."
+)
 @click.command(context_settings=CONTEXT_SETTINGS)
-def azure_setup(subscription, resource_group, region, account, iam_user, keep_existing_access, save_script, ship_token):
+def azure_setup(
+    subscription,
+    resource_group,
+    region,
+    account,
+    iam_user,
+    keep_existing_access,
+    save_script,
+    ship_token,
+    refresh_for_app_id,
+):
     print(
         "Coiled on Azure is currently in [bold]public beta[/bold], "
         "please contact [link]support@coiled.io[/link] if you have any questions or problems."
@@ -264,6 +277,17 @@ def azure_setup(subscription, resource_group, region, account, iam_user, keep_ex
         f"with [green]{region}[/green] as the default region\n"
     )
 
+    if refresh_for_app_id:
+        refresh_app_creds(
+            app_id=refresh_for_app_id,
+            coiled_account=coiled_account,
+            sub_id=sub_id,
+            rg_name=rg_name,
+            region=region,
+            keep_existing_keys=True,
+        )
+        return
+
     if ship_token:
         enable_providers(creds, sub_id)
         ship_token_creds(
@@ -378,6 +402,31 @@ def setup_with_service_principal(
     return True
 
 
+def refresh_app_creds(app_id, keep_existing_keys, coiled_account, sub_id, rg_name, region):
+    print(f"  [bright_black]Resetting/retrieving credentials for {app_id}...")
+    cred_reset_opts = "--append" if keep_existing_keys else ""
+    app_creds_json = az_cli_wrapper(f"az ad app credential reset --id {app_id} {cred_reset_opts}")
+    app_creds = json.loads(app_creds_json)
+
+    creds_to_submit = {
+        "tenant_id": app_creds["tenant"],
+        "client_id": app_creds["appId"],
+        "client_secret": app_creds["password"],
+    }
+
+    print("Sending Azure credentials to Coiled... ", end="")
+    submit_azure_credentials(
+        coiled_account=coiled_account,
+        sub_id=sub_id,
+        rg_name=rg_name,
+        region=region,
+        creds_to_submit=creds_to_submit,
+    )
+    print(f"Azure credentials have been updated for {coiled_account} using Azure app {app_id} and {rg_name}!")
+
+    coiled.add_interaction(action="RefreshCloudCredentials", success=True)
+
+
 def submit_azure_credentials(coiled_account, sub_id, rg_name, region, creds_to_submit, check_after: bool = False):
     with coiled.Cloud(account=coiled_account) as cloud:
         setup_endpoint = f"/api/v2/cloud-credentials/{coiled_account}/azure"

coiled/context.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import asyncio
 import functools
+import inspect
 import random
 import string
 from contextlib import contextmanager, nullcontext
@@ -103,7 +103,7 @@ def get_trace_context(func: Union[SyncFuncType, AsyncFuncType]):
 
 
 def track_context(func: F) -> F:
-    if asyncio.iscoroutinefunction(func):
+    if inspect.iscoroutinefunction(func):
 
         @functools.wraps(func)
         async def async_wrapper(*args: Any, **kwargs: Any) -> Any:

coiled/software_utils.py

@@ -572,6 +572,9 @@ def get_mamba_auth_dict(home_dir: Path | None = None) -> dict[str, tuple[str, st
     if auth_file.exists():
         with auth_file.open("r") as f:
             auth_data = json.load(f)
+            if not isinstance(auth_data, dict):
+                logger.debug(f"Mamba auth file {auth_file} does not contain a dictionary at top level")
+                return domain_auth
             for domain, auth in auth_data.items():
                 auth_type = auth.get("type")
                 if auth_type == "CondaToken":
@@ -634,6 +637,9 @@ def get_rattler_auth_dict(home_dir: Path | None = None) -> dict[str, tuple[str,
     if auth_file.exists():
         with auth_file.open("r") as f:
             auth_data = json.load(f)
+            if not isinstance(auth_data, dict):
+                logger.debug(f"Rattler auth file {auth_file} does not contain a dictionary at top level")
+                return domain_auth
             for domain, auth in auth_data.items():
                 parsed_auth = _parse_rattler_auth_data(auth)
                 if parsed_auth:
@@ -880,8 +886,8 @@ def set_auth_for_url(url: Url | str) -> str:
             or (get_conda_auth(no_auth_url) if use_conda_auth else None)
             # mamba could have URL stored by netloc/path or netloc
             or ((get_mamba_auth(f"{netloc}{path}") or get_mamba_auth(netloc)) if use_mamba_auth else None)
-            # rattler/pixi stores URL stored by netloc in keyring or a fallback file
-            or (get_rattler_auth(netloc) if use_rattler_auth else None)
+            # rattler/pixi could store netloc or *.netloc in keyring or a fallback file
+            or ((get_rattler_auth(netloc) or get_rattler_auth(f"*.{netloc}")) if use_rattler_auth else None)
         )
         if auth_parts is not None:
             username, password = auth_parts

coiled/v2/cluster.py

@@ -711,7 +711,6 @@ class Cluster(DistributedCluster, Generic[IsAsynchronous]):
                 "distributed",
                 "msgpack-python",
                 "msgpack",
-                "pip",
                 "python",
                 "tornado",
             ))

{coiled-1.128.3.dev6.dist-info → coiled-1.129.3.dev10.dist-info}/METADATA

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

{coiled-1.128.3.dev6.dist-info → coiled-1.129.3.dev10.dist-info}/RECORD

@@ -3,12 +3,12 @@ coiled/__main__.py,sha256=4XILBmm4ChZYo7h3JzgslFU0tjQVzdX0XtYcQLhCv0w,171
 coiled/analytics.py,sha256=96CeL8KVnm3-76lvT4fNkgML0lHebaLea-YP3wW-KqM,7486
 coiled/auth.py,sha256=go7vWtCwBbwtWyNrNBxg28xBrdjrETbE-mn3KaN5Yl8,1867
 coiled/batch.py,sha256=QH-BMlMKkjdToPbw6q0I1W1TTJIDHu24B363mUGDL2c,7102
-coiled/capture_environment.py,sha256=K5mNwUe8KM_l203h3oZvcZUJTrGozT-CH1GrtuPYv8U,18458
+coiled/capture_environment.py,sha256=YYNk_T4xOcw8vmFIOcy19d5-ptDvoes3RWa7fRy0sB4,17750
 coiled/cluster.py,sha256=wwK9-SefbFBUEHJjYHXlWN3YvPcvR6XD2J-RdPCGhgc,5049
 coiled/coiled.yaml,sha256=z70xzNUy0E8b8Yt12tYYmjJDDmp-U63oUD61ccuu5N0,1037
 coiled/compatibility.py,sha256=pZAPgTnqPaPpuZ6ZmCXgm0TJNenZPLBnIq4CaohwMY4,762
 coiled/config.py,sha256=O_dIj_PJ5qIA3MGJZRvqli4ztE3oLZQ-3xnhJlAD-Ts,196
-coiled/context.py,sha256=MXWsW0swdYU-x32U7NiM0xt-t65maiEO8rvsGGeScFw,4754
+coiled/context.py,sha256=BKJ26u-eNpe1dVDL69Q4ZJAkPzptNKRuQ94ZciT-PAY,4754
 coiled/core.py,sha256=Cu6hKBXRWSztbpF8huAyU_1glnt1gacnO9vExvG-Cwo,110796
 coiled/errors.py,sha256=5aXhNXgidMm0VgPYT3MZMwlHhRE57MeSmqAJFHYaa8Y,305
 coiled/exceptions.py,sha256=jUXgmfO0LitGe8ztSmAlzb9eQV3X5c0kNO2BwtEDTYg,3099
@@ -19,7 +19,7 @@ coiled/prefect.py,sha256=j1EOg7Xuw82TNRonAGEoZ3ANlwN8GM5aDXRYSjC0lnA,1497
 coiled/pypi_conda_map.py,sha256=GlLqvSjqvFoEPsoIVZ7so4JH3j-Z9oHKwf77UoQ7d7s,9865
 coiled/scan.py,sha256=ghAo7TKAG7E013HJpYWbic-Kp_UUf8iu533GaBpYnS8,25760
 coiled/software.py,sha256=eh3kZ8QBuIt_SPvTy_x6TXEv87SGqOJkO4HW-LCSsas,8701
-coiled/software_utils.py,sha256=JqGO8nstm0Hi-UCIBhHa25reNeVO-XOnv5eLoIyRcBo,40367
+coiled/software_utils.py,sha256=zXqhIopDtB-xp_eJJje1W9nfXjqmvVPMIfQUs1XSu0I,40783
 coiled/spans.py,sha256=Aq2MOX6JXaJ72XiEmymPcsefs-kID85MEw6t-kOdPWI,2078
 coiled/spark.py,sha256=kooZCZT4dLMG_AQEOlaf6gj86G3UdowDfbw-Eiq94MU,9059
 coiled/types.py,sha256=xJh5t_Kk7S-LeZnZ5C4oTtl1_el3mZuQeITz1QfPHjA,14619
@@ -75,7 +75,7 @@ coiled/cli/notebook/notebook.py,sha256=i_XD03RK2cYeYn_TVl20Uv-kJ_2x-0Oe5iRUTm6w1
 coiled/cli/setup/__init__.py,sha256=BiGnIH9vXGhCFOEPuSUkitcrwAA97wTsfcwMXC0DkYg,837
 coiled/cli/setup/amp.py,sha256=_zlZtqsd_LkSF5C_G8qDm0To-t30C0Z6XKMdDzrm7qg,5039
 coiled/cli/setup/aws.py,sha256=MS4Au1AGoALeVO_VuTdq_RRzL3JzOGgpTgcM69avXU0,65885
-coiled/cli/setup/azure.py,sha256=JNBdKyY9NTcWfr6NAb4d-QM45y6bPBuFFCsCY21equI,25288
+coiled/cli/setup/azure.py,sha256=TPYs1LPMf7MvUP9n2KiCLICVwspH-mxusMH-kVEjJoM,26739
 coiled/cli/setup/entry.py,sha256=2PKtvH_ARWt5c5qjeb7dfmJOcFTqRGoskPidNoQTiOg,2425
 coiled/cli/setup/gcp.py,sha256=i67kFRJJpDORrqkVfDu1jFseN80iDbKe1vswk6jxRI8,38817
 coiled/cli/setup/prometheus.py,sha256=ZW16-vFhdYkbbVWqO-jiY2GtpD-EREEa7bm4S8TTg1k,2256
@@ -88,7 +88,7 @@ coiled/extensions/prefect/__init__.py,sha256=cZp1mqX29FrnINoQsuH6pz4z4uuOACs0mgi
 coiled/extensions/prefect/runners.py,sha256=AcaGS1637TnqFPKnjmmLHpdzjwAsxBLDKrOF7OpfEwM,987
 coiled/extensions/prefect/workers.py,sha256=Z2VuAhTm5AjWEKyCniMZrTxqtkn3uJp3sO3bFeR2Rr0,1642
 coiled/v2/__init__.py,sha256=KaCULaAqatcsYbTbj_SQtTLocbSKZa-uQXiyCICKFRM,805
-coiled/v2/cluster.py,sha256=hGs5_SVdrh2zKWpd_8RNPC7LbNd1F6ggEgAj9fCEDm8,148134
+coiled/v2/cluster.py,sha256=5-dq9Vfs7R28MEzeZW4nNxmhlNLvASDQXNglKFVtkF4,148111
 coiled/v2/cluster_comms.py,sha256=UcJWLeZlc68S0uaNd9lLKbF5uaDhYqqkdTsA0CBXYRI,2643
 coiled/v2/core.py,sha256=Bf5A_rzK3tuUqqMVAgN5vix-tX_F8AEWR2pICnG3YcA,71615
 coiled/v2/cwi_log_link.py,sha256=d4k6wRYhcdDVdhWYZIX6WL1g0lscXY0yq__H1sPUNWk,1883
@@ -97,8 +97,8 @@ coiled/v2/widgets/__init__.py,sha256=Bt3GHTTyri-kFUaqGRVydDM-sCg5NdNujDg2RyvgV8U
 coiled/v2/widgets/interface.py,sha256=YeMQ5qdRbbpM04x9qIg2LE1xwxyRxFbdDYnkrwHazPk,301
 coiled/v2/widgets/rich.py,sha256=3rU5-yso92NdeEh3uSvEE-GwPNyp6i0Nb5PE5czXCik,28974
 coiled/v2/widgets/util.py,sha256=Y8qpGqwNzqfCzgyRFRy7vcscBoXqop-Upi4HLPpXLgg,3120
-coiled-1.128.3.dev6.dist-info/METADATA,sha256=IMiR5Z-p4CuJCmk6yBmknH24GO1LIiYoAyF5c0HEsb0,2181
-coiled-1.128.3.dev6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-coiled-1.128.3.dev6.dist-info/entry_points.txt,sha256=C8dz1ST_bTlTO-kNvuHBJQma9PyJPotg0S4xpPt5aHY,47
-coiled-1.128.3.dev6.dist-info/licenses/LICENSE,sha256=ZPwVR73Biwm3sK6vR54djCrhaRiM4cAD2zvOQZV8Xis,3859
-coiled-1.128.3.dev6.dist-info/RECORD,,
+coiled-1.129.3.dev10.dist-info/METADATA,sha256=aK3dJPlFqnpRc81jy1Q2T9VFDJd4NOGcQm3UtPhItQg,2182
+coiled-1.129.3.dev10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+coiled-1.129.3.dev10.dist-info/entry_points.txt,sha256=C8dz1ST_bTlTO-kNvuHBJQma9PyJPotg0S4xpPt5aHY,47
+coiled-1.129.3.dev10.dist-info/licenses/LICENSE,sha256=ZPwVR73Biwm3sK6vR54djCrhaRiM4cAD2zvOQZV8Xis,3859
+coiled-1.129.3.dev10.dist-info/RECORD,,

{coiled-1.128.3.dev6.dist-info → coiled-1.129.3.dev10.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any