Simplify error handlinging in tab

Author: ayjayt

src/py/kaleido/__init__.py

@@ -115,7 +115,7 @@ async def write_fig(
     *,
     topojson: str | None = None,
     kopts: dict[str, Any] | None = None,
-    **kwargs,  # TODO(AJP): what might we pass here?
+    **kwargs,
 ):
     """
     Write a plotly figure(s) to a file.
@@ -142,7 +142,7 @@ async def write_fig_from_object(
     fig_dicts: FigureDict | AnyIterable[FigureDict],
     *,
     kopts: dict[str, Any] | None = None,
-    **kwargs,  # TODO(AJP): what might we pass here?
+    **kwargs,
 ):
     """
     Write a plotly figure(s) to a file specified by a dictionary or iterable of.

src/py/kaleido/_kaleido_tab/_devtools_utils.py

@@ -7,7 +7,7 @@
 
 import logistro
 
-from ._errors import JavascriptError, KaleidoError, _get_error, _raise_error
+from ._errors import KaleidoError, _raise_error
 
 if TYPE_CHECKING:
     from typing import Any
@@ -75,11 +75,8 @@ async def exec_js_fn(
 
 def check_kaleido_js_response(
     response,
-) -> tuple[
-    dict,
-    Exception | None,
-]:
-    # TODO(AJP) provoke a js error and return js error
+) -> dict:
+    _raise_error(response)
     js_response = json.loads(
         response.get(
             "result",
@@ -93,23 +90,24 @@ def check_kaleido_js_response(
             "value",
         ),
     )
-    if not js_response:  # not loved, neither {}
-        return {}, RuntimeError(
-            f"JS Response not understood: {response}",
+    if not js_response:
+        raise RuntimeError(
+            f"Javascript response not understood: {response}",
         )
+    # NOTE: Why above "JavascriptError"
+    # This is an error in extracting a response when we expected javascript.
+    # If its an actual javascript error, the response will be coherent, and
+    # _raise_error above will find it.
 
     if js_response["code"] != 0:
-        return {}, KaleidoError(js_response["code"], js_response["message"])
+        raise KaleidoError(js_response["code"], js_response["message"])
 
-    return js_response, None
+    return js_response
 
 
 async def print_pdf(
     tab: choreographer.Tab,
-) -> tuple[
-    str,
-    Exception | None,
-]:
+) -> str:
     pdf_params = {
         "printBackground": True,
         "marginTop": 0.1,
@@ -123,7 +121,5 @@ async def print_pdf(
         "Page.printToPDF",
         params=pdf_params,
     )
-    e = _get_error(pdf_response)
-    if e:
-        return "", e
-    return pdf_response.get("result", {}).get("data"), None
+    _raise_error(pdf_response)
+    return pdf_response.get("result", {}).get("data")  # Check for None?

src/py/kaleido/_kaleido_tab/_tab.py

@@ -138,26 +138,13 @@ async def _calc_fig(
         )
         _raise_error(result)
 
-        # TODO(AJP): better define these error mechanics, is this a devtools
-        # function or what
-        # upon implementation of error, might not be necessary
-        # to do these go-lang/c style returns
-        # but we have to collect and associate
-        # with the gather + profile
-        # None-non return values are a problem
-        # In general, need to better understand stuff here
-
         _logger.debug2(f"Result of function call: {result}")
-        js_response, error = _dtools.check_kaleido_js_response(result)
-        if error:
-            raise error
+        js_response = _dtools.check_kaleido_js_response(result)
 
         if (response_format := js_response.get("format")) == "pdf":
-            img_raw, error = await _dtools.print_pdf(self.tab)
+            img_raw = await _dtools.print_pdf(self.tab)
         else:
-            img_raw = js_response.get("result")  # type: ignore[assignment]
-        if error:
-            raise error
+            img_raw = js_response["result"]
 
         if response_format not in _TEXT_FORMATS:
             return base64.b64decode(img_raw)