vuer 0.0.3__py3-none-any.whl → 0.0.5__py3-none-any.whl

vuer/schemas.py

@@ -3,6 +3,8 @@ from typing import Union
 import numpy as np
 import PIL.Image as pil_image
 
+# from msgpack_numpy import pack, packb
+
 element_count = 0
 
 
@@ -31,7 +33,16 @@ class Element:
         :return: Dictionary representing the element.
         """
         # note: only return the non-private attributes, allow bypass.
-        return {k: v for k, v in self.__dict__.items() if not k.startswith("_")}
+        output = {}
+        for k, v in self.__dict__.items():
+            if k.startswith('_'):
+                continue
+            if hasattr(v, "tolist"):
+                output[k] = v.tolist()
+            else:
+                output[k] = v
+
+        return output
 
 
 class BlockElement(Element):
@@ -40,7 +51,22 @@ class BlockElement(Element):
         super().__init__(**kwargs)
 
     def serialize(self):
-        return {**super().serialize(), "children": [e.serialize() for e in self.children]}
+        # writ this as multiple lines
+        children = []
+        for e in self.children:
+            if isinstance(e, str):
+                children.append(e)
+            else:
+                children.append(e.serialize())
+        return {**super().serialize(), "children": children}
+
+
+class AutoScroll(BlockElement):
+    tag = "AutoScroll"
+
+
+class Markdown(BlockElement):
+    tag = "Markdown"
 
 
 class Page(BlockElement):
@@ -53,7 +79,7 @@ class Page(BlockElement):
 
 
 class div(BlockElement):
-    tag = "div"
+    tag = "Div"
 
 
 class InputBox(Element):
@@ -122,6 +148,27 @@ class Text(Element):
         super().__init__(**kwargs)
 
 
+class Bold(Text):
+    def __init__(self, text, style=None, **kwargs):
+        _style = {"fontWeight": "bold"}
+        _style.update(style or {})
+        super().__init__(text, style=_style, **kwargs)
+
+
+class Italic(Text):
+    def __init__(self, text, style=None, **kwargs):
+        _style = {"fontStyle": "italic"}
+        _style.update(style or {})
+        super().__init__(text, style=_style, **kwargs)
+
+
+class Link(Text):
+    tag = "a"
+
+    def __init__(self, text, src, **kwargs):
+        super().__init__(text, src=src, **kwargs)
+
+
 class Button(Element):
     """
     A Button element is an element that allows the user to click on it.
@@ -211,12 +258,12 @@ class Scene(BlockElement):
     tag = "Scene"
 
     def __init__(
-        self,
-        *children,
-        rawChildren=None,
-        htmlChildren=None,
-        backgroundChildren=None,
-        **kwargs,
+            self,
+            *children,
+            rawChildren=None,
+            htmlChildren=None,
+            backgroundChildren=None,
+            **kwargs,
     ):
         super().__init__(*children, **kwargs)
         self.rawChildren = rawChildren or []
@@ -224,13 +271,29 @@ class Scene(BlockElement):
         self.backgroundChildren = backgroundChildren or []
 
     def serialize(self):
-        return {
-            **super().serialize(),
-            "children": [e.serialize() for e in self.children],
-            "rawChildren": [e.serialize() for e in self.rawChildren],
-            "htmlChildren": [e.serialize() for e in self.htmlChildren],
-            "backgroundChildren": [e.serialize() for e in self.backgroundChildren],
-        }
+        obj = super().serialize()
+        if self.rawChildren:
+            obj["rawChildren"] = [e.serialize() for e in self.rawChildren if e]
+        if self.htmlChildren:
+            obj["htmlChildren"] = [e.serialize() for e in self.htmlChildren if e]
+        if self.backgroundChildren:
+            obj["backgroundChildren"] = [e.serialize() for e in self.backgroundChildren if e]
+        return obj
+
+
+class DefaultScene(Scene):
+    def __init__(
+            self,
+            *children,
+            rawChildren=None,
+            htmlChildren=None,
+            backgroundChildren=None,
+            **kwargs,
+    ):
+        super().__init__(
+            AmbientLight(intensity=0.5, key="default_ambient_light"),
+            DirectionalLight(intensity=1, key="default_directional_light"),
+            *children, **kwargs)
 
 
 class SceneElement(BlockElement):
@@ -250,6 +313,46 @@ class group(SceneElement):
     children = []
 
 
+class mesh(SceneElement):
+    tag = "mesh"
+    children = []
+
+
+class TriMesh(SceneElement):
+    tag = "TriMesh"
+    children = []
+    vertices = None
+    faces = None
+    colors = None
+
+    def __post_init__(self, **kwargs):
+        self.vertices = self.vertices.flatten()
+        if hasattr(self.faces, "flatten"):
+            self.faces = self.faces.flatten()
+        if hasattr(self.colors, "flatten"):
+            if self.colors.shape[-1] == 4:
+                self.colors = self.colors[:, :3]
+            if self.colors.dtype == np.uint8:
+                self.colors = self.colors.astype(np.float32) / 255.
+            self.colors = self.colors.flatten().astype(np.float32)
+
+
+class PointCloud(SceneElement):
+    tag = "PointCloud"
+    children = []
+    vertices = None
+    colors = None
+
+    def __post_init__(self, **kwargs):
+        self.vertices = self.vertices.flatten()
+        if hasattr(self.colors, "flatten"):
+            if self.colors.shape[-1] == 4:
+                self.colors = self.colors[:, :3]
+            if self.colors.dtype == np.uint8:
+                self.colors = self.colors.astype(np.float32) / 255.
+            self.colors = self.colors.flatten()
+
+
 class Box(SceneElement):
     tag = "Box"
 
@@ -385,10 +488,6 @@ class Html(SceneElement):
     tag = "Html"
 
 
-class Ply(SceneElement):
-    tag = "Ply"
-
-
 class Pivot(SceneElement):
     tag = "Pivot"
 
@@ -397,6 +496,14 @@ class Movable(SceneElement):
     tag = "Movable"
 
 
+class Obj(SceneElement):
+    tag = "Obj"
+
+
+class Ply(SceneElement):
+    tag = "Ply"
+
+
 class Glb(SceneElement):
     tag = "Glb"
 
@@ -405,10 +512,6 @@ class Urdf(SceneElement):
     tag = "Urdf"
 
 
-class PointCloud(SceneElement):
-    tag = "PointCloud"
-
-
 class Gripper(SceneElement):
     tag = "Gripper"
 

vuer/serdes.py

@@ -0,0 +1,20 @@
+from typing import Sequence
+
+
+def serializer(data):
+    if hasattr(data, "serialize"):
+        return data.serialize()
+
+    if isinstance(data, str):
+        # return Text(data)
+        return data
+
+    # this could be dangerous.
+    if isinstance(data, Sequence):
+        return [serializer(d) for d in data]
+
+    # this could be dangerous
+    if isinstance(data, dict):
+        return {k: serializer(v) for k, v in data.items()}
+
+    NotImplementedError(f"Cannot serialize {data}")

vuer/server.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 from asyncio import sleep
 from collections import deque, defaultdict
@@ -5,6 +6,7 @@ from functools import partial
 from typing import cast
 from uuid import uuid4
 
+from msgpack import packb
 from params_proto import Proto, PrefixProto
 from websockets import ConnectionClosedError
 
@@ -29,14 +31,16 @@ class Vuer(PrefixProto, Server):
     name = "vuer"
     uri = "ws://localhost:8012"
     # change to vuer.dash.ml
-    domain = "https://dash.ml/demos/vqn-dash/three"
+    domain = "https://dash.ml/vuer"
     port = 8012
     free_port = True
     static_root = "."
     queue_len = None
-    cors_origin = "https://dash.ml,*"
+    # cors = "https://dash.ml,http://localhost:8000,http://127.0.0.1:8000,*"
     queries = Proto({}, help="query parameters to pass")
 
+    WEBSOCKET_MAX_SIZE = 2 ** 28
+
     device = "cuda"
 
     # need to be awaited
@@ -109,6 +113,10 @@ class Vuer(PrefixProto, Server):
     def stream(self):
         yield from self.downlink_queue
 
+    def spawn_task(self, task):
+        loop = asyncio.get_running_loop()
+        return loop.create_task(task)
+
     def spawn(self, fn=None, start=False):
         """
         Spawn a function as a task. This is useful in the following scenario:
@@ -164,9 +172,11 @@ class Vuer(PrefixProto, Server):
     async def send(self, ws_id, event: ServerEvent):
         ws = self.ws[ws_id]
         assert isinstance(event, ServerEvent), "event must be a ServerEvent type object."
-        res_str = event.serialize()
-        res_json_str = json.dumps(res_str)
-        return await ws.send_str(res_json_str)
+        res_obj = event.serialize()
+        res_bytes = packb(res_obj, use_bin_type=True)
+        return await ws.send_bytes(res_bytes)
+        # res_json_str = json.dumps(res_str)
+        # return await ws.send_str(res_json_str)
 
     async def close_ws(self, ws_id):
         self.uplink_queue.pop(ws_id)
@@ -265,6 +275,15 @@ class Vuer(PrefixProto, Server):
             print("websocket is now disconnected. Removing the socket.")
             self.ws.pop(ws_id, None)
 
+    def add_handler(self, event_type, fn):
+        handler_id = uuid4()
+        self.handlers[event_type][handler_id] = fn
+
+        def cleanup():
+            del self.handlers[event_type][handler_id]
+
+        return cleanup
+
     def run(self, kill=None, *args, **kwargs):
         print("Vuer running at: " + self.get_url())
 
@@ -281,8 +300,9 @@ class Vuer(PrefixProto, Server):
         # host = host[2:]
 
         self._socket("", self.downlink)
-        # serve local files via /local endpoint
-        self._static("/local", self.static_root)
+        # serve local files via /static endpoint
+        self._static("/static", self.static_root)
+        print("serving static files from", self.static_root, "at", "/static")
         self._route("/relay", self.relay, method="POST")
         # self._socket()
         super().run()

vuer/types.py

@@ -5,8 +5,6 @@ from math import pi
 Vector3 = namedtuple("Vector3", ["x", "y", "z"])
 
 
-# Euler = namedtuple("Euler", ["x", "y", "z", "order"])
-# refactor with default values for "order"
 class Euler(NamedTuple):
     x: int
     y: int

{vuer-0.0.3.dist-info → vuer-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vuer
-Version: 0.0.3
+Version: 0.0.5
 Home-page: https://github.com/geyang/vuer
 Author: Ge Yang<ge.ike.yang@gmail.com>
 Author-email: ge.ike.yang@gmail.com
@@ -13,10 +13,12 @@ License-File: LICENSE
 Requires-Dist: tqdm
 Requires-Dist: termcolor
 Requires-Dist: params-proto
+Requires-Dist: killport
+Requires-Dist: msgpack
 Provides-Extra: dev
-Requires-Dist: black (==22.3.0) ; extra == 'dev'
-Requires-Dist: pylint (==2.13.4) ; extra == 'dev'
-Requires-Dist: pytest (==7.1.2) ; extra == 'dev'
+Requires-Dist: black ==22.3.0 ; extra == 'dev'
+Requires-Dist: pylint ==2.13.4 ; extra == 'dev'
+Requires-Dist: pytest ==7.1.2 ; extra == 'dev'
 
 # Vuer: A modern 3D Visualizer for Robotics and VR
 

vuer-0.0.5.dist-info/RECORD

@@ -0,0 +1,22 @@
+vuer/__init__.py,sha256=x2ZqgbBIDHQr7UvdkKhVdtYToIZdhXw4XTRnfrQiBos,28
+vuer/base.py,sha256=LHGqz_067HTWDuL2JLuC_W25rKikBdrT4unF5nUi3tY,3035
+vuer/events.py,sha256=5gyYXz0XZVAMU2xyKYJmpkhIWoGGSgcrUFy8h37AoM8,3676
+vuer/schemas.py,sha256=LWY79JiN3Iwf_O8xv94LBAA8drwGjMVCC9v1Cr9byhI,12245
+vuer/serdes.py,sha256=dlnLcISXoXv7X6lk6DKYUksQSX3wjQ8YFa4FUZel6Ds,484
+vuer/server.py,sha256=ynXs4euJrLvdjsopDhZcs0QdMwTNh3Farl5PbcvZKsM,9234
+vuer/types.py,sha256=4jVXsuLjaQwmnCrK9j9G6vSVbmb8cq72WhptZg3qOuU,681
+vuer/addons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vuer/addons/nerf_vuer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vuer/addons/nerf_vuer/control_components.py,sha256=K4PU0nD572L4J7lLFfShWficWZQnH4t-x6WWMrAVw8g,290
+vuer/addons/nerf_vuer/mixins.py,sha256=fQuW3adf6X2xw_PSfS145TNfbQ9OoTKuv8mYEo6Pt6A,12966
+vuer/addons/nerf_vuer/nerf_vuer.py,sha256=0iIbrQK939wwlkJOIfdOIswRKTXOKh-0TpNM5NU2ESw,5196
+vuer/addons/nerf_vuer/render_components.py,sha256=KbClUsbKUWweUXZzh1SMlJS1wilj-VaQOQHVShircaw,3854
+vuer/addons/nerf_vuer/render_nodes.py,sha256=5TKqIbMPiOtBxfF4FQI6uB0w_9FTfGiwS8xRbhPa0_g,14441
+vuer/addons/nerfuer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vuer/addons/nerfuer/render_nodes.py,sha256=ekrF93o3Q5cE2GKoYYvt7l7Nva_i8r6AFw29xHzx0wA,4478
+vuer-0.0.5.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
+vuer-0.0.5.dist-info/METADATA,sha256=UqgVZUQ4uVYVAnlB-AIr6nBHV9XUARkaZKEW1oOCVc4,805
+vuer-0.0.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+vuer-0.0.5.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
+vuer-0.0.5.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
+vuer-0.0.5.dist-info/RECORD,,

{vuer-0.0.3.dist-info → vuer-0.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

vuer-0.0.3.dist-info/RECORD

@@ -1,21 +0,0 @@
-vuer/__init__.py,sha256=x2ZqgbBIDHQr7UvdkKhVdtYToIZdhXw4XTRnfrQiBos,28
-vuer/base.py,sha256=dR_EjvWS2lIBK2DNSlKYHh5Xj8Sv1aRFB1a285PXRLc,2963
-vuer/events.py,sha256=pJIdD5F-SqXJ_maowRiDgssnbRgP23dEsOKfXSxVE2o,4126
-vuer/schemas.py,sha256=5ie8t-yogjOicgMDJwvNn4lKmIADAbjiVXt6LpiPglM,9510
-vuer/server.py,sha256=mSmQXezngT0gzN7_70nPGfrXMGlXuvilX6AqH5vhnIQ,8613
-vuer/types.py,sha256=kaGXK2rB_wVgVp3iBKXyAUE5lJT7XTWODLo5_z25SW4,780
-vuer/addons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vuer/addons/nerf_vuer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vuer/addons/nerf_vuer/control_components.py,sha256=K4PU0nD572L4J7lLFfShWficWZQnH4t-x6WWMrAVw8g,290
-vuer/addons/nerf_vuer/mixins.py,sha256=sugZrJ2W__cDEX8aeORK0Ylf3SrlerTHrB7ZY1m_KlY,11226
-vuer/addons/nerf_vuer/nerf_vuer.py,sha256=jsG2E_sooUcfPSMUB2-VUA7agA_6-iiWdCmAJpQ2ZCU,4512
-vuer/addons/nerf_vuer/render_components.py,sha256=F6xlqfZWGghXmedWb4XhR1M_DLG9hVrtNoGSnRV-gyg,3865
-vuer/addons/nerf_vuer/render_nodes.py,sha256=ekrF93o3Q5cE2GKoYYvt7l7Nva_i8r6AFw29xHzx0wA,4478
-vuer/addons/nerfuer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vuer/addons/nerfuer/render_nodes.py,sha256=ekrF93o3Q5cE2GKoYYvt7l7Nva_i8r6AFw29xHzx0wA,4478
-vuer-0.0.3.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
-vuer-0.0.3.dist-info/METADATA,sha256=nV0OW1UiJSMNEhwSXydMMQiuDcFLCEyY8arX68Y-D-I,764
-vuer-0.0.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-vuer-0.0.3.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
-vuer-0.0.3.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
-vuer-0.0.3.dist-info/RECORD,,