arpakitlib 1.7.90__tar.gz → 1.7.93__tar.gz

{arpakitlib-1.7.90 → arpakitlib-1.7.93}/PKG-INFO

@@ -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 → arpakitlib-1.7.93}/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-1.7.90 → arpakitlib-1.7.93}/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-1.7.90 → arpakitlib-1.7.93}/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-1.7.90 → arpakitlib-1.7.93}/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-1.7.90 → arpakitlib-1.7.93}/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 → arpakitlib-1.7.93}/pyproject.toml

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