Minor cleanups

Author: ncoghlan

src/lmstudio/plugin/__init__.py

@@ -15,7 +15,7 @@
 # * [DONE] refactor hook registration to be data driven instead of hardcoded in the runner
 # * refactor to allow "Abort" request handling to be common across hook invocation tasks
 # * refactor to allow hook invocation error handling to be common across hook invocation tasks
-# * gracefully handle app termination while a dev plugin is still running (handle "None" on rx_stream)
+# * [DONE] gracefully handle app termination while a dev plugin is still running
 # * [DONE] gracefully handle using Ctrl-C to terminate a running dev plugin
 #
 # Controller APIs (may be limited to relevant hook controllers)

src/lmstudio/plugin/hooks/prompt_preprocessor.py

@@ -1,7 +1,5 @@
 """Invoking and supporting prompt preprocessor hook implementations."""
 
-import asyncio
-
 from traceback import format_tb
 
 from typing import (
@@ -23,7 +21,6 @@
     ChannelEndpoint,
     ChannelFinishedEvent,
     ChannelRxEvent,
-    LMStudioChannelClosedError,
     load_struct,
 )
 from ..._sdk_models import (
@@ -74,7 +71,7 @@ class PromptPreprocessingRequestEvent(ChannelRxEvent[PromptPreprocessingRequest]
 class PromptPreprocessingEndpoint(
     ChannelEndpoint[tuple[str, str], PromptPreprocessingRxEvent, EmptyDict]
 ):
-    """API channel endpoint to register a development plugin and receive credentials."""
+    """API channel endpoint to accept prompt preprocessing requests."""
 
     _API_ENDPOINT = "setPromptPreprocessor"
     _NOTICE_PREFIX = "Prompt preprocessing"
@@ -87,9 +84,8 @@ def iter_message_events(
     ) -> Iterable[PromptPreprocessingRxEvent]:
         match contents:
             case None:
-                raise LMStudioChannelClosedError(
-                    "Server failed to complete development plugin registration."
-                )
+                # Server can only terminate the link by closing the websocket
+                pass
             case {"type": "abort", "task_id": str(task_id)}:
                 yield PromptPreprocessingAbortEvent(task_id)
             case {"type": "preprocess"} as request_dict:
@@ -217,14 +213,10 @@ async def _invoke_hook(request: PromptPreprocessingRequest) -> None:
             response_dict: UserMessageDict
             try:
                 response = await hook_impl(hook_controller, message)
-            except asyncio.CancelledError:
-                # Cancellation is a regular exception, so explicitly
-                # reraise it to avoid blocking Ctrl-C processing
-                raise
             except Exception as exc:
                 err_msg = "Error calling prompt preprocessing hook"
                 logger.error(err_msg, exc_info=True, exc=repr(exc))
-                # TODO: Determine if it's practical to emit a stack trace the server can display
+                # TODO: Determine if it's worth sending the stack trace to the server
                 ui_cause = f"{err_msg}\n({type(exc).__name__}: {exc})"
                 error_details = SerializedLMSExtendedErrorDict(
                     cause=ui_cause, stack="\n".join(format_tb(exc.__traceback__))