Performance optimization: Added caching (24h loc, 5m weather) and connection pooling

main.py

@@ -11,7 +11,9 @@ from models.weather_models import (
     RequestModel,
 )
 
-app = FastAPI(title="Weatherstack-Compatible API")
+from services.api_client import lifespan
+
+app = FastAPI(title="Weatherstack-Compatible API", lifespan=lifespan)
 
 
 @app.get("/health", include_in_schema=False)

requirements.txt

@@ -8,3 +8,4 @@ timezonefinder
 pytz
 streamlit
 pandas
+async-lru

services/api_client.py

@@ -0,0 +1,20 @@
+from contextlib import asynccontextmanager
+from typing import Optional
+import httpx
+
+_client: Optional[httpx.AsyncClient] = None
+
+
+@asynccontextmanager
+async def lifespan(app):
+    global _client
+    _client = httpx.AsyncClient()
+    yield
+    await _client.aclose()
+
+
+def get_client() -> httpx.AsyncClient:
+    global _client
+    if _client is None:
+        raise RuntimeError("HTTP Client not initialized. Ensure lifespan is used.")
+    return _client

services/location_service.py

@@ -3,11 +3,14 @@ from timezonefinder import TimezoneFinder
 import pytz
 from datetime import datetime
 from typing import Dict, Any, Optional
+from async_lru import alru_cache
+from services.api_client import get_client
 from models.weather_models import LocationModel
 
 tf = TimezoneFinder()
 
 
+@alru_cache(maxsize=1000)
 async def get_location_details(query: str) -> Optional[LocationModel]:
     # Basic Lat/Lon check
     if "," in query:
@@ -22,24 +25,24 @@ async def get_location_details(query: str) -> Optional[LocationModel]:
     url = f"https://nominatim.openstreetmap.org/search?q={query}&format=json&limit=1&addressdetails=1"
     headers = {"User-Agent": "WeatherstackReplacementAPI/1.0"}
 
-    async with httpx.AsyncClient() as client:
-        response = await client.get(url, headers=headers)
-        if response.status_code == 200 and response.json():
-            data = response.json()[0]
-            lat = float(data["lat"])
-            lon = float(data["lon"])
-            address = data.get("address", {})
-
-            return await get_location_from_coords(
-                lat,
-                lon,
-                name=address.get("city")
-                or address.get("town")
-                or address.get("village")
-                or data["display_name"].split(",")[0],
-                country=address.get("country", ""),
-                region=address.get("state") or address.get("region", ""),
-            )
+    client = get_client()
+    response = await client.get(url, headers=headers)
+    if response.status_code == 200 and response.json():
+        data = response.json()[0]
+        lat = float(data["lat"])
+        lon = float(data["lon"])
+        address = data.get("address", {})
+
+        return await get_location_from_coords(
+            lat,
+            lon,
+            name=address.get("city")
+            or address.get("town")
+            or address.get("village")
+            or data["display_name"].split(",")[0],
+            country=address.get("country", ""),
+            region=address.get("state") or address.get("region", ""),
+        )
 
     return None
 
@@ -59,19 +62,19 @@ async def get_location_from_coords(
     if not name:
         url = f"https://nominatim.openstreetmap.org/reverse?lat={lat}&lon={lon}&format=json"
         headers = {"User-Agent": "WeatherstackReplacementAPI/1.0"}
-        async with httpx.AsyncClient() as client:
-            res = await client.get(url, headers=headers)
-            if res.status_code == 200:
-                data = res.json()
-                address = data.get("address", {})
-                name = (
-                    address.get("city")
-                    or address.get("town")
-                    or address.get("village")
-                    or "Unknown"
-                )
-                country = address.get("country", "Unknown")
-                region = address.get("state") or address.get("region", "Unknown")
+        client = get_client()
+        res = await client.get(url, headers=headers)
+        if res.status_code == 200:
+            data = res.json()
+            address = data.get("address", {})
+            name = (
+                address.get("city")
+                or address.get("town")
+                or address.get("village")
+                or "Unknown"
+            )
+            country = address.get("country", "Unknown")
+            region = address.get("state") or address.get("region", "Unknown")
 
     return LocationModel(
         name=name or "Unknown",
@@ -90,36 +93,36 @@ async def get_autocomplete_suggestions(query: str) -> list:
     url = f"https://nominatim.openstreetmap.org/search?q={query}&format=json&limit=10&addressdetails=1"
     headers = {"User-Agent": "WeatherstackReplacementAPI/1.0"}
 
-    async with httpx.AsyncClient() as client:
-        response = await client.get(url, headers=headers)
-        if response.status_code == 200:
-            data = response.json()
-            suggestions = []
-            for item in data:
-                address = item.get("address", {})
-                lat = float(item["lat"])
-                lon = float(item["lon"])
-                timezone_id = tf.timezone_at(lng=lon, lat=lat) or "UTC"
-                tz = pytz.timezone(timezone_id)
-                now = datetime.now(tz)
-                offset_hours = now.utcoffset().total_seconds() / 3600
-
-                from models.weather_models import AutocompleteLocation
-
-                suggestions.append(
-                    AutocompleteLocation(
-                        id=int(item["place_id"]),
-                        name=address.get("city")
-                        or address.get("town")
-                        or address.get("village")
-                        or item["display_name"].split(",")[0],
-                        country=address.get("country", ""),
-                        region=address.get("state") or address.get("region", ""),
-                        lat=str(round(lat, 3)),
-                        lon=str(round(lon, 3)),
-                        timezone_id=timezone_id,
-                        utc_offset=f"{offset_hours:.1f}",
-                    )
+    client = get_client()
+    response = await client.get(url, headers=headers)
+    if response.status_code == 200:
+        data = response.json()
+        suggestions = []
+        for item in data:
+            address = item.get("address", {})
+            lat = float(item["lat"])
+            lon = float(item["lon"])
+            timezone_id = tf.timezone_at(lng=lon, lat=lat) or "UTC"
+            tz = pytz.timezone(timezone_id)
+            now = datetime.now(tz)
+            offset_hours = now.utcoffset().total_seconds() / 3600
+
+            from models.weather_models import AutocompleteLocation
+
+            suggestions.append(
+                AutocompleteLocation(
+                    id=int(item["place_id"]),
+                    name=address.get("city")
+                    or address.get("town")
+                    or address.get("village")
+                    or item["display_name"].split(",")[0],
+                    country=address.get("country", ""),
+                    region=address.get("state") or address.get("region", ""),
+                    lat=str(round(lat, 3)),
+                    lon=str(round(lon, 3)),
+                    timezone_id=timezone_id,
+                    utc_offset=f"{offset_hours:.1f}",
                 )
-            return suggestions
+            )
+        return suggestions
     return []

services/weather_service.py

@@ -2,6 +2,8 @@ import httpx
 import asyncio
 from datetime import datetime
 from typing import Optional, Dict, Any, List
+from async_lru import alru_cache
+from services.api_client import get_client
 from models.weather_models import CurrentWeatherModel, AstroModel, AirQualityModel
 from utils.conversions import (
     convert_temperature,
@@ -37,6 +39,7 @@ WMO_TO_WEATHERSTACK = {
 AIR_QUALITY_URL = "https://air-quality-api.open-meteo.com/v1/air-quality"
 
 
+@alru_cache(maxsize=100, ttl=300)
 async def fetch_current_weather(
     lat: float, lon: float, unit: str = "m"
 ) -> CurrentWeatherModel:
@@ -55,13 +58,15 @@ async def fetch_current_weather(
         "timezone": "auto",
     }
 
-    async with httpx.AsyncClient() as client:
-        weather_res, aq_res = await asyncio.gather(
-            client.get(OPEN_METEO_URL, params=params),
-            client.get(AIR_QUALITY_URL, params=aq_params),
-        )
 
-        if weather_res.status_code == 200:
+    client = get_client()
+
+    weather_res, aq_res = await asyncio.gather(
+        client.get(OPEN_METEO_URL, params=params),
+        client.get(AIR_QUALITY_URL, params=aq_params),
+    )
+
+    if weather_res.status_code == 200:
             data = weather_res.json()
             current = data["current"]
             daily = data.get("daily", {})
@@ -154,6 +159,7 @@ def get_wind_dir(degrees: float) -> str:
     return directions[idx]
 
 
+@alru_cache(maxsize=100, ttl=300)
 async def fetch_weather_forecast(
     lat: float, lon: float, days: int, unit: str = "m"
 ) -> Dict[str, Any]:
@@ -167,9 +173,10 @@ async def fetch_weather_forecast(
         "timezone": "auto",
     }
 
-    async with httpx.AsyncClient() as client:
-        response = await client.get(OPEN_METEO_URL, params=params)
-        if response.status_code == 200:
+
+    client = get_client()
+    response = await client.get(OPEN_METEO_URL, params=params)
+    if response.status_code == 200:
             data = response.json()
             daily = data["daily"]
 
@@ -217,6 +224,7 @@ async def fetch_weather_forecast(
 HISTORICAL_API_URL = "https://archive-api.open-meteo.com/v1/archive"
 
 
+@alru_cache(maxsize=100, ttl=300)
 async def fetch_historical_weather(
     lat: float, lon: float, date: str, unit: str = "m"
 ) -> Dict[str, Any]:
@@ -231,9 +239,10 @@ async def fetch_historical_weather(
         "timezone": "auto",
     }
 
-    async with httpx.AsyncClient() as client:
-        response = await client.get(HISTORICAL_API_URL, params=params)
-        if response.status_code == 200:
+
+    client = get_client()
+    response = await client.get(HISTORICAL_API_URL, params=params)
+    if response.status_code == 200:
             data = response.json()
             daily = data["daily"]