diracx-db 0.0.1a25__tar.gz → 0.0.1a27__tar.gz

{diracx_db-0.0.1a25 → diracx_db-0.0.1a27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: diracx-db
-Version: 0.0.1a25
+Version: 0.0.1a27
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_db-0.0.1a25 → diracx_db-0.0.1a27}/src/diracx/db/sql/sandbox_metadata/db.py

@@ -5,7 +5,7 @@ from typing import Any
 from sqlalchemy import Executable, delete, insert, literal, select, update
 from sqlalchemy.exc import IntegrityError, NoResultFound
 
-from diracx.core.exceptions import SandboxNotFoundError
+from diracx.core.exceptions import SandboxAlreadyAssignedError, SandboxNotFoundError
 from diracx.core.models import SandboxInfo, SandboxType, UserInfo
 from diracx.db.sql.utils import BaseSQLDB, utcnow
 
@@ -135,10 +135,18 @@ class SandboxMetadataDB(BaseSQLDB):
             stmt = insert(SBEntityMapping).from_select(
                 ["SBId", "EntityId", "Type"], select_sb_id
             )
-            await self.conn.execute(stmt)
+            try:
+                await self.conn.execute(stmt)
+            except IntegrityError as e:
+                raise SandboxAlreadyAssignedError(pfn, se_name) from e
 
             stmt = update(SandBoxes).where(SandBoxes.SEPFN == pfn).values(Assigned=True)
             result = await self.conn.execute(stmt)
+            if result.rowcount == 0:
+                # If the update didn't affect any row, the sandbox doesn't exist
+                # It means the previous insert didn't have any effect
+                raise SandboxNotFoundError(pfn, se_name)
+
             assert result.rowcount == 1
 
     async def unassign_sandboxes_to_jobs(self, jobs_ids: list[int]) -> None:

{diracx_db-0.0.1a25 → diracx_db-0.0.1a27}/src/diracx/db/sql/utils/base.py

@@ -232,7 +232,7 @@ def find_time_resolution(value):
     if isinstance(value, datetime):
         return None, value
     if match := re.fullmatch(
-        r"\d{4}(-\d{2}(-\d{2}(([ T])\d{2}(:\d{2}(:\d{2}(\.\d{6}Z?)?)?)?)?)?)?", value
+        r"\d{4}(-\d{2}(-\d{2}(([ T])\d{2}(:\d{2}(:\d{2}(\.\d{1,6}Z?)?)?)?)?)?)?", value
     ):
         if match.group(6):
             precision, pattern = "SECOND", r"\1-\2-\3 \4:\5:\6"
@@ -249,7 +249,7 @@ def find_time_resolution(value):
         return (
             precision,
             re.sub(
-                r"^(\d{4})-?(\d{2})?-?(\d{2})?[ T]?(\d{2})?:?(\d{2})?:?(\d{2})?\.?(\d{6})?Z?$",
+                r"^(\d{4})-?(\d{2})?-?(\d{2})?[ T]?(\d{2})?:?(\d{2})?:?(\d{2})?\.?(\d{1,6})?Z?$",
                 pattern,
                 value,
             ),

{diracx_db-0.0.1a25 → diracx_db-0.0.1a27}/src/diracx/db/sql/utils/functions.py

@@ -47,7 +47,8 @@ class date_trunc(expression.FunctionElement):  # noqa: N801
     """
 
     type = DateTime()
-    inherit_cache = True
+    # Cache does not work as intended with time resolution values, so we disable it
+    inherit_cache = False
 
     def __init__(self, *args, time_resolution, **kwargs) -> None:
         super().__init__(*args, **kwargs)

{diracx_db-0.0.1a25 → diracx_db-0.0.1a27}/src/diracx_db.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: diracx-db
-Version: 0.0.1a25
+Version: 0.0.1a27
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research