vuer 0.0.30__py3-none-any.whl → 0.0.31rc2__py3-none-any.whl

vuer/schemas/html_components.py

@@ -1,3 +1,4 @@
+from io import BytesIO
 from typing import Union, Literal
 
 import numpy as np
@@ -214,28 +215,46 @@ class Image(Element):
         self,
         data: Union[str, np.ndarray, pil_image.Image] = None,
         *,
-        src: str = None,
-        format: Literal["png", "jpg", "b64png", "b64jpg"] = "png",
+        src: Union[str, bytes] = None,
+        format: Literal["png", "jpeg", "b64png", "b64jpeg"] = "png",
         quality: int = None,
         **kwargs,
     ):
         if src is not None:
-            assert data is None, "data and src can not be truful at the same time"
-        if data is None:
-            pass
-        elif isinstance(data, list) and len(data) == 0:
-            pass
-        else:
-            if isinstance(data, pil_image.Image):
-                data = data
-            elif isinstance(data, str):
-                # convert back to image first from base64
-                data = pil_image.open(data)
-            elif isinstance(data, np.ndarray):
-                if data.dtype == np.uint8:
-                    pass
-                else:
-                    data = (data * 255).astype(np.uint8)
+            assert data is None, "data and src can not be truthy at the same time"
+            super().__init__(src=src, **kwargs)
+            return
+
+        elif data is None or isinstance(data, list) and len(data) == 0:
+            super().__init__(**kwargs)
+            return
+
+        elif isinstance(data, pil_image.Image):
+            buff = BytesIO()
+            assert not format.startswith(
+                "b64"
+            ), "does not support base64 encoding, use binary."
+            data.save(buff, format=format)
+            binary = buff.getbuffer().tobytes()
+            super().__init__(src=binary, **kwargs)
+            return
+
+        elif isinstance(data, str):
+            buff = BytesIO()
+            img = pil_image.open(data)
+            assert not format.startswith(
+                "b64"
+            ), "does not support base64 encoding, use binary."
+            img.save(buff, format=format)
+            binary = buff.getbuffer().tobytes()
+            super().__init__(src=binary, **kwargs)
+            return
+
+        if isinstance(data, np.ndarray):
+            if data.dtype == np.uint8:
+                pass
+            else:
+                data = (data * 255).astype(np.uint8)
 
             if quality is not None:
                 src = IMAGE_FORMATS[format](data, quality=quality)

vuer/serdes.py

@@ -41,7 +41,7 @@ def serializer(data):
     # # raise NotImplementedError(f"Cannot serialize {data}")
 
 
-def jpg(image, quality: int = 90):
+def jpeg(image, quality: int = 90):
     """
     base64 encode the image into a string, using JPEG encoding
 
@@ -65,7 +65,7 @@ def png(image):
         return buff.getbuffer().tobytes()
 
 
-def b64jpg(image, quality: int = 90):
+def b64jpeg(image, quality: int = 90):
     """
     base64 encode the image into a string, using JPEG encoding
 
@@ -92,8 +92,8 @@ def b64png(image):
 
 
 IMAGE_FORMATS = {
-    "jpg": jpg,
+    "jpeg": jpeg,
     "png": png,
-    "b64jpg": b64jpg,
+    "b64jpeg": b64jpeg,
     "b64png": b64png,
 }

vuer/server.py

@@ -3,7 +3,7 @@ from asyncio import sleep
 from collections import deque, defaultdict
 from functools import partial
 from pathlib import Path
-from typing import cast, Callable, Coroutine, Dict
+from typing import cast, Callable, Dict, Union
 from uuid import uuid4
 
 from aiohttp.hdrs import UPGRADE
@@ -11,7 +11,7 @@ from aiohttp.web_request import Request, BaseRequest
 from aiohttp.web_response import Response
 from aiohttp.web_ws import WebSocketResponse
 from msgpack import packb, unpackb
-from params_proto import Proto, PrefixProto
+from params_proto import Proto, PrefixProto, Flag
 from websockets import ConnectionClosedError
 
 from vuer.base import Server, handle_file_request, websocket_handler
@@ -89,7 +89,9 @@ class VuerSession:
         :return: dqueue
         """
         assert isinstance(event, ServerEvent), "msg must be a ServerEvent type object."
-        assert not isinstance(event, Frame), "Frame event is only used in vuer.bind method."
+        assert not isinstance(
+            event, Frame
+        ), "Frame event is only used in vuer.bind method."
         assert self.CURRENT_WS_ID in self.vuer.ws, "Websocket session is missing."
 
         event_obj = event.serialize()
@@ -106,7 +108,9 @@ class VuerSession:
         :param subsample: The subsample of the render.
         :param ttl: The time to live for the handler. If the handler is not called within the time it gets removed from the handler list.
         """
-        assert self.CURRENT_WS_ID is not None, "Websocket session is missing. CURRENT_WS_ID is None."
+        assert (
+            self.CURRENT_WS_ID is not None
+        ), "Websocket session is missing. CURRENT_WS_ID is None."
 
         event = GrabRender(**kwargs)
 
@@ -242,7 +246,7 @@ class VuerSession:
             return None
 
     def clear(self):
-        "clears all client messages"
+        """clears all client messages"""
         self.downlink_queue.clear()
 
     def stream(self):
@@ -285,22 +289,28 @@ class Vuer(PrefixProto, Server):
     .. automethod:: run
     """
 
-    name = "vuer"
-    domain = "https://vuer.ai"
-    port = DEFAULT_PORT
-    free_port = True
-    static_root = "."
-    queue_len = 100  # use a max length to avoid the memory from blowing up.
-    cors = "https://vuer.ai,https://dash.ml,http://localhost:8000,http://127.0.0.1:8000,*"
-    queries = Proto({}, help="query parameters to pass")
-
-    cert = Proto(None, dtype=str, help="the path to the SSL certificate")
-    key = Proto(None, dtype=str, help="the path to the SSL key")
-    ca_cert = Proto(None, dtype=str, help="the trusted root CA certificates")
-
-    client_root = Path(__file__).parent / "client_build"
-
-    device = "cuda"
+    domain = Proto("https://vuer.ai", help="default url of web client")
+    host = Proto("localhost", help="set to 0.0.0.0 to enable remote connections")
+    port = Proto(DEFAULT_PORT, help="port to use")
+    free_port: bool = Flag("Kill what is running on the requested port if True.")
+    static_root: str = Proto(".", help="root for file serving")
+    """todo: we want to support multiple paths."""
+    queue_len: int = Proto(
+        100, help="use a max length to avoid the memory from blowing up."
+    )
+    cors = Proto(
+        "https://vuer.ai,https://dash.ml,http://localhost:8000,http://127.0.0.1:8000,*",
+        help="domains that are allowed for cross origin requests.",
+    )
+    queries: Dict = Proto({}, help="query parameters to pass")
+
+    cert: str = Proto(None, dtype=str, help="the path to the SSL certificate")
+    key: str = Proto(None, dtype=str, help="the path to the SSL key")
+    ca_cert: str = Proto(None, dtype=str, help="the trusted root CA certificates")
+
+    client_root: Path = Path(__file__).parent / "client_build"
+
+    verbose = Flag("Print the settings if True.")
 
     def _proxy(self, ws_id) -> "VuerSession":
         """This is a proxy object that allows us to use the @ notation
@@ -316,6 +326,13 @@ class Vuer(PrefixProto, Server):
 
     def __post_init__(self):
         # todo: what is this?
+
+        if self.verbose:
+            print("========= Arguments =========")
+            for k, v in vars(self).items():
+                print(f" {k} = {v},")
+            print("-----------------------------")
+
         Server.__post_init__(self)
 
         self.handlers = defaultdict(dict)
@@ -348,15 +365,17 @@ class Vuer(PrefixProto, Server):
             return Response(400)
         elif session_id in self.ws:
             self.send(ws_id=session_id, event_bytes=bytes)
+
             return Response(status=200)
-        elif session_id == "all":
+        elif session_id == "*":
             # print broadcast
             for ws_id in self.ws:
                 try:
                     self.send(ws_id=ws_id, event_bytes=bytes)
                 except Exception as e:
                     print("Exception: ", e)
-                    pass
+                    return Response(status=502, text=str(e))
+
             return Response(status=200)
         else:
             return Response(status=400)
@@ -460,7 +479,9 @@ class Vuer(PrefixProto, Server):
         ws = self.ws[ws_id]
 
         if event_bytes is None:
-            assert isinstance(event, ServerEvent), "event must be a ServerEvent type object."
+            assert isinstance(
+                event, ServerEvent
+            ), "event must be a ServerEvent type object."
             event_obj = event.serialize()
             event_bytes = packb(event_obj, use_single_float=True, use_bin_type=True)
         else:
@@ -468,7 +489,7 @@ class Vuer(PrefixProto, Server):
 
         return await ws.send_bytes(event_bytes)
 
-    async def rpc(self, ws_id, event: ServerRPC, ttl=2.0) -> ClientEvent:
+    async def rpc(self, ws_id, event: ServerRPC, ttl=2.0) -> Union[ClientEvent, None]:
         """RPC only takes a single response. For multi-response streaming,
         we need to build a new one
 
@@ -484,7 +505,9 @@ class Vuer(PrefixProto, Server):
         rpc_event = asyncio.Event()
         response = None
 
-        async def response_handler(response_event: ClientEvent, _: "VuerSession") -> Coroutine:
+        async def response_handler(
+            response_event: ClientEvent, _: "VuerSession"
+        ) -> None:
             nonlocal response
 
             response = response_event
@@ -510,7 +533,7 @@ class Vuer(PrefixProto, Server):
         raise NotImplementedError("This is not implemented yet.")
 
     async def close_ws(self, ws_id):
-        # uplink is moved to the proxy object. Clearned by garbage collection.
+        # uplink is moved to the proxy object. Cleaned by garbage collection.
         # self.uplink_queue.pop(ws_id)
         try:
             ws = self.ws.pop(ws_id)
@@ -625,10 +648,10 @@ class Vuer(PrefixProto, Server):
             await self.close_ws(ws_id)
 
     def add_handler(
-            self,
-            event_type: str,
-            fn: EventHandler = None,
-            once: bool = False,
+        self,
+        event_type: str,
+        fn: EventHandler = None,
+        once: bool = False,
     ) -> Callable[[], None]:
         """Adding event handlers to the vuer server.
 
@@ -706,7 +729,9 @@ class Vuer(PrefixProto, Server):
         """
         headers = request.headers
         if "websocket" != headers.get(UPGRADE, "").lower().strip():
-            return await handle_file_request(request, self.client_root, filename="index.html")
+            return await handle_file_request(
+                request, self.client_root, filename="index.html"
+            )
         else:
             return await websocket_handler(request, self.downlink)
 

{vuer-0.0.30.dist-info → vuer-0.0.31rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vuer
-Version: 0.0.30
+Version: 0.0.31rc2
 Home-page: https://github.com/geyang/vuer
 Author: Ge Yang<ge.ike.yang@gmail.com>
 Author-email: ge.ike.yang@gmail.com

{vuer-0.0.30.dist-info → vuer-0.0.31rc2.dist-info}/RECORD

@@ -2,15 +2,15 @@ vuer/__init__.py,sha256=kbjORSc64WWVHcx3eJB1wnCzhIF76eX5g-JAXYEDM4Q,519
 vuer/base.py,sha256=wzJoR57hjRreMBPR2zCqARhap2NF_dnizGouKaOMiog,4224
 vuer/events.py,sha256=8AAzkfbm5jHkeMh17Z57n8YTxF4mheWC3Qbya4XkQSc,7291
 vuer/schemas.py,sha256=aZOocE02gO43SLLfeYSxxac0x38TmyTcfs_iFh5hsJ4,18152
-vuer/serdes.py,sha256=gD2iA9Yypu1QjocneOT3Nc0y6q_mdHn9zW1ko5j3I7c,2600
-vuer/server.py,sha256=YWinzsS62ezlWzZwnvMHeFa44xZ5_C11dzTg6tQmPIE,22717
+vuer/serdes.py,sha256=GcUTcNwFj2rd-H9Konnud3w1hs7_ACdKzhDuHbnOaB0,2606
+vuer/server.py,sha256=d1MgXCcs7WCG87uTUcFezW4UKxQp3nTMzWeDrONHjg4,23553
 vuer/types.py,sha256=N2KLa0fl6z8Jm6cJwZoD8Vqrins_AayG5BCGk1p3Eek,1279
 vuer/__pycache__/__init__.cpython-38.pyc,sha256=5iTFXy2ivwedwlehtJwBje7Bh3j86bu9TZh_waR8kvs,644
 vuer/__pycache__/base.cpython-38.pyc,sha256=0U6qDasrEqc8tsLvlmw5grPX_htqPxbmQpZ5R760Rso,4768
 vuer/__pycache__/events.cpython-38.pyc,sha256=zx3bXeJixqOyCFe2nA7qpq6jiCJ49kRaXO-xONGUyeQ,9616
 vuer/__pycache__/schemas.cpython-38.pyc,sha256=hvY9Aak8zE-zKcWiwuNe6DghOw9qH_zSe_FtkBOAPPk,23234
-vuer/__pycache__/serdes.cpython-38.pyc,sha256=GncycLg8qwrlKR-X5el9txThHkY_zqejmZlpQKAeJnA,2253
-vuer/__pycache__/server.cpython-38.pyc,sha256=O0T1VObw7tLIUev1LIN_B8x8E6SmpokJXBIFHhQFWNc,20771
+vuer/__pycache__/serdes.cpython-38.pyc,sha256=_mtV9NhQ05aE9_QVH-oPd0TPyu5rLf9WpxhjUB_Uo1E,2255
+vuer/__pycache__/server.cpython-38.pyc,sha256=rlfXkgvQGNT04X_p_s1oZPIsSauNVA66eL9NRjWOMJQ,21559
 vuer/__pycache__/types.cpython-38.pyc,sha256=IhlXtkT-XWM0V1420FDuoqIYnpvRvekYVkGqEK7fAV8,1819
 vuer/addons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vuer/addons/nerf_vuer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -111,15 +111,15 @@ vuer/client_build/hands/index.html,sha256=E18xQ0UCKT2KP3w6O11UB0VUiTWbd6Og4ibXNr
 vuer/client_build/hands/index.pageContext.json,sha256=nRC_8Jo3t6gqQUHn2FDfo6cPOJPMonkkWWBfoBG1wzI,276
 vuer/schemas/__init__.py,sha256=ZI6UyeLZXqJbHmp6LiE3Q3mHvt1zeV-SJmmcqq-wBZE,94
 vuer/schemas/drei_components.py,sha256=U9svEOnNprhZaobLagaFnqEtZxo5hiriSqjDnvQutoA,6989
-vuer/schemas/html_components.py,sha256=KGvRo8b-34Kch81cTNPffRLKuU8oa5SX_0xZ1lkJhxY,6134
+vuer/schemas/html_components.py,sha256=28KuxiSoLi0W7LLK81QqyZbBQ6IsK5HyQqWN86ZlUuo,6759
 vuer/schemas/scene_components.py,sha256=-4EqZSpDbv_EOCZarPgqSwxR1cAnjLKX3rP8f1Db1X0,18902
 vuer/schemas/__pycache__/__init__.cpython-38.pyc,sha256=NRnVrpIDBKne93xOUY1-WpavCG7vwYiqU3VDTEEwuUE,221
 vuer/schemas/__pycache__/drei_components.cpython-38.pyc,sha256=g_ufcKxf-XKfZLdUV-HqKnjIrgxGWFv51aHLWQgH-ws,7712
-vuer/schemas/__pycache__/html_components.cpython-38.pyc,sha256=sk2gDqu_zNQMS-PC8d3L90bvjFjTBb8-UKK9Ka5aoAw,8348
+vuer/schemas/__pycache__/html_components.cpython-38.pyc,sha256=xJFawDLPt9TkpYDw5mL8RQwy-0RQ0ZxyLlBGoPkdWoQ,8745
 vuer/schemas/__pycache__/scene_components.cpython-38.pyc,sha256=FCBjSZs-lX5YvhcL3K0s_T_oz2Fm8NAdd-XsPoXQc9s,22109
-vuer-0.0.30.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
-vuer-0.0.30.dist-info/METADATA,sha256=QI0N5iV0PDd6cCEjrZ-7Qj_59RO5mV63W2omo8Tk2Lg,5346
-vuer-0.0.30.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-vuer-0.0.30.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
-vuer-0.0.30.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
-vuer-0.0.30.dist-info/RECORD,,
+vuer-0.0.31rc2.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
+vuer-0.0.31rc2.dist-info/METADATA,sha256=SFzCxh8YAa74V2Sgz_rQsqriwDT80fMzjNdMYo_m86c,5349
+vuer-0.0.31rc2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+vuer-0.0.31rc2.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
+vuer-0.0.31rc2.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
+vuer-0.0.31rc2.dist-info/RECORD,,