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

vuer/addons/nerf_vuer/mixins.py

@@ -335,6 +335,10 @@ def collector(
                 data={**flow},
             )
 
+        # holds the current pipe.
+        render_event._pipeline = pipe
+        render_event._channels = channels
+
         return render_event
 
     return decorator

vuer/addons/nerf_vuer/render_nodes.py

@@ -129,6 +129,16 @@ class RGBA(Singleton):
             **pipeline,
         }
 
+    def cache_depth(self, raw_depth, raw_accumulation, **pipeline):
+        depth_a = torch.cat([raw_depth, 255 * raw_accumulation], dim=-1).clip(0, 255).cpu().numpy().astype(np.uint8)
+        self.append(depth_a)
+
+        return {
+            "raw_depth": raw_depth,
+            "raw_accumulation": raw_accumulation,
+            **pipeline,
+        }
+
 
 def _get_colormap(colormap, invert=False, useClip=True, clip: tuple = None, gain=1.0, offset=0.0, normalize=False, **_):
     """
@@ -233,6 +243,9 @@ class FeatA(Singleton):
             **pipeline,
         }
 
+    def probe_feature(self, raw_features, **pipeline):
+        return {"raw_features": raw_features, **pipeline}
+
     def features_heatmap(self, raw_features, raw_accumulation, settings, **pipeline):
 
         print("raw_features.shape:", raw_features.shape)

vuer/base.py

@@ -65,6 +65,7 @@ class Server:
         default = aiohttp_cors.ResourceOptions(
             allow_credentials=True,
             expose_headers="*",
+            allow_headers="*",
             allow_methods="*",
         )
         cors_config = {k: default for k in self.cors.split(",")}
@@ -82,8 +83,7 @@ class Server:
 
     def _socket(self, path: str, handler: callable):
         ws_handler = partial(websocket_handler, handler=handler, max_msg_size=self.WEBSOCKET_MAX_SIZE)
-        route = self.app.router.add_resource(path).add_route("GET", ws_handler)
-        self.cors_context.add(route)
+        self._route(path, ws_handler, method="GET")
 
     def _add_task(self, fn):
         loop = asyncio.get_event_loop()
@@ -91,7 +91,7 @@ class Server:
 
     def _static(self, path, root):
         _fn = partial(handle_file_request, root=root)
-        self.app.add_routes([web.get(f"/{path}/{{filename}}", _fn)])
+        self._route(f"{path}/{{filename}}", _fn, method="GET")
 
     def run(self):
         async def init_server():
@@ -111,5 +111,5 @@ class Server:
 if __name__ == "__main__":
     app = Server()
     app._route("", websocket_handler)
-    app._static("static", handle_file_request, root=".")
+    app._static("/static", handle_file_request, root=".")
     app.run()

vuer/events.py

@@ -1,4 +1,5 @@
 from vuer.schemas import Element
+from vuer.serdes import serializer
 
 
 class Event:
@@ -54,27 +55,6 @@ NULL = NullEvent()
 #         instance = cls.__new__(cls)
 #         return cls.__init__(instance, data)
 
-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}")
-
 
 class ServerEvent(Event):  # , metaclass=Meta):
     def __init__(self, data, etype=None, **kwargs):

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):
@@ -247,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 []
@@ -270,6 +281,21 @@ class Scene(BlockElement):
         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):
     pass
 
@@ -287,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"
 
@@ -422,10 +488,6 @@ class Html(SceneElement):
     tag = "Html"
 
 
-class Ply(SceneElement):
-    tag = "Ply"
-
-
 class Pivot(SceneElement):
     tag = "Pivot"
 
@@ -434,6 +496,14 @@ class Movable(SceneElement):
     tag = "Movable"
 
 
+class Obj(SceneElement):
+    tag = "Obj"
+
+
+class Ply(SceneElement):
+    tag = "Ply"
+
+
 class Glb(SceneElement):
     tag = "Glb"
 
@@ -442,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

@@ -6,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
 
@@ -30,12 +31,12 @@ 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
@@ -171,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)
@@ -297,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-0.0.4.dist-info → vuer-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vuer
-Version: 0.0.4
+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.4.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.4.dist-info/RECORD

@@ -1,21 +0,0 @@
-vuer/__init__.py,sha256=x2ZqgbBIDHQr7UvdkKhVdtYToIZdhXw4XTRnfrQiBos,28
-vuer/base.py,sha256=P64wGxQzk3VOic9hWJRSqHvlzjo5XKqrQplX6-tLgu8,3074
-vuer/events.py,sha256=pJIdD5F-SqXJ_maowRiDgssnbRgP23dEsOKfXSxVE2o,4126
-vuer/schemas.py,sha256=CxSy1WvVS_JWtADf8L0pdBvub4ZQMGRtYOno0mVW-60,10406
-vuer/server.py,sha256=kSdB5kWxHeDxly51XHvo0Wgk-TZ3zD-ZuisMG70sYYs,9001
-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=jh-fD5wRe1rHjODFbQQqjQmvH5rT1rdqrU0HF-LaA3U,12851
-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=GbTCoVTzszijduQUmjdjrBFZW1ttGAb5AV5p4P6nPM4,13974
-vuer/addons/nerfuer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vuer/addons/nerfuer/render_nodes.py,sha256=ekrF93o3Q5cE2GKoYYvt7l7Nva_i8r6AFw29xHzx0wA,4478
-vuer-0.0.4.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
-vuer-0.0.4.dist-info/METADATA,sha256=KQMq_t1yeq0-YNjGjn9oNwgKD-O9bM39GbZMnr6bZAs,764
-vuer-0.0.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-vuer-0.0.4.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
-vuer-0.0.4.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
-vuer-0.0.4.dist-info/RECORD,,