diracx-db 0.0.1a8__py3-none-any.whl → 0.0.1a10__py3-none-any.whl

diracx/db/os/utils.py

@@ -17,8 +17,6 @@ from diracx.core.exceptions import InvalidQueryError
 from diracx.core.extensions import select_from_extension
 from diracx.db.exceptions import DBUnavailable
 
-OS_DATE_FORMAT = "%Y-%m-%dT%H:%M:%S.%f%z"
-
 logger = logging.getLogger(__name__)
 
 
@@ -184,7 +182,9 @@ class BaseOSDB(metaclass=ABCMeta):
                 if field_name not in self.fields:
                     continue
                 if self.fields[field_name]["type"] == "date":
-                    hit[field_name] = datetime.strptime(hit[field_name], OS_DATE_FORMAT)
+                    hit[field_name] = datetime.strptime(
+                        hit[field_name], "%Y-%m-%dT%H:%M:%S.%f%z"
+                    )
 
         return hits
 

diracx/db/sql/jobs/db.py

@@ -388,7 +388,7 @@ class JobDB(BaseSQLDB):
         classAdJob.insertAttributeInt("JobID", job_id)
 
         try:
-            result = self._checkAndPrepareJob(
+            result = await self._checkAndPrepareJob(
                 job_id,
                 classAdJob,
                 classAdReq,
@@ -421,11 +421,9 @@ class JobDB(BaseSQLDB):
 
         jobAttrs["ApplicationStatus"] = "Unknown"
 
-        jobAttrs["ApplicationNumStatus"] = 0
+        jobAttrs["LastUpdateTime"] = datetime.now(tz=timezone.utc)
 
-        jobAttrs["LastUpdateTime"] = str(datetime.utcnow())
-
-        jobAttrs["RescheduleTime"] = str(datetime.utcnow())
+        jobAttrs["RescheduleTime"] = datetime.now(tz=timezone.utc)
 
         reqJDL = classAdReq.asJDL()
         classAdJob.insertAttributeInt("JobRequirements", reqJDL)
@@ -435,9 +433,9 @@ class JobDB(BaseSQLDB):
         # Replace the JobID placeholder if any
         jobJDL = jobJDL.replace("%j", str(job_id))
 
-        result = self.setJobJDL(job_id, jobJDL)
+        result = await self.setJobJDL(job_id, jobJDL)
 
-        result = self.setJobAttributes(job_id, jobAttrs)
+        result = await self.setJobAttributes(job_id, jobAttrs)
 
         retVal["InputData"] = classAdJob.lookupAttribute("InputData")
         retVal["RescheduleCounter"] = reschedule_counter
@@ -669,9 +667,13 @@ class TaskQueueDB(BaseSQLDB):
         """
         Get the task queue info for given jobs
         """
-        stmt = select(
-            TaskQueues.TQId, TaskQueues.Owner, TaskQueues.OwnerGroup, TaskQueues.VO
-        ).where(JobsQueue.JobId.in_(job_ids))
+        stmt = (
+            select(
+                TaskQueues.TQId, TaskQueues.Owner, TaskQueues.OwnerGroup, TaskQueues.VO
+            )
+            .join(JobsQueue, TaskQueues.TQId == JobsQueue.TQId)
+            .where(JobsQueue.JobId.in_(job_ids))
+        )
         return set(
             (int(row[0]), str(row[1]), str(row[2]), str(row[3]))
             for row in (await self.conn.execute(stmt)).all()

diracx/db/sql/jobs/schema.py

@@ -60,10 +60,6 @@ class Jobs(JobDBBase):
     )
     JobType = Column("JobType", String(32), default="user")
     JobGroup = Column("JobGroup", String(32), default="00000000")
-    JobSplitType = Column(
-        "JobSplitType", Enum("Single", "Master", "Subjob", "DAGNode"), default="Single"
-    )
-    MasterJobID = Column("MasterJobID", Integer, default=0)
     Site = Column("Site", String(100), default="ANY")
     JobName = Column("JobName", String(128), default="Unknown")
     Owner = Column("Owner", String(64), default="Unknown")
@@ -78,17 +74,9 @@ class Jobs(JobDBBase):
     Status = Column("Status", String(32), default="Received")
     MinorStatus = Column("MinorStatus", String(128), default="Unknown")
     ApplicationStatus = Column("ApplicationStatus", String(255), default="Unknown")
-    ApplicationNumStatus = Column("ApplicationNumStatus", Integer, default=0)
     UserPriority = Column("UserPriority", Integer, default=0)
-    SystemPriority = Column("SystemPriority", Integer, default=0)
     RescheduleCounter = Column("RescheduleCounter", Integer, default=0)
     VerifiedFlag = Column("VerifiedFlag", EnumBackedBool(), default=False)
-    DeletedFlag = Column("DeletedFlag", EnumBackedBool(), default=False)
-    KilledFlag = Column("KilledFlag", EnumBackedBool(), default=False)
-    FailedFlag = Column("FailedFlag", EnumBackedBool(), default=False)
-    ISandboxReadyFlag = Column("ISandboxReadyFlag", EnumBackedBool(), default=False)
-    OSandboxReadyFlag = Column("OSandboxReadyFlag", EnumBackedBool(), default=False)
-    RetrievedFlag = Column("RetrievedFlag", EnumBackedBool(), default=False)
     # TODO: Should this be True/False/"Failed"? Or True/False/Null?
     AccountedFlag = Column(
         "AccountedFlag", Enum("True", "False", "Failed"), default="False"
@@ -97,7 +85,6 @@ class Jobs(JobDBBase):
     __table_args__ = (
         Index("JobType", "JobType"),
         Index("JobGroup", "JobGroup"),
-        Index("JobSplitType", "JobSplitType"),
         Index("Site", "Site"),
         Index("Owner", "Owner"),
         Index("OwnerGroup", "OwnerGroup"),
@@ -212,7 +199,6 @@ class TaskQueues(TaskQueueDBBase):
     __tablename__ = "tq_TaskQueues"
     TQId = Column(Integer, primary_key=True)
     Owner = Column(String(255), nullable=False)
-    OwnerDN = Column(String(255))
     OwnerGroup = Column(String(32), nullable=False)
     VO = Column(String(32), nullable=False)
     CPUTime = Column(BigInteger, nullable=False)

diracx/db/sql/sandbox_metadata/db.py

@@ -19,7 +19,7 @@ class SandboxMetadataDB(BaseSQLDB):
         stmt = sqlalchemy.select(sb_Owners.OwnerID).where(
             sb_Owners.Owner == user.preferred_username,
             sb_Owners.OwnerGroup == user.dirac_group,
-            # TODO: Add VO
+            sb_Owners.VO == user.vo,
         )
         result = await self.conn.execute(stmt)
         if owner_id := result.scalar_one_or_none():
@@ -28,6 +28,7 @@ class SandboxMetadataDB(BaseSQLDB):
         stmt = sqlalchemy.insert(sb_Owners).values(
             Owner=user.preferred_username,
             OwnerGroup=user.dirac_group,
+            VO=user.vo,
         )
         result = await self.conn.execute(stmt)
         return result.lastrowid

diracx/db/sql/sandbox_metadata/schema.py

@@ -19,6 +19,7 @@ class sb_Owners(Base):
     OwnerID = Column(Integer, autoincrement=True)
     Owner = Column(String(32))
     OwnerGroup = Column(String(32))
+    VO = Column(String(64))
     __table_args__ = (PrimaryKeyConstraint("OwnerID"),)
 
 

{diracx_db-0.0.1a8.dist-info → diracx_db-0.0.1a10.dist-info}/METADATA

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

{diracx_db-0.0.1a8.dist-info → diracx_db-0.0.1a10.dist-info}/RECORD

@@ -4,7 +4,7 @@ diracx/db/exceptions.py,sha256=-LSkEwsvjwU7vXqx-xeLvLKInTRAhjwB7K_AKfQcIH8,41
 diracx/db/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diracx/db/os/__init__.py,sha256=IZr6z6SefrRvuC8sTC4RmB3_wwOyEt1GzpDuwSMH8O4,112
 diracx/db/os/job_parameters.py,sha256=Knca19uT2G-5FI7MOFlaOAXeHn4ecPVLIH30TiwhaTw,858
-diracx/db/os/utils.py,sha256=MACBZSn9mzbaY_HAPqk-OBmLI2OYCph_1aI7oqlr-K0,9124
+diracx/db/os/utils.py,sha256=E_Eoo-txg7YRvPFb3KQbPYOz23Lpg5aiqe6LRjlG9GA,9137
 diracx/db/sql/__init__.py,sha256=R6tk5lo1EHbt8joGDesesYHcc1swIq9T4AaSixhh7lA,252
 diracx/db/sql/utils.py,sha256=BuXjIuXN-_v8YkCoMoMhw2tHVUqG6lTBx-e4VEYWE8o,7857
 diracx/db/sql/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -14,14 +14,14 @@ diracx/db/sql/dummy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 diracx/db/sql/dummy/db.py,sha256=5PIPv6aKY7CGIwmvnGKowjVr9ZQWpbjFSd2PIX7YOUw,1627
 diracx/db/sql/dummy/schema.py,sha256=uEkGDNVZbmJecytkHY1CO-M1MiKxe5w1_h0joJMPC9E,680
 diracx/db/sql/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/db/sql/jobs/db.py,sha256=-hzxAoL6Pukpaf3lpMTrzR4s0Md3jENHVxRrmUBKS60,29781
-diracx/db/sql/jobs/schema.py,sha256=5KCMciWOymJqinIwd-gdHZXrMH8p9cPz7fZo0lYHDXk,10143
+diracx/db/sql/jobs/db.py,sha256=Y_2mx5kPTeuz6nxXVwGLzTssKsIH6nfnoTvWvilSgxA,29876
+diracx/db/sql/jobs/schema.py,sha256=YkxIdjTkvLlEZ9IQt86nj80eMvOPbcrfk9aisjmNpqY,9275
 diracx/db/sql/jobs/status_utility.py,sha256=0kAt623nh1O5wgsgktctdCmHEynO1nU0vn-7zakNeOA,10525
 diracx/db/sql/sandbox_metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/db/sql/sandbox_metadata/db.py,sha256=HcmXlnObD10Lwe_VMyloTRa6TFZgEKOJn7ud8AkisbE,3464
-diracx/db/sql/sandbox_metadata/schema.py,sha256=VekS-tJqXFqn6DE3bMgZqKyBVkgFCm0mfPx7s9rZ6Bg,1372
-diracx_db-0.0.1a8.dist-info/METADATA,sha256=XUbk4aS7IZCL8ie9Rcpg57GSmiWjOolNF07ExUEd-DI,680
-diracx_db-0.0.1a8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-diracx_db-0.0.1a8.dist-info/entry_points.txt,sha256=xEFGu_zgmPgQPlUeFtdahQfQIboJ1ugFOK8eMio9gtw,271
-diracx_db-0.0.1a8.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_db-0.0.1a8.dist-info/RECORD,,
+diracx/db/sql/sandbox_metadata/db.py,sha256=HjlbnsT4cRMuFAcTL_sK3IqCehA7zISzR_d7xIGZoNk,3498
+diracx/db/sql/sandbox_metadata/schema.py,sha256=rngYYkJxBhjETBHGLD1CTipDGe44mRYR0wdaFoAJwp0,1400
+diracx_db-0.0.1a10.dist-info/METADATA,sha256=gtBaCSlMCQtrRSTCG4__GHyJQwoAb1PHBnXuimpiQHI,681
+diracx_db-0.0.1a10.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+diracx_db-0.0.1a10.dist-info/entry_points.txt,sha256=xEFGu_zgmPgQPlUeFtdahQfQIboJ1ugFOK8eMio9gtw,271
+diracx_db-0.0.1a10.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_db-0.0.1a10.dist-info/RECORD,,