fix(octopus): log the full request once when a token retry also fails

A retry only follows a failure, and that failure has just logged the request
in full. The retry's gate rightly logs the request briefly, pointing at that
line, but its own 401/403 then logged the full request a second time. Skip the
beside-failure re-log on a retry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: chalfontchubby

apps/predbat/octopus.py

@@ -2334,8 +2334,10 @@ async def async_graphql_query(self, query, request_context, returns_data=True, i
         request_logged = [True, None]
 
         def log_request_beside_failure():
-            """Log the full request beside a failure when it was only logged briefly ("as logged in full at ...")."""
-            if not request_logged[0] and request_logged[1]:
+            """Log the full request beside a failure when it was only logged briefly ("as logged in full at ...").
+
+            Not on a retry: only a failure causes one, and that failure has just logged the request in full."""
+            if not request_logged[0] and request_logged[1] and _retry_count == 0:
                 # Through the gate, so it records this full log: later brief lines name this time, and the hourly re-log counts from it
                 self.log_gate.log(self.log, ("request", request_context), query, [request_logged[1]], None, always_full=True)
                 request_logged[0] = True

apps/predbat/tests/test_octopus_waf_block.py

@@ -200,6 +200,13 @@ async def counting_read(resp, url, ignore_errors=False):
         failed = True
     else:
         print("PASS: first-attempt 401 response body logged once")
+    # The retry's own 401 must not log the full request again: the first attempt has just logged it in full
+    full_requests = [line for line in lines6b if line.startswith("OctopusAPI: Making GraphQL request to ")]
+    if len(full_requests) != 1:
+        print("ERROR: a 401 then a failed retry should log the full request once, got {}".format(full_requests))
+        failed = True
+    else:
+        print("PASS: full request logged once across a failed retry")
 
     if failed:
         print("**** Octopus WAF/CloudFront 403 tests FAILED ****")