diracx-db 0.0.1a16__tar.gz → 0.0.1a17__tar.gz

{diracx_db-0.0.1a16 → diracx_db-0.0.1a17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-db
-Version: 0.0.1a16
+Version: 0.0.1a17
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -14,7 +14,7 @@ Requires-Dist: dirac
 Requires-Dist: diracx-core
 Requires-Dist: fastapi
 Requires-Dist: opensearch-py[async]
-Requires-Dist: pydantic
-Requires-Dist: sqlalchemy[aiomysql,aiosqlite]
+Requires-Dist: pydantic>=2.4
+Requires-Dist: sqlalchemy[aiomysql,aiosqlite]>=2
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_db-0.0.1a16 → diracx_db-0.0.1a17}/pyproject.toml

@@ -17,8 +17,8 @@ dependencies = [
     "diracx-core",
     "fastapi",
     "opensearch-py[async]",
-    "pydantic",
-    "sqlalchemy[aiomysql,aiosqlite]",
+    "pydantic >=2.4",
+    "sqlalchemy[aiomysql,aiosqlite] >= 2",
 ]
 dynamic = ["version"]
 

{diracx_db-0.0.1a16 → diracx_db-0.0.1a17}/src/diracx/db/sql/jobs/status_utility.py

@@ -41,7 +41,7 @@ async def set_job_status(
     # transform JobStateUpdate objects into dicts
     statusDict = {}
     for key, value in status.items():
-        statusDict[key] = {k: v for k, v in value.dict().items() if v is not None}
+        statusDict[key] = {k: v for k, v in value.model_dump().items() if v is not None}
 
     _, res = await job_db.search(
         parameters=["Status", "StartExecTime", "EndExecTime"],

{diracx_db-0.0.1a16 → diracx_db-0.0.1a17}/src/diracx/db/sql/utils.py

@@ -11,7 +11,7 @@ from datetime import datetime, timedelta, timezone
 from functools import partial
 from typing import TYPE_CHECKING, AsyncIterator, Self, cast
 
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 from sqlalchemy import Column as RawColumn
 from sqlalchemy import DateTime, Enum, MetaData, select
 from sqlalchemy.exc import OperationalError
@@ -123,7 +123,9 @@ class BaseSQLDB(metaclass=ABCMeta):
                     if db_url == "sqlite+aiosqlite:///:memory:":
                         db_urls[db_name] = db_url
                     else:
-                        db_urls[db_name] = parse_obj_as(SqlalchemyDsn, db_url)
+                        db_urls[db_name] = str(
+                            TypeAdapter(SqlalchemyDsn).validate_python(db_url)
+                        )
                 except Exception:
                     logger.error("Error loading URL for %s", db_name)
                     raise

{diracx_db-0.0.1a16 → diracx_db-0.0.1a17}/src/diracx_db.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-db
-Version: 0.0.1a16
+Version: 0.0.1a17
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -14,7 +14,7 @@ Requires-Dist: dirac
 Requires-Dist: diracx-core
 Requires-Dist: fastapi
 Requires-Dist: opensearch-py[async]
-Requires-Dist: pydantic
-Requires-Dist: sqlalchemy[aiomysql,aiosqlite]
+Requires-Dist: pydantic>=2.4
+Requires-Dist: sqlalchemy[aiomysql,aiosqlite]>=2
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_db-0.0.1a16 → diracx_db-0.0.1a17}/src/diracx_db.egg-info/requires.txt

@@ -2,8 +2,8 @@ dirac
 diracx-core
 fastapi
 opensearch-py[async]
-pydantic
-sqlalchemy[aiomysql,aiosqlite]
+pydantic>=2.4
+sqlalchemy[aiomysql,aiosqlite]>=2
 
 [testing]
 diracx-testing

{diracx_db-0.0.1a16 → diracx_db-0.0.1a17}/tests/test_sandbox_metadata.py

@@ -26,13 +26,16 @@ def test_get_pfn(sandbox_metadata_db: SandboxMetadataDB):
         sub="vo:sub", preferred_username="user1", dirac_group="group1", vo="vo"
     )
     sandbox_info = SandboxInfo(
-        checksum="checksum",
+        checksum="90e0ba6763c91a905bb9fd6e025aac1952ae742e6d756a31a0963aa7df7cd7b1",
         checksum_algorithm="sha256",
         format="tar.bz2",
         size=100,
     )
     pfn = sandbox_metadata_db.get_pfn("bucket1", user_info, sandbox_info)
-    assert pfn == "/S3/bucket1/vo/group1/user1/sha256:checksum.tar.bz2"
+    assert pfn == (
+        "/S3/bucket1/vo/group1/user1/"
+        "sha256:90e0ba6763c91a905bb9fd6e025aac1952ae742e6d756a31a0963aa7df7cd7b1.tar.bz2"
+    )
 
 
 async def test_insert_sandbox(sandbox_metadata_db: SandboxMetadataDB):