diracx-db 0.0.1a45__tar.gz → 0.0.1a46__tar.gz

{diracx_db-0.0.1a45 → diracx_db-0.0.1a46}/PKG-INFO

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

{diracx_db-0.0.1a45 → diracx_db-0.0.1a46}/src/diracx/db/__main__.py

@@ -31,7 +31,6 @@ async def init_sql():
     from diracx.db.sql.utils import BaseSQLDB
 
     for db_name, db_url in BaseSQLDB.available_urls().items():
-
         logger.info("Initialising %s", db_name)
         db = BaseSQLDB.available_implementations(db_name)[0](db_url)
         async with db.engine_context():

{diracx_db-0.0.1a45 → diracx_db-0.0.1a46}/src/diracx/db/sql/job_logging/db.py

@@ -89,7 +89,6 @@ class JobLoggingDB(BaseSQLDB):
             status_time,
             status_source,
         ) in rows:
-
             values[job_id].append(
                 [
                     status,

{diracx_db-0.0.1a45 → diracx_db-0.0.1a46}/src/diracx/db/sql/pilot_agents/db.py

@@ -20,7 +20,6 @@ class PilotAgentsDB(BaseSQLDB):
         grid_type: str = "DIRAC",
         pilot_stamps: dict | None = None,
     ) -> None:
-
         if pilot_stamps is None:
             pilot_stamps = {}
 

{diracx_db-0.0.1a45 → diracx_db-0.0.1a46}/src/diracx/db/sql/sandbox_metadata/db.py

@@ -13,6 +13,7 @@ from sqlalchemy import (
     Table,
     and_,
     delete,
+    exists,
     insert,
     literal,
     or_,
@@ -236,7 +237,10 @@ class SandboxMetadataDB(BaseSQLDB):
         """
         conditions = [
             # If it has assigned to a job but is no longer mapped it can be removed
-            # and_(SandBoxes.Assigned, ~exists(SandBoxes.SBId == SBEntityMapping.SBId)),
+            and_(
+                SandBoxes.Assigned,
+                ~exists().where(SBEntityMapping.SBId == SandBoxes.SBId),
+            ),
             # If the sandbox is still unassigned after 15 days, remove it
             and_(~SandBoxes.Assigned, days_since(SandBoxes.LastAccessTime) >= 15),
         ]

{diracx_db-0.0.1a45 → diracx_db-0.0.1a46}/tests/opensearch/test_index_template.py

@@ -37,13 +37,15 @@ async def _get_test_index_mappings(dummy_opensearch_db: DummyOSDB):
 
     # At this point the index should not exist yet
     with pytest.raises(opensearchpy.exceptions.NotFoundError):
-        await dummy_opensearch_db.client.indices.get_mapping(index_name)
+        await dummy_opensearch_db.client.indices.get_mapping(index=index_name)
 
     # Insert document which will automatically create the index based on the template
     await dummy_opensearch_db.upsert(vo, document_id, DUMMY_DOCUMENT)
 
     # Ensure the result looks as expected and return the mappings
-    index_mapping = await dummy_opensearch_db.client.indices.get_mapping(index_name)
+    index_mapping = await dummy_opensearch_db.client.indices.get_mapping(
+        index=index_name
+    )
     assert list(index_mapping) == [index_name]
     assert list(index_mapping[index_name]) == ["mappings"]
     return index_mapping[index_name]["mappings"]

{diracx_db-0.0.1a45 → diracx_db-0.0.1a46}/tests/pilot_agents/test_pilot_agents_db.py

@@ -15,7 +15,6 @@ async def pilot_agents_db(tmp_path) -> PilotAgentsDB:
 
 
 async def test_insert_and_select(pilot_agents_db: PilotAgentsDB):
-
     async with pilot_agents_db as pilot_agents_db:
         # Add a pilot reference
         refs = [f"ref_{i}" for i in range(10)]