PyPI - topview-3d-cli - Versions diffs - 0.1.1__tar.gz → 0.1.2__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topview-3d-cli
-Version: 0.1.1
+Version: 0.1.2
 Summary: Build and render 3D director scenes locally with the topview-3d-cli command.
 License-Expression: Apache-2.0 AND CC-BY-4.0
 Project-URL: Homepage, https://www.topview.ai/topview-3d-builder

@@ -1,3 +1,3 @@
 """Local, offline Scene3D director projects and the ``topview-3d-cli`` CLI."""
-__version__ = "0.1.1"
+__version__ = "0.1.2"

@@ -22,6 +22,7 @@ from topview_3d_cli.local_errors import EXIT_INVALID_INPUT, EXIT_OK, exit_code_f
 from topview_3d_cli.local_project import (
     CLI_VERSION,
     LocalProjectError,
+    adopt_edit,
     apply_operations,
     init_project,
     open_project,
@@ -262,6 +263,9 @@ def _parser() -> argparse.ArgumentParser:
     init.add_argument("directory")
     init.add_argument("--force", action="store_true", help="replace an existing project")
     project.add_parser("status").add_argument("directory")
+    adopt = project.add_parser("adopt", help="write a Studio edit back into the project so later commands continue from it")
+    adopt.add_argument("directory")
+    adopt.add_argument("payload", help="{\"document\"?, \"fcurves\"?} JSON file, or - for stdin")
     document = group("document", "read, validate and edit the director document")
     get = document.add_parser("get", help="the stored document; --summary or --entity for smaller reads")
@@ -411,7 +415,11 @@ def _dispatch(args: argparse.Namespace) -> dict[str, Any]:
     if command == "studio":
         return open_studio(args.directory)
     if command == "project":
-        return init_project(args.directory, force=args.force) if sub == "init" else project_status(args.directory)
+        if sub == "init":
+            return init_project(args.directory, force=args.force)
+        if sub == "adopt":
+            return adopt_edit(args.directory, load_spec(args.payload, "PROJECT_ADOPT_INVALID"))
+        return project_status(args.directory)
     if command == "document":
         if sub == "get":
             return document_view(args.directory, summary=args.summary, entity=args.entity,

@@ -16,6 +16,7 @@ ERROR_CODES: dict[str, tuple[int, str]] = {
     "USAGE_INVALID": (2, "Unknown command, missing argument or bad option."),
     "PROJECT_NOT_INITIALIZED": (2, "The directory has no .topview-3d project; run `project init`."),
     "PROJECT_EXISTS": (2, "`project init` target already contains a project; pass --force to replace it."),
+    "PROJECT_ADOPT_INVALID": (2, "`project adopt` body must be a JSON object with document and/or fcurves."),
     "OPERATIONS_NOT_FOUND": (2, "The operations file does not exist."),
     "OPERATIONS_JSON_INVALID": (2, "The operations file is not JSON or not an operation batch."),
     "RENDER_PAYLOAD_INVALID": (2, "The render payload is not a JSON object of frames/width/height/cameraNodeId/publicAssetBase."),

@@ -25,9 +25,11 @@ from topview_3d_cli.director_document import (
     validate_fcurves,
 )
 from topview_3d_cli.director_operations import (
+    MAX_BATCH_OPERATIONS,
     DirectorConflictError,
     DirectorOperationError,
     DirectorStore,
+    diff_operations,
     genesis_store,
 )
 from topview_3d_cli.local_errors import LocalProjectError
@@ -193,6 +195,33 @@ def base_result(project: Project) -> dict[str, Any]:
     return result
+def adopt_edit(root: str | os.PathLike[str], payload: dict[str, Any]) -> dict[str, Any]:
+    """Replace the stored scene with a Studio edit so the next CLI command continues from it.
+    ``payload`` may include ``document``, ``fcurves``, or both. The omitted side stays as stored.
+    The entity store remains authoritative: the edit is applied as operations, then rewritten.
+    """
+    if not isinstance(payload, dict) or not ({"document", "fcurves"} & payload.keys()):
+        raise LocalProjectError("PROJECT_ADOPT_INVALID", "body must be an object with document and/or fcurves")
+    project = open_project(root)
+    current = project.store.assemble()
+    document = payload["document"] if "document" in payload else current["document"]
+    fcurves = payload["fcurves"] if "fcurves" in payload else current["fcurves"]
+    try:
+        operations = diff_operations(current, document, fcurves, stem="studio")
+    except (TypeError, ValueError) as exc:
+        raise LocalProjectError("INVALID_DIRECTOR_DOCUMENT", str(exc)) from exc
+    if not operations:
+        return {**base_result(project), "adopted": False, "operations": 0}
+    try:
+        for start in range(0, len(operations), MAX_BATCH_OPERATIONS):
+            project.store.apply(operations[start:start + MAX_BATCH_OPERATIONS], strict_versions=False, batch_id="studio")
+    except (DirectorConflictError, DirectorOperationError, ValueError) as exc:
+        raise LocalProjectError("INVALID_DIRECTOR_DOCUMENT", str(exc)) from exc
+    commit(project)
+    return {**base_result(project), "adopted": True, "operations": len(operations)}
 def project_status(root: str | os.PathLike[str]) -> dict[str, Any]:
     project = open_project(root)
     assembled = project.store.assemble()

@@ -9,7 +9,9 @@ from __future__ import annotations
 import json
 import os
 import re
+import shutil
 import socket
+import sys
 import subprocess
 import time
 import urllib.error
@@ -94,6 +96,7 @@ def _start(studio: Path, next_bin: Path, project_root: Path) -> int:
     log_path = log_dir / "studio.log"
     env = dict(os.environ)
     env["TOPVIEW3D_PROJECTS"] = str(project_root)
+    env["TOPVIEW3D_CLI"] = shutil.which("topview-3d-cli") or sys.argv[0]
     try:
         env["TOPVIEW3D_BUILTIN_ASSETS"] = str(runtime().builtin_assets)
     except LocalProjectError:

topview-3d-cli 0.1.1__tar.gz → 0.1.2__tar.gz

topview-3d-cli 0.1.1tar.gz → 0.1.2tar.gz