pyrelukko 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

pyrelukko/pyrelukko.py

@@ -151,7 +151,7 @@ class RelukkoClient:
 
     def _setup_ws_url(self, ws_url: str) -> Url:
         url = ws_url.replace("http", "ws", 1)
-        return parse_url(f"{url}/deletions")
+        return parse_url(f"{url}/ws/broadcast")
 
     def _setup_base_url(self, base_url: Union[Url, str]) -> Url:
         if isinstance(base_url, str):

pyrelukko/testcontainers.py

@@ -0,0 +1,90 @@
+# pylint: skip-file
+"""
+Testcontainers to be used in PyTests, for a fixture see tests/conftest.py
+(relukko_backend):
+
+@pytest.fixture(scope="session")
+def relukko_backend():
+    with Network() as rl_net:
+        with RelukkoDbContainer(net=rl_net, initdb_dir=INITDB_DIR,
+            image="postgres:16", hostname="relukkodb") as _db:
+            db_url = "postgresql://relukko:relukko@relukkodb/relukko"
+            with RelukkoContainer(rl_net, db_url=db_url) as backend:
+                relukko = RelukkoClient(
+                    base_url=backend.get_api_url(), api_key="somekey")
+                yield relukko, backend
+"""
+import socket
+from pathlib import Path
+
+from testcontainers.core.network import Network
+from testcontainers.core.waiting_utils import wait_container_is_ready
+from testcontainers.generic import ServerContainer
+from testcontainers.postgres import PostgresContainer
+
+
+class RelukkoContainer(ServerContainer):
+    def __init__(self, net: Network,
+                 image="registry.gitlab.com/relukko/relukko:0.10.0", db_url=None):
+        self.db_url = db_url
+        self.net = net
+        super(RelukkoContainer, self).__init__(image=image, port=3000)
+
+    def _configure(self):
+        self.with_env("DATABASE_URL", self.db_url)
+        self.with_env("RELUKKO_API_KEY", "somekey")
+        self.with_env("RELUKKO_USER", "relukko")
+        self.with_env("RELUKKO_PASSWORD", "relukko")
+        self.with_env("RELUKKO_BIND_ADDR", "0.0.0.0")
+        self.with_network(self.net)
+
+    def get_api_url(self) -> str:
+        return f"http://localhost:{self.get_exposed_port(3000)}"
+
+    def _create_connection_url(self) -> str:
+        return f"{self.get_api_url()}/healthchecker"
+
+
+class RelukkoDbContainer(PostgresContainer):
+    def __init__(
+            self, net: Network,
+            initdb_dir: Path,
+            image: str = "postgres:latest",
+            port: int = 5432,
+            username: str | None = None,
+            password: str | None = None,
+            dbname: str | None = None,
+            driver: str | None = "psycopg2",
+            **kwargs) -> None:
+        self.net = net
+        self.initdb_dir = initdb_dir
+        super().__init__(image, port, username, password, dbname, driver, **kwargs)
+
+    def _configure(self) -> None:
+        self.with_volume_mapping(self.initdb_dir, "/docker-entrypoint-initdb.d", "Z")
+        self.with_env("POSTGRES_USER", "relukko")
+        self.with_env("POSTGRES_PASSWORD", "relukko")
+        self.with_env("POSTGRES_DB", "relukko")
+        self.with_network(self.net)
+
+    @wait_container_is_ready()
+    def _connect(self) -> None:
+        packet = bytes([
+            0x00, 0x00, 0x00, 0x52, 0x00, 0x03, 0x00, 0x00, 
+            0x75, 0x73, 0x65, 0x72, 0x00, 0x72, 0x65, 0x6c, 
+            0x75, 0x6b, 0x6b, 0x6f, 0x00, 0x64, 0x61, 0x74, 
+            0x61, 0x62, 0x61, 0x73, 0x65, 0x00, 0x72, 0x65, 
+            0x6c, 0x75, 0x6b, 0x6b, 0x6f, 0x00, 0x61, 0x70, 
+            0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 
+            0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x00, 0x70, 
+            0x73, 0x71, 0x6c, 0x00, 0x63, 0x6c, 0x69, 0x65, 
+            0x6e, 0x74, 0x5f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 
+            0x69, 0x6e, 0x67, 0x00, 0x55, 0x54, 0x46, 0x38, 
+            0x00, 0x00
+        ])
+        port = self.get_exposed_port(self.port)
+        with socket.create_connection(("localhost", port)) as sock:
+            sock.send(packet)
+            buf = sock.recv(40)
+            if len(buf) == 0 and "SCRAM-SHA" not in buf:
+                raise ConnectionError

pyrelukko/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=all
-__version__ = "0.2.0"
+__version__ = "0.3.0"

{pyrelukko-0.2.0.dist-info → pyrelukko-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyrelukko
-Version: 0.2.0
+Version: 0.3.0
 Summary: Relukko client.
 Author-email: Reto Zingg <g.d0b3rm4n@gmail.com>
 Requires-Python: >=3.12
@@ -11,6 +11,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: requests >=2.32.3
+Requires-Dist: websockets >= 13.1
 Project-URL: Homepage, https://gitlab.com/relukko/pyrelukko
 Project-URL: Issues, https://gitlab.com/relukko/pyrelukko/-/issues
 

pyrelukko-0.3.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+pyrelukko/__init__.py,sha256=n-mTJV7AOfr4bljtDxok3E3gXIBRk-kFa2_Ql3S8Ht0,61
+pyrelukko/pyrelukko.py,sha256=bQDyQOWtsUznSXwdXRLg6Pg6EFomTgRzhlX4jOzHqdI,11438
+pyrelukko/retry.py,sha256=XeCc0trPhAggdEnu2nwtpFderlHaDQFTXH_O1dLeiGQ,1587
+pyrelukko/testcontainers.py,sha256=sJluMF9ImcQDGTB0w6s4ySCzOY5S9OKTpWQ8XQp05Y8,3555
+pyrelukko/version.py,sha256=NnZOmpocvSUCHLODp9u2VznENpXTvQOdCMjMjqqNyf0,44
+pyrelukko-0.3.0.dist-info/LICENSE,sha256=aEI4dThWmRUiEPch0-KaZQmHZgTyuz88Edmp25H6tAw,1089
+pyrelukko-0.3.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+pyrelukko-0.3.0.dist-info/METADATA,sha256=C8SUSQrskczP10ooDzTUYW22z4sS4g1fv2uUlnWsb3k,735
+pyrelukko-0.3.0.dist-info/RECORD,,

pyrelukko-0.2.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-pyrelukko/__init__.py,sha256=n-mTJV7AOfr4bljtDxok3E3gXIBRk-kFa2_Ql3S8Ht0,61
-pyrelukko/pyrelukko.py,sha256=5bDqueUMxbMSxbuSOE9L7aHpAP3bax4DHQqATeuHs1s,11435
-pyrelukko/retry.py,sha256=XeCc0trPhAggdEnu2nwtpFderlHaDQFTXH_O1dLeiGQ,1587
-pyrelukko/version.py,sha256=5ajVDlNTAW-Ykqh9HwJkug5LWeNtanZQhZox4hNtxio,44
-pyrelukko-0.2.0.dist-info/LICENSE,sha256=aEI4dThWmRUiEPch0-KaZQmHZgTyuz88Edmp25H6tAw,1089
-pyrelukko-0.2.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-pyrelukko-0.2.0.dist-info/METADATA,sha256=0tOto4sHXUD_sFAfTvC6EhV2l4NER-gNyYE66ori8TQ,701
-pyrelukko-0.2.0.dist-info/RECORD,,