qa

Author: francesconazzaro

cads_broker/factory.py

@@ -102,16 +102,14 @@ def register_functions():
         ),
     )
     expressions.FunctionFactory.FunctionFactory.register_function(
-        "request_age",
-        lambda context: context.request.age
+        "request_age", lambda context: context.request.age
     )
     expressions.FunctionFactory.FunctionFactory.register_function(
         "user_data",
-        lambda context: context.request.request_metadata.get("user_data", {})
+        lambda context: context.request.request_metadata.get("user_data", {}),
     )
     expressions.FunctionFactory.FunctionFactory.register_function(
-        "get",
-        lambda context, object, key, default=None: object.get(key, default)
+        "get", lambda context, object, key, default=None: object.get(key, default)
     )
 
     expressions.FunctionFactory.FunctionFactory.register_function("tagged", tagged)

cads_broker/qos/QoS.py

@@ -7,7 +7,6 @@
 # nor does it submit to any jurisdiction.
 #
 
-import collections
 import threading
 from functools import wraps
 
@@ -180,9 +179,9 @@ def dynamic_priority(self, request):
     def priority(self, request):
         """Compute the priority of a request."""
         # The priority of a request increases with time
-        return self._properties(
+        return self._properties(request).starting_priority + self.dynamic_priority(
             request
-        ).starting_priority + self.dynamic_priority(request)
+        )
 
     def dump(self, out=print):
         self.rules.dump(out)

cads_broker/qos/Rule.py

@@ -43,7 +43,9 @@ def match(self, request):
         try:
             ret_value = self.condition.evaluate(Context(request, self.environment))
         except Exception as e:
-            print(f"Error evaluating condition {self.condition} for request {request.request_uid}")
+            print(
+                f"Error evaluating condition {self.condition} for request {request.request_uid}"
+            )
             print(e)
             return False
         return ret_value
@@ -197,7 +199,9 @@ def add_priority(self, environment, info, condition, conclusion):
         self.priorities.append(Priority(environment, info, condition, conclusion))
 
     def add_dynamic_priority(self, environment, info, condition, conclusion):
-        self.dynamic_priorities.append(DynamicPriority(environment, info, condition, conclusion))
+        self.dynamic_priorities.append(
+            DynamicPriority(environment, info, condition, conclusion)
+        )
 
     def add_permission(self, environment, info, condition, conclusion):
         self.permissions.append(Permission(environment, info, condition, conclusion))

tests/test_02_database.py

@@ -792,7 +792,6 @@ def test_get_users_queue_from_processing_time(session_obj: sa.orm.sessionmaker)
     assert users_cost_ui["user1"] == 10 * 60 * 60
 
 
-
 def test_users_last_finished_at(session_obj: sa.orm.sessionmaker) -> None:
     adaptor_properties = mock_config()
     now = datetime.datetime.now()
@@ -826,7 +825,9 @@ def test_users_last_finished_at(session_obj: sa.orm.sessionmaker) -> None:
         session.add(request_2)
         session.add(request_3)
         session.commit()
-        users_last_finished_at = db.users_last_finished_at(session=session, after=now - datetime.timedelta(hours=24))
+        users_last_finished_at = db.users_last_finished_at(
+            session=session, after=now - datetime.timedelta(hours=24)
+        )
         assert finished_at == users_last_finished_at["user1"]
         assert "user2" not in users_last_finished_at
 
@@ -862,19 +863,15 @@ def test_user_last_completed_request(session_obj: sa.orm.sessionmaker) -> None:
         session.add(request_1)
         session.add(request_3)
         session.commit()
-        assert (
-            now - finished_at
-        ).seconds == db.user_last_completed_request(
+        assert (now - finished_at).seconds == db.user_last_completed_request(
             session=session, user_uid="user1", interval=60 * 60 * 24
         )
         assert 60 * 60 * 24 == db.user_last_completed_request(
             session=session, user_uid="user2", interval=60 * 60 * 24
         )
         session.add(request_2)
         session.commit()
-        assert (
-            now - finished_at
-        ).seconds == db.user_last_completed_request(
+        assert (now - finished_at).seconds == db.user_last_completed_request(
             session=session, user_uid="user1", interval=60 * 60 * 24
         )
         # invalidate cache

tests/test_03_qos.py

@@ -1,9 +1,7 @@
-import collections
 import io
 import logging
 
-from cads_broker import database
-from cads_broker import Environment, factory
+from cads_broker import Environment, database, factory
 from cads_broker.expressions import FunctionFactory
 from cads_broker.expressions.RulesParser import RulesParser
 from cads_broker.qos.Rule import RuleSet