update simulator resilience

Author: felixevers

simulator/authentication.py

@@ -129,10 +129,11 @@ def login(self) -> str:
         if CLIENT_SECRET:
             data["client_secret"] = CLIENT_SECRET
 
-        max_retries = 5
-        retry_delay = 2
+        retry_delay = 3
+        attempt = 0
 
-        for attempt in range(max_retries):
+        while True:
+            attempt += 1
             try:
                 response = self.session.post(token_url, data=data, timeout=10)
 
@@ -142,13 +143,12 @@ def login(self) -> str:
                     return token_data["access_token"]
 
                 if response.status_code == 503 or response.status_code == 502:
-                    if attempt < max_retries - 1:
-                        logger.warning(
-                            f"Keycloak not ready (HTTP {response.status_code}). "
-                            f"Retrying in {retry_delay} seconds... (attempt {attempt + 1}/{max_retries})",
-                        )
-                        time.sleep(retry_delay)
-                        continue
+                    logger.warning(
+                        f"Keycloak not ready (HTTP {response.status_code}). "
+                        f"Retrying in {retry_delay} seconds... (attempt {attempt})",
+                    )
+                    time.sleep(retry_delay)
+                    continue
 
                 try:
                     error_data = response.json()
@@ -161,19 +161,16 @@ def login(self) -> str:
                         f"HTTP {response.status_code}: {response.text[:100]}"
                     )
 
-                raise Exception(
+                logger.warning(
                     f"Authentication failed: {error_msg}. "
-                    f"Make sure the client '{CLIENT_ID}' has 'Direct Access Grants' enabled in Keycloak "
-                    f"and that USERNAME/PASSWORD are correct.",
+                    f"Retrying in {retry_delay} seconds... (attempt {attempt})",
                 )
+                time.sleep(retry_delay)
+                continue
             except requests.exceptions.RequestException as e:
-                if attempt < max_retries - 1:
-                    logger.warning(
-                        f"Connection error during authentication: {e}. "
-                        f"Retrying in {retry_delay} seconds... (attempt {attempt + 1}/{max_retries})",
-                    )
-                    time.sleep(retry_delay)
-                    continue
-                raise
-
-        raise Exception("Authentication failed after multiple retries")
+                logger.warning(
+                    f"Connection error during authentication: {e}. "
+                    f"Retrying in {retry_delay} seconds... (attempt {attempt})",
+                )
+                time.sleep(retry_delay)
+                continue

simulator/graphql_client.py

@@ -13,6 +13,21 @@ def __init__(self):
         else:
             self.authenticator = InteractiveAuthenticator(self.session)
 
+    def _is_authentication_error(self, response: requests.Response) -> bool:
+        if response.status_code == 401:
+            return True
+        if response.status_code == 400:
+            try:
+                error_data = response.json()
+                if "errors" in error_data:
+                    for error in error_data["errors"]:
+                        message = error.get("message", "").lower()
+                        if "unauthenticated" in message or "not authenticated" in message:
+                            return True
+            except Exception:
+                pass
+        return False
+
     def query(self, query: str, variables: dict = None) -> dict:
         if not self.token:
             self.token = self.authenticator.login()
@@ -31,9 +46,9 @@ def query(self, query: str, variables: dict = None) -> dict:
                 headers=headers,
             )
 
-            if response.status_code == 401:
+            if self._is_authentication_error(response):
                 logger.warning(
-                    "Token expired (401). Initiating re-authentication...",
+                    "Authentication error detected. Re-authenticating...",
                 )
                 self.token = self.authenticator.login()
                 headers["Authorization"] = f"Bearer {self.token}"