arpakitlib 1.5.30__tar.gz → 1.5.33__tar.gz

{arpakitlib-1.5.30 → arpakitlib-1.5.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.5.30
+Version: 1.5.33
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

{arpakitlib-1.5.30 → arpakitlib-1.5.33}/arpakitlib/ar_fastapi_util.py

@@ -6,6 +6,7 @@ import asyncio
 import logging
 import os.path
 import pathlib
+from datetime import datetime
 from typing import Any, Callable
 
 import fastapi.exceptions
@@ -52,6 +53,16 @@ class BaseAPISO(BaseAPISchema):
     pass
 
 
+class APISimpleDataSO(BaseAPISO):
+    data: dict[str, Any] = {}
+
+
+class BaseAPISimpleSO(BaseAPISO):
+    id: int
+    long_id: str
+    creation_dt: datetime
+
+
 class APIErrorSO(BaseAPISO):
     class APIErrorCodes(EasyEnumeration):
         cannot_authorize = "CANNOT_AUTHORIZE"
@@ -243,7 +254,7 @@ def add_ar_fastapi_static_docs_and_redoc_handlers_to_fastapi_app(
     return fastapi_app
 
 
-class BaseAPIStartupEvent:
+class BaseAPIEvent:
     def __init__(self, *args, **kwargs):
         self._logger = logging.getLogger(self.__class__.__name__)
 
@@ -251,11 +262,6 @@ class BaseAPIStartupEvent:
         self._logger.info("on_startup starts")
         self._logger.info("on_startup ends")
 
-
-class BaseAPIShutdownEvent:
-    def __init__(self, *args, **kwargs):
-        self._logger = logging.getLogger(self.__class__.__name__)
-
     async def on_shutdown(self, *args, **kwargs):
         self._logger.info("on_shutdown starts")
         self._logger.info("on_shutdown ends")
@@ -265,8 +271,7 @@ def create_fastapi_app(
         *,
         title: str,
         description: str | None = None,
-        api_startup_event: BaseAPIStartupEvent | None = BaseAPIStartupEvent(),
-        api_shutdown_event: BaseAPIShutdownEvent | None = BaseAPIShutdownEvent(),
+        api_event: BaseAPIEvent | None = BaseAPIEvent(),
         api_handle_exception_: Callable | None = simple_api_handle_exception
 ):
     app = FastAPI(
@@ -275,8 +280,8 @@ def create_fastapi_app(
         docs_url=None,
         redoc_url=None,
         openapi_url="/openapi",
-        on_startup=[api_startup_event.on_startup] if api_startup_event else [],
-        on_shutdown=[api_shutdown_event.on_shutdown] if api_shutdown_event else []
+        on_startup=[api_event.on_startup] if api_event else [],
+        on_shutdown=[api_event.on_shutdown] if api_event else []
     )
 
     add_middleware_cors_to_fastapi_app(fastapi_app=app)

{arpakitlib-1.5.30 → arpakitlib-1.5.33}/arpakitlib/ar_operation_execution_util.py

@@ -16,7 +16,7 @@ from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_easy_sqlalchemy_util import EasySQLAlchemyDB
 from arpakitlib.ar_enumeration import EasyEnumeration
-from arpakitlib.ar_fastapi_util import BaseAPISO
+from arpakitlib.ar_fastapi_util import BaseAPISO, BaseAPISimpleSO
 from arpakitlib.ar_sqlalchemy_model_util import SimpleDBM
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -78,10 +78,7 @@ class OperationDBM(SimpleDBM):
         return self.duration.total_seconds()
 
 
-class OperationSO(BaseAPISO):
-    id: int
-    long_id: str
-    creation_dt: datetime
+class OperationSO(BaseAPISimpleSO):
     execution_start_dt: datetime | None
     execution_finish_dt: datetime | None
     status: str

arpakitlib-1.5.33/arpakitlib/ar_story_log_util.py

@@ -0,0 +1,37 @@
+from datetime import datetime
+from typing import Any
+
+from sqlalchemy import TEXT
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from arpakitlib.ar_enumeration import EasyEnumeration
+from arpakitlib.ar_fastapi_util import BaseAPISO, BaseAPISimpleSO
+from arpakitlib.ar_sqlalchemy_model_util import BaseDBM, SimpleDBM
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+class StoryLogDBM(SimpleDBM):
+    __tablename__ = "story_log"
+
+    class Levels(EasyEnumeration):
+        info = "info"
+        warning = "warning"
+        error = "error"
+
+    level: Mapped[str] = mapped_column(
+        TEXT, insert_default=Levels.info, server_default=Levels.info, index=True, nullable=False
+    )
+    title: Mapped[str | None] = mapped_column(TEXT, index=True, default=None, nullable=True)
+    data: Mapped[dict[str, Any]] = mapped_column(
+        JSONB, insert_default={}, server_default="{}", index=True, nullable=False
+    )
+
+
+class AdminStoryLogSO(BaseAPISimpleSO):
+    level: str
+    title: str | None
+    data: dict[str, Any]
+
+

{arpakitlib-1.5.30 → arpakitlib-1.5.33}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.5.30"
+version = "1.5.33"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>"]
 license = "Apache License 2.0"