arpakitlib 1.7.52__py3-none-any.whl → 1.7.54__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/api/start_api_for_dev_with_reload.py

@@ -0,0 +1,9 @@
+from src.api.start_api_for_dev import start_api_for_dev
+
+
+def command():
+    start_api_for_dev(reload=True)
+
+
+if __name__ == '__main__':
+    command()

arpakitlib/ar_fastapi_util.py

@@ -354,7 +354,7 @@ def add_needed_api_router_to_app(*, app: FastAPI):
 
     @api_router.get(
         "/healthcheck",
-        response_model=ErrorSO,
+        response_model=RawDataSO | ErrorSO,
         status_code=starlette.status.HTTP_200_OK,
         tags=["Healthcheck"]
     )
@@ -366,7 +366,7 @@ def add_needed_api_router_to_app(*, app: FastAPI):
 
     @api_router.get(
         "/arpakitlib",
-        response_model=ErrorSO,
+        response_model=RawDataSO | ErrorSO,
         status_code=starlette.status.HTTP_200_OK,
         tags=["arpakitlib"]
     )

arpakitlib/ar_operation_execution_util.py

@@ -19,6 +19,7 @@ from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 from arpakitlib.ar_sqlalchemy_model_util import OperationDBM, StoryLogDBM, BaseOperationTypes
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
+from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -27,14 +28,16 @@ _logger = logging.getLogger(__name__)
 
 def get_operation_for_execution(
         *,
-        sqlalchemy_db: SQLAlchemyDB,
+        session: Session | None = None,
+        sqlalchemy_db: SQLAlchemyDB | None = None,
         filter_operation_types: list[str] | str | None = None
 ) -> OperationDBM | None:
     if isinstance(filter_operation_types, str):
         filter_operation_types = [filter_operation_types]
-    with sqlalchemy_db.new_session() as session:
+
+    def func(session_: Session):
         query = (
-            session
+            session_
             .query(OperationDBM)
             .filter(OperationDBM.status == OperationDBM.Statuses.waiting_for_execution)
         )
@@ -42,24 +45,84 @@ def get_operation_for_execution(
             query = query.filter(OperationDBM.type.in_(filter_operation_types))
         query = query.order_by(asc(OperationDBM.creation_dt))
         operation_dbm: OperationDBM | None = query.first()
-    return operation_dbm
+        return operation_dbm
+
+    if session is not None:
+        return func(session_=session)
+    elif sqlalchemy_db is not None:
+        with sqlalchemy_db.new_session() as session:
+            return func(session_=session)
+    else:
+        raise ValueError("session is None and sqlalchemy_db is None")
 
 
 def get_operation_by_id(
         *,
-        session: Session,
+        session: Session | None = None,
+        sqlalchemy_db: SQLAlchemyDB | None = None,
         filter_operation_id: int,
         raise_if_not_found: bool = False
 ) -> OperationDBM | None:
-    query = (
-        session
-        .query(OperationDBM)
-        .filter(OperationDBM.id == filter_operation_id)
-    )
-    if raise_if_not_found:
-        return query.one()
+    def func(session_: Session):
+        query = (
+            session_
+            .query(OperationDBM)
+            .filter(OperationDBM.id == filter_operation_id)
+        )
+        if raise_if_not_found:
+            return query.one()
+        else:
+            return query.one_or_none()
+
+    if session is not None:
+        return func(session_=session)
+    elif sqlalchemy_db is not None:
+        with sqlalchemy_db.new_session() as session:
+            return func(session_=session)
+    else:
+        raise ValueError("session is None and sqlalchemy_db is None")
+
+
+def remove_operations(
+        *,
+        session: Session | None = None,
+        sqlalchemy_db: SQLAlchemyDB | None = None,
+        filter_operation_ids: list[int] | int | None = None,
+        filter_operation_types: list[str] | str | None = None,
+        filter_operation_statuses: list[str] | str | None = None
+):
+    if isinstance(filter_operation_ids, int):
+        filter_operation_ids = [filter_operation_ids]
+    if isinstance(filter_operation_types, str):
+        filter_operation_types = [filter_operation_types]
+    if isinstance(filter_operation_statuses, str):
+        filter_operation_statuses = [filter_operation_statuses]
+
+    if filter_operation_ids is not None:
+        raise_for_type(filter_operation_ids, list)
+    if filter_operation_types is not None:
+        raise_for_type(filter_operation_types, list)
+    if filter_operation_statuses is not None:
+        raise_for_type(filter_operation_statuses, list)
+
+    def func(session_: Session):
+        query = session_.query(OperationDBM)
+        if filter_operation_ids is not None:
+            query = query.filter(OperationDBM.id.in_(filter_operation_ids))
+        if filter_operation_types is not None:
+            query = query.filter(OperationDBM.type.in_(filter_operation_types))
+        if filter_operation_statuses is not None:
+            query = query.filter(OperationDBM.status.in_(filter_operation_statuses))
+        query.delete()
+        session_.commit()
+
+    if session is not None:
+        return func(session_=session)
+    elif sqlalchemy_db is not None:
+        with sqlalchemy_db.new_session() as session:
+            return func(session_=session)
     else:
-        return query.one_or_none()
+        raise ValueError("session is None and sqlalchemy_db is None")
 
 
 class BaseOperationExecutor:

{arpakitlib-1.7.52.dist-info → arpakitlib-1.7.54.dist-info}/METADATA

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

{arpakitlib-1.7.52.dist-info → arpakitlib-1.7.54.dist-info}/RECORD

@@ -86,6 +86,7 @@ arpakitlib/_arpakit_project_template/src/api/schema/v1/__init__.py,sha256=47DEQp
 arpakitlib/_arpakit_project_template/src/api/schema/v1/in_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/api/schema/v1/out.py,sha256=odc-UyxBwUPh4t0H6qIuzAsBA_Qrm3H2qP-YBgJpaKc,164
 arpakitlib/_arpakit_project_template/src/api/start_api_for_dev.py,sha256=BwROGTR8Hm1ewx_Z0k8HXeql4RIItCdCtP_hmhTT_PM,344
+arpakitlib/_arpakit_project_template/src/api/start_api_for_dev_with_reload.py,sha256=xg2SFemhe8KmmoYvaG8zkFZyonzxdxcHuugjS3i0q0I,151
 arpakitlib/_arpakit_project_template/src/api/transmitted_api_data.py,sha256=YtpATqzN216e76W5QOuzN-Vo6343PVDiHpKWYQ6oqyU,278
 arpakitlib/_arpakit_project_template/src/api/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -144,7 +145,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=VA81jgoTAfDzu4UGLB9X5qSeHpiGmWqig12meAA4ZVU,24179
+arpakitlib/ar_fastapi_util.py,sha256=e4Tgz7sPJk-wqMc2sNsBZ7ZVXo2lMnaOq5WY7CbgvMk,24203
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_file_util.py,sha256=07xCF7paAUP2JUyfpeX0l3N1oCSma7qAcBmrCIZVi3g,452
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -159,7 +160,7 @@ arpakitlib/ar_logging_util.py,sha256=Gyd7B9k0glIXPm6dASiigWLq9LC9lw6vhXTCeWpY5PY
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=xq5bbAXJG-93CRVZUcLW0ZdM22rj-ZUW17C5hX_5grg,1699
 arpakitlib/ar_openai_api_client_util.py,sha256=dHUbfg1sVVCjsNl_fra3iCMEz1bR-Hk9fE-DdYbu7Wc,1215
-arpakitlib/ar_operation_execution_util.py,sha256=EL7X7vN2GlOjlps3lCNoJPOP5lyqpbz4VTKmOWz7gVE,14948
+arpakitlib/ar_operation_execution_util.py,sha256=XMS5bLM-NubLv7HuTnt0Vi6YnE42pu3dJso7HRpBBKk,17454
 arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy4,3447
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
@@ -173,9 +174,9 @@ arpakitlib/ar_str_util.py,sha256=oCEtQ_TTn35OEz9jCNLjbhopq76JmaifD_iYR-nEJJ4,214
 arpakitlib/ar_type_util.py,sha256=e6Ch8I_B3FMJMj-fiZvTwtGde4hxSa48fGt5g8RlV6I,2301
 arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.52.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.52.dist-info/METADATA,sha256=JlHwwX3e3HDjTu52a-iWi-fQFeojr2O5YlmXJ4JH1_Y,2824
-arpakitlib-1.7.52.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.52.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.52.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.52.dist-info/RECORD,,
+arpakitlib-1.7.54.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.54.dist-info/METADATA,sha256=BFELpFNE5b0L340gZI0ohoxH4tx5-Go-XV0_sCxHx_U,2824
+arpakitlib-1.7.54.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.54.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.54.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.54.dist-info/RECORD,,