arpakitlib 1.5.31__py3-none-any.whl → 1.5.34__py3-none-any.whl

arpakitlib/ar_easy_sqlalchemy_util.py

@@ -13,8 +13,19 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
 class EasySQLAlchemyDB:
-    def __init__(self, *, db_url: str, echo: bool = False):
+    def __init__(
+            self,
+            *,
+            db_url: str,
+            echo: bool = False,
+            need_include_operation_dbm: bool = False,
+            need_include_story_dbm: bool = False
+    ):
         self._logger = logging.getLogger(self.__class__.__name__)
+        self.need_include_operation_dbm = need_include_operation_dbm
+        self.need_include_story_dbm = need_include_story_dbm
+        if self.need_include_operation_dbm:
+            self.need_include_story_dbm = True
         self.engine = create_engine(
             url=db_url,
             echo=echo,
@@ -26,6 +37,16 @@ class EasySQLAlchemyDB:
         self.sessionmaker = sessionmaker(bind=self.engine)
         self.func_new_session_counter = 0
 
+    def include_operation_dbm(self):
+        if self.need_include_operation_dbm:
+            from arpakitlib.ar_operation_util import import_ar_operation_execution_util
+            import_ar_operation_execution_util()
+
+    def include_story_dbm(self):
+        if self.need_include_story_dbm or self.need_include_operation_dbm:
+            from arpakitlib.ar_story_log_util import import_ar_story_util
+            import_ar_story_util()
+
     def drop_celery_tables(self):
         with self.engine.connect() as connection:
             connection.execute(text("DROP TABLE IF EXISTS celery_tasksetmeta CASCADE;"))
@@ -41,6 +62,8 @@ class EasySQLAlchemyDB:
             self._logger.info("celery tables data were removed")
 
     def init(self):
+        self.include_operation_dbm()
+        self.include_story_dbm()
         from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
         BaseDBM.metadata.create_all(bind=self.engine, checkfirst=True)
         self._logger.info("db was inited")
@@ -51,6 +74,8 @@ class EasySQLAlchemyDB:
         self._logger.info("db was dropped")
 
     def reinit(self):
+        self.include_operation_dbm()
+        self.include_story_dbm()
         from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
         BaseDBM.metadata.drop_all(bind=self.engine, checkfirst=True)
         BaseDBM.metadata.create_all(bind=self.engine, checkfirst=True)

arpakitlib/ar_fastapi_util.py

@@ -20,6 +20,7 @@ from pydantic import BaseModel, ConfigDict
 from starlette.middleware.cors import CORSMiddleware
 from starlette.staticfiles import StaticFiles
 
+from arpakitlib.ar_easy_sqlalchemy_util import EasySQLAlchemyDB
 from arpakitlib.ar_enumeration import EasyEnumeration
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -27,9 +28,6 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 _logger = logging.getLogger(__name__)
 
 
-# ---
-
-
 class BaseAPISchema(BaseModel):
     model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 
@@ -53,6 +51,10 @@ class BaseAPISO(BaseAPISchema):
     pass
 
 
+class APISimpleDataSO(BaseAPISO):
+    data: dict[str, Any] = {}
+
+
 class BaseAPISimpleSO(BaseAPISO):
     id: int
     long_id: str
@@ -73,9 +75,6 @@ class APIErrorSO(BaseAPISO):
     error_data: dict[str, Any] = {}
 
 
-# ---
-
-
 class APIJSONResponse(fastapi.responses.JSONResponse):
     def __init__(self, *, content: BaseAPISO, status_code: int = starlette.status.HTTP_200_OK):
         super().__init__(
@@ -178,9 +177,6 @@ def from_exception_to_api_json_response(
     )
 
 
-# ---
-
-
 def add_exception_handler_to_fastapi_app(*, fastapi_app: FastAPI, api_handle_exception_: Callable) -> FastAPI:
     fastapi_app.add_exception_handler(
         exc_class_or_status_code=Exception,
@@ -250,34 +246,55 @@ def add_ar_fastapi_static_docs_and_redoc_handlers_to_fastapi_app(
     return fastapi_app
 
 
-class BaseAPIEvent:
+class BaseAPIStartupEvent:
     def __init__(self, *args, **kwargs):
         self._logger = logging.getLogger(self.__class__.__name__)
 
-    async def on_startup(self, *args, **kwargs):
+    async def async_on_startup(self, *args, **kwargs):
         self._logger.info("on_startup starts")
         self._logger.info("on_startup ends")
 
-    async def on_shutdown(self, *args, **kwargs):
+
+class BaseAPIShutdownEvent:
+    def __init__(self, *args, **kwargs):
+        self._logger = logging.getLogger(self.__class__.__name__)
+
+    async def async_on_shutdown(self, *args, **kwargs):
         self._logger.info("on_shutdown starts")
         self._logger.info("on_shutdown ends")
 
 
+class APIStartupEventInitEasySQLAlchemyDB(BaseAPIStartupEvent):
+    def __init__(self, easy_sqlalchemy_db: EasySQLAlchemyDB):
+        super().__init__()
+        self.easy_sqlalchemy_db = easy_sqlalchemy_db
+
+    async def async_on_startup(self, *args, **kwargs):
+        self.easy_sqlalchemy_db.init()
+
+
 def create_fastapi_app(
         *,
-        title: str,
+        title: str = "ARPAKITLIB FastAPI",
         description: str | None = None,
-        api_event: BaseAPIEvent | None = BaseAPIEvent(),
+        api_startup_events: list[BaseAPIStartupEvent] | None = None,
+        api_shutdown_events: list[BaseAPIStartupEvent] | None = None,
         api_handle_exception_: Callable | None = simple_api_handle_exception
 ):
+    if api_startup_events is None:
+        api_startup_events = [BaseAPIStartupEvent()]
+
+    if api_shutdown_events is None:
+        api_shutdown_events = [BaseAPIShutdownEvent()]
+
     app = FastAPI(
         title=title,
         description=description,
         docs_url=None,
         redoc_url=None,
         openapi_url="/openapi",
-        on_startup=[api_event.on_startup] if api_event else [],
-        on_shutdown=[api_event.on_shutdown] if api_event else []
+        on_startup=[api_startup_event.async_on_startup for api_startup_event in api_startup_events],
+        on_shutdown=[api_shutdown_event.async_on_shutdown for api_shutdown_event in api_shutdown_events]
     )
 
     add_middleware_cors_to_fastapi_app(fastapi_app=app)
@@ -298,9 +315,6 @@ def create_fastapi_app(
     return app
 
 
-# ---
-
-
 def __example():
     pass
 

arpakitlib/{ar_operation_execution_util.py → ar_operation_util.py}

@@ -16,11 +16,14 @@ 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, BaseAPISimpleSO
+from arpakitlib.ar_fastapi_util import BaseAPISimpleSO
 from arpakitlib.ar_sqlalchemy_model_util import SimpleDBM
+from arpakitlib.ar_story_log_util import StoryLogDBM
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
+_logger = logging.getLogger(__name__)
+
 
 class OperationDBM(SimpleDBM):
     __tablename__ = "operation"
@@ -226,6 +229,7 @@ class BaseOperationExecutor:
             traceback_str = traceback.format_exc()
 
         with self.easy_sql_alchemy_db.new_session() as session:
+
             operation_dbm: OperationDBM = get_operation_by_id(
                 session=session, filter_operation_id=operation_dbm.id, strict=True
             )
@@ -239,7 +243,21 @@ class BaseOperationExecutor:
             else:
                 operation_dbm.status = OperationDBM.Statuses.executed_without_error
             session.commit()
+
+            story_log_dbm = StoryLogDBM(
+                level=StoryLogDBM.Levels.error,
+                title="Error in sync_execute_operation",
+                data={
+                    "operation_id": operation_dbm.id,
+                    "exception": str(exception),
+                    "traceback_str": traceback_str
+                }
+            )
+            session.add(story_log_dbm)
+            session.commit()
+
             session.refresh(operation_dbm)
+            session.refresh(story_log_dbm)
 
         self._logger.info(
             f"finish sync_safe_execute_operation"
@@ -306,3 +324,7 @@ class ExecuteOperationWorker(BaseWorker):
 
     def sync_run_on_error(self, exception: BaseException, kwargs: dict[str, Any]):
         self._logger.exception(exception)
+
+
+def import_ar_operation_execution_util():
+    _logger.info("import_ar_operation_execution_util")

arpakitlib/ar_story_log_util.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+import logging
 from typing import Any
 
 from sqlalchemy import TEXT
@@ -6,10 +6,11 @@ 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
+from arpakitlib.ar_fastapi_util import BaseAPISimpleSO
+from arpakitlib.ar_sqlalchemy_model_util import SimpleDBM
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
+_logger = logging.getLogger(__name__)
 
 
 class StoryLogDBM(SimpleDBM):
@@ -29,9 +30,11 @@ class StoryLogDBM(SimpleDBM):
     )
 
 
-class AdminStoryLogSO(BaseAPISimpleSO):
+class StoryLogSO(BaseAPISimpleSO):
     level: str
     title: str | None
     data: dict[str, Any]
 
 
+def import_ar_story_util():
+    _logger.info("import_ar_operation_execution_util")

{arpakitlib-1.5.31.dist-info → arpakitlib-1.5.34.dist-info}/METADATA

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

{arpakitlib-1.5.31.dist-info → arpakitlib-1.5.34.dist-info}/RECORD

@@ -14,7 +14,7 @@ arpakitlib/ar_cache_file.py,sha256=m73_vU6bMjXsIurSPO9VCLcHsiHk8ITFS0LNjfI_8Uw,3
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
 arpakitlib/ar_dict_util.py,sha256=cF5LQJ6tLqyGoEXfDljMDZrikeZoWPw7CgINHIFGvXM,419
 arpakitlib/ar_dream_ai_api_client.py,sha256=hDPL9wbG4MjIuhn2ed6qepueogANIkt-NddhhiPUv0Y,4029
-arpakitlib/ar_easy_sqlalchemy_util.py,sha256=HuKRBD4XoxeZ5tpXlDTol5Y6AOzuCBluJQHfyRjlRqs,3224
+arpakitlib/ar_easy_sqlalchemy_util.py,sha256=tHVL5bimXzY7u7TXEH--W7LSebSpN0Y5WN3iWiD8OR8,4180
 arpakitlib/ar_encrypt_and_decrypt_util.py,sha256=GhWnp7HHkbhwFVVCzO1H07m-5gryr4yjWsXjOaNQm1Y,520
 arpakitlib/ar_enumeration.py,sha256=6KUJYOabHDPLfdigBVN0ZI4ZOUJh8TkL0g4o92Hke2I,2254
 arpakitlib/ar_fastapi_static/redoc/redoc.standalone.js,sha256=WCuodUNv1qVh0oW5fjnJDwb5AwOue73jKHdI9z8iGKU,909365
@@ -36,7 +36,7 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css,sha256=jzPZlgJTFwSdSphk9C
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb45orZPL1zAsBFJReFw6GjYqGpUX3hg,262650
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
-arpakitlib/ar_fastapi_util.py,sha256=A5cSh1axaqN4yE2E5QPLDK58aEZgT24fIQ4pgzAMI7I,9798
+arpakitlib/ar_fastapi_util.py,sha256=zuq3bGhCvnGtD3_Axh4vE_Y_-JNg_W_wEBa9gHO9CXY,10718
 arpakitlib/ar_file_storage_in_dir.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_generate_env_example.py,sha256=WseNlk_So6mTVQ2amMuigWYV4ZVmd940POvXtodoYj0,325
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -51,7 +51,7 @@ arpakitlib/ar_logging_util.py,sha256=c5wX2FLqCzb4aLckLVhIJ7go52rJQ4GN9dIkJ6KMc3o
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=qCRSWlSgx-3yU0NRHZDQ5lCOmuZKcz2Na3py9nr6hJM,1618
 arpakitlib/ar_openai_util.py,sha256=d5Aj1O2yo_zYLZCLeOLvuveYYxA2jGOqhMs1oUbuVk8,1210
-arpakitlib/ar_operation_execution_util.py,sha256=PGyyvJoYAv01MWQl1TNWGamchfIrDkSovLrNMiyKqEg,11770
+arpakitlib/ar_operation_util.py,sha256=miBG6hywKRwFaeE0tUHotAw7MBylRBlXL6YQnBCnfOU,12419
 arpakitlib/ar_parse_command.py,sha256=qpr2OwG3Bf7DFiL9S3iWgtbvtE80RSC35E5zFJvjG1I,2714
 arpakitlib/ar_postgresql_util.py,sha256=SAHEmAyMkZe516uk2gS830v_Wn2kRUZUYNcTNwmgXJk,1160
 arpakitlib/ar_run_cmd.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
@@ -59,13 +59,13 @@ arpakitlib/ar_schedule_uust_api_client.py,sha256=1JGUy6rrjAXdWjeAqiAOQlCAEV3xuc5
 arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=3zscvaloi9XY1NR70rJ4-jJlFUIqhmTbQ9wdvK-Yjf8,1379
 arpakitlib/ar_ssh_runner.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
-arpakitlib/ar_story_log_util.py,sha256=NKzC1nZkjofRTePHhncatO7B25hAFPvIwG45XWjI0tQ,1060
+arpakitlib/ar_story_log_util.py,sha256=RmrjsWHpFvNYPcj6Htplzc6lMnw-f9t_RSIsqyskXeg,1141
 arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,1885
 arpakitlib/ar_type_util.py,sha256=-h-SCsVl11eVo1u4hy2Asn0IfD5TIxmX3Ndug4AvnPE,1761
 arpakitlib/ar_yookassa_api_client.py,sha256=BwsTygaXf35AACVBl_09uYlSD_t-U1OOzbj58OOFT4Q,6480
 arpakitlib/ar_zabbix_util.py,sha256=MTQbmS0QpNCKNOGONNQHf6j7KTZsKGlIbd5rCH0R0WI,6313
-arpakitlib-1.5.31.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
-arpakitlib-1.5.31.dist-info/METADATA,sha256=2nk5FfCHFT4sV_hZ8MKq3LlSc6NauO5Fw6gxrQPGefs,2330
-arpakitlib-1.5.31.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
-arpakitlib-1.5.31.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.5.31.dist-info/RECORD,,
+arpakitlib-1.5.34.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
+arpakitlib-1.5.34.dist-info/METADATA,sha256=zPM7OWINm8HMIVCv2TT4eA9jyZI-enIAaXSjTsiR-Vg,2330
+arpakitlib-1.5.34.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
+arpakitlib-1.5.34.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.5.34.dist-info/RECORD,,