feat: move modules from judas_server/backend to judas_server/

src/judas_server/__init__.py

@@ -1 +1,7 @@
+from .backend_server import BackendServer
+
 __version__: str = "0.5.0"
+
+__all__ = [
+    "BackendServer",
+]

src/judas_server/__main__.py

@@ -3,9 +3,8 @@
 import logging as lg
 
 if __name__ == "__main__":
-    from judas_server.backend import BackendServer
+    from judas_server import BackendServer
     from judas_server.gaga import LADY_GAGA
-    from judas_server.web.web_server import JudasWebServer
 
     lg.basicConfig(
         level=lg.DEBUG,
@@ -22,11 +21,3 @@ if __name__ == "__main__":
         port=3692,
     )
     backend_server.run()
-
-    web_server: JudasWebServer = JudasWebServer(
-        backend=backend_server, secret_key="dildo"
-    )
-    web_server.run(
-        host="0.0.0.0",
-        port=5000,
-    )

src/judas_server/backend/__init__.py

@@ -1,5 +0,0 @@
-from .backend_server import BackendServer
-from .client import Client
-from .client_status import ClientStatus
-
-__all__ = ["BackendServer", "Client", "ClientStatus"]

src/judas_server/backend_server.py

@@ -12,9 +12,9 @@ from judas_protocol.types import TelemetryAction
 import yaml
 from judas_protocol import Category, ControlAction, Message
 
-from judas_server.backend.client import Client, ClientStatus
+from judas_server.client import Client, ClientStatus
-from judas_server.backend.handler.hello_handler import HelloHandler
+from judas_server.handler.hello_handler import HelloHandler
-from judas_server.backend.handler.telemetry.initial_handler import (
+from judas_server.handler.telemetry.initial_handler import (
     InitialTelemetryHandler,
 )
 
@@ -348,9 +348,7 @@ class BackendServer:
     def run(self) -> None:
         """Start the backend server."""
         self.running = True
-        threading.Thread(
+        self._loop()
-            name="BackendServer thread", target=self._loop, daemon=True
-        ).start()
 
     def _loop(self) -> None:
         """Main server loop to handle incoming connections and data."""
@@ -396,6 +394,9 @@ class BackendServer:
         except Exception as e:
             self.logger.error(f"Server error: {e}")
             raise e
+        except KeyboardInterrupt:
+            self.logger.info("Keyboard interrupt received, stopping server...")
+            self.running = False
         finally:
             self.selector.close()
             self.server_socket.close()

src/judas_server/client.py

@@ -8,7 +8,7 @@ import socket
 import time
 from typing import Any
 
-from judas_server.backend.client_status import ClientStatus
+from judas_server.client_status import ClientStatus
 
 
 class Client:

src/judas_server/handler/ack_handler.py

@@ -8,7 +8,7 @@ from .base_handler import BaseHandler
 if TYPE_CHECKING:
     from judas_protocol import Message
 
-    from judas_server.backend import BackendServer, Client
+    from judas_server import BackendServer, Client
 
 
 class AckHandler(BaseHandler):

src/judas_server/handler/base_handler.py

@@ -4,12 +4,12 @@ from __future__ import annotations
 import logging as lg
 from typing import TYPE_CHECKING
 
-from judas_server.backend.client import Client
+from judas_server.client import Client
 
 if TYPE_CHECKING:
     from judas_protocol import Message
 
-    from judas_server.backend import BackendServer
+    from judas_server import BackendServer
 
 
 class BaseHandler:

src/judas_server/handler/hello_handler.py

@@ -5,12 +5,12 @@ from typing import TYPE_CHECKING, override
 
 from judas_protocol import Category, ControlAction, Message
 
-from judas_server.backend.client import ClientStatus
+from judas_server.client import ClientStatus
-from judas_server.backend.handler import BaseHandler
+from judas_server.handler import BaseHandler
 
 if TYPE_CHECKING:
-    from judas_server.backend.backend_server import BackendServer
+    from judas_server.backend_server import BackendServer
-    from judas_server.backend.client import Client
+    from judas_server.client import Client
 
 
 class HelloHandler(BaseHandler):

src/judas_server/handler/telemetry/initial_handler.py

@@ -7,11 +7,11 @@ from typing import TYPE_CHECKING
 
 from judas_protocol import Message
 
-from judas_server.backend.handler.base_handler import BaseHandler
+from judas_server.handler.base_handler import BaseHandler
 
 if TYPE_CHECKING:
-    from judas_server.backend import BackendServer
+    from judas_server import BackendServer
-    from judas_server.backend.client import Client
+    from judas_server.client import Client
 
 
 class InitialTelemetryHandler(BaseHandler):