arpakitlib 1.8.69__py3-none-any.whl → 1.8.71__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +1,4 @@
 {
   "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "18"
+  "arpakitlib_project_template_subversion": "19"
 }

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py

@@ -3,7 +3,6 @@ from typing import Any
 import fastapi
 from fastapi import APIRouter
 
-from arpakitlib.ar_type_util import NotSet, is_set
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
 from project.api.schema.common import BaseSI
@@ -14,10 +13,10 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserDBM, OperationDBM
 
 
 class _CreateOperationAdminSI(BaseSI):
-    slug: str | None = NotSet
+    slug: str | None = None
     type: str
-    title: str | None = NotSet
-    input_data: dict[str, Any] = NotSet
+    title: str | None = None
+    input_data: dict[str, Any] = None
 
 
 api_router = APIRouter()
@@ -48,23 +47,17 @@ async def _(
         status=OperationDBM.Statuses.waiting_for_execution
     )
 
-    if is_set(create_operation_admin_si.slug):
+    if "slug" in create_operation_admin_si.model_fields_set:
         operation_dbm.slug = create_operation_admin_si.slug
-    else:
-        operation_dbm.slug = None
 
-    if is_set(create_operation_admin_si.type):
+    if "type" in create_operation_admin_si.model_fields_set:
         operation_dbm.type = create_operation_admin_si.type
 
-    if is_set(create_operation_admin_si.title):
+    if "title" in create_operation_admin_si.model_fields_set:
         operation_dbm.title = create_operation_admin_si.title
-    else:
-        operation_dbm.title = None
 
-    if is_set(create_operation_admin_si.input_data):
+    if "input_data" in create_operation_admin_si.model_fields_set:
         operation_dbm.input_data = create_operation_admin_si.input_data
-    else:
-        operation_dbm.input_data = {}
 
     async with get_cached_sqlalchemy_db().new_async_session() as async_session:
         async_session.add(operation_dbm)

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py

@@ -1,12 +1,13 @@
 import asyncio
 
+from pydantic import BaseModel
+
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 
 
 def __sandbox():
-    with get_cached_sqlalchemy_db().new_session() as session:
-        ApiKeyDBM()
+    pass
 
 
 async def __async_sandbox():

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/prod_mode_filter.py

@@ -5,4 +5,4 @@ from project.core.settings import get_cached_settings
 
 class ProdModeTgBotFilter(Filter):
     async def __call__(self, *args, **kwargs) -> bool:
-        return get_cached_settings().is_mode_type_prod
+        return get_cached_settings().prod_mode

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

@@ -16,7 +16,11 @@ _logger = logging.getLogger(__name__)
 
 
 async def notify_admins(text: str):
-    text = emojize(text.strip())
+    text = emojize(
+        f"<b>Уведомление для администраторов</b>"
+        f"\n\n"
+        f"{text.strip()}"
+    )
 
     admin_tg_ids = set()
 

arpakitlib/ar_openai_api_client_util.py

@@ -50,7 +50,14 @@ class OpenAIAPIClient:
             self._logger.error(e)
         return False
 
-    def simple_ask(self, *, prompt: str | None = None, string: str) -> ChatCompletion:
+    def simple_ask(
+            self,
+            *,
+            prompt: str | None = None,
+            content: str,
+            model: str = "gpt-4o",
+            max_tokens: int = 300
+    ) -> ChatCompletion:
         messages = []
         if prompt is not None:
             messages.append({
@@ -59,15 +66,15 @@ class OpenAIAPIClient:
             })
         messages.append({
             "role": "user",
-            "content": string
+            "content": content
         })
         response: ChatCompletion = self.open_ai.chat.completions.create(
-            model="gpt-4o",
+            model=model,
             messages=messages,
             n=1,
             temperature=0.1,
             top_p=0.9,
-            max_tokens=300
+            max_tokens=max_tokens
         )
         return response
 
@@ -121,7 +128,7 @@ async def __async_example():
     print(await client.async_is_conn_good())
 
     response = client.simple_ask(
-        string="Привет, проверяю тебя"
+        content="Привет, проверяю тебя"
     )
     print(response.choices[0].message.content)
 

{arpakitlib-1.8.69.dist-info → arpakitlib-1.8.71.dist-info}/METADATA

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

{arpakitlib-1.8.69.dist-info → arpakitlib-1.8.71.dist-info}/RECORD

@@ -8,7 +8,7 @@ arpakitlib/_arpakit_project_template_v_5/alembic/env.py,sha256=Qesmnj5A2kB-Doeuf
 arpakitlib/_arpakit_project_template_v_5/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 arpakitlib/_arpakit_project_template_v_5/alembic/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/alembic.ini,sha256=8fuyeEvGBiPGbxEFy8ISBV3xX_fgVmuhEGpB10_B5Uo,3733
-arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=tBANVyNY-JIwLj8xfjFmcDZ7RHFcfxMWa_vHuFaaTnA,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=jzAYgWiiMnqi8c38yKZ6E1MRRfui4ZLOpgAISXI_OR4,98
 arpakitlib/_arpakit_project_template_v_5/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/command/alembic_history.sh,sha256=OMnDNtHIksGh9iavWnzbtxcudZW4vjdcISsBXvzZSPw,22
 arpakitlib/_arpakit_project_template_v_5/command/alembic_revision_autogenerate.sh,sha256=yW2i-SBOtBx15Ya0poVQqKkJM5t2JZp06r9AEW-DmGE,46
@@ -96,7 +96,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/router/__init__.py,sha256=4
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/check_sqlalchemy_db.py,sha256=JGe2HvUSvXaIOaFG0ezNBhANCjvHJJFIG3aBtWF2dTY,1218
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/clear_log_file.py,sha256=HZYc4isEPEDx92v0cxTomS5j3hG7Nm2vn71hqkajM4M,1354
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py,sha256=4M30ZfUguCaFFAIfFsUHsEF1dTThGBQ1KJcVVGPsrn4,2496
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py,sha256=aZFZzJM36knQIf2I2jCOjqzQ6nn70WgcPv88V18u8Ho,2358
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py,sha256=z6w7WajDfd6H5nb3IE_U37xcaCepGJSeJ2BDrHCpDBE,1260
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py,sha256=Hpjkucwnb2LtytWpMMA2WMROY2cTLn0q_tnUFijk0so,1195
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_log_file.py,sha256=rzEPco45I-4FzrlbI3z5B-smhrHFIVIsDiHtTULoE4g,1162
@@ -206,7 +206,7 @@ arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swag
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swagger-ui.js.map,sha256=jeX-b8zAm2jsTGGCznrc49McbLKSfXspwECPhEAp0Xc,1159444
 arpakitlib/_arpakit_project_template_v_5/project/resource/templates/healthcheck.txt,sha256=sxSHRe2D3mnWbLKY320QdFehtXS-zAgMQmmu7tAQIG0,11
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py,sha256=MrrHV0l-u98iWSpretBlf3JhRNpA3euxuR1tIR3JsRI,373
+arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py,sha256=ylf2ETDk7NwcjO8ZTvyHQSj5jumvbzHhrVQhr2aYkRg,332
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_2.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
@@ -267,7 +267,7 @@ arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/__init__.py,sha2
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/is_private_chat.py,sha256=2anQo68KqkNYQnfIZDXSOX0P9hU59oSSSIJ36bWQdo8,500
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/message_text.py,sha256=OdQSWtdqAQeiJt2hr1z5XMreT-esVkBHLBLvMx4PzAw,1326
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/not_prod_mode_filter.py,sha256=WY2Bl6_vznUi2bT0WMbVUkQq_JQ783hMFFwLs4u9Whk,236
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/prod_mode_filter.py,sha256=lEqoDrL5zfgeJgud3umwIwBUOa1hrBo-u151JFBQk1c,237
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/prod_mode_filter.py,sha256=WfbAnzW8X4wJVtv_lHbr6u2SXXGwLhplTKPaHpuWQZ4,229
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/user_roles_has_admin.py,sha256=HBHDLTX6lRQcn_8NSIfP-YYfajldsToSGMafGx6AiFo,577
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/user_roles_has_client.py,sha256=vuVUssIlkpUAfMSVr6tabUiHe_Tr-KYI_pXN0YyeSA4,579
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/kb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -322,7 +322,7 @@ arpakitlib/_arpakit_project_template_v_5/project/tg_bot/tg_bot.py,sha256=jMX_awQ
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/tg_bot_dispatcher.py,sha256=CUTYSiVEQrOcOe1pTl8BAHZIDIqurwVQEy0zCmab8Z8,660
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/etc.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/notify_admins.py,sha256=Qoqa45bbTYCpBhhgSVzN8AH5WBXM0oFnahrCd3XGmTU,1835
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/notify_admins.py,sha256=csnBJPdHArFFnRnEoWriQ2PgJM0t8ttyP8EM5zhjTro,1949
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/set_tg_bot_commands.py,sha256=3Vp29YG9DGMrQSB2WPYciI4pdBHyT1vOGDBKfZ8OLTE,3483
 arpakitlib/_arpakit_project_template_v_5/project/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/util/arpakitlib_project_template.py,sha256=syA_IuszHVub0zm0sVdB4_7rPJXwXRW4JmQ4qHbjXPk,396
@@ -359,7 +359,7 @@ arpakitlib/ar_list_util.py,sha256=2woOAHAU8oTIiVjZ8GLnx15odEaoQUq3Q0JPxlufFF0,45
 arpakitlib/ar_logging_util.py,sha256=GLw87L6qUASHS4-eAoBW0kN2hHXVdmWcmE9huw-J5aI,1681
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=l4ky_15KKwqgYf2WTgEaKfBI15jZbnszOeQjwC0YUmk,2312
-arpakitlib/ar_openai_api_client_util.py,sha256=dQv0rWnONkmI9bD2eUWihvutwIfp1oxsBJuHRQu27BU,3185
+arpakitlib/ar_openai_api_client_util.py,sha256=nMF8-ybcSx29Q7HK3X6vhliQIy7UnuNcpXiYOWgyMn0,3316
 arpakitlib/ar_parse_command.py,sha256=1WTdQoWVshoDZ1jDaKeTzajfqaYHP3FNO0-REyo1aMY,3003
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_rat_func_util.py,sha256=Ca10o3RJwyx_DJLxjTxgHDO6NU3M6CWgUR4bif67OE4,2006
@@ -375,8 +375,8 @@ arpakitlib/ar_str_util.py,sha256=NisRtt4xwE7qthkkXzL49jvGKMGlvJ4KKcvpQfmRlIw,441
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=oHNS-2WckQxp7cVqsRne9JgkP9I7RQGBKVKZSMLN8zw,9427
-arpakitlib-1.8.69.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.69.dist-info/METADATA,sha256=qk3Xx26K_QklI_AJYJsQ2IANh48RSRtQ25SsSW6lM98,3475
-arpakitlib-1.8.69.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.69.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.69.dist-info/RECORD,,
+arpakitlib-1.8.71.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.71.dist-info/METADATA,sha256=YCV6y7y6s4YscTOOEcGkX2Qw8Wp302JqKtJivnSEt0o,3475
+arpakitlib-1.8.71.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.71.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.71.dist-info/RECORD,,