Store postlogistic token in carrier to avoid renew it for each jobs

Author: Hadrien Huvelle

delivery_carrier_label_batch/data/queue.job.function.xml

@@ -1,7 +1,7 @@
 <odoo>
     <record id="job_delivery_carrier_batch_send_to_shipper" model="queue.job.function">
         <field name="model_id" ref="model_stock_picking" />
-        <field name="method">send_to_shipper</field>
+        <field name="method">model_delivery_carrier_label_generate</field>
         <field name="channel_id" ref="channel_delivery_carrier_batch" />
     </record>
     <record

delivery_carrier_label_batch/wizard/generate_labels.py

@@ -4,11 +4,14 @@
 import logging
 from itertools import groupby
 
+from psycopg2 import OperationalError
+
 from odoo import api, exceptions, fields, models
 from odoo.tools.safe_eval import safe_eval
 
 from odoo.addons.queue_job.delay import chain
 from odoo.addons.queue_job.delay import group as job_group
+from odoo.addons.queue_job.exception import RetryableJobError
 
 from ..pdf_utils import assemble_pdf
 from ..zpl_utils import assemble_zpl2, assemble_zpl2_single_images
@@ -72,10 +75,23 @@ def _do_generate_labels(self, group):
         jobs = []
         for pack, picking, _label in group:
             _logger.debug("Generating label for pack %s", pack.name)
-            job = picking.delayable().send_to_shipper()
+            job = self.delayable().retriable_send_to_shipper(picking)
             jobs.append(job)
         return jobs
 
+    def retriable_send_to_shipper(self, picking):
+        """Wrapper to call send_to_shipper in a retriable way"""
+        self.ensure_one()
+        try:
+            picking.send_to_shipper()
+        except OperationalError as oe:
+            _logger.error("Error sending to shipper: %s", oe.diag)
+            raise RetryableJobError(
+                oe.diag,
+                seconds=3,
+                # ignore_retry=True,
+            ) from oe
+
     def _generate_all_labels(self, batch):
         self.ensure_one()
 

delivery_postlogistics/models/delivery_carrier.py

@@ -30,6 +30,12 @@ class DeliveryCarrier(models.Model):
     postlogistics_client_secret = fields.Char(
         string="Client Secret", groups="base.group_system"
     )
+
+    postlogistics_token = fields.Char(string="Access Token", groups="base.group_system")
+    postlogistics_token_expiry = fields.Datetime(
+        string="Access Token Expiry", groups="base.group_system"
+    )
+
     postlogistics_logo = fields.Binary(
         string="Company Logo on Post labels",
         help="Optional company logo to show on label.\n"

delivery_postlogistics/postlogistics/web_service.py

@@ -60,8 +60,6 @@ class PostlogisticsWebService:
 
     """
 
-    access_token = False
-    access_token_expiry = False
     _lock = threading.Lock()
 
     def __init__(self, company):
@@ -267,6 +265,15 @@ def _request_access_token(cls, delivery_carrier):
                 )
             )
 
+        sql = (
+            f"SELECT id FROM {delivery_carrier._table} WHERE ID = %s FOR UPDATE NOWAIT"
+        )
+
+        # this may raise an OperationalError if the lock cannot be acquired
+        delivery_carrier.env.cr.execute(
+            sql, (delivery_carrier.id,), log_exceptions=False
+        )
+
         response = requests.post(
             url=authentication_url,
             headers={"content-type": "application/x-www-form-urlencoded"},
@@ -299,19 +306,30 @@ def _request_access_token(cls, delivery_carrier):
     @classmethod
     def get_access_token(cls, picking_carrier):
         """Threadsafe access to token"""
+
         with cls._lock:
             now = datetime.now()
 
-            if cls.access_token:
+            # ensure token exists and is not expired
+            if (
+                picking_carrier.postlogistics_token
+                and picking_carrier.postlogistics_token_expiry
+            ):
                 # keep a safe margin on the expiration
-                expiry = cls.access_token_expiry - timedelta(seconds=5)
+                expiry = picking_carrier.postlogistics_token_expiry - timedelta(
+                    seconds=5
+                )
                 if now < expiry:
-                    return cls.access_token
+                    return picking_carrier.postlogistics_token
 
+            # obtain a new token if needed
             response = cls._request_access_token(picking_carrier)
-            cls.access_token = response.get("access_token", False)
+            picking_carrier.postlogistics_token = response.get("access_token", False)
+            picking_carrier.postlogistics_token_expiry = now + timedelta(
+                seconds=response["expires_in"]
+            )
 
-            if not (cls.access_token):
+            if not (picking_carrier.postlogistics_token):
                 raise UserError(
                     picking_carrier.env._(
                         "Authorization Required\n\n"
@@ -321,8 +339,10 @@ def get_access_token(cls, picking_carrier):
                     )
                 )
 
-            cls.access_token_expiry = now + timedelta(seconds=response["expires_in"])
-            return cls.access_token
+            picking_carrier.postlogistics_token_expiry = now + timedelta(
+                seconds=response["expires_in"]
+            )
+            return picking_carrier.postlogistics_token
 
     def generate_label(self, picking, packages):
         """Generate a label for a picking