General package upgrade and typing fixes

Author: subhashb

.flake8

@@ -0,0 +1,18 @@
+[flake8]
+max-line-length = 119
+max-doc-length = 119
+extend-ignore = E731, E203
+per-file-ignores = __init__.py:F401
+exclude =
+    .tox,
+    .git,
+    __pycache__,
+    build,
+    dist,
+    *.pyc,
+    *.egg-info,
+    .cache,
+    .eggs
+max-complexity = 10
+import-order-style = google
+application-import-names = flake8

.github/workflows/ci.yml

@@ -11,21 +11,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.11", "3.12"]
     name: Python ${{ matrix.python-version }} Tests
 
     services:
       message-db:
-        image: ethangarofolo/message-db:1.2.6
+        image: ethangarofolo/message-db:1.3.1
         ports:
           - "0.0.0.0:5432:5432"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -36,25 +36,25 @@ jobs:
           virtualenvs-in-project: true
           installer-parallel: true
 
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v2
+      - name: Cache multiple paths
+        uses: actions/cache@v3
         with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+          path: |
+            .venv
+            ~/.cache/pypoetry
+          key: ${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-py${{ matrix.python-version }}-
 
       - name: Install dependencies
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        if: steps.cache.outputs.cache-hit != 'true'
         run: poetry install --no-interaction --no-root
 
-      - name: Install library
-        run: poetry install --no-interaction
-
       - name: Tests
         run: poetry run pytest --cov --cov-report=xml
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
           fail_ci_if_error: true

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 21.11b1
+    rev: 24.4.0
     hooks:
       - id: black
         language_version: python3.8
@@ -17,13 +17,13 @@ repos:
           ]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910
+    rev: v1.9.0
     hooks:
       - id: mypy
         exclude: ^tests/

message_db/client.py

@@ -36,10 +36,10 @@ def __init__(
         self,
         dbname: str = "message_store",
         user: str = "message_store",
-        password: str = None,
+        password: str = "",
         host: str = "localhost",
         port: int = 5432,
-        connection_pool: ConnectionPool = None,
+        connection_pool: ConnectionPool | None = None,
     ) -> None:
         if not connection_pool:
             connection_pool = ConnectionPool(
@@ -53,8 +53,8 @@ def _write(
         stream_name: str,
         message_type: str,
         data: Dict[str, Any],
-        metadata: Dict[str, Any] = None,
-        expected_version: int = None,
+        metadata: Dict[str, Any] | None = None,
+        expected_version: int | None = None,
     ) -> int:
         try:
             with connection.cursor(cursor_factory=RealDictCursor) as cursor:
@@ -74,6 +74,8 @@ def _write(
                 )
 
                 result = cursor.fetchone()
+                if result is None:
+                    raise ValueError("No result returned from the database operation.")
         except Exception as exc:
             raise ValueError(
                 f"{getattr(exc, 'pgcode')}-{getattr(exc, 'pgerror').splitlines()[0]}"
@@ -86,8 +88,8 @@ def write(
         stream_name: str,
         message_type: str,
         data: Dict,
-        metadata: Dict = None,
-        expected_version: int = None,
+        metadata: Dict | None = None,
+        expected_version: int | None = None,
     ) -> int:
         conn = self.connection_pool.get_connection()
 
@@ -101,7 +103,9 @@ def write(
 
         return position
 
-    def write_batch(self, stream_name, data, expected_version: int = None) -> int:
+    def write_batch(
+        self, stream_name, data, expected_version: int | None = None
+    ) -> int:
         conn = self.connection_pool.get_connection()
 
         try:
@@ -125,7 +129,7 @@ def write_batch(self, stream_name, data, expected_version: int = None) -> int:
     def read(
         self,
         stream_name: str,
-        sql: str = None,
+        sql: str | None = None,
         position: int = 0,
         no_of_messages: int = 1000,
     ) -> List[Dict[str, Any]]:
@@ -171,11 +175,16 @@ def read(
 
         messages = []
         for message in raw_messages:
-            message["data"] = json.loads(message["data"])
-            message["metadata"] = (
-                json.loads(message["metadata"]) if message["metadata"] else None
+            processed_message = dict(
+                message
+            )  # Convert each RealDictRow to a dictionary
+            processed_message["data"] = json.loads(processed_message["data"])
+            processed_message["metadata"] = (
+                json.loads(processed_message["metadata"])
+                if processed_message["metadata"]
+                else None
             )
-            messages.append(message)
+            messages.append(processed_message)
 
         return messages
 
@@ -203,7 +212,7 @@ def read_category(
             category_name, sql=sql, position=position, no_of_messages=no_of_messages
         )
 
-    def read_last_message(self, stream_name) -> Dict[str, Any]:
+    def read_last_message(self, stream_name: str) -> Dict[str, Any] | None:
         conn = self.connection_pool.get_connection()
         cursor = conn.cursor(cursor_factory=RealDictCursor)
 

pyproject.toml

@@ -9,24 +9,24 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.7"
-psycopg2 = "^2.9.2"
+python = "^3.11"
+psycopg2 = "^2.9.9"
 
 [tool.poetry.dev-dependencies]
-pytest = "^6.2.5"
-black = "^21.11b1"
-pre-commit = "^2.15.0"
-isort = "^5.10.1"
-autoflake = "^1.4"
-pytest-cov = "^3.0.0"
-mypy = "^0.910"
-types-psycopg2 = "^2.9.1"
+autoflake = "^2.3.1"
+black = "^24.4.0"
+isort = "^5.13.2"
+mypy = "^1.9.0"
+pre-commit = "^3.7.0"
+pytest = "^8.1.1"
+pytest-cov = "^5.0.0"
+types-psycopg2 = "^2.9.21.20240417"
 
 [build-system]
-requires = ["setuptools", "poetry-core>=1.0.0"]
+requires = ["poetry-core>=1.0.0", "setuptools"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.coverage.run]
-source=["message_db"]
+source = ["message_db"]
 show_missing = true
 precision = 2