queue_job: address review nits

Author: Milan Topuzov

queue_job/jobrunner/runner.py

@@ -472,11 +472,9 @@ def from_environ_or_config(cls):
         return runner
 
     def get_db_names(self):
-        db_name_opt = config["db_name"]
-        if db_name_opt:
-            if isinstance(db_name_opt, (list, tuple, set)):
-                return list(db_name_opt)
-            return [n for n in str(db_name_opt).split(",") if n]
+        db_names = config["db_name"] or []
+        if db_names:
+            return list(db_names)
         return odoo.service.db.list_dbs(True)
 
     def close_databases(self, remove_jobs=True):

queue_job/models/base.py

@@ -268,6 +268,3 @@ def _job_prepare_context_before_enqueue(self):
             for key, value in self.env.context.items()
             if key in self._job_prepare_context_before_enqueue_keys()
         }
-
-    # Note: no local _patch_method helper; if needed, patch methods
-    # directly in _register_hook as shown above.

queue_job/models/queue_job.py

@@ -129,12 +129,10 @@ class QueueJob(models.Model):
 
     def init(self):
         cr = self.env.cr
-        index_1 = "queue_job_identity_key_state_partial_index"
-        index_2 = "queue_job_channel_date_done_date_created_index"
         # Used by Job.job_record_with_same_identity_key
         create_index(
             cr,
-            index_1,
+            "queue_job_identity_key_state_partial_index",
             "queue_job",
             ["identity_key"],
             where=(
@@ -146,25 +144,25 @@ def init(self):
         # Used by <queue.job>.autovacuum
         create_index(
             cr,
-            index_2,
+            "queue_job_channel_date_done_date_created_index",
             "queue_job",
             ["channel", "date_done", "date_created"],
             comment="Queue Job: index to accelerate autovacuum",
         )
 
     @api.depends("dependencies")
     def _compute_dependency_graph(self):
-        uuids = [uuid for uuid in self.mapped("graph_uuid") if uuid]
-        ids_per_graph_uuid = {}
-        if uuids:
-            rows = self.env["queue.job"]._read_group(
-                [("graph_uuid", "in", uuids)],
-                groupby=["graph_uuid"],
-                aggregates=["id:recordset"],
+        graph_uuids = [uuid for uuid in self.mapped("graph_uuid") if uuid]
+        if graph_uuids:
+            ids_per_graph_uuid = dict(
+                self.env["queue.job"]._read_group(
+                    [("graph_uuid", "in", graph_uuids)],
+                    groupby=["graph_uuid"],
+                    aggregates=["id:array_agg"],
+                )
             )
-            # rows -> list of tuples: (graph_uuid, recordset)
-            for graph_uuid, recs in rows:
-                ids_per_graph_uuid[graph_uuid] = recs.ids
+        else:
+            ids_per_graph_uuid = {}
         for record in self:
             if not record.graph_uuid:
                 record.dependency_graph = {}
@@ -224,12 +222,13 @@ def _dependency_graph_vis_node(self):
     def _compute_graph_jobs_count(self):
         graph_uuids = [uuid for uuid in self.mapped("graph_uuid") if uuid]
         if graph_uuids:
-            rows = self.env["queue.job"]._read_group(
-                [("graph_uuid", "in", graph_uuids)],
-                ["graph_uuid"],
-                ["__count"],
+            count_per_graph_uuid = dict(
+                self.env["queue.job"]._read_group(
+                    [("graph_uuid", "in", graph_uuids)],
+                    groupby=["graph_uuid"],
+                    aggregates=["__count"],
+                )
             )
-            count_per_graph_uuid = {graph_uuid: cnt for graph_uuid, cnt in rows}
         else:
             count_per_graph_uuid = {}
         for record in self:

queue_job/tests/common.py

@@ -298,13 +298,14 @@ def _filtered_enqueued_jobs(self, job_method):
 
     def _format_job_call(self, call):
         # Build method argument string (positional and keyword) separately
-        args_str = ", ".join(f"{arg}" for arg in call.args) if call.args else ""
-        kwargs_str = (
-            ", ".join(f"{key}={value}" for key, value in call.kwargs.items())
-            if call.kwargs
-            else ""
-        )
-        method_args = ", ".join(s for s in (args_str, kwargs_str) if s)
+        method_args_parts = []
+        if call.args:
+            method_args_parts.append(", ".join(f"{arg}" for arg in call.args))
+        if call.kwargs:
+            method_args_parts.append(
+                ", ".join(f"{key}={value}" for key, value in call.kwargs.items())
+            )
+        method_args = ", ".join(method_args_parts)
 
         # Build properties string
         props_str = ", ".join(

queue_job/tests/test_json_field.py

@@ -149,7 +149,7 @@ def test_encoder_date(self):
         self.assertEqual(json.loads(value_json), expected)
 
     def test_decoder_date(self):
-        value_json = '["a", 1, {"_type": "date_isoformat","value": "2017-04-19"}]'
+        value_json = '["a", 1, {"_type": "date_isoformat", "value": "2017-04-19"}]'
         expected = ["a", 1, date(2017, 4, 19)]
         value = json.loads(value_json, cls=JobDecoder, env=self.env)
         self.assertEqual(value, expected)

test_queue_job/tests/test_job.py

@@ -36,10 +36,9 @@ class TestJobsOnTestingMethod(JobCommonCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        User = cls.env["res.users"]
         main_company = cls.env.ref("base.main_company")
         group_user = cls.env.ref("base.group_user")
-        cls.demo_user = User.create(
+        cls.demo_user = cls.env["res.users"].create(
             {
                 "name": "Demo User (Queue)",
                 "login": "queue_demo_user_3",
@@ -407,10 +406,9 @@ class TestJobs(JobCommonCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        User = cls.env["res.users"]
         main_company = cls.env.ref("base.main_company")
         group_user = cls.env.ref("base.group_user")
-        cls.demo_user = User.create(
+        cls.demo_user = cls.env["res.users"].create(
             {
                 "name": "Demo User (Queue)",
                 "login": "queue_demo_user_4",