arpakitlib 1.8.31__py3-none-any.whl → 1.8.33__py3-none-any.whl

arpakitlib/ar_sqlalchemy_util.py

@@ -68,45 +68,79 @@ class BaseDBM(DeclarativeBase):
             self._bus_data = {}
         return self._bus_data
 
-    def simple_dict(self, *, include_sd_properties: bool = True) -> dict[str, Any]:
+    def simple_dict(
+            self,
+            *,
+            include_sd_properties: bool = True,
+            exclude_columns: set[str] | None = None,
+            exclude_sd_properties: set[str] | None = None
+    ) -> dict[str, Any]:
+        if exclude_columns is None:
+            exclude_columns = set()
+        if exclude_sd_properties is None:
+            exclude_sd_properties = set()
+
         res = {}
 
+        # Обрабатываем только колонки текущей модели
         for c in inspect(self).mapper.column_attrs:
+            if c.key in exclude_columns:
+                continue  # Пропускаем колонку, если она в exclude_columns
+
             value = getattr(self, c.key)
-            if isinstance(value, BaseDBM):
-                res[c.key] = value.simple_dict(include_sd_properties=include_sd_properties)
-            elif isinstance(value, list):
-                res[c.key] = [
-                    item.simple_dict(include_sd_properties=include_sd_properties)
-                    if isinstance(item, BaseDBM) else item
-                    for item in value
-                ]
-            else:
-                res[c.key] = value
+            res[c.key] = value  # Просто сохраняем значение
 
+        # Обработка свойств с префиксом "sdp_"
         if include_sd_properties:
             for attr_name in dir(self):
                 if attr_name.startswith("sdp_") and isinstance(getattr(type(self), attr_name, None), property):
-                    prop_name = attr_name.removeprefix("sdp_")
+
+                    sdp_property_name = attr_name.removeprefix("sdp_")
+                    if sdp_property_name in exclude_sd_properties:
+                        continue  # Пропускаем свойство, если оно в exclude_sdp_properties
+
                     value = getattr(self, attr_name)
                     if isinstance(value, BaseDBM):
-                        res[prop_name] = value.simple_dict(include_sd_properties=include_sd_properties)
+                        res[sdp_property_name] = value.simple_dict(include_sd_properties=include_sd_properties)
                     elif isinstance(value, list):
-                        res[prop_name] = [
+                        res[sdp_property_name] = [
                             item.simple_dict(include_sd_properties=include_sd_properties)
                             if isinstance(item, BaseDBM) else item
                             for item in value
                         ]
                     else:
-                        res[prop_name] = value
+                        res[sdp_property_name] = value
 
         return res
 
-    def simple_dict_with_sd_properties(self) -> dict[str, Any]:
-        return self.simple_dict(include_sd_properties=True)
-
-    def simple_dict_json(self, *, include_sd_properties: bool = True) -> str:
-        return transfer_data_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
+    def simple_dict_with_sd_properties(
+            self,
+            *,
+            exclude_columns: set[str] | None = None,
+            exclude_sdp_properties: set[str] | None = None
+    ) -> dict[str, Any]:
+        return self.simple_dict(
+            include_sd_properties=True,
+            exclude_columns=exclude_columns,
+            exclude_sd_properties=exclude_sdp_properties
+        )
+
+    def simple_dict_json(
+            self,
+            *,
+            include_sd_properties: bool = True,
+            exclude_columns: set[str] | None = None,
+            exclude_sdp_properties: set[str] | None = None
+    ) -> str:
+        return transfer_data_to_json_str(
+            data=self.simple_dict(
+                include_sd_properties=include_sd_properties,
+                exclude_columns=exclude_columns,
+                exclude_sd_properties=exclude_sdp_properties
+            ),
+            beautify=True,
+            fast=False
+        )
 
 
 class SQLAlchemyDb:

arpakitlib/ar_ssh_runner_util.py

@@ -61,7 +61,11 @@ class SSHRunRes(BaseModel):
         }
 
     def simple_json(self) -> str:
-        return transfer_data_to_json_str(self.simple_dict())
+        return transfer_data_to_json_str(
+            self.simple_dict(),
+            beautify=True,
+            fast=False
+        )
 
     def __repr__(self) -> str:
         return self.simple_json()

{arpakitlib-1.8.31.dist-info → arpakitlib-1.8.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.31
+Version: 1.8.33
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company
@@ -18,6 +18,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aio-pika (>=9.5.4,<10.0.0)
 Requires-Dist: aiogram (>=3.17.0,<4.0.0)
 Requires-Dist: aiohttp-socks (>=0.10.1,<0.11.0)
+Requires-Dist: aiosmtplib (>=4.0.0,<5.0.0)
 Requires-Dist: alembic (>=1.14.1,<2.0.0)
 Requires-Dist: asyncpg (>=0.30.0,<0.31.0)
 Requires-Dist: asyncssh (>=2.19.0,<3.0.0)

{arpakitlib-1.8.31.dist-info → arpakitlib-1.8.33.dist-info}/RECORD

@@ -350,16 +350,16 @@ arpakitlib/ar_schedule_uust_api_client_util.py,sha256=rXI2_3OTaIBgR-GixM1Ti-Ue1f
 arpakitlib/ar_settings_util.py,sha256=Y5wi_cmsjDjfJpM0VJHjbo0NoVPKfypKaD1USowwDtQ,1327
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
 arpakitlib/ar_sqladmin_util.py,sha256=Jd33EX_fAso4bvrcDhNEYOUlUHkudbadNGOJDg7rqhQ,301
-arpakitlib/ar_sqlalchemy_util.py,sha256=mqAzvGaKBvZKVpkogQES-bUjgrEL82kBdNSD1yRg0yY,10317
-arpakitlib/ar_ssh_runner_util.py,sha256=FHQO9xOne08Ugy9FO7gsJ81Jr60U6dkGM3N5-xwSmEc,6792
+arpakitlib/ar_sqlalchemy_util.py,sha256=-nttk279GV5HjtJ3mDI0HlDb2sEBhyF7IgdvzA0j4ss,11422
+arpakitlib/ar_ssh_runner_util.py,sha256=yvAwza480MkHKvLkDEsR7JNh2bYNs6P9rCVo4NA85NE,6865
 arpakitlib/ar_steam_payment_api_client_util.py,sha256=onvb3jt9bWfsCLbVLaApbN_-cqCu1CduVhM9GhG5yTA,250
 arpakitlib/ar_str_util.py,sha256=RIaSNA4nBDhJjQqg3KzULo6OnGUfE2uIqBAHCv3ahLE,3842
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_wata_api_client.py,sha256=gdHOqDbuqxhTjVDtRW1DvkRJLdDofCrOq51GTctzLns,242
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.8.31.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.31.dist-info/METADATA,sha256=1VUqDqGavP3puX1Ke_ejCpnA9nnESqzK_BoIeM1LSV4,3434
-arpakitlib-1.8.31.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.31.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.31.dist-info/RECORD,,
+arpakitlib-1.8.33.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.33.dist-info/METADATA,sha256=i2biPan3zsYPCOx4MmEbGGbBHn5Tn4BYFIsESp9jNkI,3477
+arpakitlib-1.8.33.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.33.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.33.dist-info/RECORD,,