vuer 0.0.44__py3-none-any.whl → 0.0.45__py3-none-any.whl

vuer/base.py

@@ -84,7 +84,7 @@ class Server:
 
         self.cors_context = aiohttp_cors.setup(self.app, defaults=cors_config)
 
-    def _route(
+    def _add_route(
         self,
         path: str,
         handler: callable,
@@ -97,20 +97,20 @@ class Server:
         ws_handler = partial(
             websocket_handler, handler=handler, max_msg_size=self.WEBSOCKET_MAX_SIZE
         )
-        self._route(path, ws_handler)
+        self._add_route(path, ws_handler)
 
     @staticmethod
     def _add_task(fn: Coroutine, name=None):
         loop = asyncio.get_running_loop()
         loop.create_task(fn, name=name)
 
-    def _static(self, path, root):
+    def _add_static(self, path, root):
         _fn = partial(handle_file_request, root=root)
-        self._route(f"{path}/{{filename:.*}}", _fn, method="GET")
+        self._add_route(f"{path}/{{filename:.*}}", _fn, method="GET")
 
     def _static_file(self, path, root, filename=None):
         _fn = partial(handle_file_request, root=root, filename=filename)
-        self._route(f"{path}", _fn, method="GET")
+        self._add_route(f"{path}", _fn, method="GET")
 
     def run(self):
         async def init_server():
@@ -139,6 +139,6 @@ class Server:
 
 if __name__ == "__main__":
     app = Server()
-    app._route("", websocket_handler)
-    app._static("/static", handle_file_request, root=".")
+    app._add_route("", websocket_handler)
+    app._add_static("/static", handle_file_request, root=".")
     app.run()

vuer/server.py

@@ -1,33 +1,33 @@
 import asyncio
 from asyncio import sleep
-from collections import deque, defaultdict
+from collections import defaultdict, deque
 from functools import partial
 from pathlib import Path
-from typing import cast, Callable, Dict, Union
+from typing import Callable, Dict, Union, cast
 from uuid import uuid4
 
 from aiohttp.hdrs import UPGRADE
-from aiohttp.web_request import Request, BaseRequest
+from aiohttp.web_request import BaseRequest, Request
 from aiohttp.web_response import Response
 from aiohttp.web_ws import WebSocketResponse
 from msgpack import packb, unpackb
-from params_proto import Proto, PrefixProto, Flag
+from params_proto import Flag, PrefixProto, Proto
 from websockets import ConnectionClosedError
 
 from vuer.base import Server, handle_file_request, websocket_handler
 from vuer.events import (
+    INIT,
+    NOOP,
+    Add,
     ClientEvent,
+    Frame,
+    GrabRender,
     NullEvent,
+    Remove,
     ServerEvent,
-    NOOP,
-    Frame,
+    ServerRPC,
     Set,
     Update,
-    INIT,
-    Remove,
-    Add,
-    ServerRPC,
-    GrabRender,
     Upsert,
 )
 from vuer.schemas import Page
@@ -755,6 +755,25 @@ class Vuer(PrefixProto, Server):
         else:
             return await websocket_handler(request, self.downlink)
 
+    def add_route(self, path, fn: Callable, method="GET", content_type="text/html"):
+        if self.verbose:
+            print("========= Adding Route =========")
+            print("        path:", path)
+            print("          fn:", fn)
+            print("      method:", method)
+            print("content_type:", content_type)
+            print("--------------------------------")
+
+        async def handler(request: Request):
+            try:
+                output = fn()
+                return Response(text=output, content_type=content_type)
+            except Exception as e:
+                print("\033[91m" + str(e) + "\033[0m", flush=True)
+                return Response(status=500, text=str(e))
+
+        self._add_route(path, handler, method=method)
+
     def run(self, kill=None, *args, **kwargs):
         import os
 
@@ -762,6 +781,7 @@ class Vuer(PrefixProto, Server):
         # port = int(_)
         if kill or self.free_port:
             import time
+
             from killport import kill_ports
 
             kill_ports(ports=[self.port])
@@ -772,14 +792,14 @@ class Vuer(PrefixProto, Server):
         # self._static_file("", Path(__file__).parent / "client_build", filename="index.html")
 
         # use the same endpoint for websocket and file serving.
-        self._route("", self.socket_index, method="GET")
-        self._static("/assets", self.client_root / "assets")
-        self._static("/hands", self.client_root / "hands")
+        self._add_route("", self.socket_index, method="GET")
+        self._add_static("/assets", self.client_root / "assets")
+        self._static_file("/editor", self.client_root, "editor/index.html")
 
         # serve local files via /static endpoint
-        self._static("/static", self.static_root)
+        self._add_static("/static", self.static_root)
         print("Serving file://" + os.path.abspath(self.static_root), "at", "/static")
-        self._route("/relay", self.relay, method="POST")
+        self._add_route("/relay", self.relay, method="POST")
 
         print("Visit: " + self.get_url())
 

{vuer-0.0.44.dist-info → vuer-0.0.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: vuer
-Version: 0.0.44
+Version: 0.0.45
 Home-page: https://github.com/vuer-ai/vuer
 Author: Ge Yang<ge.ike.yang@gmail.com>
 Author-email: ge.ike.yang@gmail.com
@@ -10,39 +10,42 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: params-proto >=2.13.0
+Requires-Dist: params-proto>=2.13.0
 Requires-Dist: pillow
 Requires-Dist: msgpack
-Requires-Dist: numpy >=1.21
+Requires-Dist: numpy>=1.21
 Requires-Dist: websockets
 Provides-Extra: all
-Requires-Dist: aiohttp ==3.10.5 ; extra == 'all'
-Requires-Dist: aiohttp-cors ; extra == 'all'
-Requires-Dist: killport ; extra == 'all'
-Provides-Extra: dev
-Requires-Dist: aiohttp ==3.10.5 ; extra == 'dev'
-Requires-Dist: aiohttp-cors ; extra == 'dev'
-Requires-Dist: killport ; 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: sphinx ==7.1.2 ; extra == 'dev'
-Requires-Dist: furo ; extra == 'dev'
-Requires-Dist: sphinx-autobuild ; extra == 'dev'
-Requires-Dist: sphinx-copybutton ; extra == 'dev'
-Requires-Dist: myst-parser ; extra == 'dev'
-Requires-Dist: trimesh ; extra == 'dev'
-Requires-Dist: tqdm ; extra == 'dev'
+Requires-Dist: aiohttp==3.10.5; extra == "all"
+Requires-Dist: aiohttp-cors; extra == "all"
+Requires-Dist: killport; extra == "all"
 Provides-Extra: example
-Requires-Dist: aiohttp ==3.10.5 ; extra == 'example'
-Requires-Dist: aiohttp-cors ; extra == 'example'
-Requires-Dist: killport ; extra == 'example'
-Requires-Dist: open3d <0.16.0,>=0.15.0 ; extra == 'example'
-Requires-Dist: trimesh ; extra == 'example'
-Requires-Dist: cmx ; extra == 'example'
-Requires-Dist: functional-notations ; extra == 'example'
-Requires-Dist: ml-logger ; extra == 'example'
-Requires-Dist: opencv-python ; extra == 'example'
+Requires-Dist: aiohttp==3.10.5; extra == "example"
+Requires-Dist: aiohttp-cors; extra == "example"
+Requires-Dist: killport; extra == "example"
+Requires-Dist: open3d<0.16.0,>=0.15.0; extra == "example"
+Requires-Dist: trimesh; extra == "example"
+Requires-Dist: cmx; extra == "example"
+Requires-Dist: functional_notations; extra == "example"
+Requires-Dist: ml_logger; extra == "example"
+Requires-Dist: opencv-python; extra == "example"
+Provides-Extra: dev
+Requires-Dist: aiohttp==3.10.5; extra == "dev"
+Requires-Dist: aiohttp-cors; extra == "dev"
+Requires-Dist: killport; 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: sphinx==7.1.2; extra == "dev"
+Requires-Dist: furo; extra == "dev"
+Requires-Dist: sphinx-autobuild; extra == "dev"
+Requires-Dist: sphinx_copybutton; extra == "dev"
+Requires-Dist: myst_parser; extra == "dev"
+Requires-Dist: trimesh; extra == "dev"
+Requires-Dist: tqdm; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
 
 <h2>Vuer: Modern High-Performance Visualization for AI & Robotics in VR
 <br/>

{vuer-0.0.44.dist-info → vuer-0.0.45.dist-info}/RECORD

@@ -1,19 +1,19 @@
 vuer/__init__.py,sha256=kbjORSc64WWVHcx3eJB1wnCzhIF76eX5g-JAXYEDM4Q,519
-vuer/base.py,sha256=oZWLC1QJ-Oa3ekCtqu3sVLgvUF2Mp7brgtv0OF4uXSI,4226
+vuer/base.py,sha256=_NR9o1n_CvjhREolq5FSouMONBGnxJwrw56isfakTUE,4254
 vuer/events.py,sha256=FFNCEXFZDIEvNV58ZWOZE4Xg-Qf60YJ6w6MLlyOAfiw,7931
 vuer/serdes.py,sha256=GcUTcNwFj2rd-H9Konnud3w1hs7_ACdKzhDuHbnOaB0,2606
-vuer/server.py,sha256=kjTXTOjlIyiJpun_3HJyJQ40BJRoaYP1KKMGyEEWosY,24420
+vuer/server.py,sha256=Uo-KJMe3ffsGHCj4fUczbQRSRxcd4a_yZdrdFkfCiHY,25224
 vuer/types.py,sha256=Hor1MmkdyQrtsj-qE0dLH-ZeaIFDQzVwunO7ZgEqC9M,1321
 vuer/__pycache__/__init__.cpython-311.pyc,sha256=jtNzgxMRe_sQNA7bcFGYXtNQv_fTiR_yvvV1MAen0aw,786
 vuer/__pycache__/__init__.cpython-38.pyc,sha256=9UiyDbGVhzENW5OZYxPZhMK1kVGNV6sTlNFK1Soetdk,652
-vuer/__pycache__/base.cpython-311.pyc,sha256=WP8WCNerh55287dkUtNRRwkTgdIOFphwUI6n9RuB8Xw,8746
-vuer/__pycache__/base.cpython-38.pyc,sha256=-6Ys76_bhj6Eozvh56583kc5JbwMWXa31pCowRCRavY,4789
+vuer/__pycache__/base.cpython-311.pyc,sha256=umIxJw-tC116BY02zkJILekYVeKYXqW8qVvXuySuMKc,8758
+vuer/__pycache__/base.cpython-38.pyc,sha256=aEEOc3MPe7ky265HG26dCyAx1RyDLbHF2xMIg3r__KI,4805
 vuer/__pycache__/events.cpython-311.pyc,sha256=hjCTwuSe638Gavc5Xu1iPgcyPDxOJ6ggZY2GW6T7oA8,14745
 vuer/__pycache__/events.cpython-38.pyc,sha256=Uvjj__OHltPlyjcaCpOvEQMHFePDW2UdQnAHt9ORi1A,9952
 vuer/__pycache__/serdes.cpython-311.pyc,sha256=oC-sI0zHgAbMLHVD_biVJ6SQfYsXfVc2bGgS6gVPWsM,4631
 vuer/__pycache__/serdes.cpython-38.pyc,sha256=dq4IFqiPsgG26p7ZAd09ehhCTkzsvGTtu8NYck1qBDU,2263
-vuer/__pycache__/server.cpython-311.pyc,sha256=iN010SBrGMzLPa70jGnotbNQLXlfb88NNYIoXDVH8Qo,35379
-vuer/__pycache__/server.cpython-38.pyc,sha256=jEjRV5_-_OrzxDlagGB2EslIIamlm_GVk9_nxux_rFU,22523
+vuer/__pycache__/server.cpython-311.pyc,sha256=ozzIJlImjSXzKwGt_20BUn90whkOKH4SVVr24vZ_Hek,36856
+vuer/__pycache__/server.cpython-38.pyc,sha256=nyo9o6L6X0a5WVKn4yIm70Q1NS2WeLyswxQXliOjJj8,23317
 vuer/__pycache__/types.cpython-311.pyc,sha256=VpSyi31RkV1ntEPZ4-zjDN5jRZ3UK5FkHU4p40lfVgA,2798
 vuer/__pycache__/types.cpython-38.pyc,sha256=C9Z8XbkgINu8ilDHmBlzkMmgg1w0nPAzJ_mM_qFiOrA,1884
 vuer/addons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,15 +94,15 @@ vuer/schemas/__pycache__/drei_components.cpython-311.pyc,sha256=5Iy4O5tm6vzVTh3H
 vuer/schemas/__pycache__/drei_components.cpython-38.pyc,sha256=YzK4Sa888xt8OhOPsx2L3iEQEU4ZGS5AwrcsQHNzN1E,7720
 vuer/schemas/__pycache__/html_components.cpython-311.pyc,sha256=hbLRG2Y39uGL0k9sYyas1ti0DoYBHG_JX7-CRWFF2Eg,14352
 vuer/schemas/__pycache__/html_components.cpython-38.pyc,sha256=XlXf72kzEbweQDcokV9Q1YJ3U6dgWocVME9NYALuhno,8743
-vuer/schemas/__pycache__/physics_components.cpython-311.pyc,sha256=zThiiRD318SaZv5oZGdpZGw5AKNms9vsQMZmHwSUXSY,2798
-vuer/schemas/__pycache__/physics_components.cpython-38.pyc,sha256=b1JqOWVzRNWC_GzrDCSFACrA9i1X9r2WHqsIhQjIxhI,2169
+vuer/schemas/__pycache__/physics_components.cpython-311.pyc,sha256=0aDpnt4N-i4mWoQzftwxQCItAEsLPbNlactvAwFVWTg,2861
+vuer/schemas/__pycache__/physics_components.cpython-38.pyc,sha256=uozao_e8htfxOly2mM6ogR6MoAdPWiRcCAS9zzDX8DQ,2202
 vuer/schemas/__pycache__/scene_components.cpython-311.pyc,sha256=Kzco9Rd3QauUKCl06DErechrsCsM4TOwWvn5WfH0km0,39293
 vuer/schemas/__pycache__/scene_components.cpython-38.pyc,sha256=3xE24HHVXAu7jNZfiQ4qTh25sfdcq-H0JoJPhyTIHyk,30148
 vuer/schemas/__pycache__/vuer_components.cpython-311.pyc,sha256=SKbT-DH72q4bRt50jj1y0er42uekv2pD3PDAUuaNKOk,1969
 vuer/schemas/__pycache__/vuer_components.cpython-38.pyc,sha256=-zv3JXOr9phygRVaQ8NAzheWPyvwf6fkQ29Q1IEhvr8,1819
-vuer-0.0.44.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
-vuer-0.0.44.dist-info/METADATA,sha256=NzyAYSiBN3IMaSYQvc4UX_abrmwecJBsug6ZZa8fhnM,5681
-vuer-0.0.44.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-vuer-0.0.44.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
-vuer-0.0.44.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
-vuer-0.0.44.dist-info/RECORD,,
+vuer-0.0.45.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
+vuer-0.0.45.dist-info/METADATA,sha256=6zMpbLX8h3H_Pid-1Ulpjgbf9Wnt5wC7SX26ATN1ZGk,5703
+vuer-0.0.45.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+vuer-0.0.45.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
+vuer-0.0.45.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
+vuer-0.0.45.dist-info/RECORD,,

{vuer-0.0.44.dist-info → vuer-0.0.45.dist-info}/WHEEL

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