arpakitlib 1.8.63__py3-none-any.whl → 1.8.66__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/get_current_api_key.py

@@ -3,16 +3,10 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
-from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.general.api_key import ApiKey1GeneralSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class GetCurrentApiKeyGeneralRouteSO(BaseRouteSO, ApiKey1GeneralSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -20,7 +14,7 @@ api_router = APIRouter()
     "",
     name="Get current api key",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetCurrentApiKeyGeneralRouteSO | str | ErrorCommonSO,
+    response_model=ApiKey1GeneralSO | str | ErrorCommonSO,
 )
 async def _(
         *,
@@ -36,6 +30,6 @@ async def _(
             )
         ]))
 ):
-    return GetCurrentApiKeyGeneralRouteSO.from_dbm(
+    return ApiKey1GeneralSO.from_dbm(
         simple_dbm=api_auth_data.api_key_dbm
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/get_errors_info.py

@@ -3,11 +3,11 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware
 from project.api.const import APIErrorCodes, APIErrorSpecificationCodes
-from project.api.schema.common import BaseRouteSO
+from project.api.schema.common import BaseSO
 from project.api.schema.out.common.error import ErrorCommonSO
 
 
-class GetErrorsInfoGeneralRouteSO(BaseRouteSO):
+class _GetErrorsInfoGeneralSO(BaseSO):
     api_error_codes: list[str] = []
     api_error_specification_codes: list[str] = []
 
@@ -19,7 +19,7 @@ api_router = APIRouter()
     "",
     name="Get errors info",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetErrorsInfoGeneralRouteSO | ErrorCommonSO,
+    response_model=_GetErrorsInfoGeneralSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -31,7 +31,7 @@ async def _(
             )
         ]))
 ):
-    return GetErrorsInfoGeneralRouteSO(
+    return _GetErrorsInfoGeneralSO(
         api_error_codes=APIErrorCodes.values_list(),
         api_error_specification_codes=APIErrorSpecificationCodes.values_list()
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/healthcheck.py

@@ -3,12 +3,12 @@ import datetime as dt
 import fastapi
 from fastapi import APIRouter
 
-from project.api.schema.common import BaseRouteSO
+from project.api.schema.common import BaseSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.core.util import now_local_dt
 
 
-class HealthcheckGeneralRouteSO(BaseRouteSO):
+class _HealthcheckGeneralRouteSO(BaseSO):
     is_ok: bool = True
     datetime: dt.datetime
 
@@ -20,11 +20,11 @@ api_router = APIRouter()
     "",
     name="Healthcheck",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=HealthcheckGeneralRouteSO | ErrorCommonSO,
+    response_model=_HealthcheckGeneralRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response
 ):
-    return HealthcheckGeneralRouteSO(is_ok=True, datetime=now_local_dt())
+    return _HealthcheckGeneralRouteSO(is_ok=True, datetime=now_local_dt())

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/now_utc_datetime.py

@@ -3,15 +3,9 @@ from fastapi import APIRouter
 
 from arpakitlib.ar_datetime_util import now_utc_dt
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
-from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.datetime_ import DatetimeCommonSO
 from project.api.schema.out.common.error import ErrorCommonSO
 
-
-class NowUTCDatetimeGeneralRouteSO(BaseRouteSO, DatetimeCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -19,7 +13,7 @@ api_router = APIRouter()
     "",
     name="Now UTC datetime",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=NowUTCDatetimeGeneralRouteSO | ErrorCommonSO,
+    response_model=DatetimeCommonSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -31,4 +25,4 @@ async def _(
             )
         ]))
 ):
-    return NowUTCDatetimeGeneralRouteSO.from_datetime(datetime_=now_utc_dt())
+    return DatetimeCommonSO.from_datetime(datetime_=now_utc_dt())

arpakitlib/_arpakit_project_template_v_5/project/api/schema/common.py

@@ -24,14 +24,3 @@ class BaseSI(BaseSchema):
 
 class BaseSO(BaseSchema):
     pass
-
-
-class BaseRouteSO(BaseSchema):
-    @classmethod
-    def __pydantic_init_subclass__(cls, **kwargs: Any) -> None:
-        if not (
-                cls.__name__.endswith("RouteSO")
-                or cls.__name__.endswith("RouteSchemaOut")
-        ):
-            raise ValueError("Route APISchema class should ends with RouteSO | RouteSchemaOut")
-        super().__init_subclass__(**kwargs)

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py

@@ -18,6 +18,6 @@ class SimpleDBMAdminSO(BaseSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMAdminSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py

@@ -23,6 +23,6 @@ class Operation1AdminSO(SimpleDBMAdminSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: OperationDBM) -> Operation1AdminSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py

@@ -14,6 +14,6 @@ class StoryLog1AdminSO(SimpleDBMAdminSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: StoryLogDBM) -> StoryLog1AdminSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py

@@ -30,6 +30,6 @@ class User1AdminSO(SimpleDBMAdminSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserDBM) -> User1AdminSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py

@@ -16,6 +16,6 @@ class SimpleDBMClientSO(BaseSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMClientSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py

@@ -29,6 +29,6 @@ class User1ClientSO(SimpleDBMClientSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserDBM) -> User1ClientSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py

@@ -11,6 +11,6 @@ class UserToken1ClientSO(SimpleDBMClientSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1ClientSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/ok.py

@@ -0,0 +1,5 @@
+from project.api.schema.common import BaseSO
+
+
+class OkSO(BaseSO):
+    is_ok: bool = True

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/api_key.py

@@ -1,16 +1,16 @@
 from __future__ import annotations
 
-from project.api.schema.out.client.common import SimpleDBMClientSO
+from project.api.schema.out.general.common import SimpleDBMGeneralSO
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 
 
-class ApiKey1GeneralSO(SimpleDBMClientSO):
+class ApiKey1GeneralSO(SimpleDBMGeneralSO):
     title: str | None
     value: str
     is_active: bool
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: ApiKeyDBM) -> ApiKey1GeneralSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/common.py

@@ -16,6 +16,6 @@ class SimpleDBMGeneralSO(BaseSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMGeneralSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 import datetime as dt
 from typing import Any
 
-from project.api.schema.out.client.common import SimpleDBMClientSO
+from project.api.schema.out.general.common import SimpleDBMGeneralSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class User1GeneralSO(SimpleDBMClientSO):
+class User1GeneralSO(SimpleDBMGeneralSO):
     email: str | None
     username: str | None
     roles: list[str]
@@ -29,6 +29,6 @@ class User1GeneralSO(SimpleDBMClientSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserDBM) -> User1GeneralSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py

@@ -1,16 +1,16 @@
 from __future__ import annotations
 
-from project.api.schema.out.client.common import SimpleDBMClientSO
+from project.api.schema.out.general.common import SimpleDBMGeneralSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 
 
-class UserToken1GeneralSO(SimpleDBMClientSO):
+class UserToken1GeneralSO(SimpleDBMGeneralSO):
     value: str
     user_id: int
     is_active: bool
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1GeneralSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
-            only_columns_and_sd_properties=cls.model_fields.keys()
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py

@@ -68,7 +68,3 @@ class UserTokenDBM(SimpleDBM):
         if not value:
             raise ValueError(f"{key=}, {value=}, value is empty")
         return value
-
-    @property
-    def sdp_user(self) -> UserDBM:
-        return self.user

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/admin.py

@@ -2,9 +2,9 @@ from functools import lru_cache
 
 from emoji import emojize
 
+from arpakitlib.ar_json_util import transfer_data_to_json_str
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.tg_bot.blank.common import SimpleBlankTgBot
-from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
 
 
 class AdminTgBotBlank(SimpleBlankTgBot):
@@ -15,7 +15,7 @@ class AdminTgBotBlank(SimpleBlankTgBot):
     def user_dbm(self, *, user_dbm: UserDBM | None) -> str:
         if user_dbm is None:
             return "None"
-        return user_dbm.simple_dict_json(include_sd_properties=True)
+        return transfer_data_to_json_str(user_dbm.simple_dict(), beautify=True)
 
 
 def create_admin_tg_bot_blank() -> AdminTgBotBlank:
@@ -28,11 +28,7 @@ def get_cached_admin_tg_bot_blank() -> AdminTgBotBlank:
 
 
 def __example():
-    print(
-        get_cached_admin_tg_bot_blank().arpakit_project_template_info(
-            arpakitlib_project_template_info=get_arpakitlib_project_template_info()
-        )
-    )
+    pass
 
 
 if __name__ == '__main__':

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/kb/inline_/client/hello_world.py

@@ -1,7 +1,7 @@
 from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.callback.client import HelloWorldClientCD
 
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/kb/static_/client/hello_world.py

@@ -1,7 +1,7 @@
 from aiogram.types import ReplyKeyboardMarkup, KeyboardButton
 from aiogram.utils.keyboard import ReplyKeyboardBuilder
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 
 
 def hello_world_client_static_kb_tg_bot() -> ReplyKeyboardMarkup:

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/about.py

@@ -4,7 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/author.py

@@ -4,7 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/error_handler.py

@@ -7,7 +7,7 @@ from aiogram.exceptions import TelegramBadRequest
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/healthcheck.py

@@ -1,6 +1,6 @@
 import aiogram.filters
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/hello_world.py

@@ -2,7 +2,7 @@ import aiogram.filters
 from aiogram.filters import or_f
 
 from arpakitlib.ar_str_util import remove_html
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.callback.client import HelloWorldClientCD
 from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/raw_callback_query.py

@@ -3,7 +3,7 @@ import logging
 import aiogram.filters
 from aiogram.exceptions import AiogramError
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/raw_message.py

@@ -1,6 +1,6 @@
 import aiogram.filters
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 tg_bot_router = aiogram.Router()

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/start.py

@@ -4,7 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/support.py

@@ -4,7 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/set_tg_bot_commands.py

@@ -8,7 +8,7 @@ from project.core.settings import get_cached_settings
 from project.core.util import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
-from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
 from project.tg_bot.const import GeneralTgBotCommands, AdminTgBotCommands
 from project.tg_bot.tg_bot import get_cached_tg_bot
 

arpakitlib/ar_sqlalchemy_util.py

@@ -2,7 +2,7 @@
 import asyncio
 import logging
 from datetime import timedelta, datetime
-from typing import Any
+from typing import Any, Collection
 from urllib.parse import quote_plus
 from uuid import uuid4
 
@@ -13,7 +13,6 @@ from sqlalchemy.orm import sessionmaker, DeclarativeBase
 from sqlalchemy.orm.session import Session
 
 from arpakitlib.ar_datetime_util import now_utc_dt
-from arpakitlib.ar_json_util import transfer_data_to_json_str
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -71,12 +70,14 @@ class BaseDBM(DeclarativeBase):
     def simple_dict(
             self,
             *,
-            include_sd_properties: bool = True,
-            exclude_columns: set[str] | None = None,
-            only_columns: list[str] | None = None,
-            exclude_sd_properties: set[str] | None = None,
-            only_sd_properties: list[str] | None = None,
-            only_columns_and_sd_properties: list[str] | None = None
+            need_include_columns: bool = True,
+            need_include_sd_properties: bool = True,
+            include_columns: Collection[str] | None = None,
+            exclude_columns: Collection[str] | None = None,
+            include_sd_properties: Collection[str] | None = None,
+            exclude_sd_properties: Collection[str] | None = None,
+            include_columns_and_sd_properties: Collection[str] | None = None,
+            kwargs: dict[str, Any] | None = None
     ) -> dict[str, Any]:
         if exclude_columns is None:
             exclude_columns = set()
@@ -85,20 +86,18 @@ class BaseDBM(DeclarativeBase):
 
         res = {}
 
-        # Обрабатываем только колонки текущей модели
-        for c in inspect(self).mapper.column_attrs:
-            if only_columns_and_sd_properties is not None and c.key not in only_columns_and_sd_properties:
-                continue  # Пропускаем колонку, если она не в only_columns_and_sd_properties
-            if only_columns is not None and c.key not in only_columns:
-                continue  # Пропускаем колонку, если она не в only_columns
-            if c.key in exclude_columns:
-                continue  # Пропускаем колонку, если она в exclude_columns
-
-            value = getattr(self, c.key)
-            res[c.key] = value  # Просто сохраняем значение
+        if need_include_columns:
+            for c in inspect(self).mapper.column_attrs:
+                if include_columns_and_sd_properties is not None and c.key not in include_columns_and_sd_properties:
+                    continue
+                if include_columns is not None and c.key not in include_columns:
+                    continue
+                if c.key in exclude_columns:
+                    continue
+                value = getattr(self, c.key)
+                res[c.key] = value
 
-        # Обработка свойств с префиксом "sdp_"
-        if include_sd_properties:
+        if need_include_sd_properties:
             for attr_name in dir(self):
                 if not attr_name.startswith("sdp_") or not isinstance(getattr(type(self), attr_name, None), property):
                     continue
@@ -106,69 +105,21 @@ class BaseDBM(DeclarativeBase):
                 sd_property_name = attr_name.removeprefix("sdp_")
 
                 if (
-                        only_columns_and_sd_properties is not None
-                        and sd_property_name not in only_columns_and_sd_properties
+                        include_columns_and_sd_properties is not None
+                        and sd_property_name not in include_columns_and_sd_properties
                 ):
-                    continue  # Пропускаем свойство, если оно не в only_columns_and_sd_properties
-                if only_sd_properties is not None and sd_property_name not in only_sd_properties:
-                    continue  # Пропускаем свойство, если оно не в only_sd_properties
+                    continue
+                if include_sd_properties is not None and sd_property_name not in include_sd_properties:
+                    continue
                 if sd_property_name in exclude_sd_properties:
-                    continue  # Пропускаем свойство, если оно в exclude_sd_properties
-
-                value = getattr(self, attr_name)
-                if isinstance(value, BaseDBM):
-                    res[sd_property_name] = value.simple_dict(include_sd_properties=include_sd_properties)
-                elif isinstance(value, list):
-                    res[sd_property_name] = [
-                        item.simple_dict(include_sd_properties=include_sd_properties)
-                        if isinstance(item, BaseDBM) else item
-                        for item in value
-                    ]
-                else:
-                    res[sd_property_name] = value
+                    continue
 
-        return res
+                res[sd_property_name] = getattr(self, attr_name)
 
-    def simple_dict_with_sd_properties(
-            self,
-            *,
-            exclude_columns: set[str] | None = None,
-            only_columns: list[str] | None = None,
-            exclude_sdp_properties: set[str] | None = None,
-            only_sd_properties: list[str] | None = None,
-            only_columns_and_sd_properties: list[str] | None = None  # Новый параметр
-    ) -> dict[str, Any]:
-        return self.simple_dict(
-            include_sd_properties=True,
-            exclude_columns=exclude_columns,
-            only_columns=only_columns,
-            exclude_sd_properties=exclude_sdp_properties,
-            only_sd_properties=only_sd_properties,
-            only_columns_and_sd_properties=only_columns_and_sd_properties  # Новый параметр
-        )
-
-    def simple_dict_json(
-            self,
-            *,
-            include_sd_properties: bool = True,
-            exclude_columns: set[str] | None = None,
-            only_columns: list[str] | None = None,
-            exclude_sd_properties: set[str] | None = None,
-            only_sd_properties: list[str] | None = None,
-            only_columns_and_sd_properties: list[str] | None = None,
-            **transfer_data_to_json_str_kwargs
-    ) -> str:
-        return transfer_data_to_json_str(
-            data=self.simple_dict(
-                include_sd_properties=include_sd_properties,
-                exclude_columns=exclude_columns,
-                only_columns=only_columns,
-                exclude_sd_properties=exclude_sd_properties,
-                only_sd_properties=only_sd_properties,
-                only_columns_and_sd_properties=only_columns_and_sd_properties
-            ),
-            **transfer_data_to_json_str_kwargs
-        )
+        if kwargs is not None:
+            res.update(kwargs)
+
+        return res
 
 
 class SQLAlchemyDb:

{arpakitlib-1.8.63.dist-info → arpakitlib-1.8.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.63
+Version: 1.8.66
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company