Update helpers/indexer.py

helpers/indexer.py

@@ -1,11 +1,12 @@
-from typing import List, Dict, Optional
+from typing import List, Dict, Any, Optional
+
 
 def detect_extra_type(text: str) -> Optional[str]:
     """يتعرف على إن كان النص عبارة عن صورة أو رابط."""
     lower = text.lower()
 
     # رابط
-    if lower.startswith(("http://", "https://")):
+    if lower.startswith("http://") or lower.startswith("https://"):
         # رابط صورة؟
         if lower.endswith((".jpg", ".jpeg", ".png", ".gif", ".webp")):
             return "image"
@@ -24,8 +25,8 @@ def detect_extra_type(text: str) -> Optional[str]:
 
 def build_indexed_response(
     texts: List[Dict[str, str]],
-    title_index: Optional[int] = None,
-    preamble_end: Optional[int] = None,
+    title_index: int,
+    preamble_end: int,
     body_end: Optional[int] = None,
     *,
     preamble_start: Optional[int] = None,
@@ -36,6 +37,18 @@ def build_indexed_response(
         return []
 
     last_idx = len(texts) - 1
+    title_index = min(title_index, last_idx)
+    preamble_end = min(preamble_end, last_idx)
+    body_end = min(body_end if body_end is not None else last_idx, last_idx)
+
+    if preamble_start is None:
+        preamble_start = title_index + 1
+    if body_start is None:
+        body_start = preamble_end + 1
+
+    preamble_start = min(preamble_start, last_idx)
+    body_start = min(body_start, last_idx)
+
     result = []
 
     def append_item(text: str, fallback_type: str):
@@ -45,51 +58,15 @@ def build_indexed_response(
             "type": extra_type if extra_type else fallback_type
         })
 
-    # ================================================================
-    # (1) إذا لم يوجد title_index ولا preamble_end → كل شيء نص عادي
-    # ================================================================
-    if title_index is None and preamble_end is None:
-        for t in texts:
-            append_item(t["text"], "text")
-        return result
-
-    # ================================================================
-    # (2) العنوان
-    # ================================================================
-    if title_index is not None:
-        title_index = min(title_index, last_idx)
-        append_item(texts[title_index]["text"], "title")
-
-    # ================================================================
-    # (3) المقدمة
-    # ================================================================
-    if preamble_end is not None:
-        preamble_end = min(preamble_end, last_idx)
-
-        # استنتاج البداية تلقائياً إذا لم يحددها المستخدم
-        if preamble_start is None:
-            preamble_start = (title_index + 1) if title_index is not None else 0
-
-        preamble_start = min(preamble_start, last_idx)
-
-        for i in range(preamble_start, preamble_end + 1):
-            append_item(texts[i]["text"], "preamble")
-
-    # ================================================================
-    # (4) النص الأساسي (body)
-    # ================================================================
-    if preamble_end is not None and body_start is None:
-        body_start = preamble_end + 1
-
-    if body_start is not None:
-        body_start = min(body_start, last_idx)
-
-        if body_end is None:
-            body_end = last_idx
+    # العنوان
+    append_item(texts[title_index]["text"], "title")
 
-        body_end = min(body_end, last_idx)
+    # المقدمة
+    for i in range(preamble_start, preamble_end + 1):
+        append_item(texts[i]["text"], "preamble")
 
-        for i in range(body_start, body_end + 1):
-            append_item(texts[i]["text"], "body")
+    # النص الأساسي (body)
+    for i in range(body_start, body_end + 1):
+        append_item(texts[i]["text"], "body")
 
     return result