Merge branch 'main' into fix/include-keypoints-metadata-json-on-model-upload

Author: grzegorz-roboflow

roboflow/adapters/rfapi.py

@@ -2,7 +2,7 @@
 import mimetypes
 import os
 import urllib
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 from urllib.parse import quote
 
 import requests
@@ -378,6 +378,76 @@ def workspace_delete_images(
     return response.json()
 
 
+def update_image_metadata(
+    api_key: str,
+    workspace_url: str,
+    image_id: str,
+    *,
+    metadata: Optional[Dict] = None,
+    remove_metadata: Optional[List[str]] = None,
+    add_tags: Optional[List[str]] = None,
+    remove_tags: Optional[List[str]] = None,
+) -> dict:
+    """Update metadata and tags on a single image (synchronous).
+
+    Args:
+        api_key: Roboflow API key.
+        workspace_url: Workspace slug/url.
+        image_id: Image/source ID.
+        metadata: Key-value pairs to set on the image.
+        remove_metadata: Metadata keys to delete.
+        add_tags: Tags to append.
+        remove_tags: Tags to remove.
+
+    Returns:
+        Parsed JSON response (``{"success": true}``).
+
+    Raises:
+        RoboflowError: On non-200 response.
+    """
+    url = f"{API_URL}/{workspace_url}/images/{quote(image_id, safe='')}/metadata"
+    body: Dict[str, Any] = {}
+    if metadata is not None:
+        body["metadata"] = metadata
+    if remove_metadata is not None:
+        body["removeMetadata"] = remove_metadata
+    if add_tags is not None:
+        body["addTags"] = add_tags
+    if remove_tags is not None:
+        body["removeTags"] = remove_tags
+
+    response = requests.post(url, params={"api_key": api_key}, json=body)
+    if response.status_code != 200:
+        raise RoboflowError(response.text)
+    return response.json()
+
+
+def batch_update_image_metadata(
+    api_key: str,
+    workspace_url: str,
+    updates: List[Dict],
+) -> dict:
+    """Batch-update metadata and tags on multiple images (asynchronous).
+
+    Args:
+        api_key: Roboflow API key.
+        workspace_url: Workspace slug/url.
+        updates: List of update dicts, each containing ``imageId`` and optionally
+            ``metadata``, ``removeMetadata``, ``addTags``, ``removeTags``.
+
+    Returns:
+        Parsed JSON with ``taskId`` and ``url`` for polling.
+
+    Raises:
+        RoboflowError: On non-202 response.
+    """
+    url = f"{API_URL}/{workspace_url}/images/metadata"
+    response = requests.post(url, params={"api_key": api_key}, json={"updates": updates})
+    if response.status_code != 202:
+        raise RoboflowError(response.text)
+    return response.json()
+
+
 def upload_image(
     api_key,
     project_url,
@@ -763,6 +833,28 @@ def delete_folder(api_key, workspace_url, group_id):
     return response.json()
 
 
+def add_projects_to_folder(api_key, workspace_url, group_id, project_ids):
+    """PATCH /{ws}/groups/{id}/projects — add projects to a folder."""
+    response = requests.patch(
+        f"{API_URL}/{workspace_url}/groups/{group_id}/projects",
+        params={"api_key": api_key},
+        json={"projects": project_ids},
+    )
+    if response.status_code not in (200, 204):
+        raise RoboflowError(response.text)
+
+
+def remove_projects_from_folder(api_key, workspace_url, group_id, project_ids):
+    """DELETE /{ws}/groups/{id}/projects — remove projects from a folder."""
+    response = requests.delete(
+        f"{API_URL}/{workspace_url}/groups/{group_id}/projects",
+        params={"api_key": api_key},
+        json={"projects": project_ids},
+    )
+    if response.status_code not in (200, 204):
+        raise RoboflowError(response.text)
+
+
 # ---------------------------------------------------------------------------
 # Phase 2: Workflow endpoints
 # ---------------------------------------------------------------------------

roboflow/cli/handlers/_aliases.py

@@ -63,7 +63,10 @@ def upload_alias(
         project: Annotated[str, typer.Option("-p", "--project", help="Project ID")],
         annotation: Annotated[Optional[str], typer.Option("-a", "--annotation", help="Annotation file")] = None,
         labelmap: Annotated[Optional[str], typer.Option("-m", "--labelmap", help="Labelmap file")] = None,
-        split: Annotated[str, typer.Option("-s", "--split", help="Split (train/valid/test)")] = "train",
+        split: Annotated[
+            Optional[str],
+            typer.Option("-s", "--split", help="Override split for all uploaded images (default: infer from folder)"),
+        ] = None,
         num_retries: Annotated[int, typer.Option("-r", "--retries", help="Retry count")] = 0,
         batch: Annotated[Optional[str], typer.Option("-b", "--batch", help="Batch name")] = None,
         tag_names: Annotated[Optional[str], typer.Option("-t", "--tag", help="Tag names")] = None,

roboflow/cli/handlers/folder.py

@@ -61,6 +61,28 @@ def delete_folder(
     _delete_folder(args)
 
 
+@folder_app.command("add-projects")
+def add_projects(
+    ctx: typer.Context,
+    folder_id: Annotated[str, typer.Argument(help="Folder ID")],
+    projects: Annotated[str, typer.Argument(help="Comma-separated project IDs")],
+) -> None:
+    """Add projects to a folder."""
+    args = ctx_to_args(ctx, folder_id=folder_id, projects=projects)
+    _add_projects(args)
+
+
+@folder_app.command("remove-projects")
+def remove_projects(
+    ctx: typer.Context,
+    folder_id: Annotated[str, typer.Argument(help="Folder ID")],
+    projects: Annotated[str, typer.Argument(help="Comma-separated project IDs")],
+) -> None:
+    """Remove projects from a folder."""
+    args = ctx_to_args(ctx, folder_id=folder_id, projects=projects)
+    _remove_projects(args)
+
+
 # ---------------------------------------------------------------------------
 # Business logic (unchanged from argparse version)
 # ---------------------------------------------------------------------------
@@ -200,3 +222,51 @@ def _delete_folder(args) -> None:  # noqa: ANN001
 
     data = {"status": "deleted"}
     output(args, data, text=f"Deleted folder '{args.folder_id}'")
+
+
+def _add_projects(args) -> None:  # noqa: ANN001
+    import roboflow
+    from roboflow.cli._output import output, output_error, suppress_sdk_output
+
+    with suppress_sdk_output(args):
+        try:
+            rf = roboflow.Roboflow(api_key=args.api_key)
+            workspace = rf.workspace(args.workspace)
+        except Exception as exc:
+            output_error(args, str(exc))
+            return
+
+    project_ids = [p.strip() for p in args.projects.split(",")]
+
+    try:
+        workspace.add_projects_to_folder(args.folder_id, project_ids)
+    except Exception as exc:
+        output_error(args, str(exc), exit_code=1)
+        return
+
+    data = {"status": "added", "folder_id": args.folder_id, "projects": project_ids}
+    output(args, data, text=f"Added {len(project_ids)} project(s) to folder '{args.folder_id}'")
+
+
+def _remove_projects(args) -> None:  # noqa: ANN001
+    import roboflow
+    from roboflow.cli._output import output, output_error, suppress_sdk_output
+
+    with suppress_sdk_output(args):
+        try:
+            rf = roboflow.Roboflow(api_key=args.api_key)
+            workspace = rf.workspace(args.workspace)
+        except Exception as exc:
+            output_error(args, str(exc))
+            return
+
+    project_ids = [p.strip() for p in args.projects.split(",")]
+
+    try:
+        workspace.remove_projects_from_folder(args.folder_id, project_ids)
+    except Exception as exc:
+        output_error(args, str(exc), exit_code=1)
+        return
+
+    data = {"status": "removed", "folder_id": args.folder_id, "projects": project_ids}
+    output(args, data, text=f"Removed {len(project_ids)} project(s) from folder '{args.folder_id}'")