AAASSs

backend/app/services/voice_assistant_service.py

@@ -99,8 +99,8 @@ def _build_weather_context(forecast_data: Dict[str, Any], time_ref: Optional[str
     return "\n".join(lines)
 
 
-def _build_apmc_context(prices_data: Dict[str, Any]) -> str:
-    """Build APMC price context string from API response."""
+def _build_mandi_context(prices_data: Dict[str, Any]) -> str:
+    """Build mandi/APMC price context string from API response."""
     records = prices_data.get("records", [])
     if not records:
         return "No price data available."
@@ -127,7 +127,7 @@ def _detect_intent(message: str) -> str:
         "tomorrow", "today", "next week", "this week",
         "मौसम", "बारिश", "तापमान", "कल", "आज",
     ]
-    apmc_keywords = [
+    mandi_keywords = [
         "price", "mandi", "apmc", "market", "cost", "rate", "sell",
         "भाव", "मंडी", "दाम", "कीमत", "बेच",
     ]
@@ -138,14 +138,60 @@ def _detect_intent(message: str) -> str:
 
     if any(kw in lower for kw in weather_keywords):
         return "weather"
-    if any(kw in lower for kw in apmc_keywords):
-        return "apmc"
+    if any(kw in lower for kw in mandi_keywords):
+        return "mandi"
     if any(kw in lower for kw in disease_keywords):
         return "disease"
 
     return "general"
 
 
+# Commodity names the system can extract from voice queries
+_COMMODITY_NAMES = [
+    "wheat", "paddy", "rice", "cotton", "sugarcane", "tomato", "potato",
+    "onion", "chilli", "maize", "corn", "pulses", "oilseeds", "millets",
+    "groundnut", "cumin", "soybean", "mustard", "bajra", "jowar", "ragi",
+    "barley", "gram", "tur", "moong", "urad", "masoor", "arhar",
+]
+
+_COMMODITY_HI_MAP = {
+    "गेहूं": "Wheat",
+    "धान": "Paddy",
+    "चावल": "Paddy",
+    "कपास": "Cotton",
+    "गन्ना": "Sugarcane",
+    "टमाटर": "Tomato",
+    "आलू": "Potato",
+    "प्याज": "Onion",
+    "मिर्च": "Chilli",
+    "मक्का": "Maize",
+    "दालें": "Pulses",
+    "दाल": "Pulses",
+    "तिलहन": "Oilseeds",
+    "बाजरा": "Millets",
+    "ज्वार": "Millets",
+    "मूंगफली": "Groundnut",
+    "जीरा": "Cumin",
+    "सोयाबीन": "Soybean",
+    "सरसों": "Mustard",
+}
+
+
+def _extract_commodity(message: str) -> Optional[str]:
+    """Extract a commodity/crop name from the user message."""
+    lower = message.lower()
+
+    for name in _COMMODITY_NAMES:
+        if name in lower:
+            return name.capitalize()
+
+    for hindi, english in _COMMODITY_HI_MAP.items():
+        if hindi in message:
+            return english
+
+    return None
+
+
 def _detect_time_ref(message: str) -> Optional[str]:
     """Detect time reference in message."""
     lower = message.lower()
@@ -282,6 +328,7 @@ async def process_voice_query(
     loc = location if location and location.get("taluka") else DEFAULT_LOCATION
     intent = _detect_intent(message)
     time_ref = _detect_time_ref(message)
+    commodity = _extract_commodity(message)
     context_parts = [f"User message: {message}"]
     navigate_to = None
     fetched_data = None
@@ -305,20 +352,29 @@ async def process_voice_query(
             )
             navigate_to = "/weather"
 
-    elif intent == "apmc":
-        # Try to extract commodity from the message
-        prices = await _fetch_apmc_prices()
+    elif intent == "mandi":
+        # Fetch prices, optionally filtered by commodity
+        prices = await _fetch_mandi_prices(commodity=commodity)
         if prices:
-            apmc_ctx = _build_apmc_context(prices)
-            context_parts.append(f"\n{apmc_ctx}")
+            mandi_ctx = _build_mandi_context(prices)
+            context_parts.append(f"\n{mandi_ctx}")
+            if commodity:
+                context_parts.append(f"\nUser is specifically asking about: {commodity}")
             navigate_to = "/apmc"
-            fetched_data = {"type": "apmc"}
+            fetched_data = {
+                "type": "mandi",
+                "commodity": commodity,
+            }
         else:
             context_parts.append(
-                "\nAPMC price data is currently unavailable. "
+                "\nMandi price data is currently unavailable. "
                 "Suggest the user check the APMC prices page."
             )
             navigate_to = "/apmc"
+            fetched_data = {
+                "type": "mandi",
+                "commodity": commodity,
+            }
 
     elif intent == "disease":
         context_parts.append(
@@ -357,7 +413,7 @@ async def process_voice_query(
             "en": f"I could not fetch the weather details right now. Please check the weather page for {loc.get('taluka', 'your area')}.",
             "hi": f"अभी मौसम की जानकारी नहीं मिल पाई। कृपया {loc.get('taluka', 'अपने क्षेत्र')} का मौसम पेज देखें।",
         },
-        "apmc": {
+        "mandi": {
             "en": "I could not fetch the APMC prices right now. Please check the APMC prices page.",
             "hi": "अभी APMC भाव नहीं मिल पाए। कृपया APMC भाव पेज देखें।",
         },

frontend/src/components/voice/VoiceButton.jsx

@@ -72,6 +72,32 @@ const DATA_INTENTS = new Set([
   INTENTS.BEST_APMC,
 ]);
 
+/**
+ * Build route state to pass entity data to target pages.
+ * This enables auto-filling search fields and triggering data fetches.
+ */
+function _buildRouteState(parsedResult, aiResult, userLocation) {
+  const state = { fromVoice: true };
+  const entities = parsedResult?.entities || {};
+
+  // Pass commodity for APMC page
+  if (entities.crops && entities.crops.length > 0) {
+    state.commodity = entities.crops[0];
+  }
+
+  // Pass location for weather page
+  if (userLocation && userLocation.taluka) {
+    state.location = userLocation;
+  }
+
+  // Also extract commodity from backend response if available
+  if (aiResult?.data?.commodity) {
+    state.commodity = aiResult.data.commodity;
+  }
+
+  return state;
+}
+
 function VoiceButton({ className = "" }) {
   const navigate = useNavigate();
   const { language } = useApp();
@@ -150,16 +176,19 @@ function VoiceButton({ className = "" }) {
             speak(aiResult.response, language, settings).catch(() => {});
           }
 
-          // Navigate after speaking if a route is suggested
-          if (aiResult.navigate_to) {
-            navigate(aiResult.navigate_to);
+          // Navigate with entity data as route state
+          const targetRoute = aiResult.navigate_to || result.route;
+          if (targetRoute) {
+            const routeState = _buildRouteState(result, aiResult, location);
+            navigate(targetRoute, { state: routeState });
           }
         })
         .catch(() => {
           // Fallback: navigate and speak the basic response
           setCommandResult(result);
           if (result.route) {
-            navigate(result.route);
+            const routeState = _buildRouteState(result, null, location);
+            navigate(result.route, { state: routeState });
           }
           const settings = getVoiceSettings();
           if (settings.autoSpeak) {

frontend/src/components/voice/VoiceChat.jsx

@@ -368,13 +368,32 @@ function VoiceChat({ isOpen, onClose, language }) {
           }
 
           if (aiResult.navigate_to) {
-            navigate(aiResult.navigate_to);
+            const routeState = { fromVoice: true };
+            const entities = localResult.entities || {};
+            if (entities.crops && entities.crops.length > 0) {
+              routeState.commodity = entities.crops[0];
+            }
+            if (aiResult.data?.commodity) {
+              routeState.commodity = aiResult.data.commodity;
+            }
+            if (location && location.taluka) {
+              routeState.location = location;
+            }
+            navigate(aiResult.navigate_to, { state: routeState });
           }
         })
         .catch(() => {
           // Fallback: use local response if backend fails
           if (localResult.action === ACTIONS.NAVIGATE && localResult.route) {
-            navigate(localResult.route);
+            const routeState = { fromVoice: true };
+            const entities = localResult.entities || {};
+            if (entities.crops && entities.crops.length > 0) {
+              routeState.commodity = entities.crops[0];
+            }
+            if (location && location.taluka) {
+              routeState.location = location;
+            }
+            navigate(localResult.route, { state: routeState });
           }
           if (voiceSettings.autoSpeak && localResult.response) {
             speak(localResult.response, lang, voiceSettings).catch(() => {});

frontend/src/pages/APMCPricePage.jsx

@@ -18,6 +18,7 @@
  */
 
 import { useState, useCallback, useRef, useEffect, useMemo } from "react";
+import { useLocation as useRouterLocation } from "react-router-dom";
 import PropTypes from "prop-types";
 import {
   BuildingStorefrontIcon,
@@ -59,6 +60,7 @@ const INITIAL_FILTERS = {
 function APMCPricePage() {
   const { language } = useApp();
   const { location } = useLocation();
+  const routerLocation = useRouterLocation();
 
   // Data state
   const [commodities, setCommodities] = useState([]);
@@ -74,6 +76,7 @@ function APMCPricePage() {
   const [error, setError] = useState(null);
 
   const requestIdRef = useRef(0);
+  const voiceAutoSearchDone = useRef(false);
 
   // Fetch commodities on mount
   useEffect(() => {
@@ -213,6 +216,17 @@ function APMCPricePage() {
     [fetchPriceData],
   );
 
+  // Auto-search when navigated from voice assistant with a commodity
+  useEffect(() => {
+    const voiceCommodity = routerLocation.state?.commodity;
+    if (voiceCommodity && !voiceAutoSearchDone.current) {
+      voiceAutoSearchDone.current = true;
+      setSelectedCommodity(voiceCommodity);
+      setFilters(INITIAL_FILTERS);
+      fetchPriceData(voiceCommodity);
+    }
+  }, [routerLocation.state, fetchPriceData]);
+
   const handleRefresh = useCallback(() => {
     if (selectedCommodity) {
       fetchPriceData(selectedCommodity, true);

frontend/src/pages/WeatherPage.jsx

@@ -10,6 +10,7 @@
  */
 
 import { useState, useCallback, useEffect, useRef } from "react";
+import { useLocation as useRouterLocation } from "react-router-dom";
 import { motion, AnimatePresence } from "framer-motion";
 import PropTypes from "prop-types";
 import {
@@ -31,6 +32,7 @@ import {
   Select,
 } from "@components/common";
 import useApp from "@hooks/useApp";
+import useLocation from "@hooks/useLocation";
 import api, { API_V1 } from "@services/api";
 import { getForecast, getAlerts } from "@services/weatherApi";
 import { SUPPORTED_CROPS, WEATHER_CACHE_DURATION_MS } from "@utils/constants";
@@ -136,8 +138,17 @@ FarmingAdviceSection.propTypes = {
 // WeatherPage
 // ---------------------------------------------------------------------------
 
+/** Default location used when no user location is set. */
+const DEFAULT_WEATHER_LOCATION = {
+  state: "Gujarat",
+  district: "Rajkot",
+  taluka: "Jetpur",
+};
+
 function WeatherPage() {
   const { language } = useApp();
+  const locationCtx = useLocation();
+  const routerLocation = useRouterLocation();
 
   // Active location (the one for which data is displayed)
   const [activeLocation, setActiveLocation] = useState(null);
@@ -156,6 +167,7 @@ function WeatherPage() {
   const [lastRefresh, setLastRefresh] = useState(null);
 
   const requestIdRef = useRef(0);
+  const voiceAutoFetchDone = useRef(false);
 
   // -------------------------------------------------------------------
   // Fetch weather data (cache-first)
@@ -233,6 +245,34 @@ function WeatherPage() {
     [fetchWeatherData],
   );
 
+  // Auto-fetch weather when navigated from voice assistant or if user has saved location
+  useEffect(() => {
+    if (voiceAutoFetchDone.current || activeLocation) return;
+    voiceAutoFetchDone.current = true;
+
+    // Priority 1: Route state from voice navigation
+    const voiceLocation = routerLocation.state?.location;
+    if (voiceLocation && voiceLocation.taluka) {
+      fetchWeatherData(voiceLocation);
+      return;
+    }
+
+    // Priority 2: User's saved location from LocationContext
+    if (locationCtx.hasLocation) {
+      fetchWeatherData({
+        state: locationCtx.state,
+        district: locationCtx.district,
+        taluka: locationCtx.taluka,
+      });
+      return;
+    }
+
+    // Priority 3: If navigated via voice (fromVoice flag), use default
+    if (routerLocation.state?.fromVoice) {
+      fetchWeatherData(DEFAULT_WEATHER_LOCATION);
+    }
+  }, [routerLocation.state, locationCtx, activeLocation, fetchWeatherData]);
+
   const handleRefresh = useCallback(() => {
     if (activeLocation) {
       fetchWeatherData(activeLocation, { forceRefresh: true });

frontend/src/services/api.js

@@ -37,7 +37,7 @@ export const API_V1 = "/api/v1";
 /** @param {string} path - Path starting with /api/v1/... */
 export function apiUrl(path) {
   if (path.startsWith("http")) return path;
-  if (isDev) return path;
+  if (isDev || !API_BASE_URL) return path;
   return `${API_BASE_URL}${path}`;
 }
 

frontend/src/utils/constants.js

@@ -9,8 +9,9 @@
 // API
 // ---------------------------------------------------------------------------
 
+// Use nullish coalescing to allow empty string as valid value (same-origin API)
 export const API_BASE_URL =
-  import.meta.env.VITE_API_BASE_URL || "http://127.0.0.1:8000";
+  import.meta.env.VITE_API_BASE_URL ?? "http://127.0.0.1:8000";
 
 export const API_PREFIX = "/api";