feat: Refactoring (PNLP-15749)

Author: Худайбердыев Виктор Мамедович

core/basic_models/actions/show_versions_action.py

@@ -2,10 +2,7 @@
 from collections.abc import AsyncGenerator
 from dataclasses import dataclass
 from dataclasses import field
-from typing import Any
-from typing import NotRequired
-from typing import Self
-from typing import TypedDict
+from typing import Any, List, Dict, Optional
 
 import core.logging.logger_constants as log_const
 from core.basic_models.actions.basic_actions import Action
@@ -15,12 +12,7 @@
 from scenarios.user.user_model import User
 
 
-class _ServiceVersionMetadata(TypedDict):
-    name: str
-    pronounce_as: NotRequired[str]
-
-
-_VersionType = str | None
+_VersionType = Optional[str]
 
 
 @dataclass
@@ -29,7 +21,7 @@ class ServiceVersions:
     dp_static_version: _VersionType = field(metadata={"name": "Dialog Policy static"})
 
     @classmethod
-    def init_from_user(cls, user: User) -> Self:
+    def init_from_user(cls, user: User) -> "ServiceVersions":
         return cls(
             dp_code_version=user.settings.version.code_version,
             dp_static_version=user.settings.version.static_version,
@@ -45,10 +37,10 @@ class ShowVersionsAction(Action):
     }
 
     async def run(
-            self,
-            user: User,
-            text_preprocessing_result: BaseTextPreprocessingResult,
-            params: dict[str, Any] | None = None,
+        self,
+        user: User,
+        text_preprocessing_result: BaseTextPreprocessingResult,
+        params: Optional[Dict[str, Any]] = None,
     ) -> AsyncGenerator[Command, None]:
         params = {**(params or {}), **user.parametrizer.collect(text_preprocessing_result)}
 
@@ -74,7 +66,7 @@ async def run(
         )
 
     @staticmethod
-    def _get_items(versions: ServiceVersions) -> list[dict[str, dict[str, str]]]:
+    def _get_items(versions: ServiceVersions) -> List[Dict[str, Dict[str, str]]]:
         parts = [
             f"**Dialog Policy**\nкод: {versions.dp_code_version}\nстатики: {versions.dp_static_version}\n\n",
         ]
@@ -102,6 +94,6 @@ def _version_to_ssml(version: str) -> str:
             return "bad format"
         ssml_groups = [f'<say-as interpret-as="digits">{gr}</say-as>' for gr in match.groups()]
         return (
-                '<say-as interpret-as="characters">D</say-as>-'
-                + f"{ssml_groups[0]}.{ssml_groups[1]}.{ssml_groups[2]}-{ssml_groups[3]}"
+            '<say-as interpret-as="characters">D</say-as>-' +
+            f"{ssml_groups[0]}.{ssml_groups[1]}.{ssml_groups[2]}-{ssml_groups[3]}"
         )

smart_kit/configs/settings.py

@@ -3,7 +3,7 @@
 import asyncio
 import os
 from io import StringIO
-from typing import Any, Union, List, Self
+from typing import Any, Union, List, Optional
 
 import yaml
 
@@ -18,7 +18,7 @@
 
 
 class DPVersion:
-    def __init__(self, code_version: str | None, separate_static=False, static_version: str = None):
+    def __init__(self, code_version: Optional[str], separate_static=False, static_version: Optional[str] = None):
         self.code_version = code_version
         self.separate_static = separate_static
         self.static_version = static_version
@@ -29,7 +29,7 @@ def __str__(self):
         return self.code_version or "UNKNOWN"
 
     @classmethod
-    def from_env_and_source(cls, source: DBAdapter) -> Self:
+    def from_env_and_source(cls, source: DBAdapter) -> "DPVersion":
         code_version = os.getenv("VERSION", default=0)
         attrs = {"code_version": code_version}
         if isinstance(source, CephAdapter):
@@ -77,7 +77,7 @@ def init(self):
                 if isinstance(repo, UpdatableFileRepository):
                     repo.update_cooldown = update_time
 
-    def override_repositories(self, repositories: list):
+    def override_repositories(self, repositories: List):
         """
         Метод предназначен для переопределения репозиториев в дочерних классах.
         :param repositories: Список репозиториев родителя

smart_kit/utils/logger_writer/logger_formatter.py

@@ -19,14 +19,14 @@ def to_num(s):
 
 TYPES = {
     "str": str,
-    "dict": dict,
+    "dict": Dict,
     "int": Number,
     "bool": bool,
 }
 
 TYPE_CASTS = {
     "str": str,
-    "dict": dict,
+    "dict": Dict,
     "int": to_num,
     "bool": bool,
 }
@@ -43,7 +43,7 @@ class SmartKitJsonFormatter(jsonlogger.JsonFormatter):
     APPLICATION_NAME = "NA"
 
     def __init__(self, *args, **kwargs):
-        self.fields_type: dict = kwargs.pop("fields_type", None)
+        self.fields_type: Dict = kwargs.pop("fields_type", None)
         super().__init__(*args, **kwargs)
 
     def add_fields(self, log_record, record, message_dict):
@@ -61,7 +61,7 @@ def add_fields(self, log_record, record, message_dict):
         if isinstance(record.args, dict):
             log_record["args"] = self._check_fields(record.args)
 
-    def _check_fields(self, record_args: Dict[str, Any], types: Optional[Dict[str, dict]] = None):
+    def _check_fields(self, record_args: Dict[str, Any], types: Optional[Dict[str, Dict]] = None):
         if types is None:
             types = self.fields_type
         if types is None: