arraylake 0.32.0__tar.gz → 1.0.0__tar.gz

{arraylake-0.32.0 → arraylake-1.0.0}/.gitignore

@@ -104,6 +104,7 @@ celerybeat.pid
 
 # Environments
 .env
+!jobs/subsync/.env
 .venv
 env/
 venv/

{arraylake-0.32.0 → arraylake-1.0.0}/PKG-INFO

@@ -1,20 +1,20 @@
 Metadata-Version: 2.4
 Name: arraylake
-Version: 0.32.0
+Version: 1.0.0
 Summary: Python client for ArrayLake
 Project-URL: Documentation, https://docs.earthmover.io/
 Project-URL: Changelog, https://docs.earthmover.io/changelog
 Author-email: Joseph Hamman <joe@earthmover.io>
 License-Expression: MIT
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: <3.14,>=3.11
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <3.15,>=3.12
 Requires-Dist: click<9.0,>=8.1.3
 Requires-Dist: donfig<1.0,>=0.7
-Requires-Dist: httpx<0.28,>=0.23
-Requires-Dist: icechunk<2.0.0,>=1.1.0
+Requires-Dist: httpx<0.29,>=0.23
+Requires-Dist: icechunk<3.0.0,>=2.0.1
 Requires-Dist: numpy<3.0,>=1.23
 Requires-Dist: packaging<26.0,>=23.0
 Requires-Dist: pydantic[email]<3.0,>=2.9
@@ -26,9 +26,7 @@ Requires-Dist: typer<1.0,>=0.12.0
 Requires-Dist: zarr<4.0,>=3.1.0
 Provides-Extra: maximal
 Requires-Dist: cf-xarray>=0.10.4; extra == 'maximal'
-Requires-Dist: numpy<2.3; extra == 'maximal'
-Requires-Dist: pyarrow<22; extra == 'maximal'
-Requires-Dist: xarray[complete]>=2024.10.0; extra == 'maximal'
+Requires-Dist: xarray[accel,etc,io,parallel]>=2024.10.0; extra == 'maximal'
 Provides-Extra: xarray
 Requires-Dist: cf-xarray>=0.10.4; extra == 'xarray'
 Requires-Dist: xarray>=2024.10.0; extra == 'xarray'

arraylake-1.0.0/arraylake/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '1.0.0'
+__version_tuple__ = version_tuple = (1, 0, 0)
+
+__commit_id__ = commit_id = None

{arraylake-0.32.0 → arraylake-1.0.0}/arraylake/api_utils.py

@@ -4,6 +4,7 @@ import asyncio
 import json
 import os
 import random
+import warnings
 import weakref
 from collections.abc import AsyncGenerator, Callable, Generator, Mapping
 from contextlib import _AsyncGeneratorContextManager
@@ -430,8 +431,15 @@ def _exception_log_debug(request: httpx.Request, response: httpx.Response):
     )
 
 
+_emitted_deprecation_warnings: set[str] = set()
+
+
 def handle_response(response: httpx.Response):
     """Convenience function to handle response status codes"""
+    deprecation_msg = response.headers.get("X-Deprecation-Warning")
+    if deprecation_msg and deprecation_msg not in _emitted_deprecation_warnings:
+        _emitted_deprecation_warnings.add(deprecation_msg)
+        warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
     try:
         response.raise_for_status()
     except httpx.RequestError as exc:

{arraylake-0.32.0 → arraylake-1.0.0}/arraylake/cli/compute.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from enum import Enum
+from enum import StrEnum
 
 import typer
 from rich import print_json
@@ -14,7 +14,7 @@ app = typer.Typer(help="Manage Arraylake compute services", no_args_is_help=True
 logger = get_logger(__name__)
 
 
-class ListOutputType(str, Enum):
+class ListOutputType(StrEnum):
     rich = "rich"
     json = "json"
 

{arraylake-0.32.0 → arraylake-1.0.0}/arraylake/cli/config.py

@@ -1,5 +1,5 @@
 import io
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 
 import typer
@@ -17,7 +17,7 @@ yaml = YAML(typ="safe", pure=True)
 yaml.default_flow_style = False
 
 
-class ListOutputType(str, Enum):
+class ListOutputType(StrEnum):
     json = "json"
     yaml = "yaml"
 

{arraylake-0.32.0 → arraylake-1.0.0}/arraylake/cli/repo.py

@@ -1,6 +1,6 @@
 import json
 import warnings
-from enum import Enum
+from enum import Enum, StrEnum
 from typing import TYPE_CHECKING, Optional
 from uuid import UUID
 
@@ -30,7 +30,7 @@ app = typer.Typer(help="Manage Arraylake repositories", no_args_is_help=True)
 logger = get_logger(__name__)
 
 
-class ListOutputType(str, Enum):
+class ListOutputType(StrEnum):
     rich = "rich"
     json = "json"
 
@@ -142,7 +142,6 @@ async def create(
     repo_name: str = typer.Argument(..., help="Name of repository {ORG}/{REPO_NAME}"),
     bucket_config_nickname: str | None = typer.Option(None, help="Bucket config nickname"),
     prefix: str = typer.Option(None, help="Optional prefix for Icechunk repo. If not provided, a random ID + the repo name will be used."),
-    import_existing: bool = typer.Option(False, help="Import existing Icechunk data into the new repo"),
     description: str | None = typer.Option(None, help="Description of the repo"),
     metadata: str | None = typer.Option(None, help="Optional metadata for the repo"),
 ):
@@ -162,7 +161,6 @@ async def create(
             repo_name,
             bucket_config_nickname=bucket_config_nickname,
             prefix=prefix,
-            import_existing=import_existing,
             description=description,
             metadata=metadata_dict,
         )
@@ -173,7 +171,7 @@ async def create(
 async def import_repo(
     repo_name: str = typer.Argument(..., help="Name of repository {ORG}/{REPO_NAME}"),
     bucket_config_nickname: str = typer.Argument(..., help="Bucket config nickname"),
-    prefix: str = typer.Option(None, help="Sub-prefix in which the Icechunk repo exists"),
+    prefix: str = typer.Argument(..., help="Prefix in which the Icechunk repo exists in the bucket"),
     description: str | None = typer.Option(None, help="Description of the repo"),
     metadata: str | None = typer.Option(None, help="Optional metadata for the repo"),
 ):
@@ -184,15 +182,15 @@ async def import_repo(
     - Import existing Icechunk repository
 
         ```
-        $ arraylake repo import my-org/example-repo --bucket-config-nickname icechunk-bucket --prefix my-icechunk-prefix --metadata '{"key": "value"}'
+        $ arraylake repo import my-org/example-repo icechunk-bucket my-icechunk-prefix --metadata '{"key": "value"}'
         ```
     """
     metadata_dict = json.loads(metadata) if metadata else None
     with simple_progress(f"Importing repo [bold]{repo_name}[/bold]..."):
         await AsyncClient().import_repo(
             repo_name,
-            bucket_config_nickname=bucket_config_nickname,
-            prefix=prefix,
+            bucket_config_nickname,
+            prefix,
             description=description,
             metadata=metadata_dict,
         )

{arraylake-0.32.0 → arraylake-1.0.0}/arraylake/client.py

@@ -558,6 +558,17 @@ class AsyncClient:
             if response.virtual_chunk_credentials:
                 credentials_map: dict[str, icechunk.AnyS3Credential | icechunk.AnyGcsCredential | icechunk.AnyAzureCredential | None] = {}
                 for vcc_prefix, vcc_creds in response.virtual_chunk_credentials.items():
+                    # Handle runtime VCCs (e.g., filtered subscriptions) - create VCC on the fly
+                    if vcc_creds.runtime_vcc_name is not None:
+                        bucket_config = await self.get_bucket_config(org=vcc_creds.org, nickname=vcc_creds.bucket_nickname)
+                        store_config = bucket_config.to_vcc_store_config(user_id=UUID(response.principal_id))
+                        container = icechunk.VirtualChunkContainer(
+                            url_prefix=vcc_prefix,
+                            store=store_config,
+                        )
+                        container.name = vcc_creds.runtime_vcc_name
+                        config.set_virtual_chunk_container(container)
+
                     # TODO: build refresh closures here using vcc_creds.org, vcc_creds.bucket_nickname,
                     # and vcc_creds.platform so that credentials can be refreshed when they expire. (See https://github.com/earth-mover/arraylake/issues/5122)
                     # TODO: support Azure virtual chunk credentials
@@ -644,7 +655,6 @@ class AsyncClient:
         *,
         bucket_config_nickname: BucketNickname | None = None,
         prefix: str | None = None,
-        import_existing: bool = False,
         description: str | None = None,
         metadata: RepoMetadataT | None = None,
         config: icechunk.RepositoryConfig | None = None,
@@ -658,7 +668,6 @@ class AsyncClient:
             bucket_config_nickname: Bucket in which the underlying Icechunk repo will be created.
                 If the repo exists, bucket_config_nickname is ignored.
             prefix: Optional prefix for Icechunk store. If not provided, a random ID + the repo name will be used.
-            import_existing: If True, the Icechunk repo will be imported if it already exists.
             description: Optional description for the repo.
             metadata: Optional dictionary of metadata to tag the repo with.
                 Dictionary values can be a scalar (string, int, float, bool, or None) or a list of scalars.
@@ -707,7 +716,6 @@ class AsyncClient:
                 name,
                 bucket_config_nickname=bucket_config_nickname,
                 prefix=prefix,
-                import_existing=import_existing,
                 description=description,
                 metadata=metadata,
                 config=config,
@@ -721,12 +729,12 @@ class AsyncClient:
         *,
         bucket_config_nickname: BucketNickname | None = None,
         prefix: str | None = None,
-        import_existing: bool = False,
         description: str | None = None,
         metadata: RepoMetadataT | None = None,
         config: icechunk.RepositoryConfig | None = None,
         authorize_virtual_chunk_access: Mapping[BucketPrefix, BucketNickname] | None = None,
         storage_options: StorageOptions | None = None,
+        spec_version: int = 2,
     ) -> IcechunkRepository:
         """Create a new repo.
 
@@ -734,7 +742,6 @@ class AsyncClient:
             name: Full name of the repo to create (of the form [ORG]/[REPO]).
             bucket_config_nickname: Bucket in which the underlying Icechunk repo will be created.
             prefix: Optional prefix for Icechunk store. If not provided, a random ID + the repo name will be used.
-            import_existing: If True, the Icechunk repo will be imported if it already exists.
             description: Optional description for the repo.
             metadata: Optional dictionary of metadata to tag the repo with.
                 Dictionary values can be a scalar (string, int, float, bool, or None) or a list of scalars.
@@ -745,6 +752,7 @@ class AsyncClient:
                 and used for the containers. Must be supplied as complete urls.
             storage_options: Optional storage options for the underlying Icechunk storage.
                 Currently supports `network_stream_timeout_seconds` for S3, Tigris, and R2 storage.
+            spec_version: The Icechunk spec version to use for the repo. Defaults to 2.
 
         Returns:
             icechunk.Repository object for the repo.
@@ -761,13 +769,12 @@ class AsyncClient:
             bucket_config_nickname,
             kind=RepoKind.Icechunk,
             prefix=prefix,
-            import_existing=import_existing,
             description=description,
             metadata=metadata,
         )
 
         # Raise a warning about token scoping for Azure delegated credentials
-        if repo_model.bucket and repo_model.bucket.auth_config.method == "azure_credential_delegation":
+        if repo_model.bucket and repo_model.bucket.auth_config and repo_model.bucket.auth_config.method == "azure_credential_delegation":
             warnings.warn(
                 "The bucket is configured to use Azure Customer Managed Role authentication. "
                 "Credentials will be scoped to the container level only for this repo. "
@@ -776,6 +783,13 @@ class AsyncClient:
             )
 
         try:
+            # Throw error if the bucket is configured for anonymous access, this is only supported for imported repo
+            if _use_anonymous_credentials(repo_model.bucket):
+                bucket_name = f"{repo_model.bucket.nickname}" if repo_model.bucket else ""
+                raise ValueError(
+                    f"The bucket {bucket_name} is configured for anonymous access and cannot be written to. Use `import_repo` to import existing repositories from this bucket."
+                )
+
             if not isinstance(config, RepositoryConfig) and config is not None:
                 raise ValueError(f"config must be an icechunk.RepositoryConfig object or None: {config}.")
 
@@ -796,41 +810,16 @@ class AsyncClient:
                 # TODO: make icechunk accept an empty dict instead of None
                 prefixes_credential_mapping = None
 
-            # Throws a specific error if the bucket is configured for anonymous access and the repo is not being imported
-            if _use_anonymous_credentials(repo_model.bucket) and not import_existing:
-                bucket_name = f"{repo_model.bucket.nickname}" if repo_model.bucket else ""
-                raise ValueError(
-                    f"The bucket {bucket_name} is configured for anonymous access and cannot be written to. Import existing repositories from this bucket with the `import_existing` parameter."
-                )
-
-            if import_existing:
-                warnings.warn(
-                    "The `import_existing` keyword argument to `create_repo` is deprecated. Please use the dedicated `import_repo` method instead of using `import_existing=True.",
-                    DeprecationWarning,
-                )
-
-                ic_repo = IcechunkRepository.open(
-                    icechunk_storage,
-                    config=config,
-                    authorize_virtual_chunk_access=prefixes_credential_mapping,
-                )
+            create_kwargs: dict[str, object] = {
+                "config": config,
+                "authorize_virtual_chunk_access": prefixes_credential_mapping,
+                "spec_version": spec_version,
+            }
 
-                # Note: We decided this was better than silently attempting to modify the IC repo config upon import by saving the config
-                if authorize_virtual_chunk_access:
-                    warnings.warn(
-                        "New virtual chunk containers will not be persisted to the icechunk repo config. "
-                        "If you want future `client.get_repo` calls to be authorized to access the same virtual chunks, please now modify the config explicitly. "
-                        "You can do this using `client.set_virtual_chunk_containers()` with the same `authorize_virtual_chunk_access`, i.e: "
-                        f"`client.set_virtual_chunk_containers({name}, authorize_virtual_chunk_access={authorize_virtual_chunk_access})`. "
-                        "Note that this requires write access to the location of the icechunk repository, so will not work for anonymous access buckets, for example.",
-                        UserWarning,
-                    )
-            else:
-                ic_repo = IcechunkRepository.create(
-                    icechunk_storage,
-                    config=config,
-                    authorize_virtual_chunk_access=prefixes_credential_mapping,
-                )
+            ic_repo = IcechunkRepository.create(
+                icechunk_storage,
+                **create_kwargs,  # type: ignore[arg-type]
+            )
 
             ic_repo.set_default_commit_metadata({"author_name": author.name, "author_email": author.email})
 
@@ -845,10 +834,11 @@ class AsyncClient:
         self,
         name: OrgAndRepoName,
         bucket_config_nickname: BucketNickname,
+        prefix: str,
         *,
-        prefix: str | None = None,
         description: str | None = None,
         metadata: RepoMetadataT | None = None,
+        authorize_virtual_chunk_access: Mapping[BucketPrefix, BucketNickname] | None = None,
         storage_options: StorageOptions | None = None,
     ) -> IcechunkRepository:
         """Create a new Arraylake Repo by importing an existing Icechunk Repository.
@@ -856,35 +846,36 @@ class AsyncClient:
         Args:
             name: Full name of the repo to create (of the form [ORG]/[REPO]).
             bucket_config_nickname: Bucket in which the underlying Icechunk repo exists.
-            prefix: Sub-prefix in which the Icechunk repo exists. If not provided, repo is assumed to be located at the root of the bucket.
+            prefix: Prefix in which the Icechunk repo exists in the bucket.
             description: Optional description for the repo.
             metadata: Optional dictionary of metadata to tag the repo with.
                 Dictionary values can be a scalar (string, int, float, bool, or None) or a list of scalars.
+            authorize_virtual_chunk_access: A mapping from virtual chunk container prefixes to bucket nicknames.
+                Credentials will be fetched for these buckets based on the auth configuration
+                and used for the containers. Must be supplied as complete urls.
             storage_options: Optional storage options for the underlying Icechunk storage.
                 Currently supports `network_stream_timeout_seconds` for S3, Tigris, and R2 storage.
 
         Returns:
             icechunk.Repository object for the repo.
         """
-
         org, repo_name = _parse_org_and_repo(name)
         mstore = self._metastore_for_org(org)
 
         user = await mstore.get_user()
         author: Author = user.as_author()
 
-        repo_model = await mstore.create_database(
+        repo_model = await mstore.import_database(
             repo_name,
             bucket_config_nickname,
-            kind=RepoKind.Icechunk,
             prefix=prefix,
-            import_existing=True,
+            kind=RepoKind.Icechunk,
             description=description,
             metadata=metadata,
         )
 
         # Raise a warning about token scoping for Azure delegated credentials
-        if repo_model.bucket and repo_model.bucket.auth_config.method == "azure_credential_delegation":
+        if repo_model.bucket and repo_model.bucket.auth_config and repo_model.bucket.auth_config.method == "azure_credential_delegation":
             warnings.warn(
                 "The bucket is configured to use Azure Customer Managed Role authentication. "
                 "Credentials will be scoped to the container level only for this repo. "
@@ -897,7 +888,34 @@ class AsyncClient:
                 repo_model, user_id=user.id, storage_options=storage_options
             )
 
-            ic_repo = IcechunkRepository.open(icechunk_storage)
+            if authorize_virtual_chunk_access is not None:
+                config = await self._add_virtual_chunk_containers(
+                    org=org, user=user, config=None, authorize_virtual_chunk_access=authorize_virtual_chunk_access
+                )
+
+                # fetch credentials to access buckets containing virtual chunks
+                prefixes_credential_mapping = await self.containers_credentials_for_buckets(
+                    org, containers_to_buckets_map=dict(authorize_virtual_chunk_access)
+                )
+
+                # Warn that VCCs won't be persisted when importing
+                warnings.warn(
+                    "New virtual chunk containers will not be persisted to the icechunk repo config. "
+                    "If you want future `client.get_repo` calls to be authorized to access the same virtual chunks, please now modify the config explicitly. "
+                    "You can do this using `client.set_virtual_chunk_containers()` with the same `authorize_virtual_chunk_access`, i.e: "
+                    f"`client.set_virtual_chunk_containers({name}, authorize_virtual_chunk_access={authorize_virtual_chunk_access})`. "
+                    "Note that this requires write access to the location of the icechunk repository, so will not work for anonymous access buckets, for example.",
+                    UserWarning,
+                )
+            else:
+                config = None
+                prefixes_credential_mapping = None
+
+            ic_repo = IcechunkRepository.open(
+                icechunk_storage,
+                config=config,
+                authorize_virtual_chunk_access=prefixes_credential_mapping,
+            )
 
             ic_repo.set_default_commit_metadata({"author_name": author.name, "author_email": author.email})
 
@@ -1600,7 +1618,6 @@ class Client:
         *,
         bucket_config_nickname: BucketNickname | None = None,
         prefix: str | None = None,
-        import_existing: bool = False,
         description: str | None = None,
         metadata: RepoMetadataT | None = None,
         config: icechunk.RepositoryConfig | None = None,
@@ -1614,7 +1631,6 @@ class Client:
             bucket_config_nickname: The created repo will use this bucket for its chunks.
                 If the repo exists, bucket_config_nickname is ignored.
             prefix: Optional prefix for Icechunk store. If not provided, a random ID + the repo name will be used.
-            import_existing: If True, the Icechunk repo will be imported if it already exists.
             description: Optional description for the repo.
             metadata: Optional dictionary of metadata to tag the repo with.
                 Dictionary values can be a scalar (string, int, float, bool, or None) or a list of scalars.
@@ -1640,7 +1656,6 @@ class Client:
             name,
             bucket_config_nickname=bucket_config_nickname,
             prefix=prefix,
-            import_existing=import_existing,
             description=description,
             metadata=metadata,
             config=config,
@@ -1654,12 +1669,12 @@ class Client:
         *,
         bucket_config_nickname: BucketNickname | None = None,
         prefix: str | None = None,
-        import_existing: bool = False,
         description: str | None = None,
         metadata: RepoMetadataT | None = None,
         config: icechunk.RepositoryConfig | None = None,
         authorize_virtual_chunk_access: Mapping[BucketPrefix, BucketNickname] | None = None,
         storage_options: StorageOptions | None = None,
+        spec_version: int = 2,
     ) -> IcechunkRepository:
         """Create a new repo
 
@@ -1667,7 +1682,6 @@ class Client:
             name: Full name of the repo to create (of the form [ORG]/[REPO])
             bucket_config_nickname: An optional bucket to use for the chunkstore
             prefix: Optional prefix for Icechunk store. If not provided, a random ID + the repo name will be used.
-            import_existing: If True, the Icechunk repo will be imported if it already exists.
             description: Optional description for the repo.
             metadata: Optional dictionary of metadata to tag the repo with.
                 Dictionary values can be a scalar (string, int, float, bool, or None) or a list of scalars.
@@ -1679,6 +1693,7 @@ class Client:
                 and used for the containers. Used for Icechunk repos only.
             storage_options: Optional storage options for the underlying Icechunk storage.
                 Currently supports `network_stream_timeout_seconds` for S3, Tigris, and R2 storage.
+            spec_version: The Icechunk spec version to use for the repo. Defaults to 2.
 
         Returns:
             icechunk.Repository: The created Icechunk repository.
@@ -1688,22 +1703,23 @@ class Client:
             name,
             bucket_config_nickname=bucket_config_nickname,
             prefix=prefix,
-            import_existing=import_existing,
             description=description,
             metadata=metadata,
             config=config,
             authorize_virtual_chunk_access=authorize_virtual_chunk_access,
             storage_options=storage_options,
+            spec_version=spec_version,
         )
 
     def import_repo(
         self,
         name: OrgAndRepoName,
         bucket_config_nickname: BucketNickname,
+        prefix: str,
         *,
-        prefix: str | None = None,
         description: str | None = None,
         metadata: RepoMetadataT | None = None,
+        authorize_virtual_chunk_access: Mapping[BucketPrefix, BucketNickname] | None = None,
         storage_options: StorageOptions | None = None,
     ) -> IcechunkRepository:
         """Create a new Arraylake Repo by importing an existing Icechunk Repository.
@@ -1711,10 +1727,13 @@ class Client:
         Args:
             name: Full name of the repo to create (of the form [ORG]/[REPO]).
             bucket_config_nickname: Bucket in which the underlying Icechunk repo exists.
-            prefix: Sub-prefix in which the Icechunk repo exists. If not provided, repo is assumed to be located at the root of the bucket.
+            prefix: Prefix in which the Icechunk repo exists in the bucket.
             description: Optional description for the repo.
             metadata: Optional dictionary of metadata to tag the repo with.
                 Dictionary values can be a scalar (string, int, float, bool, or None) or a list of scalars.
+            authorize_virtual_chunk_access: A mapping from virtual chunk container prefixes to bucket nicknames.
+                Credentials will be fetched for these buckets based on the auth configuration
+                and used for the containers. Must be supplied as complete urls.
             storage_options: Optional storage options for the underlying Icechunk storage.
                 Currently supports `network_stream_timeout_seconds` for S3, Tigris, and R2 storage.
 
@@ -1724,10 +1743,11 @@ class Client:
         return sync(
             self.aclient.import_repo,
             name,
-            bucket_config_nickname=bucket_config_nickname,
-            prefix=prefix,
+            bucket_config_nickname,
+            prefix,
             description=description,
             metadata=metadata,
+            authorize_virtual_chunk_access=authorize_virtual_chunk_access,
             storage_options=storage_options,
         )
 

{arraylake-0.32.0 → arraylake-1.0.0}/arraylake/compute/types.py

@@ -1,11 +1,11 @@
 import re
 from datetime import datetime
-from enum import Enum
+from enum import StrEnum
 
 from pydantic import BaseModel, field_validator
 
 
-class ServiceType(str, Enum):
+class ServiceType(StrEnum):
     dap = "dap2"
     edr = "edr"
     wms = "wms"
@@ -13,14 +13,14 @@ class ServiceType(str, Enum):
     zarr = "zarr"
 
 
-class ServiceStatus(str, Enum):
+class ServiceStatus(StrEnum):
     available = "available"
     progressing = "progressing"
     unknown = "unknown"
     error = "error"
 
 
-class LogLevel(str, Enum):
+class LogLevel(StrEnum):
     debug = "DEBUG"
     info = "INFO"
     warning = "WARNING"

{arraylake-0.32.0 → arraylake-1.0.0}/arraylake/metastore/http_metastore.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import json
 from dataclasses import dataclass, field
-from typing import Any, Literal
+from typing import Any
 from uuid import UUID
 
 from pydantic import TypeAdapter
@@ -26,6 +26,7 @@ from arraylake.types import (
     Repo,
     RepoActions,
     RepoCreateBody,
+    RepoImportBody,
     RepoKind,
     RepoMetadataT,
     RepoModifyRequest,
@@ -132,10 +133,9 @@ class HttpMetastore(ArraylakeHttpClient, Metastore):
         bucket_nickname: str | None = None,
         kind: RepoKind = RepoKind.Icechunk,
         prefix: str | None = None,
-        import_existing: bool = False,
         description: str | None = None,
         metadata: RepoMetadataT | None = None,
-    ):
+    ) -> Repo:
         """
         Creates a repo database entry in the metastore.
 
@@ -144,17 +144,18 @@ class HttpMetastore(ArraylakeHttpClient, Metastore):
             bucket_nickname: Optional nickname of a bucket already existing in the org.
             kind: Kind of repo to create
             prefix: Optional prefix for the icechunk repo
-            import_existing: Whether to import an existing icechunk repo
             description: Optional description for the repo
             metadata: Optional metadata for the repo
+
+        Returns:
+            The created Repo object
         """
-        create_mode: Literal["create", "register", "import"] = "import" if import_existing else "register"
         body = RepoCreateBody(
             name=name,
             bucket_nickname=bucket_nickname,
             kind=kind,
             prefix=prefix,
-            create_mode=create_mode,
+            create_mode="register",
             description=description,
             metadata=metadata,
         )
@@ -163,7 +164,46 @@ class HttpMetastore(ArraylakeHttpClient, Metastore):
         repo = Repo.model_validate_json(response.content)
 
         if repo.kind == RepoKind.Icechunk:
-            # TODO: should I wrap this response in an IcechunkV2Database object?
+            return repo
+
+        raise ValueError(f"Unknown repo kind: {repo.kind}")
+
+    async def import_database(
+        self,
+        name: str,
+        bucket_nickname: str,
+        prefix: str,
+        kind: RepoKind = RepoKind.Icechunk,
+        description: str | None = None,
+        metadata: RepoMetadataT | None = None,
+    ) -> Repo:
+        """
+        Imports an existing icechunk repo from storage.
+
+        Args:
+            name: Name of the repo to create
+            bucket_nickname: Nickname of the bucket containing the existing icechunk repo.
+            prefix: Prefix where the icechunk repo exists in the bucket.
+            kind: Kind of repo to create
+            description: Optional description for the repo
+            metadata: Optional metadata for the repo
+
+        Returns:
+            The imported Repo object
+        """
+        body = RepoImportBody(
+            name=name,
+            bucket_nickname=bucket_nickname,
+            kind=kind,
+            prefix=prefix,
+            description=description,
+            metadata=metadata,
+        )
+        response = await self._request("POST", f"/orgs/{self._config.org}/repos/import", content=body.model_dump_json())
+        handle_response(response)
+        repo = Repo.model_validate_json(response.content)
+
+        if repo.kind == RepoKind.Icechunk:
             return repo
 
         raise ValueError(f"Unknown repo kind: {repo.kind}")