arpakitlib 1.8.101__tar.gz → 1.8.103__tar.gz

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/PKG-INFO

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

arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

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

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/command/show_arpakitlib_project_template_info.py

@@ -1,4 +1,4 @@
-from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
+from project.util.arpakitlib_project_template_util import get_arpakitlib_project_template_info
 
 
 def __command():

arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/command/start_api.py

@@ -0,0 +1,26 @@
+import uvicorn
+
+from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
+
+
+def __command():
+    setup_logging()
+    if get_cached_settings().api_start_scheduled_operation_creator_worker:
+        _ = safe_run_worker_in_background(
+            worker=create_scheduled_operation_creator_worker(),
+            mode=SafeRunInBackgroundModes.thread
+        )
+    uvicorn.run(
+        "project.api.asgi:app",
+        port=get_cached_settings().api_port,
+        host="localhost",
+        workers=1,
+        reload=False
+    )
+
+
+if __name__ == '__main__':
+    __command()

arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/command/start_api_for_prod.py

@@ -0,0 +1,26 @@
+import uvicorn
+
+from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
+
+
+def __command():
+    setup_logging()
+    if get_cached_settings().api_start_scheduled_operation_creator_worker:
+        _ = safe_run_worker_in_background(
+            worker=create_scheduled_operation_creator_worker(),
+            mode=SafeRunInBackgroundModes.thread
+        )
+    uvicorn.run(
+        app="project.api.asgi:app",
+        host="127.0.0.1",
+        port=get_cached_settings().api_port,
+        reload=False,
+        workers=4
+    )
+
+
+if __name__ == '__main__':
+    __command()

arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/command/start_api_with_reload.py

@@ -0,0 +1,26 @@
+import uvicorn
+
+from arpakitlib.ar_base_worker_util import SafeRunInBackgroundModes, safe_run_worker_in_background
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
+
+
+def __command():
+    setup_logging()
+    if get_cached_settings().api_start_scheduled_operation_creator_worker:
+        _ = safe_run_worker_in_background(
+            worker=create_scheduled_operation_creator_worker(),
+            mode=SafeRunInBackgroundModes.thread
+        )
+    uvicorn.run(
+        "project.api.asgi:app",
+        port=get_cached_settings().api_port,
+        host="localhost",
+        workers=1,
+        reload=True
+    )
+
+
+if __name__ == '__main__':
+    __command()

arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/command/start_operation_executor_workers_mode_async_task.py

@@ -0,0 +1,24 @@
+import asyncio
+
+from arpakitlib.ar_base_worker_util import safe_run_workers_in_background, SafeRunInBackgroundModes
+from project.core.util import setup_logging
+from project.operation_execution.operation_executor_worker import OperationExecutorWorker
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+
+
+async def __async_command():
+    setup_logging()
+    workers = []
+    for i in range(int(input("amount of workers: "))):
+        workers.append(OperationExecutorWorker(
+            sqlalchemy_db=get_cached_sqlalchemy_db(),
+        ))
+    async_tasks = safe_run_workers_in_background(
+        workers=workers,
+        mode=SafeRunInBackgroundModes.async_task
+    )
+    await asyncio.gather(*async_tasks)
+
+
+if __name__ == '__main__':
+    asyncio.run(__async_command())

arpakitlib-1.8.101/arpakitlib/_arpakit_project_template_v_5/command/start_operation_executor_workers.py → arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/command/start_operation_executor_workers_mode_thread.py

@@ -1,4 +1,5 @@
 from arpakitlib.ar_base_worker_util import safe_run_workers_in_background, SafeRunInBackgroundModes
+
 from project.core.util import setup_logging
 from project.operation_execution.operation_executor_worker import OperationExecutorWorker
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py

@@ -6,7 +6,7 @@ from project.api.authorize import require_user_token_dbm_api_authorize_middlewar
     api_authorize, require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
-from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
+from project.util.arpakitlib_project_template_util import get_arpakitlib_project_template_info
 
 api_router = APIRouter()
 

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py

@@ -12,6 +12,7 @@ class User1ClientSO(SimpleDBMClientSO):
     username: str | None
     roles: list[str]
     is_active: bool
+    is_verified: bool
     tg_id: int | None
     tg_bot_last_action_dt: dt.datetime | None
     tg_data: dict[str, Any]

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/__init__.py

@@ -4,3 +4,4 @@ from project.sqladmin_.model_view.operation import OperationMV
 from project.sqladmin_.model_view.story_log import StoryLogMV
 from project.sqladmin_.model_view.user import UserMV
 from project.sqladmin_.model_view.user_token import UserTokenMV
+from project.sqladmin_.model_view.verification_code import VerificationCodeMV

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py

@@ -9,7 +9,16 @@ class StoryLogMV(SimpleMV, model=StoryLogDBM):
     name = "StoryLog"
     name_plural = "StoryLogs"
     icon = "fa-solid fa-history"
-    column_list = sqlalchemy.inspect(StoryLogDBM).columns
+    column_list = [
+        StoryLogDBM.id,
+        StoryLogDBM.long_id,
+        StoryLogDBM.slug,
+        StoryLogDBM.creation_dt,
+        StoryLogDBM.level,
+        StoryLogDBM.type,
+        StoryLogDBM.title,
+        StoryLogDBM.extra_data
+    ]
     form_columns = [
         StoryLogDBM.slug,
         StoryLogDBM.level,

arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/verification_code.py

@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+import sqlalchemy
+
+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
+
+
+class VerificationCodeMV(SimpleMV, model=VerificationCodeDBM):
+    name = "VerificationCode"
+    name_plural = "VerificationCodes"
+    icon = "fa-solid fa-envelope"
+    column_list = [
+        VerificationCodeDBM.id,
+        VerificationCodeDBM.long_id,
+        VerificationCodeDBM.slug,
+        VerificationCodeDBM.creation_dt,
+        VerificationCodeDBM.type,
+        VerificationCodeDBM.value,
+        VerificationCodeDBM.recipient,
+        VerificationCodeDBM.user,
+        VerificationCodeDBM.is_active,
+        VerificationCodeDBM.extra_data
+    ]
+    form_columns = [
+        VerificationCodeDBM.slug,
+        VerificationCodeDBM.type,
+        VerificationCodeDBM.value,
+        VerificationCodeDBM.recipient,
+        VerificationCodeDBM.user,
+        VerificationCodeDBM.is_active,
+        VerificationCodeDBM.extra_data
+    ]
+    column_sortable_list = sqlalchemy.inspect(VerificationCodeDBM).columns
+    column_default_sort = [
+        (VerificationCodeDBM.creation_dt, True)
+    ]
+    column_searchable_list = [
+        VerificationCodeDBM.id,
+        VerificationCodeDBM.long_id,
+        VerificationCodeDBM.slug,
+        VerificationCodeDBM.value,
+        VerificationCodeDBM.recipient,
+    ]
+    column_formatters = {
+        VerificationCodeDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        VerificationCodeDBM.extra_data: lambda m, _: format_json_for_preview_(m.extra_data)
+    }
+    column_formatters_detail = {
+        VerificationCodeDBM.creation_dt: lambda m, _: format_datetime_(m.creation_dt),
+        VerificationCodeDBM.extra_data: lambda m, a: format_json_(m.extra_data),
+    }

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py

@@ -6,6 +6,7 @@ from project.sqlalchemy_db_.sqlalchemy_model.operation import OperationDBM
 from project.sqlalchemy_db_.sqlalchemy_model.story_log import StoryLogDBM
 from project.sqlalchemy_db_.sqlalchemy_model.user import UserDBM
 from project.sqlalchemy_db_.sqlalchemy_model.user_token import UserTokenDBM
+from project.sqlalchemy_db_.sqlalchemy_model.verification_code import VerificationCodeDBM
 
 if __name__ == '__main__':
     print(get_string_info_from_declarative_base(SimpleDBM))

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py

@@ -5,16 +5,18 @@ from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 import sqlalchemy
+from email_validator import validate_email
+from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
+
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_str_util import make_none_if_blank
 from arpakitlib.ar_type_util import raise_for_type
-from email_validator import validate_email
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
-from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
 
 if TYPE_CHECKING:
     from project.sqlalchemy_db_.sqlalchemy_model.user_token import UserTokenDBM
+    from project.sqlalchemy_db_.sqlalchemy_model.verification_code import VerificationCodeDBM
 
 
 def generate_default_user_password() -> str:
@@ -55,6 +57,13 @@ class UserDBM(SimpleDBM):
         insert_default=True,
         server_default="true",
     )
+    is_verified: Mapped[bool] = mapped_column(
+        sqlalchemy.Boolean,
+        nullable=False,
+        index=True,
+        insert_default=False,
+        server_default="false",
+    )
     password: Mapped[str | None] = mapped_column(
         sqlalchemy.TEXT,
         nullable=True,
@@ -87,6 +96,13 @@ class UserDBM(SimpleDBM):
         foreign_keys="UserTokenDBM.user_id",
         cascade="all, delete-orphan"
     )
+    verification_codes: Mapped[list[VerificationCodeDBM]] = relationship(
+        "VerificationCodeDBM",
+        uselist=True,
+        back_populates="user",
+        foreign_keys="VerificationCodeDBM.user_id",
+        cascade="all, delete-orphan"
+    )
 
     def __repr__(self) -> str:
         parts = [f"id={self.id}"]

arpakitlib-1.8.103/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/verification_code.py

@@ -0,0 +1,101 @@
+from __future__ import annotations
+
+from random import randint
+from typing import TYPE_CHECKING
+
+import sqlalchemy
+from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
+
+from arpakitlib.ar_enumeration_util import Enumeration
+from arpakitlib.ar_str_util import make_none_if_blank
+from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+
+if TYPE_CHECKING:
+    from project.sqlalchemy_db_.sqlalchemy_model.user import UserDBM
+
+
+def generate_default_verification_code_value() -> str:
+    alphabet: list = list("JZSDQWRLGFZX" + "123456789")
+    return "".join(alphabet[randint(0, len(alphabet) - 1)] for _ in range(7))
+
+
+class VerificationCodeDBM(SimpleDBM):
+    __tablename__ = "verification_code"
+
+    class Types(Enumeration):
+        register_or_authenticate = "register_or_authenticate"
+        reset_email = "reset_email"
+
+    type: Mapped[str] = mapped_column(
+        sqlalchemy.TEXT,
+        nullable=False,
+        index=True,
+    )
+    value: Mapped[str] = mapped_column(
+        sqlalchemy.TEXT,
+        nullable=False,
+        index=True,
+        insert_default=generate_default_verification_code_value,
+        server_default=sqlalchemy.func.gen_random_uuid(),
+    )
+    recipient: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT,
+        nullable=True,
+        index=True,
+    )
+    user_id: Mapped[int | None] = mapped_column(
+        sqlalchemy.BIGINT,
+        sqlalchemy.ForeignKey("user.id", ondelete="CASCADE"),
+        nullable=True,
+        index=True,
+    )
+    is_active: Mapped[bool] = mapped_column(
+        sqlalchemy.BOOLEAN,
+        nullable=False,
+        index=True,
+        insert_default=True,
+        server_default="true"
+    )
+
+    # one to many
+    user: Mapped[UserDBM | None] = relationship(
+        "UserDBM",
+        uselist=False,
+        back_populates="verification_codes",
+        foreign_keys=[user_id]
+    )
+
+    def __repr__(self) -> str:
+        parts = [
+            f"id={self.id}",
+            f"type={self.type}"
+        ]
+        if self.recipient is not None:
+            parts.append(f"recipient={self.recipient}")
+        elif self.user_id is not None:
+            parts.append(f"user_id={self.user_id}")
+        return f"{self.entity_name} ({', '.join(parts)})"
+
+    @validates("type")
+    def _validate_type(self, key, value, *args, **kwargs):
+        if not isinstance(value, str):
+            raise ValueError(f"{key=}, {value=}, value is not str")
+        value = value.strip()
+        if not value:
+            raise ValueError(f"{key=}, {value=}, value is empty")
+        if value not in self.Types.values_list():
+            raise ValueError(f"{value} not in {self.Types.values_list()}")
+        return value
+
+    @validates("recipient")
+    def _validate_recipient(self, key, value, *args, **kwargs):
+        if value is None:
+            return None
+        if not isinstance(value, str):
+            raise ValueError(f"{key=}, {value=}, value is not str")
+        value = make_none_if_blank(value.strip())
+        return value
+
+    @property
+    def sdp_allowed_types(self) -> list[str]:
+        return self.Types.values_list()

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/arpakitlib_project_template_info.py

@@ -7,7 +7,7 @@ from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
-from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
+from project.util.arpakitlib_project_template_util import get_arpakitlib_project_template_info
 
 tg_bot_router = aiogram.Router()
 

{arpakitlib-1.8.101 → arpakitlib-1.8.103}/pyproject.toml

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

arpakitlib-1.8.101/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

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

arpakitlib-1.8.101/arpakitlib/_arpakit_project_template_v_5/command/start_api.py

@@ -1,19 +0,0 @@
-import uvicorn
-
-from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
-
-
-def __command():
-    setup_logging()
-    uvicorn.run(
-        "project.api.asgi:app",
-        port=get_cached_settings().api_port,
-        host="localhost",
-        workers=1,
-        reload=False
-    )
-
-
-if __name__ == '__main__':
-    __command()

arpakitlib-1.8.101/arpakitlib/_arpakit_project_template_v_5/command/start_api_for_prod.py

@@ -1,19 +0,0 @@
-import uvicorn
-
-from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
-
-
-def __command():
-    setup_logging()
-    uvicorn.run(
-        app="project.api.asgi:app",
-        host="127.0.0.1",
-        port=get_cached_settings().api_port,
-        reload=False,
-        workers=4
-    )
-
-
-if __name__ == '__main__':
-    __command()

arpakitlib-1.8.101/arpakitlib/_arpakit_project_template_v_5/command/start_api_with_reload.py

@@ -1,19 +0,0 @@
-import uvicorn
-
-from project.core.settings import get_cached_settings
-from project.core.util import setup_logging
-
-
-def __command():
-    setup_logging()
-    uvicorn.run(
-        "project.api.asgi:app",
-        port=get_cached_settings().api_port,
-        host="localhost",
-        workers=1,
-        reload=True
-    )
-
-
-if __name__ == '__main__':
-    __command()