arpakitlib 1.8.111__tar.gz → 1.8.112__tar.gz

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/PKG-INFO

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

arpakitlib-1.8.112/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -0,0 +1,4 @@
+{
+  "arpakitlib_project_template_version": "5",
+  "arpakitlib_project_template_subversion": "27"
+}

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation.py

@@ -34,12 +34,10 @@ async def _(
         ])),
         filter_id: int | None = fastapi.Query(default=None),
         filter_long_id: str | None = fastapi.Query(default=None),
-        filter_slug: str | None = fastapi.Query(default=None),
 ):
     filter_long_id = make_none_if_blank(strip_if_not_none(filter_long_id))
-    filter_slug = make_none_if_blank(strip_if_not_none(filter_slug))
 
-    if filter_id is None and filter_long_id is None and filter_slug is None:
+    if filter_id is None and filter_long_id is None:
         return None
 
     query = sqlalchemy.select(OperationDBM)
@@ -47,8 +45,6 @@ async def _(
         query = query.filter(OperationDBM.id == filter_id)
     if filter_long_id is not None:
         query = query.filter(OperationDBM.long_id == filter_long_id)
-    if filter_slug is not None:
-        query = query.filter(OperationDBM.slug == filter_slug)
 
     async with get_cached_sqlalchemy_db().new_async_session() as async_session:
         result = await async_session.scalar(query)

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py

@@ -34,12 +34,10 @@ async def _(
         ])),
         filter_id: int | None = fastapi.Query(default=None),
         filter_long_id: str | None = fastapi.Query(default=None),
-        filter_slug: str | None = fastapi.Query(default=None),
 ):
     filter_long_id = make_none_if_blank(strip_if_not_none(filter_long_id))
-    filter_slug = make_none_if_blank(strip_if_not_none(filter_slug))
 
-    if filter_id is None and filter_long_id is None and filter_slug is None:
+    if filter_id is None and filter_long_id is None:
         return None
 
     query = sqlalchemy.select(StoryLogDBM)
@@ -47,8 +45,6 @@ async def _(
         query = query.filter(StoryLogDBM.id == filter_id)
     if filter_long_id is not None:
         query = query.filter(StoryLogDBM.long_id == filter_long_id)
-    if filter_slug is not None:
-        query = query.filter(StoryLogDBM.slug == filter_slug)
 
     async with get_cached_sqlalchemy_db().new_async_session() as async_session:
         result = await async_session.scalar(query)

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_user.py

@@ -34,20 +34,17 @@ async def _(
         ])),
         filter_id: int | None = fastapi.Query(default=None),
         filter_long_id: str | None = fastapi.Query(default=None),
-        filter_slug: str | None = fastapi.Query(default=None),
         filter_email: str | None = fastapi.Query(default=None),
         filter_username: str | None = fastapi.Query(default=None),
         filter_tg_id: int | None = fastapi.Query(default=None),
 ):
     filter_long_id = make_none_if_blank(strip_if_not_none(filter_long_id))
-    filter_slug = make_none_if_blank(strip_if_not_none(filter_slug))
     filter_email = make_none_if_blank(strip_if_not_none(filter_email))
     filter_username = make_none_if_blank(strip_if_not_none(filter_username))
 
     if (
             filter_id is None
             and filter_long_id is None
-            and filter_slug is None
             and filter_email is None
             and filter_username is None
             and filter_tg_id is None
@@ -59,8 +56,6 @@ async def _(
         query = query.filter(UserDBM.id == filter_id)
     if filter_long_id is not None:
         query = query.filter(UserDBM.long_id == filter_long_id)
-    if filter_slug is not None:
-        query = query.filter(UserDBM.slug == filter_slug)
     if filter_email is not None:
         query = query.filter(UserDBM.email == filter_email)
     if filter_username is not None:

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -168,6 +168,14 @@ class Settings(SimpleSettings):
 
     local_timezone: str | None = None
 
+    email_smtp_user: str | None = None
+
+    email_smtp_password: str | None = None
+
+    email_smtp_port: int | None = 465
+
+    email_smtp_hostname: str | None = "smtp.yandex.ru"
+
     @property
     def local_timezone_as_pytz(self) -> Any:
         raise_for_type(self.local_timezone, str)
@@ -177,6 +185,10 @@ class Settings(SimpleSettings):
 
     openai_api_base_url: str | None = "https://api.proxyapi.ru/openai/v1"
 
+    tg_bot_notifier_token: str | None = None
+
+    tg_bot_notifier_proxy_url: str | None = None
+
 
 @lru_cache()
 def get_cached_settings() -> Settings:

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py

@@ -41,6 +41,7 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
     ]
     column_searchable_list = [
         ApiKeyDBM.id,
+        ApiKeyDBM.long_id,
         ApiKeyDBM.value,
     ]
     column_formatters = {

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py

@@ -33,7 +33,6 @@ class StoryLogMV(SimpleMV, model=StoryLogDBM):
     column_searchable_list = [
         StoryLogDBM.id,
         StoryLogDBM.long_id,
-        StoryLogDBM.slug,
     ]
     column_formatters = {
         StoryLogDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py

@@ -43,7 +43,7 @@ class UserMV(SimpleMV, model=UserDBM):
     form_args = {
         UserDBM.roles.key: {
             "choices": [(role, role) for role in UserDBM.Roles.values_list()],
-            "description": "Choose user roles"
+            "description": "Choose roles"
         }
     }
     column_sortable_list = sqlalchemy.inspect(UserDBM).columns
@@ -55,7 +55,6 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.long_id,
         UserDBM.email,
         UserDBM.username,
-        UserDBM.password,
         UserDBM.tg_id
     ]
     column_formatters = {

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py

@@ -34,7 +34,6 @@ class UserTokenMV(SimpleMV, model=UserTokenDBM):
     column_searchable_list = [
         UserTokenDBM.id,
         UserTokenDBM.long_id,
-        UserTokenDBM.slug,
         UserTokenDBM.value,
     ]
     column_formatters = {
@@ -47,7 +46,7 @@ class UserTokenMV(SimpleMV, model=UserTokenDBM):
     }
     form_ajax_refs = {
         UserTokenDBM.user.key: {
-            "fields": [UserDBM.id.key, UserDBM.email.key],
+            "fields": [UserDBM.id.key, UserDBM.email.key, UserDBM.username.key],
             "placeholder": "Search by id or email",
             "minimum_input_length": 1,
             "page_size": 10,

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py

@@ -5,7 +5,7 @@ from sqladmin.fields import SelectField
 
 from project.sqladmin_.model_view import SimpleMV
 from project.sqladmin_.util.etc import format_datetime_, format_json_for_preview_, format_json_
-from project.sqlalchemy_db_.sqlalchemy_model import VerificationCodeDBM
+from project.sqlalchemy_db_.sqlalchemy_model import VerificationCodeDBM, UserDBM
 
 
 class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
@@ -48,6 +48,7 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
     ]
     column_searchable_list = [
         VerificationCodeDBM.id,
+        VerificationCodeDBM.long_id,
         VerificationCodeDBM.value,
         VerificationCodeDBM.recipient
     ]
@@ -59,3 +60,11 @@ class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
         VerificationCodeDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
         VerificationCodeDBM.extra_data: lambda m, a: format_json_(m.extra_data),
     }
+    form_ajax_refs = {
+        VerificationCodeDBM.user.key: {
+            "fields": [UserDBM.id.key, UserDBM.email.key, UserDBM.username.key],
+            "placeholder": "Search by id or email",
+            "minimum_input_length": 1,
+            "page_size": 10,
+        }
+    }

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 
+from arpakitlib.ar_datetime_util import now_utc_dt
 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
@@ -31,13 +32,28 @@ def make_test_data_1():
             is_active=True,
             is_verified=True,
             password="123",
-            tg_id=269870432
+            tg_id=269870432,
+            tg_bot_last_action_dt=now_utc_dt(),
+            tg_data={
+                "id": 269870432,
+                "is_bot": False,
+                "first_name": "Арсен",
+                "last_name": "Arsen",
+                "username": "arpakit",
+                "language_code": "en",
+                "is_premium": True,
+                "added_to_attachment_menu": None,
+                "can_join_groups": None,
+                "can_read_all_group_messages": None,
+                "supports_inline_queries": None,
+                "can_connect_to_business": None
+            }
         )
         session.add(arpakit_user)
         session.commit()
         _logger.info(arpakit_user)
 
-        for i in range(1000):
+        for i in range(100):
             user_token_dbm = UserTokenDBM(user_id=arpakit_user.id, value=str(i))
             session.add(user_token_dbm)
             _logger.info(user_token_dbm)

arpakitlib-1.8.112/arpakitlib/_arpakit_project_template_v_5/project/tg_bot_notifier/blank.py

@@ -0,0 +1,20 @@
+from functools import lru_cache
+
+from arpakitlib.ar_blank_util import BaseBlank
+
+
+class TgBotNotifierBlank(BaseBlank):
+    pass
+
+
+@lru_cache()
+def get_cached_rus_tg_bot_notifier_blank() -> TgBotNotifierBlank:
+    return TgBotNotifierBlank(lang=TgBotNotifierBlank.Languages.rus)
+
+
+def __example():
+    print(get_cached_rus_tg_bot_notifier_blank().hello_world())
+
+
+if __name__ == '__main__':
+    __example()

arpakitlib-1.8.112/arpakitlib/_arpakit_project_template_v_5/project/tg_bot_notifier/tg_bot_notifier.py

@@ -0,0 +1,24 @@
+import aiogram
+from aiogram.client.default import DefaultBotProperties
+from aiogram.client.session.aiohttp import AiohttpSession
+from aiogram.enums import ParseMode
+
+from project.core.settings import get_cached_settings
+
+
+def create_tg_bot_notifier() -> aiogram.Bot | None:
+    if get_cached_settings().tg_bot_notifier_token is None:
+        return None
+    session: AiohttpSession | None = None
+    if get_cached_settings().tg_bot_notifier_proxy_url:
+        session = AiohttpSession(proxy=get_cached_settings().tg_bot_notifier_proxy_url)
+    tg_bot = aiogram.Bot(
+        token=get_cached_settings().tg_bot_notifier_token,
+        default=DefaultBotProperties(
+            parse_mode=ParseMode.HTML,
+            disable_notification=False,
+            link_preview_is_disabled=True
+        ),
+        session=session
+    )
+    return tg_bot

arpakitlib-1.8.112/arpakitlib/_arpakit_project_template_v_5/project/util/send_email.py

@@ -0,0 +1,81 @@
+import asyncio
+import logging
+import smtplib
+from email.message import EmailMessage
+
+import aiosmtplib
+
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+
+_logger = logging.getLogger(__name__)
+
+
+def send_email(
+        *, to_email: str, subject: str = "Hello world", html_content: str,
+        emulate: bool = False
+):
+    to_email = to_email.strip()
+
+    if emulate:
+        _logger.info(f"emulate email sending, {to_email=}, {subject=}, {html_content=}")
+        return
+
+    message = EmailMessage()
+    message["From"] = get_cached_settings().email_smtp_user
+    message["To"] = to_email
+    message["Subject"] = subject
+    message.add_alternative(html_content, subtype="html")
+
+    with smtplib.SMTP_SSL(
+            get_cached_settings().email_smtp_hostname,
+            get_cached_settings().email_smtp_port
+    ) as server:
+        server.login(
+            get_cached_settings().email_smtp_user,
+            get_cached_settings().email_smtp_password
+        )
+        server.send_message(message)
+
+    _logger.info(f"email was send, {to_email=}")
+
+
+async def async_send_email(
+        *,
+        to_email: str, subject: str = "Hello world", html_content: str,
+        emulate: bool = False
+):
+    to_email = to_email.strip()
+
+    if emulate:
+        _logger.info(f"emulate email sending, {to_email=}, {subject=}, {html_content=}")
+        return
+
+    message = EmailMessage()
+    message["From"] = get_cached_settings().email_smtp_user
+    message["To"] = to_email
+    message["Subject"] = subject
+    message.add_alternative(html_content, subtype="html")
+
+    await aiosmtplib.send(
+        message,
+        hostname=get_cached_settings().email_smtp_hostname,
+        port=get_cached_settings().email_smtp_port,
+        username=get_cached_settings().email_smtp_user,
+        password=get_cached_settings().email_smtp_password,
+        use_tls=True
+    )
+
+    _logger.info(f"email was send, {to_email=}")
+
+
+async def __async_example():
+    setup_logging()
+    send_email(
+        to_email="arpakit@gmail.com",
+        html_content="Hello world 2"
+    )
+
+
+if __name__ == '__main__':
+    asyncio.run(__async_example())

{arpakitlib-1.8.111 → arpakitlib-1.8.112}/pyproject.toml

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

arpakitlib-1.8.111/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "26"
-}