add labels and names

main.py

@@ -78,6 +78,33 @@ async def wordcloud(query: Query):
             query['query'], query['top_k'], query['similarity'], query['start_date'], query['end_date']))
     )
 
+@app.post("/add_search")
+async def add_search(query: Query):
+	query = query.dict()
+	keywords = query['query'].split()
+	### return these three 
+	ret_keywords = []
+	ret_labels = []
+	ret_names = []
+	#print("###############keywords:", keywords)
+	'''
+	with open("static/data.json", "r") as f:
+		return_keywords = json.load(f)
+		for keyword in keywords:
+			if ret := return_keywords.get(keyword):
+				return_keywords = ret
+			else:
+				ret = {}
+				break
+		ret_keywords = list(ret.keys())
+		print("##########return", ret_keywords)
+	'''
+	### write here and ret is list of recommend keywords
+	ret_keywords = ["abc", "def", "ghi", "jkl", "nmo", "pqr"]
+	ret_labels = ["1", "2", "3", "4", "5", "6"]
+	ret_names = ["Tomoya", "Jared", "Doris", "Wizer", "Nina", "Morrison"]
+	###	
+	return {"add_keywords":ret_keywords, "add_labels":ret_labels, "add_names":ret_names}
 
 # if __name__ == "__main__":
 #     print('123')

static/main.js

@@ -3,7 +3,9 @@ function semantic_search() {
     $("#tag_list").empty();
     $("#wordcloud").empty();
     $("#results").empty();
-    $("#add_search").empty();
+    $("#add_keywords").empty();
+	$("#add_labels").empty();
+	$("#add_names").empty();
     $("#wordcloud").append(`
     <div class="spinner-border text-primary" role="status">
         <span class="visually-hidden">Loading...</span>
@@ -126,23 +128,67 @@ function semantic_search() {
             	`);
           	});
         }
+	  })
+      .fail(function () {
+        console.log("tag list error");
+      });
 
+  	$.ajax({
+    url: "/add_search",
+    type: "post",
+    dataType: "json",
+    contentType: "application/json; charset=utf-8",
+	data: data
+  	})
+	.done(function(data){
+		let max_add = 5
+		console.log(data);
+		add_data = data["add_keywords"]
+		console.log(add_data)
 		let contentList = [];
       	let falseCount = 0;
-		let len = (data.length>=5)? 5: data.length;
+		let len = Math.min(max_add, add_data.length);
 		for (i=0; i<len; i++){
-	  	$("#add_search").append(`
-            <button type="button" onclick="addValue('${data[i]}')" class="btn btn-outline-dark rounded-pill py-0 me-1">
+	  	$("#add_keywords").append(`
+            <button type="button" onclick="addValue('${add_data[i]}')" class="btn btn-outline-dark rounded-pill py-0 me-1">
             <div class="d-flex align-items-center">
-            <span>＋</span> <p class="m-0 pe-1">${data[i]}</p> 
+            <span>＋</span> <p class="m-0 pe-1">${add_data[i]}</p> 
             </div>
             </button>`);
 	  
 		}
-      })
-      .fail(function () {
-        console.log("tag list error");
-      });
+		add_data = data["add_labels"]
+		console.log(data)
+		contentList = [];
+      	falseCount = 0;
+		len = Math.min(max_add, add_data.length);
+		for (i=0; i<len; i++){
+	  	$("#add_labels").append(`
+            <button type="button" onclick="addValue('${add_data[i]}')" class="btn btn-outline-dark rounded-pill py-0 me-1">
+            <div class="d-flex align-items-center">
+            <span>＋</span> <p class="m-0 pe-1">${add_data[i]}</p> 
+            </div>
+            </button>`);
+	  
+		}
+		add_data = data["add_names"]
+		console.log(data)
+		contentList = [];
+      	falseCount = 0;
+		len = Math.min(max_add, add_data.length);
+		for (i=0; i<len; i++){
+	  	$("#add_names").append(`
+            <button type="button" onclick="addValue('${add_data[i]}')" class="btn btn-outline-dark rounded-pill py-0 me-1">
+            <div class="d-flex align-items-center">
+            <span>＋</span> <p class="m-0 pe-1">${add_data[i]}</p> 
+            </div>
+            </button>`);
+	  
+		}
+	})
+	.fail(function(){
+		console.log("add search error")
+	});
   }
 }
 

templates/index.html

@@ -73,7 +73,15 @@
 				  		    </div>
 						    <div class="d-flex align-items-center" style="height: 30px;">
 								擴大搜尋：
-								<div id="add_search" class="add_search ms-1"></div>
+								<div id="add_keywords" class="add_search ms-1"></div>
+							</div>
+						    <div class="d-flex align-items-center" style="height: 30px;">
+								iCulture 類別：
+								<div id="add_labels" class="add_search ms-1"></div>
+							</div>
+						    <div class="d-flex align-items-center" style="height: 30px;">
+								人名：
+								<div id="add_names" class="add_search ms-1"></div>
 							</div>
 						</div>
 					</div>