[DOP-14540] Fix Pydantic v2 warnings

.github/workflows/changelog.yml

@@ -42,7 +42,6 @@ jobs:
             ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-${{ hashFiles('**/poetry.lock') }}
             ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-
             ${{ runner.os }}-python
-            ${{ runner.os }}-
 
       - name: Install dependencies
         run: |

.github/workflows/codeql-analysis.yml

@@ -51,7 +51,6 @@ jobs:
             ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-${{ hashFiles('**/poetry.lock') }}
             ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-
             ${{ runner.os }}-python
-            ${{ runner.os }}-
 
       - name: Install dependencies
         run: |

.github/workflows/release.yml

@@ -42,10 +42,11 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry
-          key: pypi-release-${{ runner.os }}-py-${{ hashFiles('**/poetry.lock') }}-${{ env.DEFAULT_PYTHON }}
+          key: ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-${{ hashFiles('**/poetry.lock') }}
           restore-keys: |
-            pypi-release-${{ runner.os }}-py-${{ hashFiles('**/poetry.lock') }}-
-            pypi-release-${{ runner.os }}-py-
+            ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-${{ hashFiles('**/poetry.lock') }}
+            ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-release-
+            ${{ runner.os }}-python
 
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -82,7 +82,7 @@ jobs:
         run: |
           poetry install --no-root --all-extras --with test --without dev,docs
           if [ "${{ matrix.pydantic-version }}" == "1" ]; then
-            pip install "pydantic<2.0.0"
+            poetry run pip install "pydantic<2.0.0"
           fi
 
       - name: Run Tests

docs/changelog/next_release/47.improvement.rst

@@ -0,0 +1 @@
+Fix Pydantic v2 model warnings while starting backend.

horizon/backend/api/v1/router/hwm.py

@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
 # SPDX-License-Identifier: Apache-2.0
 
+# mypy: disable-error-code="pydantic-orm"
 
 from fastapi import APIRouter, Depends, status
 from typing_extensions import Annotated

horizon/backend/api/v1/router/namespaces.py

@@ -1,6 +1,8 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
 # SPDX-License-Identifier: Apache-2.0
 
+# mypy: disable-error-code="pydantic-orm"
+
 from fastapi import APIRouter, Depends, HTTPException, status
 from typing_extensions import Annotated
 

horizon/backend/api/v1/router/users.py

@@ -1,6 +1,8 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems)
 # SPDX-License-Identifier: Apache-2.0
 
+# mypy: disable-error-code="pydantic-orm"
+
 from typing import Union
 
 from fastapi import APIRouter, Depends

horizon/client/base.py

@@ -12,7 +12,11 @@
 from pydantic import AnyHttpUrl, BaseModel, PrivateAttr, ValidationError
 from pydantic import __version__ as pydantic_version
 from pydantic import parse_obj_as, validator
-from pydantic.generics import GenericModel
+
+if pydantic_version >= "2":
+    from pydantic import BaseModel as GenericModel
+else:
+    from pydantic.generics import GenericModel  # type: ignore[no-redef] # noqa: WPS440
 from typing_extensions import Protocol
 
 import horizon
@@ -58,9 +62,9 @@ class Config:
     @classmethod
     def session_class(cls) -> type[SessionClass]:
         # Get `Session` from `SyncClient(BaseClient[Session])`
-        if pydantic_version < "2":
-            return cls.__bases__[0].__annotations__["session"].__args__[0]
-        return cls.model_fields["session"].annotation.__args__[0]
+        if pydantic_version >= "2":
+            return cls.model_fields["session"].annotation.__args__[0]  # type: ignore[union-attr]
+        return cls.__bases__[0].__annotations__["session"].__args__[0]
 
     @validator("base_url")
     def _validate_url(cls, value: AnyHttpUrl):

horizon/commons/errors/base.py

@@ -5,7 +5,11 @@
 
 from pydantic import BaseModel
 from pydantic import __version__ as pydantic_version
-from pydantic.generics import GenericModel
+
+if pydantic_version >= "2":
+    from pydantic import BaseModel as GenericModel
+else:
+    from pydantic.generics import GenericModel  # type: ignore[no-redef] # noqa: WPS440
 
 from horizon.commons.dto.unset import Unset
 

horizon/commons/errors/schemas/__init__.py

@@ -13,4 +13,5 @@
     "NotAuthorizedSchema",
     "NotFoundSchema",
     "BadRequestError",
+    "PermissionDeniedSchema",
 ]

horizon/commons/errors/schemas/invalid_request.py

@@ -22,10 +22,10 @@ class InvalidRequestBaseErrorSchema(BaseModel):
         input: Any = Field(default=None)
 
     class Config:
-        # pydantic v1
-        allow_population_by_field_name = True
-        # pydantic v2
-        populate_by_name = True
+        if pydantic_version >= "2":
+            populate_by_name = True
+        else:
+            allow_population_by_field_name = True
 
 
 @register_error_response(

horizon/commons/schemas/v1/hwm.py

@@ -3,7 +3,9 @@
 from datetime import datetime
 from typing import Any, List, Optional, Union
 
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import BaseModel, Field
+from pydantic import __version__ as pydantic_version
+from pydantic import root_validator, validator
 
 from horizon.commons.dto import Unset
 from horizon.commons.schemas.v1.pagination import PaginateQueryV1
@@ -30,10 +32,10 @@ class HWMResponseV1(BaseModel):
     changed_by: Optional[str] = Field(default=None, description="Latest user who changed the HWM data")
 
     class Config:
-        # pydantic v1
-        orm_mode = True
-        # pydantic v2
-        from_attributes = True
+        if pydantic_version >= "2":
+            from_attributes = True
+        else:
+            orm_mode = True
 
 
 class HWMListResponseV1(BaseModel):

horizon/commons/schemas/v1/hwm_history.py

@@ -5,6 +5,7 @@
 from typing import Any, Optional
 
 from pydantic import BaseModel, Field
+from pydantic import __version__ as pydantic_version
 
 from horizon.commons.schemas.v1.pagination import PaginateQueryV1
 
@@ -37,7 +38,7 @@ class HWMHistoryResponseV1(BaseModel):
     changed_by: Optional[str] = Field(default=None, description="User who changed the HWM data")
 
     class Config:
-        # pydantic v1
-        orm_mode = True
-        # pydantic v2
-        from_attributes = True
+        if pydantic_version >= "2":
+            from_attributes = True
+        else:
+            orm_mode = True

horizon/commons/schemas/v1/namespace.py

@@ -4,7 +4,9 @@
 from enum import Enum
 from typing import Optional, Union
 
-from pydantic import BaseModel, Field, root_validator
+from pydantic import BaseModel, Field
+from pydantic import __version__ as pydantic_version
+from pydantic import root_validator
 
 from horizon.commons.dto import Unset
 from horizon.commons.schemas.v1.pagination import PaginateQueryV1
@@ -29,10 +31,10 @@ class NamespaceResponseV1(BaseModel):
     changed_by: Optional[str] = Field(default=None, description="Latest user who changed the namespace data")
 
     class Config:
-        # pydantic v1
-        orm_mode = True
-        # pydantic v2
-        from_attributes = True
+        if pydantic_version >= "2":
+            from_attributes = True
+        else:
+            orm_mode = True
 
 
 class NamespacePaginateQueryV1(PaginateQueryV1):

horizon/commons/schemas/v1/namespace_history.py

@@ -5,6 +5,7 @@
 from typing import Optional
 
 from pydantic import BaseModel, Field
+from pydantic import __version__ as pydantic_version
 
 from horizon.commons.schemas.v1.pagination import PaginateQueryV1
 
@@ -30,7 +31,7 @@ class NamespaceHistoryResponseV1(BaseModel):
     changed_by: Optional[str] = Field(default=None, description="User who changed the namespace data")
 
     class Config:
-        # pydantic v1
-        orm_mode = True
-        # pydantic v2
-        from_attributes = True
+        if pydantic_version >= "2":
+            from_attributes = True
+        else:
+            orm_mode = True

horizon/commons/schemas/v1/pagination.py

@@ -3,7 +3,12 @@
 from typing import Generic, List, Optional, TypeVar
 
 from pydantic import BaseModel, Field
-from pydantic.generics import GenericModel
+from pydantic import __version__ as pydantic_version
+
+if pydantic_version >= "2":
+    from pydantic import BaseModel as GenericModel
+else:
+    from pydantic.generics import GenericModel  # type: ignore[no-redef] # noqa: WPS440
 
 from horizon.commons.dto import Pagination
 

horizon/commons/schemas/v1/permission.py

@@ -40,7 +40,10 @@ class PermissionsUpdateRequestV1(BaseModel):
     )
 
     @validator("permissions")
-    def _ensure_unique_usernames_and_single_owner(cls, permissions):
+    def _ensure_unique_usernames_and_single_owner(
+        cls,
+        permissions: List[PermissionUpdateRequestItemV1],
+    ) -> List[PermissionUpdateRequestItemV1]:
         seen: Set[str] = set()
         owner_count = 0
         for perm in permissions:

horizon/commons/schemas/v1/user.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from pydantic import BaseModel, Field
+from pydantic import __version__ as pydantic_version
 
 
 class UserResponseV1(BaseModel):
@@ -12,10 +13,10 @@ class UserResponseV1(BaseModel):
     username: str = Field(description="User name, unique in the entire database")
 
     class Config:
-        # pydantic v1
-        orm_mode = True
-        # pydantic v2
-        from_attributes = True
+        if pydantic_version >= "2":
+            from_attributes = True
+        else:
+            orm_mode = True
 
 
 class UserResponseV1WithAdmin(UserResponseV1):

pyproject.toml

@@ -280,6 +280,7 @@ known_first_party = ["horizon", "tests"]
 [tool.mypy]
 python_version = "3.8"
 plugins = ["pydantic.mypy", "sqlalchemy.ext.mypy.plugin"]
+strict_optional = true
 
 [[tool.mypy.overrides]]
 module = "sqlalchemy_utils"