fix: pass forecast raw_data to service for parsing

Qdrant client was extracting 'days' (int) instead of 'daily' (list)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

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

CHANGELOG.md

@@ -5,6 +5,50 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.10.12] - 2026-01-08
+
+### Fixed
+
+- **Forecast data retrieval** - Pass raw_data to service instead of extracting wrong field
+  - Qdrant client was extracting `days` (integer 7) instead of `daily` (list)
+  - Now passes full raw_data for service to parse correctly
+
+## [1.10.11] - 2026-01-08
+
+### Fixed
+
+- **Weather wind direction** - Convert integer degrees to cardinal direction string
+  - Scheduler stores wind_direction as degrees (e.g., 135)
+  - Schema expects string (e.g., "SE")
+  - Added `_degrees_to_cardinal()` conversion
+
+## [1.10.10] - 2026-01-08
+
+### Fixed
+
+- **Environment data parsing** - Fix parsing of scheduler-generated Qdrant data
+  - Forecast: Check `daily` key first (scheduler stores day count in `days`, list in `daily`)
+  - Sun times: Use `sunrise_iso`/`sunset_iso` fields, handle time-only format fallback
+  - Sun times: Calculate daylight from `daylight_duration_seconds` or `daylight_hours`
+  - Air quality: Support `aqi_us`/`aqi_european` and `nitrogen_dioxide` field names
+
+## [1.10.9] - 2026-01-08
+
+### Fixed
+
+- **Environment user ID cleanup** - Strip email domain from user identifier
+  - If `preferred_username` is an email, extract just the username part
+  - Ensures Qdrant collection name matches (e.g., `volatile_jpmschweitzer` not `volatile_jpmschweitzer@gmail.com`)
+
+## [1.10.8] - 2026-01-08
+
+### Fixed
+
+- **OIDC audience validation** - python-jose requires string audience, not list
+  - Extract and validate audience from unverified claims first
+  - Use token's actual audience for JWT decode (after validating it's allowed)
+  - Fixes "audience must be a string or None" error
+
 ## [1.10.7] - 2026-01-08
 
 ### Added

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "core-api"
-version = "1.10.7"
+version = "1.10.12"
 description = "Core Code API - Infrastructure management and tools API"
 readme = "README.md"
 requires-python = ">=3.12"

src/auth/oidc.py

@@ -131,15 +131,21 @@ async def get_current_user(
     token = credentials.credentials
 
     try:
-        # First, extract issuer from unverified claims to know which JWKS to use
+        # First, extract issuer and audience from unverified claims
         unverified_claims = jwt.get_unverified_claims(token)
         token_issuer = unverified_claims.get("iss", "")
+        token_audience = unverified_claims.get("aud", "")
 
         # Validate issuer is in our allowed list
         if not oidc_config.is_valid_issuer(token_issuer):
             logger.warning(f"Invalid token issuer: {token_issuer}")
             raise HTTPException(status_code=401, detail="Invalid token issuer")
 
+        # Validate audience is in our allowed list
+        if token_audience not in oidc_config.audiences:
+            logger.warning(f"Invalid token audience: {token_audience}")
+            raise HTTPException(status_code=401, detail="Invalid token audience")
+
         # Decode token header to get key ID
         unverified_header = jwt.get_unverified_header(token)
         kid = unverified_header.get("kid")
@@ -160,18 +166,17 @@ async def get_current_user(
             logger.warning(f"No matching key found for kid: {kid}")
             raise HTTPException(status_code=401, detail="Invalid token key")
 
-        # Verify and decode token (accepts any of the configured audiences)
-        # Use the token's issuer for validation (already verified it's in our allowed list)
+        # Verify and decode token using the token's actual issuer and audience
         payload = jwt.decode(
             token,
             rsa_key,
             algorithms=["RS256"],
-            audience=oidc_config.audiences,
-            issuer=token_issuer,
+            audience=token_audience,  # Use the token's audience (already validated)
+            issuer=token_issuer,  # Use the token's issuer (already validated)
         )
 
         user_email = payload.get("email", "unknown")
-        logger.info(f"Authenticated user: {user_email}")
+        logger.info(f"Authenticated user: {user_email} (issuer: {token_issuer})")
 
         return payload
 

src/domains/auth/oidc.py

@@ -185,15 +185,22 @@ async def get_current_user(
 
         kid = unverified_header.get("kid")
         token_issuer = unverified_claims.get("iss", "")
+        token_audience = unverified_claims.get("aud", "")
 
         if not kid:
             raise HTTPException(status_code=401, detail="Invalid token format")
 
         # Validate issuer is in allowed list
+        logger.debug(f"Token issuer: {token_issuer}, allowed issuers: {oidc_config.issuers}")
         if not oidc_config.is_valid_issuer(token_issuer):
-            logger.warning(f"Invalid token issuer: {token_issuer}")
+            logger.warning(f"Invalid token issuer: {token_issuer} (allowed: {oidc_config.issuers})")
             raise HTTPException(status_code=401, detail="Invalid token issuer")
 
+        # Validate audience is in allowed list
+        if token_audience not in oidc_config.audiences:
+            logger.warning(f"Invalid token audience: {token_audience} (allowed: {oidc_config.audiences})")
+            raise HTTPException(status_code=401, detail="Invalid token audience")
+
         # Get JWKS for this specific issuer
         jwks = get_jwks_for_issuer(token_issuer)
         rsa_key = None
@@ -207,13 +214,13 @@ async def get_current_user(
             logger.warning(f"No matching key found for kid: {kid}")
             raise HTTPException(status_code=401, detail="Invalid token key")
 
-        # Verify and decode token using the token's actual issuer
+        # Verify and decode token using the token's actual issuer and audience
         payload = jwt.decode(
             token,
             rsa_key,
             algorithms=["RS256"],
-            audience=oidc_config.audiences,
-            issuer=token_issuer,  # Use the token's issuer for validation
+            audience=token_audience,  # Use the token's audience (already validated)
+            issuer=token_issuer,  # Use the token's issuer (already validated)
         )
 
         user_email = payload.get("email", "unknown")
@@ -315,12 +322,14 @@ async def get_optional_user(
         }
 
     if not credentials:
+        logger.debug("No credentials provided for optional auth")
         return None
 
     try:
         return await get_current_user(credentials)
-    except HTTPException:
-        # Invalid token - return None instead of raising
+    except HTTPException as e:
+        # Invalid token - log and return None instead of raising
+        logger.warning(f"Optional auth failed: {e.detail}")
         return None
 
 

src/domains/tools/controller.py

@@ -198,6 +198,9 @@ class ToolsController(BaseController):
                 user_id = "default"
                 if user:
                     user_id = user.get("preferred_username") or user.get("sub", "default")
+                    # Strip email domain if present (e.g., "user@example.com" -> "user")
+                    if "@" in user_id:
+                        user_id = user_id.split("@")[0]
 
                 logger.info(f"Fetching environment data for user: {user_id}")
                 result = await self.environment_service.get_current(user_id)

src/domains/tools/environment/service.py

@@ -43,13 +43,18 @@ class EnvironmentService:
             return None
 
         try:
+            # Handle wind direction - convert degrees to cardinal if integer
+            wind_dir = raw_data.get("wind_direction") or raw_data.get("wind_dir")
+            if isinstance(wind_dir, (int, float)):
+                wind_dir = self._degrees_to_cardinal(wind_dir)
+
             return WeatherData(
                 temperature=raw_data.get("temperature") or raw_data.get("temp"),
                 feels_like=raw_data.get("feels_like") or raw_data.get("feelslike"),
                 conditions=raw_data.get("conditions") or raw_data.get("weather") or raw_data.get("description"),
                 humidity=raw_data.get("humidity"),
                 wind_speed=raw_data.get("wind_speed") or raw_data.get("windspeed") or raw_data.get("wind"),
-                wind_direction=raw_data.get("wind_direction") or raw_data.get("wind_dir"),
+                wind_direction=wind_dir,
                 pressure=raw_data.get("pressure"),
                 visibility=raw_data.get("visibility"),
                 uv_index=raw_data.get("uv_index") or raw_data.get("uv"),
@@ -60,6 +65,13 @@ class EnvironmentService:
             logger.warning(f"Failed to parse weather data: {e}")
             return None
 
+    def _degrees_to_cardinal(self, degrees: float) -> str:
+        """Convert wind direction degrees to cardinal direction."""
+        directions = ["N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE",
+                      "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"]
+        index = round(degrees / 22.5) % 16
+        return directions[index]
+
     def _parse_forecast(self, raw_data: Any) -> Optional[List[ForecastDay]]:
         """
         Parse raw forecast data into list of ForecastDay schemas.
@@ -73,7 +85,15 @@ class EnvironmentService:
             # Normalize to list
             forecast_list = raw_data
             if isinstance(raw_data, dict):
-                forecast_list = raw_data.get("days") or raw_data.get("forecast") or []
+                # Check 'daily' first (scheduler format), then 'forecast', then 'days'
+                # Note: 'days' might be an integer count, so check 'daily' first
+                forecast_list = raw_data.get("daily") or raw_data.get("forecast")
+                if forecast_list is None:
+                    days_value = raw_data.get("days")
+                    if isinstance(days_value, list):
+                        forecast_list = days_value
+                    else:
+                        forecast_list = []
 
             if not isinstance(forecast_list, list):
                 return None
@@ -83,8 +103,8 @@ class EnvironmentService:
                 if isinstance(day, dict):
                     days.append(ForecastDay(
                         date=day.get("date", ""),
-                        high=day.get("high") or day.get("maxtemp") or day.get("temp_max"),
-                        low=day.get("low") or day.get("mintemp") or day.get("temp_min"),
+                        high=day.get("high") or day.get("temp_high") or day.get("maxtemp") or day.get("temp_max"),
+                        low=day.get("low") or day.get("temp_low") or day.get("mintemp") or day.get("temp_min"),
                         conditions=day.get("conditions") or day.get("weather") or day.get("description"),
                         precipitation_chance=day.get("precipitation_chance") or day.get("pop") or day.get("precip"),
                         icon=day.get("icon"),
@@ -106,19 +126,39 @@ class EnvironmentService:
             return None
 
         try:
-            sunrise = raw_data.get("sunrise")
-            sunset = raw_data.get("sunset")
+            # Prefer ISO format fields (sunrise_iso, sunset_iso) over time-only fields
+            sunrise = raw_data.get("sunrise_iso") or raw_data.get("sunrise")
+            sunset = raw_data.get("sunset_iso") or raw_data.get("sunset")
 
             # Parse datetime strings if needed
             if isinstance(sunrise, str):
-                sunrise = datetime.fromisoformat(sunrise.replace("Z", "+00:00"))
+                # Handle time-only format (HH:MM) by combining with today's date
+                if len(sunrise) <= 5 and ":" in sunrise:
+                    today = datetime.now().date()
+                    sunrise = datetime.strptime(f"{today} {sunrise}", "%Y-%m-%d %H:%M")
+                else:
+                    sunrise = datetime.fromisoformat(sunrise.replace("Z", "+00:00"))
             if isinstance(sunset, str):
-                sunset = datetime.fromisoformat(sunset.replace("Z", "+00:00"))
+                # Handle time-only format (HH:MM) by combining with today's date
+                if len(sunset) <= 5 and ":" in sunset:
+                    today = datetime.now().date()
+                    sunset = datetime.strptime(f"{today} {sunset}", "%Y-%m-%d %H:%M")
+                else:
+                    sunset = datetime.fromisoformat(sunset.replace("Z", "+00:00"))
 
-            # Calculate daylight minutes if not provided
+            # Get daylight from various field names
             daylight_minutes = raw_data.get("daylight_minutes") or raw_data.get("daylight")
-            if daylight_minutes is None and sunrise and sunset:
-                daylight_minutes = int((sunset - sunrise).total_seconds() / 60)
+            if daylight_minutes is None:
+                # Try to calculate from daylight_duration_seconds or daylight_hours
+                daylight_seconds = raw_data.get("daylight_duration_seconds")
+                if daylight_seconds:
+                    daylight_minutes = int(daylight_seconds / 60)
+                else:
+                    daylight_hours = raw_data.get("daylight_hours")
+                    if daylight_hours:
+                        daylight_minutes = int(daylight_hours * 60)
+                    elif sunrise and sunset:
+                        daylight_minutes = int((sunset - sunrise).total_seconds() / 60)
 
             # Parse optional fields
             solar_noon = raw_data.get("solar_noon")
@@ -167,7 +207,8 @@ class EnvironmentService:
             if not isinstance(raw_data, dict):
                 return None
 
-            aqi = raw_data.get("aqi") or raw_data.get("index")
+            # Try various AQI field names - prefer US AQI, then European, then generic
+            aqi = raw_data.get("aqi") or raw_data.get("aqi_us") or raw_data.get("aqi_european") or raw_data.get("index")
             if isinstance(aqi, (int, float)):
                 aqi = int(aqi)
 
@@ -177,7 +218,7 @@ class EnvironmentService:
                 pm25=raw_data.get("pm25") or raw_data.get("pm2_5"),
                 pm10=raw_data.get("pm10"),
                 o3=raw_data.get("o3") or raw_data.get("ozone"),
-                no2=raw_data.get("no2"),
+                no2=raw_data.get("no2") or raw_data.get("nitrogen_dioxide"),
                 location=raw_data.get("location"),
             )
 

src/shared/clients/qdrant_client.py

@@ -190,19 +190,10 @@ class QdrantReadClient:
                 if aqi:
                     result["air_quality"] = aqi if isinstance(aqi, dict) else {"aqi": aqi}
 
-        # Fetch forecast data
+        # Fetch forecast data - pass raw_data to service for parsing
         forecast_records = await self.get_by_namespace(user, "forecast")
         if forecast_records:
-            # Forecast might be a single record with list or multiple records
-            first_record = forecast_records[0].get("raw_data")
-            if isinstance(first_record, list):
-                result["forecast"] = first_record
-            elif isinstance(first_record, dict):
-                # Could be a dict with 'days' or 'forecast' key
-                result["forecast"] = first_record.get(
-                    "days",
-                    first_record.get("forecast", [first_record])
-                )
+            result["forecast"] = forecast_records[0].get("raw_data")
 
         # Fetch sun times data
         sun_records = await self.get_by_namespace(user, "sun")