Update main.py

main.py

@@ -558,38 +558,58 @@ def _extract_sme_doc_text(filename: str, file_bytes: bytes) -> str:
 
     return ""
 
-
-def _fetch_active_programs(company_code: str) -> List[Dict[str, Any]]:
+def _fetch_active_programs(company_code: Optional[str] = None) -> List[Dict[str, Any]]:
     try:
-        docs = (
-            db.collection("programs")
-            .where("companyCode", "==", company_code)
-            .stream()
-        )
+        ref = db.collection("programs")
+
+        if company_code:
+            docs = ref.where("companyCode", "==", company_code).stream()
+        else:
+            docs = ref.stream()
 
         programs = []
+
         for doc_snap in docs:
             data = doc_snap.to_dict() or {}
             status = _norm(data.get("status") or data.get("programStatus"))
+
             if status and status not in ["active", "open", "running"]:
                 continue
 
+            eligibility = data.get("eligibilityCriteria") or {}
+
             programs.append({
                 "id": doc_snap.id,
-                "name": data.get("name") or data.get("programName") or data.get("title") or "",
+                "companyCode": data.get("companyCode") or "",
+                "name": data.get("name") or "",
                 "description": data.get("description") or "",
-                "sector": data.get("sector") or data.get("targetSector") or "",
-                "stage": data.get("stage") or data.get("targetStage") or "",
-                "branch": data.get("assignedBranch") or data.get("branch") or "",
-                "requirements": data.get("requirements") or [],
+                "type": data.get("type") or "",
+                "cohortYear": data.get("cohortYear") or "",
+                "startDate": to_jsonable(data.get("startDate")),
+                "endDate": to_jsonable(data.get("endDate")),
+                "maxCapacity": data.get("maxCapacity"),
+                "registrationLink": data.get("registrationLink") or "",
+                "eligibilityCriteria": eligibility,
+                "eligibilitySummary": {
+                    "minimumAge": eligibility.get("minimumAge"),
+                    "maximumAge": eligibility.get("maximumAge"),
+                    "gender": eligibility.get("gender"),
+                    "sector": eligibility.get("sector"),
+                    "province": eligibility.get("province"),
+                    "minYearsOfTrading": eligibility.get("minYearsOfTrading"),
+                    "bbbeeLevel": eligibility.get("bbbeeLevel"),
+                    "minYouthOwnershipPercent": eligibility.get("minYouthOwnershipPercent"),
+                    "minBlackOwnershipPercent": eligibility.get("minBlackOwnershipPercent"),
+                    "minFemaleOwnershipPercent": eligibility.get("minFemaleOwnershipPercent"),
+                },
             })
 
-        return programs[:30]
+        return programs[:50]
+
     except Exception as e:
         print("fetch_active_programs_failed:", e)
         return []
 
-
 def _fetch_intervention_catalog(company_code: str) -> List[Dict[str, Any]]:
     try:
         docs = (
@@ -717,7 +737,10 @@ Rules:
 - urgent/high urgency should be used where compliance, tax, funding, payroll, legal, safety, or survival risks are clear.
 - Recommend interventions only from the intervention catalog where possible.
 - Recommend one program from availablePrograms where possible.
-- If no program fits, leave recommendedProgramId blank and explain in summary.
+- Match programmes using eligibilityCriteria first, especially province, sector, gender, age, years of trading, B-BBEE level, youth ownership, black ownership, and female ownership.
+- If the SME does not clearly meet a programme's eligibility criteria, do not force that programme.
+- If required eligibility data is missing from the SME story, add friendly questions to missingFields.
+- If no programme fits, leave recommendedProgramId blank and explain why in summary.
 - benefitsOfProgram must explain why structured incubation helps.
 - benefitsOfAgents must explain why direct agent support helps without programme onboarding.
 - Keep text professional and concise.
@@ -1339,15 +1362,14 @@ def analyze_sme_application_intake():
     """
     try:
         mode = request.form.get("mode") or "initial_review"
-        company_code = request.form.get("companyCode")
+        company_code = (request.form.get("companyCode") or "").strip()
         user_id = request.form.get("userId") or ""
         contact_name = request.form.get("contactName") or ""
         contact_email = request.form.get("email") or request.form.get("contactEmail") or ""
         contact_phone = request.form.get("contactPhone") or ""
         raw_story = (request.form.get("rawStory") or "").strip()
 
-        if not company_code:
-            return jsonify({"error": "Missing companyCode"}), 400
+        # companyCode is optional for public/unregistered SME intake
 
         if not raw_story:
             return jsonify({"error": "Missing rawStory"}), 400