diff --git a/pyproject.toml b/pyproject.toml index 06cd3f0..4c8a658 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ znsocket = "znsocket.cli:app" repository = "https://github.com/zincware/ZnSocket" [tool.ruff.lint] -select = ["I"] +select = ["I", "F", "W", "C"] [tool.coverage.run] # omit the tests themselves diff --git a/tests/test_connection.py b/tests/test_connection.py index d0e4720..47cb42d 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -1,8 +1,6 @@ import pytest import redis.exceptions -import znsocket.exceptions - @pytest.mark.parametrize("client", ["znsclient", "znsclient_w_redis", "redisclient"]) def test_set(client, request): diff --git a/znsocket/__init__.py b/znsocket/__init__.py index eb99b2f..7dd7cc4 100644 --- a/znsocket/__init__.py +++ b/znsocket/__init__.py @@ -2,4 +2,4 @@ from znsocket.objects import Dict, List from znsocket.server import Server, attach_events -__all__ = ["Client", "Server", "List", "Dict"] +__all__ = ["Client", "Server", "List", "Dict", "attach_events"] diff --git a/znsocket/client.py b/znsocket/client.py index 41eac05..c4dccc2 100644 --- a/znsocket/client.py +++ b/znsocket/client.py @@ -1,10 +1,8 @@ import dataclasses import datetime import functools -import json import logging import typing as t -import warnings import socketio.exceptions import typing_extensions as tyex diff --git a/znsocket/objects/__init__.py b/znsocket/objects/__init__.py index 11faaff..5cba58a 100644 --- a/znsocket/objects/__init__.py +++ b/znsocket/objects/__init__.py @@ -160,7 +160,7 @@ def __getitem__(self, index: int | list | slice) -> t.Any | list[t.Any]: items.append(item) return items[0] if single_item else items - def __setitem__(self, index: int | list | slice, value: t.Any) -> None: + def __setitem__(self, index: int | list | slice, value: t.Any) -> None: # noqa C901 single_item = isinstance(index, int) if single_item: index = [index] @@ -197,7 +197,7 @@ def __setitem__(self, index: int | list | slice, value: t.Any) -> None: if self.socket is not None: refresh: RefreshTypeDict = {"indices": index} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def __delitem__(self, index: int | list | slice) -> None: single_item = isinstance(index, int) @@ -224,7 +224,7 @@ def __delitem__(self, index: int | list | slice) -> None: if self.socket is not None: refresh: RefreshTypeDict = {"start": min(index), "stop": None} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def insert(self, index: int, value: t.Any) -> None: if isinstance(value, Dict): @@ -248,7 +248,7 @@ def insert(self, index: int, value: t.Any) -> None: if self.socket is not None: refresh: RefreshTypeDict = {"start": index, "stop": None} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def __eq__(self, value: object) -> bool: if isinstance(value, List): @@ -287,7 +287,7 @@ def append(self, value: t.Any) -> None: if self.socket is not None: refresh: RefreshTypeDict = {"indices": [len(self) - 1]} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def extend(self, values: t.Iterable) -> None: """Extend the list with an iterable using redis pipelines.""" @@ -306,7 +306,7 @@ def extend(self, values: t.Iterable) -> None: if self.socket is not None: refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def pop(self, index: int = -1) -> t.Any: """Pop an item from the list.""" @@ -327,7 +327,7 @@ def pop(self, index: int = -1) -> t.Any: if self.socket is not None: refresh: RefreshTypeDict = {"start": index, "stop": None} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") return _decode(self, value) def copy(self, key: str) -> "List": @@ -426,7 +426,7 @@ def __setitem__(self, key: str, value: t.Any) -> None: if self.socket is not None: refresh: RefreshTypeDict = {"keys": [key]} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def __delitem__(self, key: str) -> None: if not self.redis.hexists(self.key, key): @@ -437,7 +437,7 @@ def __delitem__(self, key: str) -> None: if self.socket is not None: refresh: RefreshTypeDict = {"keys": [key]} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def __iter__(self): return iter(self.keys()) @@ -486,7 +486,7 @@ def __repr__(self) -> str: elif self.repr_type == "minimal": return "Dict()" elif self.repr_type == "full": - data = {a: b for a, b in self.items()} + data = dict(self.items()) return f"Dict({data})" else: raise ValueError(f"Invalid repr_type: {self.repr_type}") @@ -546,7 +546,7 @@ def update(self, *args, **kwargs): if self.socket is not None: refresh: RefreshTypeDict = {"keys": list(other.keys())} refresh_data: RefreshDataTypeDict = {"target": self.key, "data": refresh} - self.socket.sio.emit(f"refresh", refresh_data, namespace="/znsocket") + self.socket.sio.emit("refresh", refresh_data, namespace="/znsocket") def __or__(self, value: "dict|Dict") -> dict: if isinstance(value, Dict): diff --git a/znsocket/server.py b/znsocket/server.py index 629b1cf..47e5d4e 100644 --- a/znsocket/server.py +++ b/znsocket/server.py @@ -288,7 +288,7 @@ def get_sio( return sio -def attach_events( +def attach_events( # noqa: C901 sio: socketio.Server, namespace: str = "/znsocket", storage=None ) -> None: if storage is None: