Enhance AI response generation by incorporating company name and updating context builder to return company name along with context string.

app/routers/chat.py

@@ -44,11 +44,11 @@ async def chat(data: ChatRequest, db: Session = Depends(get_db)):
     ai_messages = [{"role": m.role, "content": m.content} for m in reversed(history)]
 
     # Fetch relevant live CMS context based on user intent
-    context = await build_context(data.message)
+    company_name, context = await build_context(data.message)
 
     # Generate AI response
     try:
-        ai_response = await generate_ai_response(ai_messages, context)
+        ai_response = await generate_ai_response(ai_messages, company_name, context)
     except RateLimitError:
         raise HTTPException(status_code=429, detail="AI service quota exceeded. Please try again later.")
     except AuthenticationError:

app/services/ai_service.py

@@ -6,12 +6,12 @@ load_dotenv()
 
 client = AsyncGroq(api_key=os.getenv("GROQ_API_KEY"))
 
-_BASE_SYSTEM_PROMPT = """You are the AI assistant for FixinMoto, an automotive repair and maintenance company.
+_BASE_SYSTEM_PROMPT = """You are the AI assistant for {company_name}, an automotive repair and maintenance company.
 
 STRICT RULES:
-1. Only answer questions about FixinMoto's services, pricing, locations, hours, bookings, and general automotive maintenance topics.
+1. Only answer questions about {company_name}'s services, pricing, locations, hours, bookings, and general automotive maintenance topics.
 2. Use ONLY the company context provided below — never invent information.
-3. If a question is unrelated to the company or automotive services, respond: "I can only help with FixinMoto services and automotive questions. Is there something specific I can help you with?"
+3. If a question is unrelated to the company or automotive services, respond: "I can only help with {company_name} services and automotive questions. Is there something specific I can help you with?"
 4. Be concise, helpful, and professional.
 5. When relevant, suggest booking an appointment or contacting the team.
 
@@ -19,8 +19,11 @@ STRICT RULES:
 """
 
 
-async def generate_ai_response(messages: list[dict], context: str) -> str:
-    system_prompt = _BASE_SYSTEM_PROMPT.format(context=context)
+async def generate_ai_response(messages: list[dict], company_name: str, context: str) -> str:
+    system_prompt = _BASE_SYSTEM_PROMPT.format(
+        company_name=company_name,
+        context=context,
+    )
 
     formatted = [{"role": "system", "content": system_prompt}] + messages
 

app/services/context_builder.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 from app.services.cms_service import (
     get_settings,
     get_services,
@@ -116,7 +117,8 @@ def _fmt_faqs(faqs: list[dict]) -> str:
     return "\n".join(lines)
 
 
-async def build_context(message: str) -> str:
+async def build_context(message: str) -> tuple[str, str]:
+    """Returns (company_name, context_string) — both pulled from CMS."""
     intents = _detect_intents(message)
 
     # Decide which CMS calls to make
@@ -143,12 +145,18 @@ async def build_context(message: str) -> str:
         for k, v in zip(keys, results)
     }
 
-    parts: list[str] = ["=== FixinMoto Company Context ==="]
+    settings = data.get("settings") or {}
+    company_name = (
+        settings.get("companyName")
+        or os.getenv("COMPANY_NAME")
+        or "FixinMoto"
+    )
+
+    parts: list[str] = [f"=== {company_name} Company Context ==="]
 
     # Company info (always present)
-    settings = data.get("settings") or {}
     if settings:
-        parts.append(f"Company: FixinMoto")
+        parts.append(f"Company: {company_name}")
         if settings.get("phone"):
             parts.append(f"Phone: {settings['phone']}")
         if settings.get("contactEmail"):
@@ -178,4 +186,4 @@ async def build_context(message: str) -> str:
     if data.get("faqs"):
         parts.append(_fmt_faqs(data["faqs"]))
 
-    return "\n\n".join(parts)
+    return company_name, "\n\n".join(parts)