qa

Author: francesconazzaro

cads_broker/config.py

@@ -26,15 +26,14 @@
 
 
 class BrokerConfig(pydantic_settings.BaseSettings):
-
     high_priority_user_uid: str = "8d8ee054-6a09-4da8-a5be-d5dff52bbc5f"
     broker_priority_algorithm: str = "legacy"
     broker_priority_interval_hours: int = 24
     broker_get_number_of_workers_cache_time: int = 10
     broker_qos_rules_cache_time: int = 10
     broker_get_tasks_from_scheduler_cache_time: int = 1
     broker_rules_path: str = "/src/rules.qos"
-    broker_wait_time: float = 2.
+    broker_wait_time: float = 2.0
     broker_sync_database_cache_time: int = 10
     broker_requeue_on_killed_worker_requests: bool = False
     broker_requeue_on_lost_requests: bool = True

cads_broker/database.py

@@ -568,7 +568,7 @@ def get_users_queue_from_processing_time(
         .distinct()
     ).all()
 
-    queueing_user_costs = {u: 0 for u, in queue_users if u not in running_user_costs}
+    queueing_user_costs = {u: 0 for (u,) in queue_users if u not in running_user_costs}
 
     return queueing_user_costs | running_user_costs
 

cads_broker/entry_points.py

@@ -149,7 +149,9 @@ def delete_requests(
         if user_uid:
             statement = statement.where(database.SystemRequest.user_uid == user_uid)
         if request_uid:
-            statement = statement.where(database.SystemRequest.request_uid == request_uid)
+            statement = statement.where(
+                database.SystemRequest.request_uid == request_uid
+            )
         statement = statement.values(
             status="dismissed",
             request_metadata={

tests/test_02_database.py

@@ -935,34 +935,40 @@ def test_get_request(session_obj: sa.orm.sessionmaker) -> None:
 def test_get_users_queue_per_cost(session_obj: sa.orm.sessionmaker) -> None:
     adaptor_properties = mock_config()
     request_1 = mock_system_request(
-        status="successful", adaptor_properties_hash=adaptor_properties.hash,
+        status="successful",
+        adaptor_properties_hash=adaptor_properties.hash,
         user_uid="user1",
         started_at=datetime.datetime.now() - datetime.timedelta(hours=10),
         finished_at=datetime.datetime.now() - datetime.timedelta(hours=5),
     )
     request_2 = mock_system_request(
-        status="successful", adaptor_properties_hash=adaptor_properties.hash,
+        status="successful",
+        adaptor_properties_hash=adaptor_properties.hash,
         user_uid="user1",
         started_at=datetime.datetime.now() - datetime.timedelta(hours=20),
         finished_at=datetime.datetime.now() - datetime.timedelta(hours=10),
     )
     request_3 = mock_system_request(
-        status="successful", adaptor_properties_hash=adaptor_properties.hash,
+        status="successful",
+        adaptor_properties_hash=adaptor_properties.hash,
         user_uid="user2",
         started_at=datetime.datetime.now() - datetime.timedelta(hours=20),
         finished_at=datetime.datetime.now() - datetime.timedelta(hours=10),
     )
     request_4 = mock_system_request(
-        status="running", adaptor_properties_hash=adaptor_properties.hash,
+        status="running",
+        adaptor_properties_hash=adaptor_properties.hash,
         user_uid="user2",
         started_at=datetime.datetime.now() - datetime.timedelta(hours=20),
     )
     request_5 = mock_system_request(
-        status="accepted", adaptor_properties_hash=adaptor_properties.hash,
+        status="accepted",
+        adaptor_properties_hash=adaptor_properties.hash,
         user_uid="user2",
     )
     request_6 = mock_system_request(
-        status="accepted", adaptor_properties_hash=adaptor_properties.hash,
+        status="accepted",
+        adaptor_properties_hash=adaptor_properties.hash,
         user_uid="user3",
     )
     with session_obj() as session:
@@ -975,7 +981,9 @@ def test_get_users_queue_per_cost(session_obj: sa.orm.sessionmaker) -> None:
         session.add(request_6)
         session.commit()
     with session_obj() as session:
-        users_cost = db.get_users_queue_from_processing_time(session, interval_stop=datetime.datetime.now())
+        users_cost = db.get_users_queue_from_processing_time(
+            session, interval_stop=datetime.datetime.now()
+        )
     assert users_cost["user3"] == 0
     assert users_cost["user1"] == 15 * 60 * 60
     assert users_cost["user2"] == 30 * 60 * 60