Even more rearranging, this is so painful

src/server/device_flapi_receive.py → flapi/device_flapi_receive.py

@@ -8,13 +8,29 @@
 It attaches to the "Flapi Request" device and handles messages before sending
 a response via the "Flapi Respond" script.
 """
+import sys
 import logging
 import device
+from pathlib import Path
+from typing import Optional
 from base64 import b64decode, b64encode
-from flapi import _consts as consts
-from flapi._consts import MessageStatus, MessageOrigin, MessageType
-from capout import Capout
-from flapi.flapi_msg import FlapiMsg
+
+# Add the dir containing flapi to the PATH, so that imports work
+sys.path.append(str(Path(__file__).parent.parent))
+
+# These imports need lint ignores, since they depend on the path modification
+# above
+
+from flapi import _consts as consts  # noqa: E402
+from flapi._consts import (  # noqa: E402
+    MessageStatus,
+    MessageOrigin,
+    MessageType,
+)
+from flapi.server.capout import Capout  # noqa: E402
+from flapi.server.client_context import ClientContext  # noqa: E402
+from flapi.flapi_msg import FlapiMsg  # noqa: E402
+from flapi.types import ScopeType
 
 try:
     from fl_classes import FlMidiMsg
@@ -44,6 +60,37 @@ def send_stdout(text: str):
 capout = Capout(send_stdout)
 
 
+###############################################################################
+
+
+clients: dict[int, ClientContext] = {}
+
+
+def version_query(
+    client_id: int,
+    status_code: int,
+    msg_data: Optional[bytes],
+    context: ClientContext,
+) -> tuple[int, bytes]:
+    """
+    Request the server version
+    """
+    return MessageStatus.OK, bytes(consts.VERSION)
+
+
+def register_message_type(
+    client_id: int,
+    status_code: int,
+    msg_data: Optional[bytes],
+    context: ClientContext,
+) -> tuple[int, bytes]:
+    """
+    Register a new message type
+    """
+    assert msg_data
+    # TODO
+
+
 def OnInit():
     print("\n".join([
         "Flapi request server",

src/server/client_context.py → flapi/server/client_context.py

@@ -1,11 +1,7 @@
 """
 # Flapi Server / Client Context
 """
-from typing import Any
-from flapi.types import ServerMessageHandler
-
-
-ScopeType = dict[str, Any]
+from flapi.types import ServerMessageHandler, ScopeType
 
 
 class ClientContext:

src/flapi/types/__init__.py → flapi/types/__init__.py

@@ -4,11 +4,13 @@
 Type definitions used by Flapi.
 """
 from .mido_types import MidoPort, MidoMsg
+from .scope import ScopeType
 from .message_handler import ServerMessageHandler
 
 
 __all__ = [
     'MidoPort',
     'MidoMsg',
     'ServerMessageHandler',
+    'ScopeType',
 ]

src/server/flapi/types/message_handler.py → flapi/types/message_handler.py

@@ -1,7 +1,8 @@
 """
 # Flapi / Types / Message Handler
 """
-from typing import Any, Optional, Protocol
+from typing import Optional, Protocol
+from flapi.server.client_context import ClientContext
 
 
 class ServerMessageHandler(Protocol):
@@ -15,12 +16,17 @@ class ServerMessageHandler(Protocol):
     * `status_code`: status code sent by client.
     * `msg_data`: optional additional bytes.
     * `scope`: local scope to use when executing arbitrary code.
+
+    ## Returns of handler function
+
+    * `int` status code
+    * `bytes` additional data
     """
     def __call__(
         self,
         client_id: int,
         status_code: int,
         msg_data: Optional[bytes],
-        scope: dict[str, Any],
+        context: ClientContext,
     ) -> int | tuple[int, bytes]:
         ...

flapi/types/scope.py

@@ -0,0 +1,10 @@
+"""
+# Flapi / Types / Scope
+"""
+from typing import Any
+
+
+ScopeType = dict[str, Any]
+"""
+Represents a variable scope in Python
+"""