Add light, zoom and camera controls to Model3D

shiny3d/backend/gradio_shiny3d/__init__.py

@@ -0,0 +1,4 @@
+
+from .shiny3d import shiny3D
+
+__all__ = ['shiny3D']

shiny3d/backend/gradio_shiny3d/shiny3d.py

@@ -0,0 +1,171 @@
+"""gr.shiny3D() component."""
+
+from __future__ import annotations
+
+import warnings
+from pathlib import Path
+from typing import Any, Callable, Literal
+
+from gradio_client.documentation import document, set_documentation_group
+
+from gradio.components.base import Component, _Keywords
+from gradio.data_classes import FileData
+from gradio.events import Events
+
+set_documentation_group("component")
+
+
+@document()
+class shiny3D(Component):
+    """
+    Component allows users to upload or view 3D Model files (.obj, .glb, or .gltf).
+    Preprocessing: This component passes the uploaded file as a {str}filepath.
+    Postprocessing: expects function to return a {str} or {pathlib.Path} filepath of type (.obj, glb, or .gltf)
+
+    Demos: model3D
+    Guides: how-to-use-3D-model-component
+    """
+
+    EVENTS = [Events.change, Events.upload, Events.edit, Events.clear]
+
+    data_model = FileData
+
+    def __init__(
+        self,
+        value: str | Callable | None = None,
+        *,
+        clear_color: tuple[float, float, float, float] | None = None,
+        camera_position: tuple[
+            int | float | None, int | float | None, int | float | None
+        ] = (
+            None,
+            None,
+            None,
+        ),
+        zoom_speed: float = 1,
+        height: int | None = None,
+        label: str | None = None,
+        show_label: bool | None = None,
+        every: float | None = None,
+        container: bool = True,
+        scale: int | None = None,
+        min_width: int = 160,
+        visible: bool = True,
+        elem_id: str | None = None,
+        elem_classes: list[str] | str | None = None,
+        **kwargs,
+    ):
+        """
+        Parameters:
+            value: path to (.obj, glb, or .gltf) file to show in model3D viewer. If callable, the function will be called whenever the app loads to set the initial value of the component.
+            clear_color: background color of scene, should be a tuple of 4 floats between 0 and 1 representing RGBA values.
+            camera_position: initial camera position of scene, provided as a tuple of `(alpha, beta, radius)`. Each value is optional. If provided, `alpha` and `beta` should be in degrees reflecting the angular position along the longitudinal and latitudinal axes, respectively. Radius corresponds to the distance from the center of the object to the camera.
+            zoom_speed: the speed of zooming in and out of the scene when the cursor wheel is rotated or when screen is pinched on a mobile device. Should be a positive float, increase this value to make zooming faster, decrease to make it slower. Affects the wheelPrecision property of the camera.
+            height: height of the model3D component, in pixels.
+            label: component name in interface.
+            show_label: if True, will display label.
+            every: If `value` is a callable, run the function 'every' number of seconds while the client connection is open. Has no effect otherwise. Queue must be enabled. The event can be accessed (e.g. to cancel it) via this component's .load_event attribute.
+            container: If True, will place the component in a container - providing some extra padding around the border.
+            scale: relative width compared to adjacent Components in a Row. For example, if Component A has scale=2, and Component B has scale=1, A will be twice as wide as B. Should be an integer.
+            min_width: minimum pixel width, will wrap if not sufficient screen space to satisfy this value. If a certain scale value results in this Component being narrower than min_width, the min_width parameter will be respected first.
+            visible: If False, component will be hidden.
+            elem_id: An optional string that is assigned as the id of this component in the HTML DOM. Can be used for targeting CSS styles.
+            elem_classes: An optional list of strings that are assigned as the classes of this component in the HTML DOM. Can be used for targeting CSS styles.
+        """
+        self.clear_color = clear_color or [0, 0, 0, 0]
+        self.camera_position = camera_position
+        self.height = height
+        self.zoom_speed = zoom_speed
+        super().__init__(
+            label=label,
+            every=every,
+            show_label=show_label,
+            container=container,
+            scale=scale,
+            min_width=min_width,
+            visible=visible,
+            elem_id=elem_id,
+            elem_classes=elem_classes,
+            value=value,
+            **kwargs,
+        )
+
+    @staticmethod
+    def update(
+        value: Any | Literal[_Keywords.NO_VALUE] | None = _Keywords.NO_VALUE,
+        camera_position: tuple[
+            int | float | None, int | float | None, int | float | None
+        ]
+        | None = None,
+        clear_color: tuple[float, float, float, float] | None = None,
+        height: int | None = None,
+        zoom_speed: float | None = None,
+        label: str | None = None,
+        show_label: bool | None = None,
+        container: bool | None = None,
+        scale: int | None = None,
+        min_width: int | None = None,
+        visible: bool | None = None,
+    ):
+        warnings.warn(
+            "Using the update method is deprecated. Simply return a new object instead, e.g. `return gr.shiny3D(...)` instead of `return gr.shiny3D.update(...)`."
+        )
+        updated_config = {
+            "camera_position": camera_position,
+            "clear_color": clear_color,
+            "height": height,
+            "zoom_speed": zoom_speed,
+            "label": label,
+            "show_label": show_label,
+            "container": container,
+            "scale": scale,
+            "min_width": min_width,
+            "visible": visible,
+            "value": value,
+            "__type__": "update",
+        }
+        return updated_config
+
+    def preprocess(self, x: dict[str, str] | None) -> str | None:
+        """
+        Parameters:
+            x: JSON object with filename as 'name' property and base64 data as 'data' property
+        Returns:
+            string file path to temporary file with the 3D image model
+        """
+        if x is None:
+            return x
+        file_name, file_data, is_file = (
+            x["name"],
+            x["data"],
+            x.get("is_file", False),
+        )
+        if is_file:
+            temp_file_path = self.make_temp_copy_if_needed(file_name)
+        else:
+            temp_file_path = self.base64_to_temp_file_if_needed(file_data, file_name)
+
+        return temp_file_path
+
+    def postprocess(self, y: str | Path | None) -> FileData | None:
+        """
+        Parameters:
+            y: path to the model
+        Returns:
+            file name mapped to base64 url data
+        """
+        if y is None:
+            return y
+        data = {
+            "name": self.make_temp_copy_if_needed(y),
+            "data": None,
+            "is_file": True,
+        }
+        return FileData(**data)
+
+    def as_example(self, input_data: str | None) -> str:
+        return Path(input_data).name if input_data else ""
+
+    def example_inputs(self):
+        # TODO: Use permanent link
+        return "https://raw.githubusercontent.com/gradio-app/gradio/main/demo/model3D/files/Fox.gltf"

shiny3d/demo/app.py

@@ -0,0 +1,11 @@
+
+import gradio as gr
+from gradio_shiny3d import shiny3D
+import os
+
+model_file = os.path.join(os.path.dirname(__file__), "Duck.glb")
+
+with gr.Blocks() as demo:
+    shiny3D(interactive=True, value=model_file)
+
+demo.launch()

shiny3d/frontend/example/Model3d.svelte

@@ -0,0 +1,19 @@
+<script lang="ts">
+	export let value: string;
+	export let type: "gallery" | "table";
+	export let selected = false;
+</script>
+
+<div
+	class:table={type === "table"}
+	class:gallery={type === "gallery"}
+	class:selected
+>
+	{value}
+</div>
+
+<style>
+	.gallery {
+		padding: var(--size-1) var(--size-2);
+	}
+</style>

shiny3d/frontend/example/index.ts

@@ -0,0 +1 @@
+export { default } from "./Model3d.svelte";

shiny3d/frontend/icons/Minus.svelte

@@ -0,0 +1,16 @@
+<svg
+  width="10px"
+  height="10px"
+  version="1.1"
+  viewBox="0 0 32 32"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <title>minus-circle</title>
+  <g fill="none" fill-rule="evenodd">
+    <g transform="translate(-516 -1087)" fill="var(--block-label-text-color)">
+      <path
+        d="m532 1117c-7.732 0-14-6.27-14-14s6.268-14 14-14 14 6.27 14 14-6.268 14-14 14zm0-30c-8.837 0-16 7.16-16 16s7.163 16 16 16 16-7.16 16-16-7.163-16-16-16zm6 15h-12c-0.553 0-1 0.45-1 1s0.447 1 1 1h12c0.553 0 1-0.45 1-1s-0.447-1-1-1z"
+      />
+    </g>
+  </g>
+</svg>

shiny3d/frontend/icons/Plus.svelte

@@ -0,0 +1,17 @@
+<svg
+  width="10px"
+  height="10px"
+  fill="white"
+  version="1.1"
+  viewBox="0 0 32 32"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <title>plus-circle</title>
+  <g fill="none" fill-rule="evenodd">
+    <g transform="translate(-464 -1087)" fill="var(--block-label-text-color)">
+      <path
+        d="m480 1117c-7.732 0-14-6.27-14-14s6.268-14 14-14 14 6.27 14 14-6.268 14-14 14zm0-30c-8.837 0-16 7.16-16 16s7.163 16 16 16 16-7.16 16-16-7.163-16-16-16zm6 15h-5v-5c0-0.55-0.447-1-1-1s-1 0.45-1 1v5h-5c-0.553 0-1 0.45-1 1s0.447 1 1 1h5v5c0 0.55 0.447 1 1 1s1-0.45 1-1v-5h5c0.553 0 1-0.45 1-1s-0.447-1-1-1z"
+      />
+    </g>
+  </g>
+</svg>

shiny3d/frontend/interactive/InteractiveModel3d.svelte

@@ -0,0 +1,73 @@
+<script lang="ts">
+  import type { Gradio } from "@gradio/utils";
+  import type { FileData } from "@gradio/upload";
+  import { normalise_file } from "@gradio/upload";
+  import Model3DUpload from "./Model3DUpload.svelte";
+  import { Block, UploadText } from "@gradio/atoms";
+
+  import { StatusTracker } from "@gradio/statustracker";
+  import type { LoadingStatus } from "@gradio/statustracker";
+
+  export let elem_id = "";
+  export let elem_classes: string[] = [];
+  export let visible = true;
+  export let value: null | FileData = null;
+  export let root: string;
+  export let root_url: null | string;
+  export let clear_color: [number, number, number, number];
+  export let loading_status: LoadingStatus;
+  export let label: string;
+  export let show_label: boolean;
+  export let container = true;
+  export let scale: number | null = null;
+  export let min_width: number | undefined = undefined;
+  export let gradio: Gradio<{
+    change: typeof value;
+    clear: never;
+  }>;
+  export let zoom_speed = 1;
+  export let height: number | undefined = undefined;
+
+  // alpha, beta, radius
+  export let camera_position: [number | null, number | null, number | null] = [
+    null,
+    null,
+    null,
+  ];
+
+  let _value: null | FileData;
+  $: _value = normalise_file(value, root, root_url);
+
+  let dragging = false;
+</script>
+
+<Block
+  {visible}
+  variant={value === null ? "dashed" : "solid"}
+  border_mode={dragging ? "focus" : "base"}
+  padding={false}
+  {elem_id}
+  {elem_classes}
+  {container}
+  {scale}
+  {min_width}
+  {height}
+>
+  <!-- <StatusTracker autoscroll={gradio.autoscroll} {...loading_status} /> -->
+
+  <Model3DUpload
+    {label}
+    {show_label}
+    {root}
+    {clear_color}
+    value={_value}
+    {camera_position}
+    {zoom_speed}
+    on:change={({ detail }) => (value = detail)}
+    on:drag={({ detail }) => (dragging = detail)}
+    on:change={({ detail }) => gradio.dispatch("change", detail)}
+    on:clear={() => gradio.dispatch("clear")}
+  >
+    <!-- <UploadText /> -->
+  </Model3DUpload>
+</Block>