python3-commons 0.9.15__tar.gz → 0.13.5__tar.gz

python3_commons-0.13.5/.devcontainer/Dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.13.9-slim-trixie
+
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+
+RUN apt update && \
+    apt install -y curl ca-certificates apt-transport-https wget gnupg && \
+    wget -O- https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg && \
+    echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main | tee /etc/apt/sources.list.d/postgresql.list && \
+    apt update && \
+    apt install -y --no-install-recommends libpq-dev gcc g++ make postgresql-server-dev-18 libffi-dev git cargo pkg-config ssh && \
+    apt clean && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/

python3_commons-0.13.5/.devcontainer/devcontainer.json

@@ -0,0 +1,23 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/postgres
+{
+    "name": "python3-commons",
+    "dockerComposeFile": "docker-compose.yml",
+    "service": "python3-commons",
+    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+    // Features to add to the dev container. More info: https://containers.dev/features.
+    // "features": {},
+
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // This can be used to network with other containers or the host.
+     "forwardPorts": [8080, 5432],
+
+    "postCreateCommand": "uv sync --all-groups --all-extras",
+    "customizations": {
+        "jetbrains": {
+            "backend": "PyCharm"
+        }
+    },
+    // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+    "remoteUser": "root"
+}

python3_commons-0.13.5/.devcontainer/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+  db:
+    image: postgres:18-alpine
+    container_name: db
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_DB: "${POSTGRES_DB:-python3-commons}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:-dev}"
+      POSTGRES_USER: "${POSTGRES_USER:-dev}"
+    restart: unless-stopped
+
+    # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+volumes:
+  postgres-data:

python3_commons-0.13.5/.github/workflows/checks.yml

@@ -0,0 +1,63 @@
+name: Checks
+
+on:
+  push:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v5
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+
+      - name: "Set up Python"
+        uses: actions/setup-python@v6
+        with:
+          python-version-file: "pyproject.toml"
+
+      - name: Install the project
+        run: uv sync --locked --all-extras --dev
+
+      - name: Ruff format check
+        run: |
+          uvx ruff format --diff ./src/ ./tests/
+
+      - name: Ruff default rules and import check
+        run: |
+          uvx ruff check --extend-select I ./src/ ./tests/
+
+#      - name: Pyright check
+#        run: |
+#          uvx pyright ./src/
+#  tests:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check Out Repo
+#        uses: actions/checkout@v5
+#
+#      - name: Install uv
+#        uses: astral-sh/setup-uv@v6
+#        with:
+#          enable-cache: true
+#          cache-dependency-glob: "uv.lock"
+#
+#      - name: "Set up Python"
+#        uses: actions/setup-python@v6
+#        with:
+#          python-version-file: "pyproject.toml"
+#
+#      - name: Install the project
+#        run: uv sync --locked --all-extras --all-groups --dev
+#
+#      - name: Run unittests
+#        run: uv run pytest tests/

{python3_commons-0.9.15 → python3_commons-0.13.5}/.github/workflows/python-publish.yaml

@@ -21,16 +21,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         enable-cache: true
         cache-dependency-glob: "uv.lock"
 
     - name: "Set up Python"
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version-file: "pyproject.toml"
 

{python3_commons-0.9.15 → python3_commons-0.13.5}/.github/workflows/release-on-tag-push.yml

@@ -26,16 +26,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
 
       - name: "Set up Python"
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version-file: "pyproject.toml"
 

{python3_commons-0.9.15 → python3_commons-0.13.5}/.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.8.15
+    rev: 0.9.9
     hooks:
       - id: uv-lock
 #      - id: uv-export
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.12
+    rev: v0.14.4
     hooks:
       # Run the linter.
       - id: ruff-check

python3_commons-0.13.5/.python-version

@@ -0,0 +1 @@
+>=3.13.9,<3.15.0

{python3_commons-0.9.15/src/python3_commons.egg-info → python3_commons-0.13.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.9.15
+Version: 0.13.5
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -8,24 +8,20 @@ Project-URL: Homepage, https://github.com/kamikaze/python3-commons
 Project-URL: Documentation, https://github.com/kamikaze/python3-commons/wiki
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
-Requires-Python: ==3.13.*
+Requires-Python: <3.15.0,>=3.13.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiobotocore~=2.24.2
-Requires-Dist: aiohttp[speedups]~=3.12.15
+Requires-Dist: aiobotocore~=2.25.2
+Requires-Dist: aiohttp[speedups]<3.15.0,>=3.12.0
 Requires-Dist: asyncpg~=0.30.0
-Requires-Dist: fastapi-users-db-sqlalchemy~=7.0.0
-Requires-Dist: fastapi-users[sqlalchemy]~=14.0.1
-Requires-Dist: lxml~=6.0.1
-Requires-Dist: msgpack~=1.1.1
+Requires-Dist: lxml~=6.0.2
+Requires-Dist: msgpack~=1.1.2
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.11.7
-Requires-Dist: pydantic-settings~=2.10.1
-Requires-Dist: python-jose==3.5.0
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.43
+Requires-Dist: pydantic-settings~=2.12.0
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.44
 Requires-Dist: valkey[libvalkey]~=6.1.1
-Requires-Dist: zeep~=4.3.1
+Requires-Dist: zeep~=4.3.2
 Dynamic: license-file
 
 Re-usable Python3 code

{python3_commons-0.9.15 → python3_commons-0.13.5}/pyproject.toml

@@ -16,23 +16,18 @@ classifiers = [
     "Programming Language :: Python"
 ]
 keywords = []
-requires-python = "==3.13.*"
-
+requires-python = ">=3.13.9,<3.15.0"
 dependencies = [
-    "aiobotocore~=2.24.2",
-    "aiohttp[speedups]~=3.12.15",
+    "aiobotocore~=2.25.2",
+    "aiohttp[speedups]>=3.12.0,<3.15.0",
     "asyncpg~=0.30.0",
-    "fastapi-users-db-sqlalchemy~=7.0.0",
-    "fastapi-users[sqlalchemy]~=14.0.1",
-    "lxml~=6.0.1",
-    "msgpack~=1.1.1",
+    "lxml~=6.0.2",
+    "msgpack~=1.1.2",
     "msgspec~=0.19.0",
-    "pydantic[email]~=2.11.7",
-    "pydantic-settings~=2.10.1",
-    "python-jose==3.5.0",
-    "SQLAlchemy[asyncio]~=2.0.43",
+    "pydantic-settings~=2.12.0",
+    "SQLAlchemy[asyncio]~=2.0.44",
     "valkey[libvalkey]~=6.1.1",
-    "zeep~=4.3.1"
+    "zeep~=4.3.2"
 ]
 
 [dependency-groups]
@@ -44,14 +39,14 @@ dev = [
     "ruff",
     "setuptools",
     "setuptools_scm",
-    "types-aiobotocore-s3",
+    "types-aiobotocore[s3]",
     "wheel",
 ]
 testing = [
     "pytest",
     "pytest-asyncio",
     "pytest-cov",
-    "pytest-mock"
+    "pytest-mock",
 ]
 
 [project.urls]
@@ -67,13 +62,6 @@ exclude = ["tests"]
 [tool.bdist_wheel]
 universal = true
 
-[tool.pytest.ini_options]
-addopts = [
-    "--verbose"
-]
-norecursedirs = ["dist", "build", ".tox"]
-testpaths = ["tests"]
-
 [tool.ruff]
 line-length = 120
 indent-width = 4
@@ -82,8 +70,69 @@ target-version = "py313"
 [tool.ruff.analyze]
 detect-string-imports = true
 
+[tool.ruff.lint]
+select = [
+    "FAST",
+    "YTT",
+#    "ANN",
+    "I",
+    "E",
+    "W",
+    "PYI",
+
+    "A",
+#    "ARG",
+    "ASYNC",
+    "B",
+    "C4",
+#    "DTZ",
+    "EM",
+    "EXE",
+    "F",
+    "FA",
+    "FBT",
+    "FLY",
+    "FURB",
+#    "G",
+    "ICN",
+    "INP",
+    "ISC",
+    "LOG",
+    "N",
+    "NPY",
+    "PD",
+    "PERF",
+    "PIE",
+    "PLC",
+    "PLE",
+#    "PLR",
+    "PLW",
+    "PT",
+    "PTH",
+    "Q",
+    "RET",
+    "RSE",
+    "RUF",
+    "S",
+    "SIM",
+    "SLF",
+    "SLOT",
+    "T20",
+    "TC",
+    "TID",
+    "TRY",
+    "UP",
+]
+ignore = [
+    "ASYNC109",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*.py" = ["DTZ", "S101"]
+
 [tool.ruff.lint.flake8-quotes]
 docstring-quotes = "double"
+inline-quotes = "single"
 
 [tool.ruff.format]
 exclude = ["*.pyi"]
@@ -95,3 +144,11 @@ venvPath = "."
 venv = ".venv"
 reportMatchNotExhaustive = "error"
 reportUnnecessaryComparison = "error"
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]
+asyncio_mode = "strict"
+asyncio_default_fixture_loop_scope = "function"
+addopts = "--cov python3_commons --cov-fail-under=20 --cov-report term-missing --verbose"
+norecursedirs = ["dist", "build", ".tox"]
+testpaths = ["tests"]

{python3_commons-0.9.15 → python3_commons-0.13.5}/src/python3_commons/api_client.py

@@ -1,10 +1,12 @@
+import errno
 import logging
+from collections.abc import AsyncGenerator, Mapping, Sequence
 from contextlib import asynccontextmanager
 from datetime import UTC, datetime
 from enum import Enum
 from http import HTTPStatus
 from json import dumps
-from typing import AsyncGenerator, Literal, Mapping, Sequence
+from typing import Literal
 from uuid import uuid4
 
 from aiohttp import ClientResponse, ClientSession, ClientTimeout, client_exceptions
@@ -20,7 +22,7 @@ logger = logging.getLogger(__name__)
 
 async def _store_response_for_audit(
     response: ClientResponse, audit_name: str, uri_path: str, method: str, request_id: str
-):
+) -> None:
     response_text = await response.text()
 
     if response_text:
@@ -52,8 +54,8 @@ async def request(
     date_path = now.strftime('%Y/%m/%d')
     timestamp = now.strftime('%H%M%S_%f')
     request_id = str(uuid4())[-12:]
-    uri_path = uri[:-1] if uri.endswith('/') else uri
-    uri_path = uri_path[1:] if uri_path.startswith('/') else uri_path
+    uri_path = uri.removesuffix('/')
+    uri_path = uri_path.removeprefix('/')
     url = f'{u[:-1] if (u := str(base_url)).endswith("/") else u}{uri}'
 
     if audit_name:
@@ -90,15 +92,25 @@ async def request(
                 else:
                     match response.status:
                         case HTTPStatus.UNAUTHORIZED:
-                            raise PermissionError('Unauthorized')
+                            msg = 'Unauthorized'
+
+                            raise PermissionError(msg)
                         case HTTPStatus.FORBIDDEN:
-                            raise PermissionError('Forbidden')
+                            msg = 'Forbidden'
+
+                            raise PermissionError(msg)
                         case HTTPStatus.NOT_FOUND:
-                            raise LookupError('Not found')
+                            msg = 'Not found'
+
+                            raise LookupError(msg)
                         case HTTPStatus.BAD_REQUEST:
-                            raise ValueError('Bad request')
+                            msg = 'Bad request'
+
+                            raise ValueError(msg)
                         case HTTPStatus.TOO_MANY_REQUESTS:
-                            raise InterruptedError('Too many requests')
+                            msg = 'Too many requests'
+
+                            raise InterruptedError(msg)
                         case _:
                             response.raise_for_status()
         else:
@@ -116,13 +128,21 @@ async def request(
 
                 yield response
     except client_exceptions.ClientConnectorError as e:
-        raise ConnectionRefusedError('Cient connection error') from e
+        msg = 'Cient connection error'
+
+        raise ConnectionRefusedError(msg) from e
     except client_exceptions.ClientOSError as e:
-        if e.errno == 32:
-            raise ConnectionResetError('Broken pipe') from e
-        elif e.errno == 104:
-            raise ConnectionResetError('Connection reset by peer') from e
+        if e.errno == errno.EPIPE:
+            msg = 'Broken pipe'
+
+            raise ConnectionResetError(msg) from e
+        elif e.errno == errno.ECONNRESET:
+            msg = 'Connection reset by peer'
+
+            raise ConnectionResetError(msg) from e
 
         raise
     except client_exceptions.ServerDisconnectedError as e:
-        raise ConnectionResetError('Server disconnected') from e
+        msg = 'Server disconnected'
+
+        raise ConnectionResetError(msg) from e

{python3_commons-0.9.15 → python3_commons-0.13.5}/src/python3_commons/audit.py

@@ -137,14 +137,14 @@ logger = logging.getLogger(__name__)
 #                 logger.error(f'Failed to delete object in {bucket_name=}: {error}')
 
 
-async def write_audit_data(settings: S3Settings, key: str, data: bytes):
-    if settings.s3_secret_access_key:
+async def write_audit_data(settings: S3Settings, key: str, data: bytes) -> None:
+    if settings.aws_secret_access_key:
         try:
             absolute_path = object_storage.get_absolute_path(f'audit/{key}')
 
             await object_storage.put_object(settings.s3_bucket, absolute_path, io.BytesIO(data), len(data))
-        except Exception as e:
-            logger.error(f'Failed storing object in storage: {e}')
+        except Exception:
+            logger.exception('Failed storing object in storage.')
         else:
             logger.debug(f'Stored object in storage: {key}')
     else:
@@ -152,11 +152,11 @@ async def write_audit_data(settings: S3Settings, key: str, data: bytes):
 
 
 class ZeepAuditPlugin(Plugin):
-    def __init__(self, audit_name: str = 'zeep'):
+    def __init__(self, audit_name: str = 'zeep') -> None:
         super().__init__()
         self.audit_name = audit_name
 
-    def store_audit_in_s3(self, envelope, operation: AbstractOperation, direction: str):
+    def store_audit_in_s3(self, envelope, operation: AbstractOperation, direction: str) -> None:
         xml = etree.tostring(envelope, encoding='UTF-8', pretty_print=True)
         now = datetime.now(tz=UTC)
         date_path = now.strftime('%Y/%m/%d')

python3_commons-0.13.5/src/python3_commons/auth.py

@@ -0,0 +1,48 @@
+import logging
+from collections.abc import Sequence
+from http import HTTPStatus
+from typing import TypeVar
+
+import aiohttp
+import msgspec
+
+from python3_commons.conf import oidc_settings
+
+logger = logging.getLogger(__name__)
+
+
+class TokenData(msgspec.Struct):
+    sub: str
+    aud: str | Sequence[str]
+    exp: int
+    iss: str
+
+
+T = TypeVar('T', bound=TokenData)
+OIDC_CONFIG_URL = f'{oidc_settings.authority_url}/.well-known/openid-configuration'
+
+
+async def fetch_openid_config() -> dict:
+    """
+    Fetch the OpenID configuration (including JWKS URI) from OIDC authority.
+    """
+    async with aiohttp.ClientSession() as session, session.get(OIDC_CONFIG_URL) as response:
+        if response.status != HTTPStatus.OK:
+            msg = 'Failed to fetch OpenID configuration'
+
+            raise RuntimeError(msg)
+
+        return await response.json()
+
+
+async def fetch_jwks(jwks_uri: str) -> dict:
+    """
+    Fetch the JSON Web Key Set (JWKS) for validating the token's signature.
+    """
+    async with aiohttp.ClientSession() as session, session.get(jwks_uri) as response:
+        if response.status != HTTPStatus.OK:
+            msg = 'Failed to fetch JWKS'
+
+            raise RuntimeError(msg)
+
+        return await response.json()