[FIX] queue job pass stored context

Author: KKamaa

base_import_async/models/base_import_import.py

@@ -169,7 +169,7 @@ def _split_file(self, model_name, translated_model_name,
                 fields, data[row_from:row_to + 1], options,
                 file_name=root + '-' + chunk + ext)
             delayed_job = self.with_context(
-                job_batch=batch).with_delay(
+                job_batch=batch.id).with_delay(
                 description=description,
                 priority=priority,
                 keep_context=True

queue_job/job.py

@@ -5,6 +5,8 @@
 import functools
 import hashlib
 import logging
+import json
+import yaml
 import uuid
 import sys
 from datetime import datetime, timedelta
@@ -301,6 +303,7 @@ def _load_from_db_record(cls, job_db_record):
         if stored.company_id:
             job_.company_id = stored.company_id.id
         job_.identity_key = stored.identity_key
+        job_.keep_context = stored.context or {}
         return job_
 
     def job_record_with_same_identity_key(self):
@@ -355,6 +358,15 @@ def enqueue(cls, func, args=None, kwargs=None,
     def db_record_from_uuid(env, job_uuid):
         model = env['queue.job'].sudo()
         record = model.search([('uuid', '=', job_uuid)], limit=1)
+        if record.context:
+            try:
+                ctx = json.loads(record.context)
+            except Exception as e:
+                _logger.error('\n\nERROR Due to JSON CONVERSION: %s\n\n' % e)
+                return record.with_env(env)
+            else:
+                _logger.info("\n\nCONTEXT: %s\n\n" % ctx)
+                return record.with_context(ctx).with_env(env)
         return record.with_env(env)
 
     def __init__(self, func,
@@ -510,8 +522,11 @@ def store(self):
                 }
 
         dt_to_string = odoo.fields.Datetime.to_string
+        context = {}
         if self.keep_context:
-            vals.update({"context": str(self.env.context.copy())})
+            context = self.env.context.copy()
+            vals.update({"context": json.dumps(context)})
+            _logger.info("\n\nCURRENT CONTEXT: %s\n\n" % context)
         if self.date_enqueued:
             vals['date_enqueued'] = dt_to_string(self.date_enqueued)
         if self.date_started:
@@ -539,17 +554,13 @@ def store(self):
                          'args': self.args,
                          'kwargs': self.kwargs,
                          })
-            # By default the context is completely reset
-            # (compatibility with previous version).
-            context = {}
-            if self.keep_context:
-                context = self.env.context.copy()
             # it the channel is not specified, lets the job_model compute
             # the right one to use
             if self.channel:
                 vals.update({'channel': self.channel})
 
-            self.env[self.job_model_name].sudo().create(vals)
+            job = self.env[self.job_model_name].sudo().create(vals)
+            _logger.info('\n\nJOB: %s CONTEXT: %s' % (job, context))
 
     def db_record(self):
         return self.db_record_from_uuid(self.env, self.uuid)
@@ -564,9 +575,9 @@ def _get_record_context(self):
             company_ids = [self.company_id]
         context_txt = self.db_record().context or {}
         if isinstance(context_txt, str):
-            context = safe_eval(context_txt)
+            context = json.loads(context_txt)
         else:
-            context = context_txt
+            context = json.loads(context_txt)
         context.update(
             {"job_uuid": self.uuid, "allowed_company_ids": company_ids})
         return context

test_queue_job_batch/tests/test_queue_job_batch.py

@@ -8,7 +8,7 @@ def test_batch(self):
         batch = self.env['queue.job.batch'].get_new_batch('TEST')
         self.assertFalse(batch.job_ids)
         model = self.env['test.queue.job'].with_context(
-            job_batch=batch
+            job_batch=batch.id
         )
         job_1 = model.with_delay().testing_method()
         self.assertEqual(job_1.db_record().state, 'pending')