From 4aa2ca426c2ae3ac29724f70aa9a07e7eb5a723b Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Thu, 28 Aug 2025 19:57:10 +0200 Subject: [PATCH 01/31] build(pyproject.toml): add depedency on judas_protocol --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index d87e671..d1d0984 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ dependencies = [ "flask>=3.1.1", "flask-login>=0.6.3", "flask-socketio>=5.5.1", + "judas-protocol", ] license = { text = "GPL-3.0+" } @@ -85,3 +86,6 @@ allowed_tags = [ minor_tags = ["feat"] patch_tags = ["fix", "perf"] default_bump_level = 0 + +[tool.uv.sources] +judas-protocol = { git = "https://gitea.pufereq.pl/judas/judas_protocol.git" } -- 2.39.5 From 4e16a70174a4492ec59a2ff356deddd758e3e6e1 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Thu, 28 Aug 2025 19:57:24 +0200 Subject: [PATCH 02/31] build(uv.lock): add depedency on judas_protocol --- uv.lock | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/uv.lock b/uv.lock index 9113841..0902c2e 100644 --- a/uv.lock +++ b/uv.lock @@ -308,6 +308,11 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, ] +[[package]] +name = "judas-protocol" +version = "0.1.0" +source = { git = "https://gitea.pufereq.pl/judas/judas_protocol.git#fd070b176347a0f7b81f937b189d8f50736f3514" } + [[package]] name = "judas-server" version = "0.2.0" @@ -316,6 +321,7 @@ dependencies = [ { name = "flask" }, { name = "flask-login" }, { name = "flask-socketio" }, + { name = "judas-protocol" }, ] [package.dev-dependencies] @@ -335,6 +341,7 @@ requires-dist = [ { name = "flask", specifier = ">=3.1.1" }, { name = "flask-login", specifier = ">=0.6.3" }, { name = "flask-socketio", specifier = ">=5.5.1" }, + { name = "judas-protocol", git = "https://gitea.pufereq.pl/judas/judas_protocol.git" }, ] [package.metadata.requires-dev] -- 2.39.5 From 639e1f73a07286bce1a1ef227d216a722e3fa214 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Thu, 28 Aug 2025 20:04:32 +0200 Subject: [PATCH 03/31] feat(server.py): add socket-based communication --- src/judas_server/backend/server.py | 183 ++++++++++++++++++++++++----- 1 file changed, 155 insertions(+), 28 deletions(-) diff --git a/src/judas_server/backend/server.py b/src/judas_server/backend/server.py index 6324478..70ee238 100644 --- a/src/judas_server/backend/server.py +++ b/src/judas_server/backend/server.py @@ -1,54 +1,181 @@ # -*- coding: utf-8 -*- from __future__ import annotations -from typing import Any - import logging as lg -import random as rn import threading import time +import selectors +import socket +import types +from typing import Any + +from judas_protocol import Message + +from judas_server.backend.client import Client class BackendServer: - def __init__(self) -> None: + def __init__(self, host: str = "0.0.0.0", port: int = 3692) -> None: + """Initialize the backend server. + + Args: + host (str): The host IP address to bind the server to. + port (int): The port number to bind the server to. + """ self.logger: lg.Logger = lg.getLogger( f"{__name__}.{self.__class__.__name__}" ) self.logger.debug("Initializing Server...") - # TODO: add socket logic here + self.selector = selectors.DefaultSelector() + self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self._bind_socket(host, port) + self.server_socket.listen() + self.server_socket.setblocking(False) + self.selector.register( + self.server_socket, selectors.EVENT_READ, data=None + ) - self.clients: dict[str, dict[str, dict[str, Any]]] = { - "C_01": { - "one_time": { - "hostname": "mock-host", - "platform": "windows 11", - "cpu_info": "i7", - }, - "polled": {"cpu_usage": 0, "ram_usage": 0}, - "ondemand": {}, - } - } + self.clients: dict[str, Client] = {} self.running: bool = False + def _bind_socket(self, host: str, port: int) -> None: + """Bind the server socket to the specified host and port. + + Args: + host (str): The host IP address to bind the server to. + port (int): The port number to bind the server to. + """ + self.logger.debug(f"Binding socket to {host}:{port}") + while True: + try: + self.server_socket.bind((host, port)) + self.logger.debug(f"Socket bound to {host}:{port}") + break + except OSError as e: + self.logger.error( + f"Failed to bind socket to {host}:{port}, retrying...: {e}" + ) + time.sleep(1) + + def _accept_connection(self, sock: socket.socket) -> None: + """Accept a new client connection. + + Args: + sock (socket.socket): The selected socket. + """ + conn, addr = sock.accept() + self.logger.info(f"[+] Accepted connection from {addr}") + conn.setblocking(False) + + # wait for hello message to get mac_id + + conn.settimeout(5) + message = conn.recv(1024) + conn.settimeout(None) + + message = Message.from_bytes(message) + + mac_id = message.payload.get("mac", None) + if mac_id is None: + self.logger.error( + f"[-] No mac_id provided by {addr}, closing connection" + ) + conn.close() + return + + client = Client(id_=mac_id, addr=addr, socket=conn) + self.clients[mac_id] = client + + events = selectors.EVENT_READ | selectors.EVENT_WRITE + self.selector.register(conn, events, data=client) + + self.logger.info(f"[+] Registered client {client}") + + def _disconnect(self, client: Client) -> None: + """Disconnect a client and clean up resources. + + Args: + sock (socket.socket): The client socket to disconnect. + """ + self.logger.info(f"[-] Disconnecting {client}") + self.selector.unregister(client.socket) + client.disconnect() + + def _handle_connection( + self, key: selectors.SelectorKey, mask: int + ) -> None: + """Handle a client connection. + + Args: + key (selectors.SelectorKey): The selector key for the client. + mask (int): The event mask. + """ + sock: socket.socket = key.fileobj + client = key.data + + try: + if mask & selectors.EVENT_READ: + recv_data = sock.recv(1024) + if recv_data: + self.logger.debug( + f"[<] Received data from {client}: {recv_data!r}" + ) + client.inbound += recv_data + while b"\n" in client.inbound: + line, client.inbound = client.inbound.split(b"\n", 1) + self.logger.info( + f"[<] Complete message from {client}: {line!r}" + ) + + # send ACK + ack = Message.ack().to_bytes() + self.logger.debug(f"[>] Sending ACK to {client}") + client.outbound += ack + + else: + self._disconnect(client) + + if mask & selectors.EVENT_WRITE: + if client.outbound: + self.logger.debug( + f"[>] Sending data to {client}: {client.outbound!r}" + ) + sent = sock.send(client.outbound) + + client.outbound = client.outbound[sent:] + except ConnectionResetError as e: + self.logger.error(f"Connection reset by {client}, disconnect: {e}") + self._disconnect(client) + def run(self) -> None: + """Start the backend server.""" self.running = True threading.Thread( name="BackendServer thread", target=self._loop, daemon=True ).start() def _loop(self) -> None: - self.logger.info("Starting server loop...") - while self.running: - for client in self.clients.values(): - client["polled"]["cpu_usage"] = round(rn.uniform(0, 100), 1) - client["polled"]["ram_usage"] = round(rn.uniform(0, 100), 1) - time.sleep(1) + """Main server loop to handle incoming connections and data.""" + self.logger.info("Server is running...") + try: + while self.running: + events = self.selector.select(timeout=1) + for key, mask in events: + if key.data is None: + self._accept_connection(key.fileobj) + else: + self._handle_connection(key, mask) + except Exception as e: + self.logger.error(f"Server error: {e}") + raise e + finally: + self.selector.close() + self.server_socket.close() + self.logger.info("Server has stopped.") - self.logger.info("Server loop stopped.") - - def get_client_data( - self, client_id: str - ) -> dict[str, dict[str, Any]] | None: - return self.clients.get(client_id, None) + # def get_client_data( + # self, client_id: str + # ) -> dict[str, dict[str, Any]] | None: + # return self.clients.get(client_id, None) -- 2.39.5 From b5670e5d2cf08a031b99478de57aa53cba78bd5b Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:15:40 +0200 Subject: [PATCH 04/31] refactor(server.py): rename `server.py` to `backend_server.py` for clarity --- src/judas_server/backend/{server.py => backend_server.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/judas_server/backend/{server.py => backend_server.py} (100%) diff --git a/src/judas_server/backend/server.py b/src/judas_server/backend/backend_server.py similarity index 100% rename from src/judas_server/backend/server.py rename to src/judas_server/backend/backend_server.py -- 2.39.5 From cafef5ed932ea5456260398b44e42d71702a386a Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:18:18 +0200 Subject: [PATCH 05/31] style(backend_server.py): remove unused imports --- src/judas_server/backend/backend_server.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index 70ee238..ab4abc8 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -6,8 +6,6 @@ import threading import time import selectors import socket -import types -from typing import Any from judas_protocol import Message -- 2.39.5 From c0cacfad2d13799d3472a5d033ae15fd668401f9 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:20:02 +0200 Subject: [PATCH 06/31] fix(backend_server.py): fix server waiting for closed socket to dissapear by reusing it in `__init__()` --- src/judas_server/backend/backend_server.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index ab4abc8..1c20b85 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -27,6 +27,9 @@ class BackendServer: self.selector = selectors.DefaultSelector() self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.server_socket.setsockopt( + socket.SOL_SOCKET, socket.SO_REUSEADDR, 1 + ) self._bind_socket(host, port) self.server_socket.listen() self.server_socket.setblocking(False) -- 2.39.5 From 1c96390f3cade804b2667bb69bec4419703a6d56 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:23:48 +0200 Subject: [PATCH 07/31] feat(backend_server.py): add error handling for HELLO message handler in `_accept_connection()` --- src/judas_server/backend/backend_server.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index 1c20b85..b2b1396 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -73,9 +73,19 @@ class BackendServer: # wait for hello message to get mac_id conn.settimeout(5) - message = conn.recv(1024) + try: + message = conn.recv(1024) + if not message: + self.logger.error(f"[-] No data received from {addr}") + conn.close() + return + except socket.timeout: + self.logger.error(f"[-] Timeout waiting for hello from {addr}") + conn.close() + return conn.settimeout(None) + message = message.split(b"\n")[0] # get first line only message = Message.from_bytes(message) mac_id = message.payload.get("mac", None) -- 2.39.5 From 2ecd32decce95e6aec74433ef3255bc4cf3c3988 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:26:49 +0200 Subject: [PATCH 08/31] feat(client.py): add `Client` class --- src/judas_server/backend/client.py | 58 ++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/judas_server/backend/client.py diff --git a/src/judas_server/backend/client.py b/src/judas_server/backend/client.py new file mode 100644 index 0000000..20bb840 --- /dev/null +++ b/src/judas_server/backend/client.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +"""Client representation.""" + +from __future__ import annotations + +import logging as lg +import socket + +from enum import Enum + + +class ClientStatus(str, Enum): + CONNECTED = "connected" + DISCONNECTED = "disconnected" + + +class Client: + """Represents a client.""" + + def __init__( + self, id_: str, addr: tuple[str, int], socket: socket.socket + ) -> None: + """Initialize the client. + + Args: + id_ (str): The unique identifier for the client. + addr (tuple[str, int]): The (IP, port) address of the client. + socket (socket.socket): The socket object for communication. + """ + self.logger: lg.Logger = lg.getLogger( + f"{__name__}.{self.__class__.__name__}" + ) + self.logger.debug(f"Initializing Client {addr}...") + + self.id: str = id_ + self.last_seen: float = 0.0 # unix timestanp of last inbound message + self.status: ClientStatus = ClientStatus.CONNECTED + + self.socket: socket.socket = socket + self.addr: tuple[str, int] = addr + self.inbound: bytes = b"" + self.outbound: bytes = b"" + + def __str__(self) -> str: + return f"Client({self.id} ({self.addr[0]}:{self.addr[1]}))" + + def __repr__(self) -> str: + return f"Client({self.id}, {self.addr})" + + def disconnect(self) -> None: + """Disconnect the client and close the socket.""" + self.logger.debug(f"Disconnecting Client {self}...") + try: + self.socket.close() + except Exception as e: + self.logger.error(f"Error closing socket for Client {self}: {e}") + self.status = ClientStatus.DISCONNECTED + self.logger.info(f"Client {self} disconnected.") -- 2.39.5 From ac66ce19998a4518a346b6608645486121cd2123 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:29:56 +0200 Subject: [PATCH 09/31] chore(backend_server.py): set `Client.last_seen` on message receive --- src/judas_server/backend/backend_server.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index b2b1396..b522c1e 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -145,6 +145,8 @@ class BackendServer: self.logger.debug(f"[>] Sending ACK to {client}") client.outbound += ack + # set last seen + client.last_seen = time.time() else: self._disconnect(client) -- 2.39.5 From b9a7c2bdaf4be8dcea4c6f3196a6092f76eac183 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:30:34 +0200 Subject: [PATCH 10/31] docs(backend_server.py): add TODO in `_handle_connection()` --- src/judas_server/backend/backend_server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index b522c1e..ad82e8b 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -158,6 +158,7 @@ class BackendServer: sent = sock.send(client.outbound) client.outbound = client.outbound[sent:] + # TODO: wait for ACK from client except ConnectionResetError as e: self.logger.error(f"Connection reset by {client}, disconnect: {e}") self._disconnect(client) -- 2.39.5 From c0ad91b22f0e011da1021ead1c126a94aaf90f44 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:31:43 +0200 Subject: [PATCH 11/31] feat(backend_server.py): re-add the `get_client_data()` method --- src/judas_server/backend/backend_server.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index ad82e8b..d530bdf 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -189,7 +189,14 @@ class BackendServer: self.server_socket.close() self.logger.info("Server has stopped.") - # def get_client_data( - # self, client_id: str - # ) -> dict[str, dict[str, Any]] | None: - # return self.clients.get(client_id, None) + def get_client_data(self, client_id: str) -> dict[str, Any] | None: + client: Client | None = self.clients.get(client_id, None) + if client is None: + self.logger.warning(f"Client {client_id} not found") + return None + return { + "id": client.id, + "addr": client.addr, + "last_seen": client.last_seen, + "status": client.status, + } -- 2.39.5 From 54512d8393a32f59a9aaddf5a52cb18ee9986fdf Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:33:44 +0200 Subject: [PATCH 12/31] chore(routes/api.py): adapt `emit_polled_data()` for `Client` class --- src/judas_server/web/routes/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/judas_server/web/routes/api.py b/src/judas_server/web/routes/api.py index b2f9da6..2690535 100644 --- a/src/judas_server/web/routes/api.py +++ b/src/judas_server/web/routes/api.py @@ -52,7 +52,8 @@ def emit_polled_data(app, socketio): import time while True: - for client_id, data in backend.clients.items(): + for client_id in backend.clients.keys(): + data = backend.get_client_data(client_id) socketio.emit("update_data", {client_id: data}) time.sleep(1) -- 2.39.5 From ac7799213cba82dbb189919873130647d7c87a78 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:35:22 +0200 Subject: [PATCH 13/31] refactor(__main__.py): provide `host` and `port` args to `BackendServer` explicitly --- src/judas_server/__main__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/judas_server/__main__.py b/src/judas_server/__main__.py index 7832738..42d5910 100644 --- a/src/judas_server/__main__.py +++ b/src/judas_server/__main__.py @@ -11,7 +11,10 @@ if __name__ == "__main__": format="%(asctime)s : [%(levelname)s] : %(threadName)s : %(name)s :: %(message)s", ) - backend_server: BackendServer = BackendServer() + backend_server: BackendServer = BackendServer( + host="0.0.0.0", + port=3692, + ) backend_server.run() web_server: JudasWebServer = JudasWebServer( -- 2.39.5 From f7f6f19808b19ae95bc361d00123a13c4afd344d Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:36:03 +0200 Subject: [PATCH 14/31] style(__main__.py): organize imports --- src/judas_server/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/judas_server/__main__.py b/src/judas_server/__main__.py index 42d5910..7421780 100644 --- a/src/judas_server/__main__.py +++ b/src/judas_server/__main__.py @@ -3,8 +3,8 @@ import logging as lg if __name__ == "__main__": - from judas_server.web.web_server import JudasWebServer from judas_server.backend import BackendServer + from judas_server.web.web_server import JudasWebServer lg.basicConfig( level=lg.DEBUG, -- 2.39.5 From b9fd84d08f24bb21e51b48b529f62bfe2671c895 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:38:23 +0200 Subject: [PATCH 15/31] feat(gaga.py): add Lady Gaga's Born This Way album art ASCII --- src/judas_server/gaga.py | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/judas_server/gaga.py diff --git a/src/judas_server/gaga.py b/src/judas_server/gaga.py new file mode 100644 index 0000000..dd5f84f --- /dev/null +++ b/src/judas_server/gaga.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +"""ASCII art of Lady Gaga's Born This Way album cover.""" + +from judas_server import __version__ + +LADY_GAGA: str = """ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⢔⢑⠔⡁⡂⢅⠢⠃⢆⢊⠜⡩⠳⣕⣙⡪⡪⡢⣫⢺⢔⢵⢱⢕⢮⢮⢺⡢⢕⠕⡽⣘⢜⠳⣌⢢⠀⠀⢄⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⢰⣶⣆⢰⠰⡄⢢⣶⣶⢐⠂⡑⡐⢆⢊⠔⠌⢌⢂⠢⠡⢂⠅⢍⢲⣉⡙⢜⡘⢎⣗⢵⢕⡕⡧⡳⡹⣮⣫⢺⢼⡪⣮⡳⡜⡮⡙⠤⠄⢂⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠈⠉⢽⡫⠉⡏⡏⠉⠍⡏⡉⢋⡍⣇⢕⢨⡈⡔⡠⠁⠕⡀⡈⠄⠠⡀⠍⠜⠜⡪⣚⡎⢏⢯⢞⡽⣺⡺⡮⡷⣝⣗⢽⢽⣽⢽⢶⢦⡨⠌⢔⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⡠⠨⡪⡹⡸⡑⡕⡑⢄⠕⠄⠔⡈⠜⡈⡂⡂⢅⠁⢂⢅⡪⡨⠒⡜⡾⣘⡪⡣⡻⣷⡻⣯⢿⡺⣗⡿⣽⢽⡽⣞⡽⡫⢷⣆⠑⡄⢀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⡀⠄⡕⣪⢞⢜⠌⡎⢜⠔⡡⢊⢰⢌⠎⡐⢄⢎⢢⡁⣂⠥⣌⢪⢪⡱⡹⡵⣎⢮⢯⡸⢝⣾⡽⣞⣿⠺⢝⣯⣿⢯⡳⡝⣄⠊⠻⢬⡢⣑⡀⠀⠀ +⠀⠀⠀⠀⠀⠀⠠⡐⣼⣪⢯⢽⠢⡃⢊⠊⠜⢬⡢⣟⢮⡣⣕⢵⣱⢵⢵⣳⢯⡷⣯⣞⣞⡮⡯⣗⡯⡪⡫⣎⢷⣻⣿⣺⡿⣼⡿⣝⢽⡷⣝⢆⠁⠀⠈⠝⣖⢦⠀⠀ +⠀⠀⠀⠀⢀⠨⠰⡱⡵⣯⢿⡝⢌⢐⠀⠂⠨⡠⢹⣺⡵⣳⢕⣯⢾⣻⡯⣿⣻⣿⣽⣾⣟⣿⣯⢿⡽⣳⢵⢕⡯⡿⣾⡮⣿⡿⣮⡫⣷⡻⣟⣧⡑⡐⢀⠐⡸⣕⡇⠠ +⠀⠀⡀⠐⠄⠅⢕⢝⣽⣻⣯⡇⢅⠢⣁⡊⠆⢜⣮⡺⡽⣺⢽⣞⣿⣽⣟⣯⣿⣾⢿⣾⣿⣽⣾⣿⡽⣯⢿⢽⣯⣻⡽⣿⣟⣿⡸⡹⣷⣯⣟⣯⣷⡄⡂⠀⡍⡖⡷⠀ +⠐⠀⠀⠨⠀⡘⡌⡇⡗⣟⡾⡊⢔⠅⡆⡌⡪⡘⣮⣞⢿⢽⢽⣺⡿⣾⣿⣿⣿⣿⣿⣿⣷⣿⣿⣿⣿⡽⣯⣟⡾⣜⣿⣿⢽⣺⣇⠢⡙⣽⣾⣟⣿⣟⣆⠢⡸⡵⢼⣂ +⠀⠀⢀⠠⠁⢜⠌⢌⠪⢪⡫⣎⢆⢇⢧⠪⡐⡘⡮⡿⡽⠹⡙⢕⣛⢿⣻⣿⢿⣻⣽⣿⣿⢿⣿⠿⣟⣿⢵⣷⣻⣪⣾⣟⡿⣯⣷⢑⢸⢸⡽⣿⣜⡿⣟⣞⠁⣳⢽⢯ +⠀⠀⠀⠠⢨⢪⢈⠄⡑⡑⣕⢇⢇⢇⢧⢣⡓⣌⠊⡁⠀⠀⡈⢄⠀⠛⡾⡽⣻⣿⣻⣻⣺⠋⠁⠁⠀⠀⢏⢺⣾⣼⡏⡾⣿⣽⣾⢯⡢⡱⡱⣻⣧⢻⣿⣿⡜⣜⢿⡧ +⠀⠀⡈⡌⡌⡂⡢⢐⢈⠆⡣⢪⢮⢣⡣⢇⢯⡪⡲⣐⠐⠝⡌⣎⠾⠦⠭⡎⣗⣷⡃⢧⠥⠺⠪⢅⠝⠂⢹⣨⣷⣿⣳⢝⣽⣿⣽⣯⣗⣗⢕⢯⣿⡸⣿⣿⢿⣇⣻⣇ +⢠⢧⣫⢵⢕⢗⡊⢆⠢⡊⠔⣹⢪⣳⢱⢩⢇⢯⡳⣝⢽⣳⣖⣶⢽⡯⣗⢕⣗⣟⡮⡪⣺⣻⣷⣶⢶⡿⣽⣳⣿⣿⣧⣛⣾⣿⣷⣟⣷⣯⣳⡺⣿⡥⢼⣿⣿⣷⢸⣷ +⢯⢿⢽⣝⢵⢱⣱⠵⡑⡌⢎⡞⡕⡵⡱⡑⡭⡳⡹⡮⣳⢳⣟⣾⣿⣯⡟⡮⣞⣯⣿⢜⠮⣷⣿⣾⣿⣿⣿⣯⣿⡿⣿⣶⢫⣿⣿⣽⣿⣷⣗⢿⣿⡗⡒⣿⣿⣻⣿⣿ +⣻⡫⣳⢕⡷⡝⡎⡮⡪⡊⢢⠱⡱⢱⢱⠱⡸⡸⣕⢝⢮⡳⣻⣿⣷⣿⢽⡺⣻⡿⣟⢷⢽⣽⣿⣷⣿⠿⣽⣾⢿⣿⣯⣿⡯⣿⣿⢿⣿⣿⣿⣟⣿⣷⡐⡼⣿⡯⣿⣿ +⡒⡕⡇⡯⡪⡎⡭⡪⡒⢌⠂⢕⠸⡨⡣⢣⠱⡱⡱⡳⣹⡪⣳⣿⣿⣻⡯⣟⣶⣿⣿⣽⣟⣾⣿⣿⣿⢿⣿⢯⣻⣿⣿⣿⣿⣻⣿⣯⢿⣿⣿⣿⣿⣿⣷⢏⢿⣿⢿⣿ +⡈⡖⡝⣼⢝⢜⡸⡸⡨⡠⡑⡅⢇⠎⣊⢪⢊⢎⢪⢺⢸⢜⢮⢿⣯⡯⠏⡣⡑⡥⠣⠐⡨⠘⢾⢿⣿⣟⡿⣯⣻⣿⣿⢿⣯⣿⣿⣯⢯⢿⣿⣻⣿⡷⣿⣗⢽⢽⢿⣿ +⠌⣮⡾⡳⡕⢝⡔⣕⢎⣪⢪⢪⢢⢃⢎⢎⡮⡺⣨⢳⣹⢸⢸⡻⣗⡏⠌⣶⣶⣾⣿⣿⡷⡕⠸⣟⣯⣿⣿⣳⢯⣿⣿⡿⣿⢷⣻⣿⣝⢝⣽⣿⣿⣟⡽⣾⡕⠝⡯⣿ +⡨⡮⡳⡩⡸⡲⣹⣵⣟⡮⡺⢸⡰⡫⣸⢜⢮⢺⡸⡸⡜⡌⢎⢎⢗⠕⡨⢒⢜⢭⢗⢕⡰⡜⢼⢿⣿⣻⡾⣽⣎⣿⣿⣿⣽⢿⣗⢿⣽⡮⡪⣾⣟⡷⡍⢿⣣⢘⢮⡿ +⠹⡜⡑⡬⡲⡽⣯⣷⢟⢔⢜⡴⡵⢏⢇⣣⢗⡇⢇⠎⡎⡎⡎⡜⢬⡣⠀⣧⣷⣽⣮⣯⡦⡩⣸⡿⣽⣯⢿⠕⢜⣽⣿⣽⡾⡯⣿⡞⣞⡯⡷⡿⣽⣟⠌⣞⣿⢨⢑⣿ +⠮⡱⡱⣱⢽⣽⢿⢕⣯⠢⡃⡣⢑⣔⣗⠯⢓⠨⢢⢣⠣⡓⣝⢮⡘⣞⢄⠄⣽⠚⡙⠡⡈⣢⣷⢿⣻⡽⠃⢹⢔⠼⣾⢿⣿⡹⡵⣿⢺⡪⢪⡻⡮⣗⠧⡱⣿⡄⣫⡗ +⢽⢸⡹⣕⣟⡞⣕⢯⣯⡇⡂⡢⢓⠌⡢⢨⢂⢕⠕⢅⠣⡊⢎⢗⢳⢸⣝⣗⣷⣶⣶⣷⣿⣟⣿⣻⢝⡮⡅⢂⠯⡪⣯⣿⢿⣎⢺⣽⣯⣻⣜⢜⢜⢜⣱⢱⣯⣏⢷⡯ +⣏⢮⡪⡞⣃⢂⢪⢽⡾⣯⢂⢊⠢⡑⢅⠇⡊⠢⡑⢅⠇⢊⠔⣕⡕⡏⣿⡽⣿⣿⣿⣿⣟⣿⢝⡮⣷⢙⢌⠢⡩⡯⣷⣻⣿⣿⣔⢵⣿⡺⣟⣜⢮⢪⢎⡮⣾⣇⢽⡣ +⢾⡫⡫⡊⡖⡜⡎⣕⢏⠯⣇⠪⡪⡂⡅⢂⠂⢕⠱⡑⡁⠅⡗⢱⣝⣾⡳⣹⢻⡯⡷⢿⢻⢱⣝⣞⢝⢴⡱⠀⢈⢹⣳⢽⢾⣻⣷⢕⢽⣿⢽⣞⢽⢺⢜⢮⣻⢮⢺⡸ +⣣⣣⡳⣵⢽⣺⢽⣳⢱⡩⡪⡪⣐⠹⡸⡲⡸⡨⠬⠨⢰⢰⡱⡵⢻⢺⡺⣵⢻⣜⢮⡳⣽⢵⡣⣇⠣⡵⣫⡂⠰⠨⡷⣻⢽⣻⡾⣿⡸⣿⡽⣗⡝⡧⡳⡱⣻⢯⡣⣗ +⣾⣺⡽⡯⣿⣝⡽⡪⡪⡂⢊⠪⡢⢣⠨⡂⣕⣔⡬⠮⠫⠓⠉⣐⢨⠚⡙⡎⡷⣕⣗⢯⡳⣝⢕⢕⣕⢯⠃⠈⡬⡨⡏⡽⣝⢷⣻⣽⣟⡾⣻⣽⣎⢯⡲⡸⣽⢗⣇⠧ +⣳⢿⢽⢭⢺⣺⡪⡇⡗⡈⠢⡨⡨⡸⡸⣚⠮⡲⠭⠳⠒⠘⠉⠀⠀⠁⠀⡀⠱⣳⢽⣹⢹⢜⢕⢝⣜⠊⡀⠐⠀⢪⢻⡜⣝⢽⢽⣾⣻⣿⣽⡷⣗⢷⠱⡕⡽⢧⡳⣝ +⡽⡽⡱⢱⢽⢮⣻⢊⢮⠠⠄⡀⠈⠀⠀⠀⠀⠈⠨⠀⠀⡀⠀⠀⠀⠀⠂⠀⠈⢘⢓⠕⠕⠡⠁⠁⠂⠀⠀⠀⠀⠀⢏⢷⡸⡜⡜⣷⡯⣷⣿⣽⣯⠫⠣⡯⣣⡣⡯⣞ +⡎⠣⣝⣮⣟⣯⢷⡱⡑⠄⠀⠀⠑⠂⠆⢄⠀⠀⠀⠀⠀⠀⠄⢀⠀⠀⠀⠀⠉⠀⠠⠀⠂⠡⠀⠀⠀⠀⠀⠀⠀⠀⠨⢝⢷⡱⡱⢽⣻⢽⡾⣗⣯⢝⢌⡽⣧⠾⡽⣞ +⠀⠈⢚⣞⡾⡯⡳⡕⡹⣆⠀⠄⡀⠀⠀⠀⠈⠑⠀⠄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠠⡀⠂⠯⣷⢝⢎⡯⡗⣿⣻⢽⠍⠭⠚⢽⡕⣰⢝ +""" + +# add centered subtitle +width: int = LADY_GAGA.index("\n", 1) +subtitle: str = f"judas_server {__version__}" +padding: int = (width - len(subtitle)) // 2 +LADY_GAGA += " " * padding + subtitle + "\n" -- 2.39.5 From d5985cf5945a304505546ef733631bc33d004621 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 00:38:59 +0200 Subject: [PATCH 16/31] feat(__main__.py): display ascii judas splash screen on launch --- src/judas_server/__main__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/judas_server/__main__.py b/src/judas_server/__main__.py index 7421780..31f0c86 100644 --- a/src/judas_server/__main__.py +++ b/src/judas_server/__main__.py @@ -5,12 +5,16 @@ import logging as lg if __name__ == "__main__": from judas_server.backend import BackendServer from judas_server.web.web_server import JudasWebServer + from judas_server.gaga import LADY_GAGA lg.basicConfig( level=lg.DEBUG, format="%(asctime)s : [%(levelname)s] : %(threadName)s : %(name)s :: %(message)s", ) + ladygaga_logger = lg.getLogger(f"{__name__}.LAGA_DYGA") + ladygaga_logger.info(LADY_GAGA) + backend_server: BackendServer = BackendServer( host="0.0.0.0", port=3692, -- 2.39.5 From 2922123a7050a9438b024067ebad2901adb84fe3 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 15:17:58 +0200 Subject: [PATCH 17/31] fix(backend/__init__.py): fix backend_server import --- src/judas_server/backend/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/judas_server/backend/__init__.py b/src/judas_server/backend/__init__.py index fe2bf76..8e31517 100644 --- a/src/judas_server/backend/__init__.py +++ b/src/judas_server/backend/__init__.py @@ -1,3 +1,3 @@ -from .server import BackendServer +from .backend_server import BackendServer __all__ = ["BackendServer"] -- 2.39.5 From f2b4811145a0a45b2a866aefb095f833c8cb50ae Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 15:20:02 +0200 Subject: [PATCH 18/31] feat(backend_server.py): add `BackendServer._send_ack()` helper method --- src/judas_server/backend/backend_server.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index d530bdf..bbf8833 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -60,6 +60,16 @@ class BackendServer: ) time.sleep(1) + def _send_ack(self, client: Client) -> None: + """Send an ACK message to a client. + + Args: + client (Client): The client to send the ACK to. + """ + ack: bytes = Message.ack().to_bytes() + self.logger.debug(f"[>] Sending ACK to {client}") + client.outbound += ack + def _accept_connection(self, sock: socket.socket) -> None: """Accept a new client connection. -- 2.39.5 From 0d074adc0d441428baac6858ff57717f3164cf6a Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 29 Aug 2025 15:21:57 +0200 Subject: [PATCH 19/31] refactor(backend_server.py): use `_send_ack()` in `_handle_connection()` --- src/judas_server/backend/backend_server.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index bbf8833..3511e18 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -150,10 +150,7 @@ class BackendServer: f"[<] Complete message from {client}: {line!r}" ) - # send ACK - ack = Message.ack().to_bytes() - self.logger.debug(f"[>] Sending ACK to {client}") - client.outbound += ack + self._send_ack(client) # set last seen client.last_seen = time.time() -- 2.39.5 From b68c755c450c7b13f95b335fc93810847306708c Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Tue, 2 Sep 2025 19:13:26 +0200 Subject: [PATCH 20/31] fix(backend_server.py): send ack on connect --- src/judas_server/backend/backend_server.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index 3511e18..a1ddd59 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -109,6 +109,8 @@ class BackendServer: client = Client(id_=mac_id, addr=addr, socket=conn) self.clients[mac_id] = client + self._send_ack(client) + events = selectors.EVENT_READ | selectors.EVENT_WRITE self.selector.register(conn, events, data=client) -- 2.39.5 From df0b19d94361f63d7ae3def51e3f9360242755b7 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Tue, 2 Sep 2025 19:16:35 +0200 Subject: [PATCH 21/31] feat(routes/api.py): support mulitple clients correctly --- src/judas_server/web/routes/api.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/judas_server/web/routes/api.py b/src/judas_server/web/routes/api.py index 2690535..fe3a171 100644 --- a/src/judas_server/web/routes/api.py +++ b/src/judas_server/web/routes/api.py @@ -52,9 +52,10 @@ def emit_polled_data(app, socketio): import time while True: + data = {} for client_id in backend.clients.keys(): - data = backend.get_client_data(client_id) - socketio.emit("update_data", {client_id: data}) + data[client_id] = backend.get_client_data(client_id) + socketio.emit("update_data", data) time.sleep(1) -- 2.39.5 From a1b28faa9ff30ddf9da4e882c0bbac27f4863480 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:53:43 +0200 Subject: [PATCH 22/31] build: add isort as lint depedency --- pyproject.toml | 3 +++ uv.lock | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index d1d0984..731618a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,6 +19,9 @@ license = { text = "GPL-3.0+" } [dependency-groups] bump = ["git-cliff>=2.9.1", "python-semantic-release>=10.2.0"] +lint = [ + "isort>=6.0.1", +] test = [ "pytest>=4.2.1", "pytest-cov>=6.2.1", diff --git a/uv.lock b/uv.lock index 0902c2e..70153ef 100644 --- a/uv.lock +++ b/uv.lock @@ -287,6 +287,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050, upload-time = "2025-03-19T20:10:01.071Z" }, ] +[[package]] +name = "isort" +version = "6.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b8/21/1e2a441f74a653a144224d7d21afe8f4169e6c7c20bb13aec3a2dc3815e0/isort-6.0.1.tar.gz", hash = "sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450", size = 821955, upload-time = "2025-02-26T21:13:16.955Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c1/11/114d0a5f4dabbdcedc1125dee0888514c3c3b16d3e9facad87ed96fad97c/isort-6.0.1-py3-none-any.whl", hash = "sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615", size = 94186, upload-time = "2025-02-26T21:13:14.911Z" }, +] + [[package]] name = "itsdangerous" version = "2.2.0" @@ -329,6 +338,9 @@ bump = [ { name = "git-cliff" }, { name = "python-semantic-release" }, ] +lint = [ + { name = "isort" }, +] test = [ { name = "pytest" }, { name = "pytest-cov" }, @@ -349,6 +361,7 @@ bump = [ { name = "git-cliff", specifier = ">=2.9.1" }, { name = "python-semantic-release", specifier = ">=10.2.0" }, ] +lint = [{ name = "isort", specifier = ">=6.0.1" }] test = [ { name = "pytest", specifier = ">=4.2.1" }, { name = "pytest-cov", specifier = ">=6.2.1" }, -- 2.39.5 From 19aa80a08ebe65685209678b5daf061ffbf19840 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:54:24 +0200 Subject: [PATCH 23/31] style(__main__.py): order imports --- src/judas_server/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/judas_server/__main__.py b/src/judas_server/__main__.py index 31f0c86..d03289a 100644 --- a/src/judas_server/__main__.py +++ b/src/judas_server/__main__.py @@ -4,8 +4,8 @@ import logging as lg if __name__ == "__main__": from judas_server.backend import BackendServer - from judas_server.web.web_server import JudasWebServer from judas_server.gaga import LADY_GAGA + from judas_server.web.web_server import JudasWebServer lg.basicConfig( level=lg.DEBUG, -- 2.39.5 From a27b5b1275fadfb2049fa5e5c535b6667ae37ab5 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:54:43 +0200 Subject: [PATCH 24/31] style(backend_server.py): order imports --- src/judas_server/backend/backend_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/judas_server/backend/backend_server.py b/src/judas_server/backend/backend_server.py index a1ddd59..be7c124 100644 --- a/src/judas_server/backend/backend_server.py +++ b/src/judas_server/backend/backend_server.py @@ -2,10 +2,10 @@ from __future__ import annotations import logging as lg -import threading -import time import selectors import socket +import threading +import time from judas_protocol import Message -- 2.39.5 From 377a846c5982be129724a84b4b77a6fb69fd03df Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:54:54 +0200 Subject: [PATCH 25/31] style(client.py): order imports --- src/judas_server/backend/client.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/judas_server/backend/client.py b/src/judas_server/backend/client.py index 20bb840..dd35fde 100644 --- a/src/judas_server/backend/client.py +++ b/src/judas_server/backend/client.py @@ -5,7 +5,6 @@ from __future__ import annotations import logging as lg import socket - from enum import Enum -- 2.39.5 From 98c49b1d0d9bb7653a12c7558b5e6daf62a7762b Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:55:08 +0200 Subject: [PATCH 26/31] style(api.py): order imports --- src/judas_server/web/routes/api.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/judas_server/web/routes/api.py b/src/judas_server/web/routes/api.py index fe3a171..7d8ef3b 100644 --- a/src/judas_server/web/routes/api.py +++ b/src/judas_server/web/routes/api.py @@ -1,12 +1,11 @@ # -*- coding: utf-8 -*- from __future__ import annotations + +import threading from typing import TYPE_CHECKING import flask import flask_login -import threading -import logging as lg - if TYPE_CHECKING: from werkzeug.wrappers import Response -- 2.39.5 From 7d36e6e43132a687d0494f14f36d9b4dc357abaf Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:55:44 +0200 Subject: [PATCH 27/31] style(auth.py): order imports --- src/judas_server/web/routes/auth.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/judas_server/web/routes/auth.py b/src/judas_server/web/routes/auth.py index 33f69dc..d78594d 100644 --- a/src/judas_server/web/routes/auth.py +++ b/src/judas_server/web/routes/auth.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import annotations + from typing import TYPE_CHECKING import flask -- 2.39.5 From b14541ea8302679091b519e3b6f630fabc0ce476 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:55:56 +0200 Subject: [PATCH 28/31] style(index.py): order imports --- src/judas_server/web/routes/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/judas_server/web/routes/index.py b/src/judas_server/web/routes/index.py index 7f0c0b6..6940868 100644 --- a/src/judas_server/web/routes/index.py +++ b/src/judas_server/web/routes/index.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- from __future__ import annotations + from typing import TYPE_CHECKING import flask import flask_login - if TYPE_CHECKING: from werkzeug.wrappers import Response -- 2.39.5 From 6bbb152ae1b1178aa77cf54c6e0f544a0fed66ef Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:56:06 +0200 Subject: [PATCH 29/31] style(panel.py): order imports --- src/judas_server/web/routes/panel.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/judas_server/web/routes/panel.py b/src/judas_server/web/routes/panel.py index c5e3e05..a3cbe1d 100644 --- a/src/judas_server/web/routes/panel.py +++ b/src/judas_server/web/routes/panel.py @@ -4,7 +4,6 @@ from __future__ import annotations import flask import flask_login - panel_bp: flask.Blueprint = flask.Blueprint( "panel", __name__, url_prefix="/panel" ) -- 2.39.5 From d96fec0222bbf707bc1aa48a6d215dbfec93f159 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:56:45 +0200 Subject: [PATCH 30/31] build(web_server.py): order imports --- src/judas_server/web/web_server.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/judas_server/web/web_server.py b/src/judas_server/web/web_server.py index 5b99771..c56fad0 100644 --- a/src/judas_server/web/web_server.py +++ b/src/judas_server/web/web_server.py @@ -53,12 +53,7 @@ class JudasWebServer: def init_routes(self) -> None: self.logger.debug("Initializing routes...") - from judas_server.web.routes import ( - auth_bp, - index_bp, - panel_bp, - api, - ) + from judas_server.web.routes import api, auth_bp, index_bp, panel_bp self.app.register_blueprint(index_bp) self.app.register_blueprint(auth_bp) -- 2.39.5 From 66db11c40b34d5315eda2a7dc19cd8ae428ae862 Mon Sep 17 00:00:00 2001 From: Artur Borecki Date: Fri, 19 Sep 2025 14:57:38 +0200 Subject: [PATCH 31/31] build: add ruff lint depedency --- pyproject.toml | 1 + uv.lock | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 731618a..2e40610 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ license = { text = "GPL-3.0+" } bump = ["git-cliff>=2.9.1", "python-semantic-release>=10.2.0"] lint = [ "isort>=6.0.1", + "ruff>=0.13.1", ] test = [ "pytest>=4.2.1", diff --git a/uv.lock b/uv.lock index 70153ef..6a3b219 100644 --- a/uv.lock +++ b/uv.lock @@ -340,6 +340,7 @@ bump = [ ] lint = [ { name = "isort" }, + { name = "ruff" }, ] test = [ { name = "pytest" }, @@ -361,7 +362,10 @@ bump = [ { name = "git-cliff", specifier = ">=2.9.1" }, { name = "python-semantic-release", specifier = ">=10.2.0" }, ] -lint = [{ name = "isort", specifier = ">=6.0.1" }] +lint = [ + { name = "isort", specifier = ">=6.0.1" }, + { name = "ruff", specifier = ">=0.13.1" }, +] test = [ { name = "pytest", specifier = ">=4.2.1" }, { name = "pytest-cov", specifier = ">=6.2.1" }, @@ -644,6 +648,32 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e3/30/3c4d035596d3cf444529e0b2953ad0466f6049528a879d27534700580395/rich-14.1.0-py3-none-any.whl", hash = "sha256:536f5f1785986d6dbdea3c75205c473f970777b4a0d6c6dd1b696aa05a3fa04f", size = 243368, upload-time = "2025-07-25T07:32:56.73Z" }, ] +[[package]] +name = "ruff" +version = "0.13.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ab/33/c8e89216845615d14d2d42ba2bee404e7206a8db782f33400754f3799f05/ruff-0.13.1.tar.gz", hash = "sha256:88074c3849087f153d4bb22e92243ad4c1b366d7055f98726bc19aa08dc12d51", size = 5397987, upload-time = "2025-09-18T19:52:44.33Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f3/41/ca37e340938f45cfb8557a97a5c347e718ef34702546b174e5300dbb1f28/ruff-0.13.1-py3-none-linux_armv6l.whl", hash = "sha256:b2abff595cc3cbfa55e509d89439b5a09a6ee3c252d92020bd2de240836cf45b", size = 12304308, upload-time = "2025-09-18T19:51:56.253Z" }, + { url = "https://files.pythonhosted.org/packages/ff/84/ba378ef4129415066c3e1c80d84e539a0d52feb250685091f874804f28af/ruff-0.13.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:4ee9f4249bf7f8bb3984c41bfaf6a658162cdb1b22e3103eabc7dd1dc5579334", size = 12937258, upload-time = "2025-09-18T19:52:00.184Z" }, + { url = "https://files.pythonhosted.org/packages/8d/b6/ec5e4559ae0ad955515c176910d6d7c93edcbc0ed1a3195a41179c58431d/ruff-0.13.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:5c5da4af5f6418c07d75e6f3224e08147441f5d1eac2e6ce10dcce5e616a3bae", size = 12214554, upload-time = "2025-09-18T19:52:02.753Z" }, + { url = "https://files.pythonhosted.org/packages/70/d6/cb3e3b4f03b9b0c4d4d8f06126d34b3394f6b4d764912fe80a1300696ef6/ruff-0.13.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:80524f84a01355a59a93cef98d804e2137639823bcee2931f5028e71134a954e", size = 12448181, upload-time = "2025-09-18T19:52:05.279Z" }, + { url = "https://files.pythonhosted.org/packages/d2/ea/bf60cb46d7ade706a246cd3fb99e4cfe854efa3dfbe530d049c684da24ff/ruff-0.13.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff7f5ce8d7988767dd46a148192a14d0f48d1baea733f055d9064875c7d50389", size = 12104599, upload-time = "2025-09-18T19:52:07.497Z" }, + { url = "https://files.pythonhosted.org/packages/2d/3e/05f72f4c3d3a69e65d55a13e1dd1ade76c106d8546e7e54501d31f1dc54a/ruff-0.13.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c55d84715061f8b05469cdc9a446aa6c7294cd4bd55e86a89e572dba14374f8c", size = 13791178, upload-time = "2025-09-18T19:52:10.189Z" }, + { url = "https://files.pythonhosted.org/packages/81/e7/01b1fc403dd45d6cfe600725270ecc6a8f8a48a55bc6521ad820ed3ceaf8/ruff-0.13.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:ac57fed932d90fa1624c946dc67a0a3388d65a7edc7d2d8e4ca7bddaa789b3b0", size = 14814474, upload-time = "2025-09-18T19:52:12.866Z" }, + { url = "https://files.pythonhosted.org/packages/fa/92/d9e183d4ed6185a8df2ce9faa3f22e80e95b5f88d9cc3d86a6d94331da3f/ruff-0.13.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c366a71d5b4f41f86a008694f7a0d75fe409ec298685ff72dc882f882d532e36", size = 14217531, upload-time = "2025-09-18T19:52:15.245Z" }, + { url = "https://files.pythonhosted.org/packages/3b/4a/6ddb1b11d60888be224d721e01bdd2d81faaf1720592858ab8bac3600466/ruff-0.13.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4ea9d1b5ad3e7a83ee8ebb1229c33e5fe771e833d6d3dcfca7b77d95b060d38", size = 13265267, upload-time = "2025-09-18T19:52:17.649Z" }, + { url = "https://files.pythonhosted.org/packages/81/98/3f1d18a8d9ea33ef2ad508f0417fcb182c99b23258ec5e53d15db8289809/ruff-0.13.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0f70202996055b555d3d74b626406476cc692f37b13bac8828acff058c9966a", size = 13243120, upload-time = "2025-09-18T19:52:20.332Z" }, + { url = "https://files.pythonhosted.org/packages/8d/86/b6ce62ce9c12765fa6c65078d1938d2490b2b1d9273d0de384952b43c490/ruff-0.13.1-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:f8cff7a105dad631085d9505b491db33848007d6b487c3c1979dd8d9b2963783", size = 13443084, upload-time = "2025-09-18T19:52:23.032Z" }, + { url = "https://files.pythonhosted.org/packages/a1/6e/af7943466a41338d04503fb5a81b2fd07251bd272f546622e5b1599a7976/ruff-0.13.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:9761e84255443316a258dd7dfbd9bfb59c756e52237ed42494917b2577697c6a", size = 12295105, upload-time = "2025-09-18T19:52:25.263Z" }, + { url = "https://files.pythonhosted.org/packages/3f/97/0249b9a24f0f3ebd12f007e81c87cec6d311de566885e9309fcbac5b24cc/ruff-0.13.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:3d376a88c3102ef228b102211ef4a6d13df330cb0f5ca56fdac04ccec2a99700", size = 12072284, upload-time = "2025-09-18T19:52:27.478Z" }, + { url = "https://files.pythonhosted.org/packages/f6/85/0b64693b2c99d62ae65236ef74508ba39c3febd01466ef7f354885e5050c/ruff-0.13.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:cbefd60082b517a82c6ec8836989775ac05f8991715d228b3c1d86ccc7df7dae", size = 12970314, upload-time = "2025-09-18T19:52:30.212Z" }, + { url = "https://files.pythonhosted.org/packages/96/fc/342e9f28179915d28b3747b7654f932ca472afbf7090fc0c4011e802f494/ruff-0.13.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dd16b9a5a499fe73f3c2ef09a7885cb1d97058614d601809d37c422ed1525317", size = 13422360, upload-time = "2025-09-18T19:52:32.676Z" }, + { url = "https://files.pythonhosted.org/packages/37/54/6177a0dc10bce6f43e392a2192e6018755473283d0cf43cc7e6afc182aea/ruff-0.13.1-py3-none-win32.whl", hash = "sha256:55e9efa692d7cb18580279f1fbb525146adc401f40735edf0aaeabd93099f9a0", size = 12178448, upload-time = "2025-09-18T19:52:35.545Z" }, + { url = "https://files.pythonhosted.org/packages/64/51/c6a3a33d9938007b8bdc8ca852ecc8d810a407fb513ab08e34af12dc7c24/ruff-0.13.1-py3-none-win_amd64.whl", hash = "sha256:3a3fb595287ee556de947183489f636b9f76a72f0fa9c028bdcabf5bab2cc5e5", size = 13286458, upload-time = "2025-09-18T19:52:38.198Z" }, + { url = "https://files.pythonhosted.org/packages/fd/04/afc078a12cf68592345b1e2d6ecdff837d286bac023d7a22c54c7a698c5b/ruff-0.13.1-py3-none-win_arm64.whl", hash = "sha256:c0bae9ffd92d54e03c2bf266f466da0a65e145f298ee5b5846ed435f6a00518a", size = 12437893, upload-time = "2025-09-18T19:52:41.283Z" }, +] + [[package]] name = "shellingham" version = "1.5.4" -- 2.39.5