Add optional keyword for quick search

app.py

@@ -222,7 +222,7 @@ class BatchDocResponse(BaseModel):
     search_time: float
 
 class KeywordRequest(BaseModel):
-    keywords: str
+    keywords: Optional[str] = ""
     search_mode: Literal["quick", "deep"]
     case_sensitive: Optional[bool] = False
     release: Optional[str] = None
@@ -450,20 +450,21 @@ async def main_menu():
 def search_spec(request: KeywordRequest):
     start_time = time.time()
     booleanLowered = request.case_sensitive
-    kws = [willLower(_, booleanLowered) for _ in request.keywords.split(" ")]
+    search_mode = request.search_mode
+    release = request.release
+    working_group = request.working_group
+    spec_type = request.spec_type
+    kws = [willLower(_, booleanLowered) for _ in request.keywords.split(" ")] if request.keywords != " " else ""
     unique_specs = set()
     results = []
 
+    if kws == "" and search_mode == "deep":
+        raise HTTPException(status_code=400, detail="You must enter keywords in deep search mode !")
+
     for string, spec in finder_spec.indexer_specs.items():
         put = False
         if spec['id'] in unique_specs:
             continue
-
-        release = request.release
-        working_group = request.working_group
-        spec_type = request.spec_type
-        search_mode = request.search_mode
-
         if spec.get('version', None) is None or (release is not None and spec["version"].split(".")[0] != str(release)):
             continue
         if spec.get('type', None) is None or (spec_type is not None and spec["type"] != spec_type):
@@ -471,35 +472,35 @@ def search_spec(request: KeywordRequest):
         if spec.get('working_group', None) is None or (working_group is not None and spec["working_group"] != working_group):
             continue
         
-        if not spec["working_group"] != working_group:
-            print(spec["working_group"], working_group, spec["working_group"] != working_group)
-
-        contents = []
-        version = finder_spec.search_document(spec['id'], spec['release']).split("/")[-1].replace(".zip", "").split("-")[-1]
-        if search_mode == "deep":
-            doc = finder_spec.get_document(spec['id'], version)
-            docValid = not isinstance(doc, str)
-
-        if request.mode == "and":
-            if all(kw in willLower(string, booleanLowered) for kw in kws):
-                put = True
+        if kws != "":
             if search_mode == "deep":
-                if docValid:
-                    for chapter in list(doc.keys())[1:]:
-                        if "references" not in chapter.lower() and "void" not in chapter.lower() and "annexe" not in doc[chapter].lower():
-                            if all(kw in willLower(doc[chapter], booleanLowered) for kw in kws):
-                                put = True
-                                contents.append(chapter)    
-        elif request.mode == "or":
-            if any(kw in willLower(string, booleanLowered) for kw in kws):
-                put = True
-            if search_mode == "deep":
-                if docValid:
-                    for chapter in list(doc.keys())[1:]:
-                        if "references" not in chapter.lower() or "void" not in chapter.lower() or "annexe" not in doc[chapter].lower():
-                            if any(kw in willLower(doc[chapter], booleanLowered) for kw in kws):
-                                put = True
-                                contents.append(chapter)   
+                contents = []
+                version = finder_spec.search_document(spec['id'], spec['release']).split("/")[-1].replace(".zip", "").split("-")[-1]
+                doc = finder_spec.get_document(spec['id'], version)
+                docValid = not isinstance(doc, str)
+
+            if request.mode == "and":
+                if all(kw in willLower(string, booleanLowered) for kw in kws):
+                    put = True
+                if search_mode == "deep":
+                    if docValid:
+                        for chapter in list(doc.keys())[1:]:
+                            if "references" not in chapter.lower() and "void" not in chapter.lower() and "annexe" not in doc[chapter].lower():
+                                if all(kw in willLower(doc[chapter], booleanLowered) for kw in kws):
+                                    put = True
+                                    contents.append(chapter)    
+            elif request.mode == "or":
+                if any(kw in willLower(string, booleanLowered) for kw in kws):
+                    put = True
+                if search_mode == "deep":
+                    if docValid:
+                        for chapter in list(doc.keys())[1:]:
+                            if "references" not in chapter.lower() or "void" not in chapter.lower() or "annexe" not in doc[chapter].lower():
+                                if any(kw in willLower(doc[chapter], booleanLowered) for kw in kws):
+                                    put = True
+                                    contents.append(chapter)  
+        else:
+            put = True 
 
         if put:
             spec_content = spec

static/script.js

@@ -91,8 +91,8 @@ keywordSearchBtn.addEventListener("click", async ()=>{
     let checked = caseSensitiveFilter.checked;
     let mode = modeFilter.value;
 
-    if (!keywords) {
-        showError("Please enter at least one keyword");
+    if (!keywords && searchMode == "deep") {
+        showError("Please enter at least one keyword in deep search mode");
         return;
     }