bind_jsonschema_api: reduce method nesting

pkgs/clan-app/clan_app/deps/webview/webview.py

@@ -2,6 +2,7 @@ import ctypes
 import json
 import logging
 import threading
+import functools
 from collections.abc import Callable
 from dataclasses import dataclass
 from enum import IntEnum
@@ -57,53 +58,15 @@ class Webview:
         if size:
             self.size = size
 
-    def __enter__(self) -> "Webview":
-        return self
+    def api_wrapper(
+        self,
+        api: MethodRegistry,
+        wrap_method: Callable[..., Any],
+        method_name: str,
 
-    @property
-    def size(self) -> Size:
-        return self._size
-
-    @size.setter
-    def size(self, value: Size) -> None:
-        _webview_lib.webview_set_size(
-            self._handle, value.width, value.height, value.hint
-        )
-        self._size = value
-
-    @property
-    def title(self) -> str:
-        return self._title
-
-    @title.setter
-    def title(self, value: str) -> None:
-        _webview_lib.webview_set_title(self._handle, _encode_c_string(value))
-        self._title = value
-
-    def destroy(self) -> None:
-        for name in list(self._callbacks.keys()):
-            self.unbind(name)
-        _webview_lib.webview_terminate(self._handle)
-        _webview_lib.webview_destroy(self._handle)
-        self._handle = None
-
-    def navigate(self, url: str) -> None:
-        _webview_lib.webview_navigate(self._handle, _encode_c_string(url))
-
-    def run(self) -> None:
-        _webview_lib.webview_run(self._handle)
-        log.info("Shutting down webview...")
-        self.destroy()
-
-    def bind_jsonschema_api(self, api: MethodRegistry) -> None:
-        for name, method in api.functions.items():
-
-            def wrapper(
         seq: bytes,
         req: bytes,
         arg: int,
-                wrap_method: Callable[..., Any] = method,
-                method_name: str = name,
     ) -> None:
         def thread_task(stop_event: threading.Event) -> None:
             try:
@@ -166,6 +129,52 @@ class Webview:
             thread=thread, stop_event=stop_event
         )
 
+    def __enter__(self) -> "Webview":
+        return self
+
+    @property
+    def size(self) -> Size:
+        return self._size
+
+    @size.setter
+    def size(self, value: Size) -> None:
+        _webview_lib.webview_set_size(
+            self._handle, value.width, value.height, value.hint
+        )
+        self._size = value
+
+    @property
+    def title(self) -> str:
+        return self._title
+
+    @title.setter
+    def title(self, value: str) -> None:
+        _webview_lib.webview_set_title(self._handle, _encode_c_string(value))
+        self._title = value
+
+    def destroy(self) -> None:
+        for name in list(self._callbacks.keys()):
+            self.unbind(name)
+        _webview_lib.webview_terminate(self._handle)
+        _webview_lib.webview_destroy(self._handle)
+        self._handle = None
+
+    def navigate(self, url: str) -> None:
+        _webview_lib.webview_navigate(self._handle, _encode_c_string(url))
+
+    def run(self) -> None:
+        _webview_lib.webview_run(self._handle)
+        log.info("Shutting down webview...")
+        self.destroy()
+
+    def bind_jsonschema_api(self, api: MethodRegistry) -> None:
+        for name, method in api.functions.items():
+            wrapper = functools.partial(
+                self.api_wrapper,
+                api,
+                name,
+                method,
+            )
             c_callback = _webview_lib.CFUNCTYPE(
                 None, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_void_p
             )(wrapper)