From 563255202d0a633f82456e4b6e1f8a272a0e3cb7 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 3 Sep 2025 09:43:08 +0200 Subject: [PATCH] read request_timeout configuration only once --- src/nominatim_api/core.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/nominatim_api/core.py b/src/nominatim_api/core.py index f8941bcc..f699a519 100644 --- a/src/nominatim_api/core.py +++ b/src/nominatim_api/core.py @@ -62,6 +62,8 @@ class NominatimAPIAsync: self.config = Configuration(project_dir, environ) self.query_timeout = self.config.get_int('QUERY_TIMEOUT') \ if self.config.QUERY_TIMEOUT else None + self.request_timeout = self.config.get_int('REQUEST_TIMEOUT') \ + if self.config.REQUEST_TIMEOUT else None self.reverse_restrict_to_country_area = self.config.get_bool('SEARCH_WITHIN_COUNTRIES') self.server_version = 0 @@ -252,8 +254,7 @@ class NominatimAPIAsync: async with self.begin() as conn: conn.set_query_timeout(self.query_timeout) geocoder = nsearch.ForwardGeocoder(conn, ntyp.SearchDetails.from_kwargs(params), - self.config.get_int('REQUEST_TIMEOUT') - if self.config.REQUEST_TIMEOUT else None) + self.request_timeout) phrases = [nsearch.Phrase(nsearch.PHRASE_ANY, p.strip()) for p in query.split(',')] return await geocoder.lookup(phrases) @@ -309,9 +310,7 @@ class NominatimAPIAsync: if amenity: details.layers |= ntyp.DataLayer.POI - geocoder = nsearch.ForwardGeocoder(conn, details, - self.config.get_int('REQUEST_TIMEOUT') - if self.config.REQUEST_TIMEOUT else None) + geocoder = nsearch.ForwardGeocoder(conn, details, self.request_timeout) return await geocoder.lookup(phrases) async def search_category(self, categories: List[Tuple[str, str]], @@ -334,9 +333,7 @@ class NominatimAPIAsync: if details.keywords: await nsearch.make_query_analyzer(conn) - geocoder = nsearch.ForwardGeocoder(conn, details, - self.config.get_int('REQUEST_TIMEOUT') - if self.config.REQUEST_TIMEOUT else None) + geocoder = nsearch.ForwardGeocoder(conn, details, self.request_timeout) return await geocoder.lookup_pois(categories, phrases) -- 2.39.5