changes

Author: abidlabs

trackio/__init__.py

@@ -254,7 +254,6 @@ def init(
                 dataset_id,
                 bucket_id,
                 private,
-                create_bucket_if_missing=True,
             )
             user_name, space_name = space_id.split("/")
             space_url = deploy.SPACE_HOST_URL.format(

trackio/deploy.py

@@ -26,7 +26,6 @@
 from trackio.bucket_storage import create_bucket_if_not_exists, upload_project_to_bucket
 from trackio.space_volumes import (
     attach_bucket_volume,
-    resolve_bucket_id_for_deploy,
 )
 from trackio.sqlite_storage import SQLiteStorage
 from trackio.utils import (
@@ -118,23 +117,13 @@ def deploy_as_space(
     dataset_id: str | None = None,
     bucket_id: str | None = None,
     private: bool | None = None,
-    *,
-    create_bucket_if_missing: bool = False,
-    bucket_short_name: str | None = None,
-    bucket_read_only: bool = False,
 ):
     if (
         os.getenv("SYSTEM") == "spaces"
     ):  # in case a repo with this function is uploaded to spaces
         return
 
-    resolved_bucket = resolve_bucket_id_for_deploy(
-        space_id,
-        bucket_id=bucket_id,
-        create_bucket_if_missing=create_bucket_if_missing,
-        bucket_short_name=bucket_short_name,
-    )
-    if dataset_id is not None and resolved_bucket is not None:
+    if dataset_id is not None and bucket_id is not None:
         raise ValueError(
             "Cannot use bucket volume options together with dataset_id; use one persistence mode."
         )
@@ -171,8 +160,8 @@ def deploy_as_space(
     # Make sure necessary dependencies are installed by creating a requirements.txt.
     is_source_install = _is_trackio_installed_from_source()
 
-    if resolved_bucket is not None:
-        create_bucket_if_not_exists(resolved_bucket, private=private)
+    if bucket_id is not None:
+        create_bucket_if_not_exists(bucket_id, private=private)
 
     with open(Path(trackio_path, "README.md"), "r") as f:
         readme_content = f.read()
@@ -243,16 +232,15 @@ def deploy_as_space(
 
     if hf_token := huggingface_hub.utils.get_token():
         huggingface_hub.add_space_secret(space_id, "HF_TOKEN", hf_token)
-    if resolved_bucket is not None:
+    if bucket_id is not None:
         changed = attach_bucket_volume(
             space_id,
-            resolved_bucket,
+            bucket_id,
             mount_path="/data",
-            read_only=bucket_read_only,
         )
         huggingface_hub.add_space_variable(space_id, "TRACKIO_DIR", "/data/trackio")
         if changed:
-            print(f"* Attached bucket {resolved_bucket} at '/data'")
+            print(f"* Attached bucket {bucket_id} at '/data'")
     elif dataset_id is not None:
         huggingface_hub.add_space_variable(space_id, "TRACKIO_DATASET_ID", dataset_id)
     if logo_light_url := os.environ.get("TRACKIO_LOGO_LIGHT_URL"):
@@ -276,10 +264,6 @@ def create_space_if_not_exists(
     dataset_id: str | None = None,
     bucket_id: str | None = None,
     private: bool | None = None,
-    *,
-    create_bucket_if_missing: bool = False,
-    bucket_short_name: str | None = None,
-    bucket_read_only: bool = False,
 ) -> None:
     """
     Creates a new Hugging Face Space if it does not exist.
@@ -298,12 +282,6 @@ def create_space_if_not_exists(
             Whether to make the Space private. If `None` (default), the repo will be
             public unless the organization's default is private. This value is ignored
             if the repo already exists.
-        create_bucket_if_missing (`bool`, *optional*):
-            If `True`, create a bucket named `{space_repo}-storage` under the Space owner before attach.
-        bucket_short_name (`str`, *optional*):
-            Short bucket name when using `create_bucket_if_missing` (no namespace prefix).
-        bucket_read_only (`bool`, *optional*):
-            Mount the bucket read-only.
     """
     if "/" not in space_id:
         raise ValueError(
@@ -341,9 +319,6 @@ def create_space_if_not_exists(
         dataset_id,
         bucket_id,
         private,
-        create_bucket_if_missing=create_bucket_if_missing,
-        bucket_short_name=bucket_short_name,
-        bucket_read_only=bucket_read_only,
     )
     print("* Waiting for Space to be ready...")
     _wait_until_space_running(space_id)

trackio/space_volumes.py

@@ -100,21 +100,3 @@ def attach_bucket_volume(
         new_vol["readOnly"] = True
     set_space_volumes(space_id, existing + [new_vol], token=token)
     return True
-
-
-def resolve_bucket_id_for_deploy(
-    space_id: str,
-    *,
-    bucket_id: str | None,
-    create_bucket_if_missing: bool,
-    bucket_short_name: str | None,
-) -> str | None:
-    if bucket_id is not None:
-        return bucket_id
-    if not create_bucket_if_missing:
-        return None
-    namespace, repo = space_id.split("/", 1)
-    short = bucket_short_name if bucket_short_name else f"{repo}-storage"
-    if "/" in short:
-        short = short.split("/")[-1]
-    return f"{namespace}/{short}"