Merge branch 'develop'

MobileTeleSystems · Jan 28, 2025 · 8253941 · 8253941
2 parents 5121d24 + 56e3d03
commit 8253941
Show file tree

Hide file tree

Showing 209 changed files with 1,432 additions and 1,269 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -7,7 +7,7 @@ on:
       - master
 
 env:
-  DEFAULT_PYTHON: '3.12'
+  DEFAULT_PYTHON: '3.13'
 
 permissions:
   contents: read

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -14,8 +14,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  # flake8-commas is failing on Python 3.12
-  DEFAULT_PYTHON: '3.11'
+  DEFAULT_PYTHON: '3.13'
 
 jobs:
   linters:
@@ -55,6 +54,7 @@ jobs:
       - name: Install dependencies
         run: |
           poetry install --no-root --all-extras --with dev --without docs,test
+          pip install -U flake8-commas
 
       - name: Run flake8
         run: poetry run flake8 horizon/

diff --git a/.github/workflows/dev-release.yaml b/.github/workflows/dev-release.yaml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  DEFAULT_PYTHON: '3.12'
+  DEFAULT_PYTHON: '3.13'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+'
 
 env:
-  DEFAULT_PYTHON: '3.12'
+  DEFAULT_PYTHON: '3.13'
 
 jobs:
   release:
@@ -122,5 +122,6 @@ jobs:
           name: ${{ steps.release-name.outputs.name }}
           body_path: changelog.md
           files: |
-            dist/*
+            dist/*.tar.gz
+            dist/*.whl
             openapi.json
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DEFAULT_PYTHON: '3.12'
+  DEFAULT_PYTHON: '3.13'
 
 jobs:
   tests:
@@ -22,11 +22,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.12']
-        pydantic-version: [1, 2]
-        os: [ubuntu-latest]
+        include:
+          - python-version: '3.7'
+            pydantic-version: '1'
+            os: ubuntu-22.04
+
+          - python-version: '3.13'
+            pydantic-version: '2'
+            os: ubuntu-latest
     env:
-      POETRY_VERSION: ${{ matrix.python-version == '3.7' && '1.5.1' || '1.8.2' }}
+      POETRY_VERSION: ${{ matrix.python-version == '3.7' && '1.5.1' || '2.0.1' }}
 
     steps:
       - name: Checkout code

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,3 @@
-default_language_version:
-  python: python3.12
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
@@ -54,11 +51,11 @@ repos:
         args:
           - --license-filepath
           - .spdx-license-header.txt
-          - --use-current-year
+          - --allow-past-years
           - --no-extra-eol
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus, --keep-runtime-typing]
@@ -87,7 +84,7 @@ repos:
           - black==24.4.2
 
   - repo: https://github.com/pycqa/bandit
-    rev: 1.7.10
+    rev: 1.8.2
     hooks:
       - id: bandit
         args:
@@ -97,7 +94,7 @@ repos:
         require_serial: true
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.0
     hooks:
       - id: isort
         name: isort
@@ -114,15 +111,15 @@ repos:
         args: [--autofix, --indent, '2', --offset, '2']
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
       - id: codespell
         args: [-w]
         additional_dependencies:
           - tomli
 
   - repo: https://github.com/sbrunner/hooks
-    rev: 1.1.2
+    rev: 1.2.1
     hooks:
       - id: poetry-check
         additional_dependencies:

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -1,26 +1,27 @@
 version: 2
 
+sphinx:
+  configuration: docs/conf.py
+
 build:
   os: ubuntu-22.04
   tools:
-    python: '3.12'
+    python: '3.13'
+
   apt_packages:
     - libldap2-dev
     - libsasl2-dev
+
   jobs:
     post_checkout:
       - git fetch --unshallow || true
     post_create_environment:
       - python -m pip install poetry
       - python -m pip install --no-deps sphinx-plantuml # remove after https://github.com/zqmillet/sphinx-plantuml/pull/4
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry config virtualenvs.create false
-      - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry config virtualenvs.prefer-active-python true
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry debug info
     post_install:
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry install --no-root --all-extras --with docs --without dev,test
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry show -v
       - python -m pip list -v
       - HORIZON__DATABASE__URL=postgresql+asyncpg://fake:[email protected]:5432/fake HORIZON__AUTH__ACCESS_TOKEN__SECRET_KEY=fake python -m horizon.backend.export_openapi_schema docs/_static/openapi.json
-
-sphinx:
-  configuration: docs/conf.py
diff --git a/.spdx-license-header.txt b/.spdx-license-header.txt
@@ -1,2 +1,2 @@
-SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 SPDX-License-Identifier: Apache-2.0
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2023-2024 MTS PJSC.  All rights reserved.
+Copyright 2023-2025 MTS PJSC.  All rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/docker/Dockerfile.backend b/docker/Dockerfile.backend
@@ -1,4 +1,4 @@
-FROM python:3.12-slim AS prod
+FROM python:3.13-slim AS prod
 LABEL maintainer="DataOps.ETL"
 
 RUN apt-get update && apt-get install -y \
@@ -18,7 +18,6 @@ RUN apt-get update && apt-get install -y \
         curl \
     && rm -rf /var/lib/apt/lists/*
 
-
 WORKDIR /app
 ENV PYTHONPATH=/app
 
@@ -27,7 +26,8 @@ RUN pip install poetry \
 
 COPY ./pyproject.toml ./poetry.lock* ./
 
-RUN poetry install \
+RUN --mount=type=cache,target=/root/.cache/pypoetry \
+    poetry install \
         --no-root \
         --all-extras \
         --without dev,test,docs

diff --git a/docs/changelog/1.0.3.rst b/docs/changelog/1.0.3.rst
@@ -0,0 +1,8 @@
+1.0.3 (2025-01-28)
+==================
+
+Improvements
+------------
+
+- Add compatibility with ``Python 3.13`` (:issue:`94`)
+- Replace outdated ``python-jose`` dependency with ``authlib.jose``, to fix security issues. (:issue:`97`)
diff --git a/docs/changelog/index.rst b/docs/changelog/index.rst
@@ -3,6 +3,7 @@
     :caption: Changelog
 
     DRAFT
+    1.0.3
     1.0.2
     1.0.1
     1.0.0

diff --git a/docs/conf.py b/docs/conf.py
@@ -24,7 +24,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "horizon"
-copyright = "2023-2024 MTS PJSC"
+copyright = "2023-2025 MTS PJSC"
 author = "DataOps.ETL"
 
 # The version info for the project you're documenting, acts as replacement for
@@ -34,7 +34,7 @@
 # The short X.Y version.
 
 # this value is updated automatically by `poetry version ...` and poetry-bumpversion plugin
-ver = Version.parse("1.0.2")
+ver = Version.parse("1.0.3")
 version = ver.base_version
 # The full version, including alpha/beta/rc tags.
 release = ver.public

diff --git a/horizon/__init__.py b/horizon/__init__.py
@@ -1,9 +1,9 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 # _raw_version could contain pre-release version, like 0.0.1dev123
 # value is updated automatically by `poetry version ...` and poetry-bumpversion plugin
-_raw_version = "1.0.2"
+_raw_version = "1.0.3"
 
 # version always contain only release number like 0.0.1
 __version__ = ".".join(_raw_version.split(".")[:3])

diff --git a/horizon/backend/__init__.py b/horizon/backend/__init__.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from typing import Type

diff --git a/horizon/backend/__main__.py b/horizon/backend/__main__.py
@@ -1,5 +1,5 @@
 #!/bin/env python3
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 import os

diff --git a/horizon/backend/api/__init__.py b/horizon/backend/api/__init__.py
@@ -1,2 +1,2 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
diff --git a/horizon/backend/api/handlers.py b/horizon/backend/api/handlers.py
@@ -1,9 +1,10 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 from __future__ import annotations
 
 import http
 import logging
+from typing import Mapping
 
 from asgi_correlation_id import correlation_id
 from fastapi import HTTPException, Request, Response
@@ -115,7 +116,7 @@ def application_exception_handler(request: Request, exc: ApplicationError) -> Re
 def exception_json_response(
     status: int,
     content: BaseErrorSchema,
-    headers: dict[str, str] | None = None,
+    headers: Mapping[str, str] | None = None,
 ) -> Response:
     # Using Response + `model.json()` because JSONResponse + `model.dict()` does not convert Unset() to JSON value "<unset>"
     content_type = type(content)

diff --git a/horizon/backend/api/monitoring.py b/horizon/backend/api/monitoring.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from fastapi import APIRouter

diff --git a/horizon/backend/api/router.py b/horizon/backend/api/router.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from fastapi import APIRouter

diff --git a/horizon/backend/api/v1/__init__.py b/horizon/backend/api/v1/__init__.py
@@ -1,2 +1,2 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
diff --git a/horizon/backend/api/v1/router/__init__.py b/horizon/backend/api/v1/router/__init__.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 from fastapi import APIRouter
 

diff --git a/horizon/backend/api/v1/router/auth.py b/horizon/backend/api/v1/router/auth.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from fastapi import APIRouter, Depends

diff --git a/horizon/backend/api/v1/router/hwm.py b/horizon/backend/api/v1/router/hwm.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 # mypy: disable-error-code="pydantic-orm"

diff --git a/horizon/backend/api/v1/router/hwm_history.py b/horizon/backend/api/v1/router/hwm_history.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from fastapi import APIRouter, Depends

diff --git a/horizon/backend/api/v1/router/namespace_history.py b/horizon/backend/api/v1/router/namespace_history.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from fastapi import APIRouter, Depends

diff --git a/horizon/backend/api/v1/router/namespaces.py b/horizon/backend/api/v1/router/namespaces.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 # mypy: disable-error-code="pydantic-orm"

diff --git a/horizon/backend/api/v1/router/users.py b/horizon/backend/api/v1/router/users.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 # mypy: disable-error-code="pydantic-orm"

diff --git a/horizon/backend/db/__init__.py b/horizon/backend/db/__init__.py
@@ -1,2 +1,2 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
diff --git a/horizon/backend/db/factory.py b/horizon/backend/db/factory.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from typing import AsyncGenerator

diff --git a/horizon/backend/db/migrations/__main__.py b/horizon/backend/db/migrations/__main__.py
@@ -1,6 +1,6 @@
 #!/bin/env python3
 
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 from __future__ import annotations

diff --git a/horizon/backend/db/migrations/env.py b/horizon/backend/db/migrations/env.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 import asyncio
 from logging.config import fileConfig

diff --git a/horizon/backend/db/migrations/versions/2023-10-09_b91de692624e_.py b/horizon/backend/db/migrations/versions/2023-10-09_b91de692624e_.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 
 """Add user table

diff --git a/horizon/backend/db/migrations/versions/2023-10-13_e29b66594970_.py b/horizon/backend/db/migrations/versions/2023-10-13_e29b66594970_.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 """Add namespace table
 

diff --git a/horizon/backend/db/migrations/versions/2023-10-16_edd2e353ca38_.py b/horizon/backend/db/migrations/versions/2023-10-16_edd2e353ca38_.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 """Add hwm table
 

diff --git a/horizon/backend/db/migrations/versions/2023-10-19_6b9001985cd2_.py b/horizon/backend/db/migrations/versions/2023-10-19_6b9001985cd2_.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 MTS PJSC
+# SPDX-FileCopyrightText: 2023-2025 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
 """Add hwm_history table
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
         :caption: Changelog
         DRAFT
+.0.3
 .0.2
 .0.1
 .0.0
@@ Expand Down @@