More performant plotting for simple plot types

captain/internal/wsmanager.py

@@ -3,7 +3,7 @@
 from flojoy import PlotlyJSONEncoder
 from queue import Queue
 from typing import Any, Union
-import json
+import orjson
 from captain.types.worker import WorkerJobResponse
 import threading
 import traceback
@@ -44,7 +44,8 @@ async def disconnect(self, socket_id: str):
             del self.active_connections_map[socket_id]
 
     # this method sends a message to all connected websockets
-    async def broadcast(self, message: Union[dict[str, Any], WorkerJobResponse]):
+    async def broadcast(self, message: Union[dict[str, Any],
+                                             WorkerJobResponse]):
         if not isinstance(message, WorkerJobResponse):
             return
 
@@ -56,9 +57,9 @@ async def broadcast(self, message: Union[dict[str, Any], WorkerJobResponse]):
                     continue
 
                 try:
-                    await connection.send_text(
-                        json.dumps(message, cls=PlotlyJSONEncoder)
-                    )
+                    await connection.send_bytes(
+                        orjson.dumps(message,
+                                     option=orjson.OPT_SERIALIZE_NUMPY))
                 except Exception as e:
                     print(
                         f"Error in broadcast to {id}",

captain/utils/manifest/generate_manifest.py

@@ -8,6 +8,7 @@
 
 NAME_MAP = {
     "AI_ML": "AI & ML",
+    "COMPUTER_VISION": "Computer Vision",
     "DATA": "Data",
     "DSP": "Digital Signal Processing",
     "IMAGE": "Image",
@@ -29,6 +30,7 @@
 # A node will inherit the type of its parent if it is not in the allowed types.
 ALLOWED_TYPES = [
     "AI_ML",
+    "COMPUTER_VISION",
     "DATA",
     "VISUALIZATION",
     "MATH",
@@ -53,6 +55,7 @@
     "ETL",
     "DSP",
     "IMAGE",
+    "COMPUTER_VISION",
     "CONTROL_FLOW",
     "HARDWARE",
     "DSP",

package.json

@@ -27,6 +27,7 @@
     "@radix-ui/react-tooltip": "^1.0.7",
     "@tisoap/react-flow-smart-edge": "file:bauhaus/tisoap-react-flow-smart-edge-v3.0.0.tgz",
     "axios": "^1.5.1",
+    "candygraph": "^0.10.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
     "cmdk": "^0.2.0",
@@ -37,6 +38,7 @@
     "express": "^4.18.2",
     "file-saver": "^2.0.5",
     "framer-motion": "^10.16.4",
+    "gl-matrix": "^3.4.3",
     "html-to-image": "^1.11.11",
     "http-proxy-middleware": "^2.0.6",
     "immer": "^10.0.3",
@@ -63,6 +65,7 @@
     "react-syntax-highlighter": "^15.5.0",
     "react-tabs": "^6.0.2",
     "react-use": "^17.4.0",
+    "regl": "^2.1.0",
     "reactflow": "^11.9.4",
     "sonner": "^1.0.3",
     "tailwind-merge": "^1.14.0",

pkgs/flojoy/flojoy/__init__.pyi

@@ -26,4 +26,5 @@ def flojoy(
     deps: Optional[dict[str, str]] = None,
     inject_node_metadata: bool = False,
     inject_connection: bool = False,
+    forward_result: bool = False
 ) -> Callable[..., DataContainer | dict[str, Any] | None]: ...

pkgs/flojoy/flojoy/flojoy_python.py

@@ -115,6 +115,7 @@ def flojoy(
     deps: Optional[dict[str, str]] = None,
     inject_node_metadata: bool = False,
     inject_connection: bool = False,
+    forward_result: bool = False,
 ):
     """
     Decorator to turn Python functions with numerical return
@@ -251,7 +252,7 @@ def wrapper(
 
                 # Package the result and return it
                 FN = func.__name__
-                result = get_frontend_res_obj_from_result(dc_obj)
+                result = get_frontend_res_obj_from_result(dc_obj, forward_result)
                 return JobSuccess(
                     result=result,
                     fn=FN,

pkgs/flojoy/flojoy/job_result_utils.py

@@ -72,11 +72,15 @@ def get_text_blob_from_dc(dc: DataContainer) -> str | None:
 
 
 def get_frontend_res_obj_from_result(
-    result: Optional[dict[str, Any] | DataContainer]
+    result: Optional[dict[str, Any] | DataContainer], forward_result: bool = False
 ) -> Optional[dict[str, Any]]:
     if result is None:
         return None
 
+    if forward_result:
+        if isinstance(result, DataContainer):
+            return {"data": result}
+
     # Only return a plotly fig if it is a viz node
     match result:
         case Plotly() | TextBlob() | Bytes():
@@ -107,4 +111,6 @@ def get_frontend_res_obj_from_result(
             "text_blob": text_blob,
         }
     keys = list(result.keys())
-    return get_frontend_res_obj_from_result(result[keys[0]])
+    return get_frontend_res_obj_from_result(
+        result[keys[0]],
+    )

pkgs/flojoy/flojoy/utils.py

@@ -23,7 +23,6 @@
 import base64
 from .CONSTANTS import FLOJOY_DIR, FLOJOY_CACHE_DIR, CREDENTIAL_FILE
 
-
 __all__ = [
     "get_env_var",
     "set_env_var",
@@ -36,7 +35,6 @@
     "clear_flojoy_memory",
 ]
 
-
 # # package result
 # def package_result(result: dict | None, fn: str, node_id: str, jobset_id: str) -> dict:
 #     return {
@@ -55,6 +53,7 @@
 #         "FAILED_NODES": {node_id: str(error)},
 #         "jobsetId": jobset_id,
 #     }
+#
 
 
 # Make as a function to mock at test-time

pkgs/flojoy/pyproject.toml

@@ -7,7 +7,7 @@ authors = [
   "Dallas Strandell <[email protected]>",
 ]
 name = "flojoy"
-version = "0.1.16"
+version = "0.1.17"
 description = ""
 readme = "README.md"