arpakitlib 1.7.90__py3-none-any.whl → 1.7.93__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/api/router/main_router.py

@@ -3,6 +3,9 @@ from fastapi import APIRouter
 from src.api.router.v1.main_router import main_v1_api_router
 
 main_api_router = APIRouter()
+
+# API Error Info
+
 main_api_router.include_router(
     router=main_v1_api_router,
     prefix="/api/v1"

arpakitlib/ar_base_worker_util.py

@@ -19,7 +19,7 @@ class BaseWorker(ABC):
     def __init__(
             self,
             *,
-            timeout_after_run=timedelta(seconds=0.1),
+            timeout_after_run=timedelta(seconds=0.3),
             timeout_after_err_in_run=timedelta(seconds=1),
             startup_funcs: list[Any] | None = None
     ):

arpakitlib/ar_operation_execution_util.py

@@ -11,6 +11,7 @@ from typing import Any, Callable
 from pydantic import ConfigDict
 from pydantic.v1 import BaseModel
 from sqlalchemy import asc
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import Session
 
 from arpakitlib.ar_base_worker_util import BaseWorker
@@ -61,7 +62,8 @@ def get_operation_by_id(
         session: Session | None = None,
         sqlalchemy_db: SQLAlchemyDB | None = None,
         filter_operation_id: int,
-        raise_if_not_found: bool = False
+        raise_if_not_found: bool = False,
+        lock: bool = False
 ) -> OperationDBM | None:
     def func(session_: Session):
         query = (
@@ -69,8 +71,16 @@ def get_operation_by_id(
             .query(OperationDBM)
             .filter(OperationDBM.id == filter_operation_id)
         )
+
+        if lock:
+            query = query.with_for_update()
+
         if raise_if_not_found:
-            return query.one()
+            try:
+                return query.one()
+            except NoResultFound:
+                if raise_if_not_found:
+                    raise ValueError("Operation not found")
         else:
             return query.one_or_none()
 
@@ -305,7 +315,7 @@ class OperationExecutorWorker(BaseWorker):
             sqlalchemy_db: SQLAlchemyDB,
             operation_executor: BaseOperationExecutor | None = None,
             filter_operation_types: str | list[str] | None = None,
-            timeout_after_run=timedelta(seconds=0.1),
+            timeout_after_run=timedelta(seconds=0.3),
             timeout_after_err_in_run=timedelta(seconds=1),
             startup_funcs: list[Any] | None = None
     ):
@@ -374,7 +384,7 @@ class ScheduledOperationCreatorWorker(BaseWorker):
             *,
             sqlalchemy_db: SQLAlchemyDB,
             scheduled_operations: list[ScheduledOperation] | None = None,
-            timeout_after_run=timedelta(seconds=0.1),
+            timeout_after_run=timedelta(seconds=0.3),
             timeout_after_err_in_run=timedelta(seconds=1),
             startup_funcs: list[Any] | None = None
     ):

arpakitlib/ar_schedule_uust_api_client_util.py

@@ -189,18 +189,25 @@ class ScheduleUUSTAPIClient:
             return False
         return True
 
-    async def check_all(self):
+    async def check_all(self) -> dict[str, Any]:
+        current_semester = await self.get_current_semester()
+        self._logger.info(f"current_semester: {current_semester}")
+
+        current_week = await self.get_current_week()
+        self._logger.info(f"current_week: {current_week}")
+
         groups = await self.get_groups()
         self._logger.info(f"groups len: {len(groups)}")
 
         teachers = await self.get_teachers()
         self._logger.info(f"teachers len: {len(teachers)}")
 
-        current_semester = await self.get_current_semester()
-        self._logger.info(f"current_semester: {current_semester}")
-
-        current_week = await self.get_current_week()
-        self._logger.info(f"current_week: {current_week}")
+        return {
+            "current_semester": current_semester,
+            "current_week": current_week,
+            "len(groups)": len(groups),
+            "len(teachers)": len(teachers)
+        }
 
 
 def __example():

arpakitlib/ar_sqlalchemy_model_util.py

@@ -4,7 +4,7 @@ from datetime import datetime, timedelta
 from typing import Any
 from uuid import uuid4
 
-from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP
+from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
@@ -78,10 +78,12 @@ class SimpleDBM(BaseDBM):
         INTEGER, primary_key=True, autoincrement=True, sort_order=-3, nullable=False
     )
     long_id: Mapped[str] = mapped_column(
-        TEXT, insert_default=generate_default_long_id, unique=True, sort_order=-2, nullable=False
+        TEXT, insert_default=generate_default_long_id, server_default=func.gen_random_uuid(),
+        unique=True, sort_order=-2, nullable=False
     )
     creation_dt: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=True), insert_default=now_utc_dt, index=True, sort_order=-1, nullable=False
+        TIMESTAMP(timezone=True), insert_default=now_utc_dt, server_default=func.now(),
+        index=True, sort_order=-1, nullable=False
     )
 
     def __repr__(self):

{arpakitlib-1.7.90.dist-info → arpakitlib-1.7.93.dist-info}/METADATA

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

{arpakitlib-1.7.90.dist-info → arpakitlib-1.7.93.dist-info}/RECORD

@@ -78,7 +78,7 @@ arpakitlib/_arpakit_project_template/src/api/const.py,sha256=7d4qD5hedqr7QxVzbfs
 arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=lDE77W6WkeAeRB_vJY3TXRTa3HeiO-t26eTtG7v8j6U,4594
 arpakitlib/_arpakit_project_template/src/api/event.py,sha256=58wCVyVSIe_kydWi44M0Wvp7bTnV8xvO30gMXzjbFYc,750
 arpakitlib/_arpakit_project_template/src/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/api/router/main_router.py,sha256=__Z-pGoeooYCub7besFXGJJvZR3V-4IakXd3cKo6ZIM,209
+arpakitlib/_arpakit_project_template/src/api/router/main_router.py,sha256=Yv699WCJDcdiJMXFg1kPTvolqj-NAGoXfqe-vzbMzIU,228
 arpakitlib/_arpakit_project_template/src/api/router/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/api/router/v1/get_api_error_info.py,sha256=lz2yH5IjzKvkdAqOErnT4E4DCTwmE1Ru0h_7dc_ZNn4,844
 arpakitlib/_arpakit_project_template/src/api/router/v1/main_router.py,sha256=fvT-t2c2o6XVVJWiUdNnIWEOE8Q8F4v1Ik1Nae5YqvU,256
@@ -120,7 +120,7 @@ arpakitlib/ar_arpakit_project_template_util.py,sha256=AswzQvvb-zfUyrcP4EP0K756YL
 arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=jGbP6egs2yhgfheyqhM0J-SeM2qp2YrW7dV-u9djv4Q,19223
 arpakitlib/ar_arpakitlib_cli_util.py,sha256=8lhEDxnwMSRX2PGV2xQtQru1AYKSA92SVolol5u7iBk,3154
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
-arpakitlib/ar_base_worker_util.py,sha256=WyQfelUQbj20ppp-kCNt4DCiG6S1VsfIbfaX6at4-5s,4828
+arpakitlib/ar_base_worker_util.py,sha256=3pK03ps_AwtdDJofA8mRIGqlEDR1mfWd_QsSS3IR6sM,4828
 arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
 arpakitlib/ar_dict_util.py,sha256=cF5LQJ6tLqyGoEXfDljMDZrikeZoWPw7CgINHIFGvXM,419
@@ -164,23 +164,23 @@ arpakitlib/ar_logging_util.py,sha256=mx3H6CzX9dsh29ruFmYnva8lL6mwvdBXmeHH9E2tvu8
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=GETiREPMEYhch-yU6T--Bdawlbb04Jp1Qy7cOsUlIeA,2228
 arpakitlib/ar_openai_api_client_util.py,sha256=_XmlApvHFMSyjvZydPa_kASIt9LsFrZmSC7YEzIG8Bg,1806
-arpakitlib/ar_operation_execution_util.py,sha256=2sLdchRsoZTymfG4mULX-7rOSWfxzhyS43WSo5LgEEo,17956
+arpakitlib/ar_operation_execution_util.py,sha256=D0pUb0hJ7VRsBrq1tiW5otPJMSqZdPDQLUnlPJxkAL0,18242
 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
-arpakitlib/ar_schedule_uust_api_client_util.py,sha256=rAIxrAwURes5kuviFi2MA1VgOaWCZQtqmqsTf0QlAvY,6634
+arpakitlib/ar_schedule_uust_api_client_util.py,sha256=0Ns0mMEXYEkVmP6YTAXHyNcrhNsvCJ8X-G_5XwILhJ4,6855
 arpakitlib/ar_settings_util.py,sha256=EFRh5WrB_iaqwxy0rGAtnyGtA6JkNCan-Y_Y6XWb4UY,1583
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
-arpakitlib/ar_sqlalchemy_model_util.py,sha256=qoODDW9Adh-axF5j0GyWBgEtYUanOgwVC_eMle71R8o,6176
+arpakitlib/ar_sqlalchemy_model_util.py,sha256=nKJGN32eg3Gn5kmJwHdVJznPT5TydLsfUfwJGdypdUo,6264
 arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjlSJ0,4207
 arpakitlib/ar_ssh_runner_util.py,sha256=e9deuUdBW7Eh0Exx2nTBhk57SaOZYaJaSjNk8q6dbJk,6804
 arpakitlib/ar_str_util.py,sha256=tFoGSDYoGpfdVHWor5Li9pEOFmDFlHkX-Z8iOy1LK7Y,3537
 arpakitlib/ar_type_util.py,sha256=s0NsTM7mV3HuwyRwyYLdNn7Ep2HbyI4FIr-dd8x0lfI,3734
 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.90.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.90.dist-info/METADATA,sha256=fKDY1Z8KVPJn7k4MySiimIGREhtmnvd4NGGSM35jffk,2824
-arpakitlib-1.7.90.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.90.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.90.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.90.dist-info/RECORD,,
+arpakitlib-1.7.93.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.93.dist-info/METADATA,sha256=pZPltqRitxj6pZ7I8pHAauB5P2sUINz3NUjA8ZGSnBY,2824
+arpakitlib-1.7.93.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.93.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.93.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.93.dist-info/RECORD,,