Merge branch 'query_type' into 'master'

Query type

See merge request !91

trans2es/commons/words_utils.py

@@ -14,13 +14,12 @@ from gm_rpcd.all import bind
 QUERY_KEY = "query:{}:set"
 
 LABEL_VALUE = {
-    MIND_TYPE.PROJECT: 8,
-    MIND_TYPE.HOSPITAL: 7,
-    MIND_TYPE.DOCTOR: 6,
-    MIND_TYPE.FREE_FACE: 4,
-    MIND_TYPE.FACE: 3,
-    MIND_TYPE.AREA: 2,
-    MIND_TYPE.USER: 1,
+    # MIND_TYPE.SCHEME: 6,
+    MIND_TYPE.PROJECT: 5,
+    MIND_TYPE.DOCTOR: 4,
+    MIND_TYPE.HOSPITAL: 3,
+    MIND_TYPE.FREE_FACE: 2,
+    MIND_TYPE.FACE: 1,
     MIND_TYPE.UNKNOWN: 0
 }
 
@@ -285,7 +284,7 @@ def label_key(label):
     return LABEL_VALUE.get(label)
 
 
-def get_tips_word_type(query=''):
+def no_get_tips_word_type(query=''):
     query_base64 = base64.b64encode(query.encode('utf8')).decode('utf8')
     key = QUERY_KEY.format(query_base64)
     labels = list(map(lambda x: x.decode("utf8"), list(redis_client.smembers(key))))
@@ -294,3 +293,20 @@ def get_tips_word_type(query=''):
         labels.append(MIND_TYPE.PROJECT)
     labels.sort(key=label_key, reverse=True)
     return labels[0]
+
+
+def get_tips_word_type(query=''):
+    try:
+        query_old_key = "query_type_set:{}"
+        ##正常判断
+        labels = list()
+        key = query_old_key.format(query)
+        labels = list(map(lambda x: x.decode("utf8"), list(redis_client.smembers(key))))
+        labels.append(MIND_TYPE.UNKNOWN)
+        if query in QUERY_WORD_LABEL_NEED_MODIFIED:
+            labels.append(MIND_TYPE.PROJECT)
+        labels.sort(key=label_key, reverse=True)
+        return labels[0]
+    except:
+        logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+        return "unknown"