dsmq 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

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/example_get_client.py

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

dsmq/example_put_client.py

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

{dsmq-0.3.0.dist-info → dsmq-0.5.0.dist-info}/METADATA

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: dsmq
-Version: 0.3.0
+Version: 0.5.0
 Summary: A dead simple message queue
-License-File: LICENSE
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 
@@ -58,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.5.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+dsmq/__init__.py,sha256=YCgbnQAk8YbtHRyMcU0v2O7RdRhPhlT-vS_q40a7Q6g,50
+dsmq/demo_linux.py,sha256=7yLglGmirDLuuyMxppYSK-dfx2Fg2Q0dIWB4cl2yV1c,622
+dsmq/dsmq.py,sha256=dKYtGkg8Kwll2sCytCqSI5klFs2cwm2pyXAkyQk4RdU,6206
+dsmq/example_get_client.py,sha256=chFfB2949PBENmgdUc3ASrATq1m4wvHGBzEnOC-o_Xs,296
+dsmq/example_put_client.py,sha256=mUKCRhmUieMZEpHLFWFvzeKB6IR7A8l4tWN8TvPzdKU,348
+dsmq/example_server.py,sha256=kkXOPaaTzVxf9_iIM76zU9pZhkPna_1vcGWkPrhCjus,61
+dsmq-0.5.0.dist-info/METADATA,sha256=EQISO0WcVsb7smXIie-ZP7pIO1itY8FZfjGw3DPuZDM,3878
+dsmq-0.5.0.dist-info/WHEEL,sha256=3U_NnUcV_1B1kPkYaPzN-irRckL5VW_lytn0ytO_kRY,87
+dsmq-0.5.0.dist-info/licenses/LICENSE,sha256=3Yu1mAp5VsKmnDtzkiOY7BdmrLeNwwZ3t6iWaLnlL0Y,1071
+dsmq-0.5.0.dist-info/RECORD,,

{dsmq-0.3.0.dist-info → dsmq-0.5.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.26.1
 Root-Is-Purelib: true
 Tag: py3-none-any

dsmq-0.3.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-dsmq/__init__.py,sha256=YCgbnQAk8YbtHRyMcU0v2O7RdRhPhlT-vS_q40a7Q6g,50
-dsmq/demo_linux.py,sha256=7yLglGmirDLuuyMxppYSK-dfx2Fg2Q0dIWB4cl2yV1c,622
-dsmq/dsmq.py,sha256=7s-e2dmbaPMfmkrbY-CXZ5y9DmOQ9xBvoWATYGAKgGY,5483
-dsmq/example_get_client.py,sha256=VwL7Z7KdSDzbpdAhetcOY8KHVPjb6_OB5rtbI30CjJ0,308
-dsmq/example_put_client.py,sha256=CRVQhZTYXDawXSiJP997A0ttBwKuNf8QvSpvPmEP7ng,374
-dsmq/example_server.py,sha256=kkXOPaaTzVxf9_iIM76zU9pZhkPna_1vcGWkPrhCjus,61
-dsmq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsmq-0.3.0.dist-info/METADATA,sha256=8Mxc1JRyO8BrRiT5eLeszE5zVYUDuwJvrqXq6HW6g2s,3513
-dsmq-0.3.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-dsmq-0.3.0.dist-info/licenses/LICENSE,sha256=3Yu1mAp5VsKmnDtzkiOY7BdmrLeNwwZ3t6iWaLnlL0Y,1071
-dsmq-0.3.0.dist-info/RECORD,,