arpakitlib 1.8.65__tar.gz → 1.8.67__tar.gz

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/PKG-INFO

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

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -6,12 +6,24 @@ from project.api.authorize import APIAuthorizeData, api_authorize, require_user_
 from project.api.schema.out.client.user import User1ClientSO
 from project.api.schema.out.client.user_token import UserToken1ClientSO
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM, UserTokenDBM
 
 
 class _UserToken1ClientSO(UserToken1ClientSO):
     user: User1ClientSO
 
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1ClientSO:
+        simple_dict = simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys(),
+            kwargs={
+                "user": simple_dbm.user.simple_dict(
+                    include_columns_and_sd_properties=User1ClientSO.model_fields.keys()
+                )
+            }
+        )
+        return cls.model_validate(simple_dict)
+
 
 api_router = APIRouter()
 

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py

@@ -17,7 +17,7 @@ class SimpleDBMAdminSO(BaseSO):
     entity_name: str
 
     @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()
+    def from_dbm(cls, *, simple_dbm: SimpleDBM, **kwargs) -> SimpleDBMAdminSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py

@@ -22,7 +22,7 @@ class Operation1AdminSO(SimpleDBMAdminSO):
     allowed_types: list[str]
 
     @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()
+    def from_dbm(cls, *, simple_dbm: OperationDBM, **kwargs) -> Operation1AdminSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py

@@ -13,7 +13,7 @@ class StoryLog1AdminSO(SimpleDBMAdminSO):
     allowed_types: list[str]
 
     @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()
+    def from_dbm(cls, *, simple_dbm: StoryLogDBM, **kwargs) -> StoryLog1AdminSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py

@@ -29,7 +29,7 @@ class User1AdminSO(SimpleDBMAdminSO):
     tg_data_link_by_username: str | None
 
     @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()
+    def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1AdminSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py

@@ -15,7 +15,7 @@ class SimpleDBMClientSO(BaseSO):
     entity_name: str
 
     @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()
+    def from_dbm(cls, *, simple_dbm: SimpleDBM, **kwargs) -> SimpleDBMClientSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py

@@ -28,7 +28,7 @@ class User1ClientSO(SimpleDBMClientSO):
     tg_data_link_by_username: str | None
 
     @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()
+    def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1ClientSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py

@@ -10,7 +10,7 @@ class UserToken1ClientSO(SimpleDBMClientSO):
     is_active: bool
 
     @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()
+    def from_dbm(cls, *, simple_dbm: UserTokenDBM, **kwargs) -> UserToken1ClientSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

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

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

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/common.py

@@ -15,7 +15,7 @@ class SimpleDBMGeneralSO(BaseSO):
     entity_name: str
 
     @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()
+    def from_dbm(cls, *, simple_dbm: SimpleDBM, **kwargs) -> SimpleDBMGeneralSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/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]
@@ -28,7 +28,7 @@ class User1GeneralSO(SimpleDBMClientSO):
     tg_data_link_by_username: str | None
 
     @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()
+    def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1GeneralSO:
+        return cls.model_validate(simple_dbm.simple_dict(
+            include_columns_and_sd_properties=cls.model_fields.keys()
         ))

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

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

{arpakitlib-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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-1.8.65 → arpakitlib-1.8.67}/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.65 → arpakitlib-1.8.67}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.65"
+version = "1.8.67"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

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

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-from project.api.schema.out.client.common import SimpleDBMClientSO
-from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
-
-
-class ApiKey1GeneralSO(SimpleDBMClientSO):
-    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()
-        ))

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

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-from project.api.schema.out.client.common import SimpleDBMClientSO
-from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
-
-
-class UserToken1GeneralSO(SimpleDBMClientSO):
-    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()
-        ))