dsmq 0.3.0__tar.gz → 0.5.0__tar.gz

dsmq-0.3.0/README.md → dsmq-0.5.0/PKG-INFO

@@ -1,3 +1,10 @@
+Metadata-Version: 2.3
+Name: dsmq
+Version: 0.5.0
+Summary: A dead simple message queue
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+
 # Dead Simple Message Queue
 
 ## What it does
@@ -50,6 +57,24 @@ topic = "greetings"
 msg = mq.get(topic)
 ```
 
+### Spin up and shut down a dsmq in its own process
+
+A dsmq server doesn't come with a built-in way to shut itself down. 
+It can be helpful to have it running in a separate process that can be
+managed
+
+```python
+import multiprocessing as mp
+
+p_mq = mp.Process(target=dsmq.start_server, args=(config.MQ_HOST, config.MQ_PORT))
+p_mq.start()
+
+p_mq.join()
+# or 
+p_mq.kill()
+p_mq.close()
+```
+
 ### Demo
 
 1. Open 3 separate terminal windows.

dsmq-0.3.0/PKG-INFO → dsmq-0.5.0/README.md

@@ -1,11 +1,3 @@
-Metadata-Version: 2.3
-Name: dsmq
-Version: 0.3.0
-Summary: A dead simple message queue
-License-File: LICENSE
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-
 # Dead Simple Message Queue
 
 ## What it does
@@ -58,6 +50,24 @@ topic = "greetings"
 msg = mq.get(topic)
 ```
 
+### Spin up and shut down a dsmq in its own process
+
+A dsmq server doesn't come with a built-in way to shut itself down. 
+It can be helpful to have it running in a separate process that can be
+managed
+
+```python
+import multiprocessing as mp
+
+p_mq = mp.Process(target=dsmq.start_server, args=(config.MQ_HOST, config.MQ_PORT))
+p_mq.start()
+
+p_mq.join()
+# or 
+p_mq.kill()
+p_mq.close()
+```
+
 ### Demo
 
 1. Open 3 separate terminal windows.

{dsmq-0.3.0 → dsmq-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dsmq"
-version = "0.3.0"
+version = "0.5.0"
 description = "A dead simple message queue"
 readme = "README.md"
 requires-python = ">=3.10"

{dsmq-0.3.0 → dsmq-0.5.0}/src/dsmq/dsmq.py

@@ -10,6 +10,8 @@ DEFAULT_PORT = 30008
 
 N_RETRIES = 5
 FIRST_RETRY = 0.01  # seconds
+TIME_TO_LIVE = 60  # seconds
+TIME_TO_LIVE = 5  # seconds
 
 
 def start_server(host=DEFAULT_HOST, port=DEFAULT_PORT):
@@ -65,7 +67,10 @@ class DSMQClientSideConnection:
             raise RuntimeError("Connection terminated by server")
         msg_str = data.decode("utf-8")
         msg = json.loads(msg_str)
-        return msg
+        try:
+            return msg["message"]
+        except KeyError:
+            return ""
 
     def put(self, topic, msg):
         msg = json.dumps({"action": "put", "topic": topic, "message": msg})
@@ -76,8 +81,9 @@ def _handle_client_connection(socket_conn):
     sqlite_conn = sqlite3.connect("file:mem1?mode=memory&cache=shared")
     cursor = sqlite_conn.cursor()
 
-    creation_time = time.time()
-    last_read = {}
+    client_creation_time = time.time()
+    last_read_times = {}
+    time_of_last_purge = time.time()
 
     while True:
         data = socket_conn.recv(1024)
@@ -120,10 +126,10 @@ VALUES (:timestamp, :topic, :message)
 
         elif msg["action"] == "get":
             try:
-                last_read_time = last_read[topic]
+                last_read_time = last_read_times[topic]
             except KeyError:
-                last_read[topic] = creation_time
-                last_read_time = last_read[topic]
+                last_read_times[topic] = client_creation_time
+                last_read_time = last_read_times[topic]
             msg["last_read_time"] = last_read_time
 
             # This block allows for multiple retries if the database
@@ -156,7 +162,7 @@ AND timestamp = a.min_time
                 result = cursor.fetchall()[0]
                 message = result[0]
                 timestamp = result[1]
-                last_read[topic] = timestamp
+                last_read_times[topic] = timestamp
             except IndexError:
                 # Handle the case where no results are returned
                 message = ""
@@ -166,6 +172,20 @@ AND timestamp = a.min_time
         else:
             print("Action must either be 'put' or 'get'")
 
+        # Periodically clean out messages from the queue that are
+        # past their sell buy date.
+        # This operation is pretty fast. I clock it at 12 us on my machine.
+        if time.time() - time_of_last_purge > TIME_TO_LIVE:
+            cursor.execute(
+                """
+DELETE FROM messages
+WHERE timestamp < :time_threshold
+                """,
+                {"time_threshold": time_of_last_purge}
+            )
+            sqlite_conn.commit()
+            time_of_last_purge = time.time()
+
     sqlite_conn.close()
 
 

{dsmq-0.3.0 → dsmq-0.5.0}/src/dsmq/example_get_client.py

@@ -1,4 +1,3 @@
-import json
 import time
 import dsmq
 

{dsmq-0.3.0 → dsmq-0.5.0}/src/dsmq/example_put_client.py

@@ -1,5 +1,3 @@
-import json
-import socket
 import time
 import dsmq
 

{dsmq-0.3.0 → dsmq-0.5.0}/uv.lock

@@ -3,5 +3,5 @@ requires-python = ">=3.10"
 
 [[package]]
 name = "dsmq"
-version = "0.2.0"
+version = "0.4.0"
 source = { editable = "." }