fix: make LinkedEvents API timeout configurable

The hardcoded 20-second timeout was causing ReadTimeout errors
when the external LinkedEvents API experienced high load or
network latency.

Changes:
- Add LINKED_EVENTS_API_TIMEOUT env variable (default: 60s)
- Read timeout from config in LinkedEventsApiClient
- Remove hardcoded CONNECTION_TIMEOUT constant

Resolves Sentry issue 89742127.

Refs: PT-1992

Author: mhieta

graphene_linked_events/rest_client.py

@@ -2,12 +2,11 @@
 
 
 class LinkedEventsApiClient(object):
-    CONNECTION_TIMEOUT = 20
-
     def __init__(self, config) -> None:
         self.root = config["ROOT"]
         self.api_key = config["API_KEY"]
         self.data_source = config["DATA_SOURCE"]
+        self.timeout = config.get("TIMEOUT", 60)
         super().__init__()
 
     def get_actions(self, resource=None):
@@ -34,13 +33,13 @@ def retrieve(self, resource, id, params=None, is_event_staff=False):
                 params=formatted_params,
                 headers=headers,
                 cookies=cookies,
-                timeout=self.CONNECTION_TIMEOUT,
+                timeout=self.timeout,
             )
         return requests.request(
             actions["retrieve"]["method"],
             actions["retrieve"]["url"].format(id),
             params=formatted_params,
-            timeout=self.CONNECTION_TIMEOUT,
+            timeout=self.timeout,
         )
 
     def list(self, resource, filter_list=None, is_event_staff=False):
@@ -61,13 +60,13 @@ def list(self, resource, filter_list=None, is_event_staff=False):
                 params=filter_params,
                 headers=headers,
                 cookies=cookies,
-                timeout=self.CONNECTION_TIMEOUT,
+                timeout=self.timeout,
             )
         return requests.request(
             actions["list"]["method"],
             actions["list"]["url"],
             params=filter_params,
-            timeout=self.CONNECTION_TIMEOUT,
+            timeout=self.timeout,
         )
 
     def create(self, resource, body):
@@ -78,7 +77,7 @@ def create(self, resource, body):
             actions["create"]["url"],
             data=body,
             headers=headers,
-            timeout=self.CONNECTION_TIMEOUT,
+            timeout=self.timeout,
         )
 
     def update(self, resource, id, body):
@@ -89,7 +88,7 @@ def update(self, resource, id, body):
             actions["update"]["url"].format(id),
             data=body,
             headers=headers,
-            timeout=self.CONNECTION_TIMEOUT,
+            timeout=self.timeout,
         )
 
     def delete(self, resource, id):
@@ -99,7 +98,7 @@ def delete(self, resource, id):
             actions["delete"]["method"],
             actions["delete"]["url"].format(id),
             headers=headers,
-            timeout=self.CONNECTION_TIMEOUT,
+            timeout=self.timeout,
         )
 
     # Special action to full-text search generic resources
@@ -110,7 +109,7 @@ def search(self, params):
             action["method"],
             action["url"],
             params=search_params,
-            timeout=self.CONNECTION_TIMEOUT,
+            timeout=self.timeout,
         )
         return response
 
@@ -123,7 +122,7 @@ def upload(self, resource, body, files):
             data=body,
             files=files,
             headers=headers,
-            timeout=self.CONNECTION_TIMEOUT,
+            timeout=self.timeout,
         )
 
     @staticmethod

palvelutarjotin/settings.py

@@ -68,6 +68,7 @@
     ENABLE_GRAPHIQL=(bool, False),
     LINKED_EVENTS_API_ROOT=(str, "https://api.hel.fi/linkedevents/v1/"),
     LINKED_EVENTS_API_KEY=(str, ""),
+    LINKED_EVENTS_API_TIMEOUT=(int, 60),
     LINKED_EVENTS_DATA_SOURCE=(str, "palvelutarjotin"),
     SERVICEMAP_API_ROOT=(str, "https://www.hel.fi/palvelukarttaws/rest/v4/unit/"),
     NOTIFICATION_SERVICE_SMS_ENABLED=(bool, True),
@@ -432,6 +433,7 @@ def sentry_traces_sampler(sampling_context: SamplingContext) -> float:
     "ROOT": env.str("LINKED_EVENTS_API_ROOT"),
     "API_KEY": env.str("LINKED_EVENTS_API_KEY"),
     "DATA_SOURCE": env.str("LINKED_EVENTS_DATA_SOURCE"),
+    "TIMEOUT": env.int("LINKED_EVENTS_API_TIMEOUT"),
 }
 
 SERVICEMAP_API_CONFIG = {"ROOT": env.str("SERVICEMAP_API_ROOT")}