UPDATE

rag/services/yield_harvest.py

@@ -14,6 +14,7 @@ from rag.chat import (
     _load_service_tone,
 )
 from rag.config import RAGConfig, get_service_config, load_rag_config
+from rag.failure_contract import RAGServiceError
 
 logger = logging.getLogger(__name__)
 
@@ -90,6 +91,8 @@ class YieldHarvestRAGService:
             if audit_log is not None:
                 _complete_audit_log(audit_log, raw)
             return {
+                "status": "success",
+                "source": "llm",
                 "season_highlights_subtitle": validated.season_highlights_subtitle,
                 "yield_prediction_explanation": validated.yield_prediction_explanation,
                 "harvest_readiness_summary": validated.harvest_readiness_summary,
@@ -99,12 +102,25 @@ class YieldHarvestRAGService:
             logger.warning("Yield harvest narrative parsing failed for farm_uuid=%s: %s", farm_uuid, exc)
             if audit_log is not None:
                 _fail_audit_log(audit_log, str(exc))
-            return {}
+            raise RAGServiceError(
+                error_code="invalid_payload",
+                message=f"Yield harvest narrative parsing failed for farm_uuid={farm_uuid or 'unknown'}.",
+                source="llm",
+                details={"farm_uuid": farm_uuid or "unknown", "service_id": SERVICE_ID},
+                http_status=502,
+            ) from exc
         except Exception as exc:
             logger.error("Yield harvest narrative LLM call failed for farm_uuid=%s: %s", farm_uuid, exc)
             if audit_log is not None:
                 _fail_audit_log(audit_log, str(exc))
-            return {}
+            raise RAGServiceError(
+                error_code="upstream_failure",
+                message=f"Yield harvest narrative generation failed for farm_uuid={farm_uuid or 'unknown'}.",
+                source="llm",
+                retriable=True,
+                details={"farm_uuid": farm_uuid or "unknown", "service_id": SERVICE_ID},
+                http_status=503,
+            ) from exc
 
     def _build_service_client(self, cfg: RAGConfig):
         service = get_service_config(SERVICE_ID, cfg)
@@ -217,11 +233,31 @@ class YieldHarvestRAGService:
                 cleaned = cleaned[4:]
             cleaned = cleaned.strip()
         if not cleaned:
-            raise ValueError("Yield harvest narrative response was empty.")
+            raise RAGServiceError(
+                error_code="empty_response",
+                message="Yield harvest narrative response was empty.",
+                source="llm",
+                retriable=True,
+                details={"service_id": SERVICE_ID},
+                http_status=502,
+            )
         try:
             parsed = json.loads(cleaned)
         except (json.JSONDecodeError, ValueError) as exc:
-            raise ValueError("Yield harvest narrative response was not valid JSON.") from exc
+            raise RAGServiceError(
+                error_code="invalid_json",
+                message="Yield harvest narrative response was not valid JSON.",
+                source="llm",
+                retriable=True,
+                details={"service_id": SERVICE_ID},
+                http_status=502,
+            ) from exc
         if not isinstance(parsed, dict):
-            raise ValueError("Yield harvest narrative response root must be a JSON object.")
+            raise RAGServiceError(
+                error_code="invalid_schema",
+                message="Yield harvest narrative response root must be a JSON object.",
+                source="llm",
+                details={"service_id": SERVICE_ID},
+                http_status=502,
+            )
         return parsed