Upload folder using huggingface_hub

server.py

@@ -296,10 +296,7 @@ async def search_scripture_find_first_match(
     req: ScriptureFirstSearchRequst,
 ):
     """
-    Search scripture collection and return the first matching result.
-    - `scripture_name`: Name of the collection
-    - `filter_obj`: MetadataWhereClause (filters, groups, operator)
-    - `has_audio`: optional. can take values any|none|recitation|virutham|upanyasam
+    Search scripture collection and return the first matching result after applying audio filter.
     """
     filter_obj = req.filter_obj
     has_audio = req.has_audio
@@ -319,8 +316,8 @@ async def search_scripture_find_first_match(
         if not config:
             return {"error": f"Scripture '{scripture_name}' not found"}
 
-        # 1️⃣ Fetch results (same as before)
-        results = db.fetch_first_match(
+        # 1️⃣ Fetch all matches
+        results = db.fetch_all_matches(
             collection_name=config["collection_name"],
             metadata_where_clause=filter_obj,
         )
@@ -331,18 +328,15 @@ async def search_scripture_find_first_match(
             metadata_doc = results["metadatas"][i]
             metadata_doc["id"] = doc_id
 
-            document_text = (
-                results["documents"][i] if results.get("documents") else None
-            )
+            document_text = results["documents"][i] if results.get("documents") else None
             canonical_doc = SanatanConfig().canonicalize_document(
                 scripture_name, document_text, metadata_doc
             )
             formatted_results.append(canonical_doc)
 
-        # 2️⃣ Apply has_audio filter (same logic as in search_scripture_find_all_matches)
+        # 2️⃣ Apply has_audio filter
         if has_audio and formatted_results:
             if has_audio == AudioType.none:
-                # Get all indices that have any audio
                 all_audio_indices = set()
                 for atype in [
                     AudioType.recitation,
@@ -353,45 +347,39 @@ async def search_scripture_find_first_match(
                     indices = await svc_get_indices_with_audio(scripture_name, atype)
                     all_audio_indices.update(indices)
 
-                # Keep only those without audio
                 formatted_results = [
-                    r
-                    for r in formatted_results
-                    if r["_global_index"] not in all_audio_indices
+                    r for r in formatted_results if r["_global_index"] not in all_audio_indices
                 ]
-
             else:
+                audio_indices = set()
                 if has_audio == AudioType.any:
-                    audio_indices = set()
                     for atype in [
                         AudioType.recitation,
                         AudioType.virutham,
                         AudioType.upanyasam,
                         AudioType.santhai,
                     ]:
-                        indices = await svc_get_indices_with_audio(
-                            scripture_name, atype
-                        )
+                        indices = await svc_get_indices_with_audio(scripture_name, atype)
                         audio_indices.update(indices)
                 else:
-                    audio_indices = set(
-                        await svc_get_indices_with_audio(scripture_name, has_audio)
-                    )
+                    audio_indices.update(await svc_get_indices_with_audio(scripture_name, has_audio))
 
                 formatted_results = [
                     r for r in formatted_results if r["_global_index"] in audio_indices
                 ]
 
-        # 3️⃣ Return only the first valid result (if any)
-        return {
-            "results": formatted_results[:1] if formatted_results else [],
-        }
+        # 3️⃣ Sort by global index
+        formatted_results.sort(key=lambda x: x["_global_index"])
+
+        # 4️⃣ Return only the first valid result
+        return {"results": formatted_results[:1] if formatted_results else []}
 
     except Exception as e:
         logger.error("Error while searching %s", e, exc_info=True)
         return {"error": str(e)}
 
 
+
 class ScriptureMultiSearchRequest(BaseModel):
     filter_obj: Optional[MetadataWhereClause] = None
     page: int = 1