diracx-db 0.0.1a22__tar.gz → 0.0.1a23__tar.gz

{diracx_db-0.0.1a22 → diracx_db-0.0.1a23}/PKG-INFO

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

{diracx_db-0.0.1a22 → diracx_db-0.0.1a23}/src/diracx/db/sql/job_logging/db.py

@@ -105,10 +105,9 @@ class JobLoggingDB(BaseSQLDB):
 
         seqnum = {jid: seqnum for jid, seqnum in (await self.conn.execute(seqnum_stmt))}
         # IF a seqnum is not found, then assume it does not exist and the first sequence number is 1.
-
         # https://docs.sqlalchemy.org/en/20/orm/queryguide/dml.html#orm-bulk-insert-statements
         await self.conn.execute(
-            insert(LoggingInfo),
+            LoggingInfo.__table__.insert(),
             [
                 {
                     "JobID": record.job_id,
@@ -118,38 +117,43 @@ class JobLoggingDB(BaseSQLDB):
                     "ApplicationStatus": record.application_status[:255],
                     "StatusTime": record.date,
                     "StatusTimeOrder": get_epoc(record.date),
-                    "Source": record.source[:32],
+                    "StatusSource": record.source[:32],
                 }
                 for record in records
             ],
         )
 
-    async def get_records(self, job_id: int) -> list[JobStatusReturn]:
+    async def get_records(self, job_ids: list[int]) -> dict[int, JobStatusReturn]:
         """Returns a Status,MinorStatus,ApplicationStatus,StatusTime,Source tuple
         for each record found for job specified by its jobID in historical order.
         """
+        # We could potentially use a group_by here, but we need to post-process the
+        # results later.
         stmt = (
             select(
+                LoggingInfo.JobID,
                 LoggingInfo.Status,
                 LoggingInfo.MinorStatus,
                 LoggingInfo.ApplicationStatus,
                 LoggingInfo.StatusTime,
                 LoggingInfo.Source,
             )
-            .where(LoggingInfo.JobID == int(job_id))
+            .where(LoggingInfo.JobID.in_(job_ids))
             .order_by(LoggingInfo.StatusTimeOrder, LoggingInfo.StatusTime)
         )
         rows = await self.conn.execute(stmt)
 
-        values = []
+        values = defaultdict(list)
         for (
+            job_id,
             status,
             minor_status,
             application_status,
             status_time,
             status_source,
         ) in rows:
-            values.append(
+
+            values[job_id].append(
                 [
                     status,
                     minor_status,
@@ -161,16 +165,16 @@ class JobLoggingDB(BaseSQLDB):
 
         # If no value has been set for the application status in the first place,
         # We put this status to unknown
-        res = []
-        if values:
-            if values[0][2] == "idem":
-                values[0][2] = "Unknown"
+        res: dict = defaultdict(list)
+        for job_id, history in values.items():
+            if history[0][2] == "idem":
+                history[0][2] = "Unknown"
 
             # We replace "idem" values by the value previously stated
-            for i in range(1, len(values)):
+            for i in range(1, len(history)):
                 for j in range(3):
-                    if values[i][j] == "idem":
-                        values[i][j] = values[i - 1][j]
+                    if history[i][j] == "idem":
+                        history[i][j] = history[i - 1][j]
 
             # And we replace arrays with tuples
             for (
@@ -179,8 +183,8 @@ class JobLoggingDB(BaseSQLDB):
                 application_status,
                 status_time,
                 status_source,
-            ) in values:
-                res.append(
+            ) in history:
+                res[job_id].append(
                     JobStatusReturn(
                         Status=status,
                         MinorStatus=minor_status,

{diracx_db-0.0.1a22 → diracx_db-0.0.1a23}/src/diracx/db/sql/utils/job.py

@@ -435,6 +435,7 @@ async def set_job_status_bulk(
         )
 
         job_data: dict[str, str] = {}
+        new_status: str | None = None
         if updateTimes[-1] >= lastTime:
             new_status, new_minor, new_application = (
                 returnValueOrRaise(  # TODO: Catch this

{diracx_db-0.0.1a22 → diracx_db-0.0.1a23}/src/diracx_db.egg-info/PKG-INFO

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

diracx_db-0.0.1a23/tests/jobs/test_jobLoggingDB.py

@@ -0,0 +1,80 @@
+from datetime import datetime, timezone
+
+import pytest
+
+from diracx.core.models import JobStatus
+from diracx.db.sql import JobLoggingDB
+
+
+@pytest.fixture
+async def job_logging_db():
+    job_logging_db = JobLoggingDB("sqlite+aiosqlite:///:memory:")
+    async with job_logging_db.engine_context():
+        async with job_logging_db.engine.begin() as conn:
+            await conn.run_sync(job_logging_db.metadata.create_all)
+        yield job_logging_db
+
+
+async def test_insert_records(job_logging_db: JobLoggingDB):
+    async with job_logging_db as job_logging_db:
+        # Arrange
+        date = datetime.now(timezone.utc)
+
+        # Act
+        for i in range(50):
+            await job_logging_db.insert_record(
+                i,
+                status=JobStatus.RECEIVED,
+                minor_status="received_minor_status",
+                application_status="application_status",
+                date=date,
+                source="pytest",
+            )
+            await job_logging_db.insert_record(
+                i,
+                status=JobStatus.SUBMITTING,
+                minor_status="submitted_minor_status",
+                application_status="application_status",
+                date=date,
+                source="pytest",
+            )
+            await job_logging_db.insert_record(
+                i,
+                status=JobStatus.RUNNING,
+                minor_status="running_minor_status",
+                application_status="application_status",
+                date=date,
+                source="pytest",
+            )
+
+        # Assert
+        res = await job_logging_db.get_records([i for i in range(50)])
+
+        assert len(res) == 50
+        # Check the first job - first record
+        assert res[0][0].Status == JobStatus.RECEIVED.value
+        assert res[0][0].MinorStatus == "received_minor_status"
+        assert res[0][0].ApplicationStatus == "application_status"
+        assert res[0][0].StatusTime == date
+        assert res[0][0].Source == "pytest"
+
+        # Check the first job - second record
+        assert res[0][1].Status == JobStatus.SUBMITTING.value
+        assert res[0][1].MinorStatus == "submitted_minor_status"
+        assert res[0][1].ApplicationStatus == "application_status"
+        assert res[0][1].StatusTime == date
+        assert res[0][1].Source == "pytest"
+
+        # Check the first job - third record
+        assert res[0][2].Status == JobStatus.RUNNING.value
+        assert res[0][2].MinorStatus == "running_minor_status"
+        assert res[0][2].ApplicationStatus == "application_status"
+        assert res[0][2].StatusTime == date
+        assert res[0][2].Source == "pytest"
+
+        # Check the last job - third record
+        assert res[49][2].Status == JobStatus.RUNNING.value
+        assert res[49][2].MinorStatus == "running_minor_status"
+        assert res[49][2].ApplicationStatus == "application_status"
+        assert res[49][2].StatusTime == date
+        assert res[49][2].Source == "pytest"

diracx_db-0.0.1a22/tests/jobs/test_jobLoggingDB.py

@@ -1,41 +0,0 @@
-from datetime import datetime, timezone
-
-import pytest
-
-from diracx.core.models import JobStatus
-from diracx.db.sql import JobLoggingDB
-
-
-@pytest.fixture
-async def job_logging_db():
-    job_logging_db = JobLoggingDB("sqlite+aiosqlite:///:memory:")
-    async with job_logging_db.engine_context():
-        async with job_logging_db.engine.begin() as conn:
-            await conn.run_sync(job_logging_db.metadata.create_all)
-        yield job_logging_db
-
-
-async def test_insert_record(job_logging_db: JobLoggingDB):
-    async with job_logging_db as job_logging_db:
-        # Arrange
-        date = datetime.now(timezone.utc)
-
-        # Act
-        await job_logging_db.insert_record(
-            1,
-            status=JobStatus.RECEIVED,
-            minor_status="minor_status",
-            application_status="application_status",
-            date=date,
-            source="pytest",
-        )
-
-        # Assert
-        res = await job_logging_db.get_records(1)
-
-        assert len(res) == 1
-        assert res[0].Status == JobStatus.RECEIVED.value
-        assert res[0].MinorStatus == "minor_status"
-        assert res[0].ApplicationStatus == "application_status"
-        assert res[0].StatusTime == date
-        assert res[0].Source == "pytest"