message-db-py 0.3.2__tar.gz → 0.3.4__tar.gz

{message_db_py-0.3.2 → message_db_py-0.3.4}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: message-db-py
-Version: 0.3.2
+Version: 0.3.4
 Summary: The Python interface to the MessageDB Event Store and Message Store
 License: MIT
 License-File: LICENSE
 Keywords: message-db,event-sourcing,event-store,messaging,cqrs,command-query-responsibility-segregation,events,streaming,database,postgresql,python,async,microservices,distributed-systems,message-queue,event-driven,real-time
 Author: Subhash Bhushan
 Author-email: subhash.bhushan@gmail.com
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.11
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology

{message_db_py-0.3.2 → message_db_py-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "message-db-py"
-version = "0.3.2"
+version = "0.3.4"
 description = "The Python interface to the MessageDB Event Store and Message Store"
 authors = ["Subhash Bhushan <subhash.bhushan@gmail.com>"]
 license = "MIT"
@@ -48,7 +48,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = ">=3.11"
 psycopg2 = "^2.9.11"
 
 [tool.poetry.group.dev.dependencies]

{message_db_py-0.3.2 → message_db_py-0.3.4}/src/message_db/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 # Re-export client class

{message_db_py-0.3.2 → message_db_py-0.3.4}/src/message_db/client.py

@@ -144,49 +144,51 @@ class MessageDB:
         Returns a list of messages from the stream or category starting from the given position.
         """
         conn = self.connection_pool.get_connection()
-        cursor = conn.cursor(cursor_factory=RealDictCursor)
-
-        if not sql:
-            if stream_name == "$all":
-                sql = """
-                    SELECT
-                        id::varchar,
-                        stream_name::varchar,
-                        type::varchar,
-                        position::bigint,
-                        global_position::bigint,
-                        data::varchar,
-                        metadata::varchar,
-                        time::timestamp
-                    FROM
-                        messages
-                    WHERE
-                        global_position > %(position)s
-                    LIMIT %(batch_size)s
-                """
-            elif "-" in stream_name:
-                sql = "SELECT * FROM get_stream_messages(%(stream_name)s, %(position)s, %(batch_size)s);"
-            else:
-                sql = "SELECT * FROM get_category_messages(%(stream_name)s::varchar, %(position)s::bigint, %(batch_size)s::bigint"
-                if consumer_group_member is not None:
-                    sql += ", NULL, %(consumer_group_member)s::bigint, %(consumer_group_size)s::bigint"
-                sql += ");"
-
-        params = {
-            "stream_name": stream_name,
-            "position": position,
-            "batch_size": no_of_messages,
-        }
-        if consumer_group_member is not None:
-            params["consumer_group_member"] = consumer_group_member
-            params["consumer_group_size"] = consumer_group_size
-
-        cursor.execute(sql, params)
-        raw_messages = cursor.fetchall()
-
-        conn.commit()
-        cursor.close()
-        self.connection_pool.release(conn)
+        try:
+            cursor = conn.cursor(cursor_factory=RealDictCursor)
+
+            if not sql:
+                if stream_name == "$all":
+                    sql = """
+                        SELECT
+                            id::varchar,
+                            stream_name::varchar,
+                            type::varchar,
+                            position::bigint,
+                            global_position::bigint,
+                            data::varchar,
+                            metadata::varchar,
+                            time::timestamp
+                        FROM
+                            messages
+                        WHERE
+                            global_position > %(position)s
+                        LIMIT %(batch_size)s
+                    """
+                elif "-" in stream_name:
+                    sql = "SELECT * FROM get_stream_messages(%(stream_name)s, %(position)s, %(batch_size)s);"
+                else:
+                    sql = "SELECT * FROM get_category_messages(%(stream_name)s::varchar, %(position)s::bigint, %(batch_size)s::bigint"
+                    if consumer_group_member is not None:
+                        sql += ", NULL, %(consumer_group_member)s::bigint, %(consumer_group_size)s::bigint"
+                    sql += ");"
+
+            params = {
+                "stream_name": stream_name,
+                "position": position,
+                "batch_size": no_of_messages,
+            }
+            if consumer_group_member is not None:
+                params["consumer_group_member"] = consumer_group_member
+                params["consumer_group_size"] = consumer_group_size
+
+            cursor.execute(sql, params)
+            raw_messages = cursor.fetchall()
+
+            conn.commit()
+            cursor.close()
+        finally:
+            self.connection_pool.release(conn)
 
         messages = []
         for message in raw_messages:
@@ -304,45 +306,49 @@ class MessageDB:
             raise ValueError(f"{category_name} is not a category")
 
         conn = self.connection_pool.get_connection()
-        cursor = conn.cursor()
-
-        cursor.execute(
-            """
-            SELECT DISTINCT
-                substring(stream_name from position('-' in stream_name) + 1)
-            FROM message_store.messages
-            WHERE stream_name LIKE %(pattern)s
-              AND stream_name NOT LIKE %(snapshot_pattern)s
-            ORDER BY 1
-            """,
-            {
-                "pattern": f"{category_name}-%",
-                "snapshot_pattern": f"{category_name}:snapshot-%",
-            },
-        )
-        identifiers = [row[0] for row in cursor.fetchall() if row[0]]
+        try:
+            cursor = conn.cursor()
 
-        conn.commit()
-        cursor.close()
-        self.connection_pool.release(conn)
+            cursor.execute(
+                """
+                SELECT DISTINCT
+                    substring(stream_name from position('-' in stream_name) + 1)
+                FROM message_store.messages
+                WHERE stream_name LIKE %(pattern)s
+                  AND stream_name NOT LIKE %(snapshot_pattern)s
+                ORDER BY 1
+                """,
+                {
+                    "pattern": f"{category_name}-%",
+                    "snapshot_pattern": f"{category_name}:snapshot-%",
+                },
+            )
+            identifiers = [row[0] for row in cursor.fetchall() if row[0]]
+
+            conn.commit()
+            cursor.close()
+        finally:
+            self.connection_pool.release(conn)
 
         return identifiers
 
     def read_last_message(self, stream_name: str) -> Dict[str, Any] | None:
         """Read the last message from a stream."""
         conn = self.connection_pool.get_connection()
-        cursor = conn.cursor(cursor_factory=RealDictCursor)
+        try:
+            cursor = conn.cursor(cursor_factory=RealDictCursor)
 
-        cursor.execute(
-            "SELECT * from get_last_stream_message(%(stream_name)s);",
-            {"stream_name": stream_name},
-        )
+            cursor.execute(
+                "SELECT * from get_last_stream_message(%(stream_name)s);",
+                {"stream_name": stream_name},
+            )
 
-        message = cursor.fetchone()
+            message = cursor.fetchone()
 
-        conn.commit()
-        cursor.close()
-        self.connection_pool.release(conn)
+            conn.commit()
+            cursor.close()
+        finally:
+            self.connection_pool.release(conn)
 
         if message:
             message["data"] = json.loads(message["data"])

{message_db_py-0.3.2 → message_db_py-0.3.4}/src/message_db/connection.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Any
 
 from psycopg2.extensions import connection
-from psycopg2.pool import SimpleConnectionPool
+from psycopg2.pool import ThreadedConnectionPool
 
 
 class ConnectionPool:
@@ -35,7 +35,7 @@ class ConnectionPool:
         # Minimum connections start at 1
         min_connections = 1
 
-        self._connection_pool = SimpleConnectionPool(
+        self._connection_pool = ThreadedConnectionPool(
             min_connections, self.max_connections, *self.args, **self.kwargs
         )