灰度

search/utils/auto_tips.py

@@ -78,8 +78,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
                 if hit_item["_source"]["ori_name"] not in have_read_tips_set:
                     have_read_tips_set.add(hit_item["_source"]["ori_name"])
                     highlight_marks = u'<ems>%s</ems>' % query
-                    # hit_item["_source"]["highlight_name"] = hit_item["_source"]["ori_name"].replace(query,
-                    #                                                                                 highlight_marks)
                     hit_item["_source"]["highlight_name"] = set_highlihgt(query, hit_item["_source"]["ori_name"])
                     if hit_item["_source"]["type_flag"] == "hospital":
                         if lat is not None and lng is not None and lat != 0.0 and lng != 0.0:
@@ -130,41 +128,27 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
             ret_list.extend(get_tag_wiki_data)
             ret_list.extend(get_doctor_hospital_data)
 
-        if len(ret_list) >= 50:
-
-            if gray_number in (1, 2):
-                logging.info("get-----------------ret_list:%s" % ret_list)
-
-                return ret_list[:50]
-            else:
-                logging.info("get+++++++++++++++++ret_list:%s" % ret_list)
-
-                # 在去掉强加权的逻辑上根据词频和tag转化率排序后再前段强加权
-                front_data = []
-                end_data = []
-                equal_data = []
-                need_change_sort = ret_list[:30]
-                for item in need_change_sort:
-                    ori_name = item.get("ori_name", None)
-                    if query == ori_name:
-                        equal_data.append(item)
-                    elif query == ori_name[:len(query)]:
-                        front_data.append(item)
-
-                    else:
-                        end_data.append(item)
+        if gray_number == 3:
+            # 在去掉强加权的逻辑上根据词频和tag转化率排序后再前段强加权
+            front_data = []
+            end_data = []
+            equal_data = []
+            need_change_sort = ret_list[:30]
+            for item in need_change_sort:
+                ori_name = item.get("ori_name", None)
+                if query == ori_name:
+                    equal_data.append(item)
+                elif query == ori_name[:len(query)]:
+                    front_data.append(item)
+                else:
+                    end_data.append(item)
+            equal_data.extend(front_data)
+            equal_data.extend(end_data)
+            equal_data.extend(ret_list[30:])
+            ret_list = equal_data
 
-                logging.info("get+++++++++++++++++equal_data:%s" % equal_data)
-                logging.info("get+++++++++++++++++front_data:%s" % front_data)
-                logging.info("get+++++++++++++++++end_data:%s" % end_data)
-                logging.info("get+++++++++++++++++ret_list:%s" % ret_list)
-
-                equal_data.extend(front_data)
-                equal_data.extend(end_data)
-                equal_data.extend(ret_list[30:])
-                ret_list = equal_data
-
-                return ret_list
+        if len(ret_list) >= 50:
+            return ret_list[:50]
         else:
             query_ret_list = []
             wordresemble_ret_list = []
@@ -184,7 +168,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
                         describe = "约" + str(result_num) + "个结果" if result_num else ""
                         logging.info("get result_num:%s" % result_num)
                         highlight_marks = u'<ems>%s</ems>' % query
-                        # highlight_name = ori_name.replace(query, highlight_marks)
                         highlight_name = set_highlihgt(query, ori_name)
                         if ori_name == query:
                             query_ret_list.append(
@@ -204,7 +187,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
                 ret_list.extend(wordresemble_ret_list)
             ###繁体字删掉，把搜索结果加到简体字上边
             fanti_query = [{'痩脸针': "瘦脸针"}]
-
             for item in ret_list:
                 result_num = [[item['results_num'], list(ret.values())[0], list(ret.keys())[0]] for ret in fanti_query
                               if list(ret.keys())[0] == item['ori_name']]
@@ -215,12 +197,10 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
                         if item['ori_name'] == result_num[0][1]:
                             item['results_num'] += result_num[0][0]
 
-            ####
             if len(ret_list) >= 50:
                 return ret_list[0:50]
             else:
                 return ret_list
-
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
         return list()

trans2es/models/wordresemble.py

@@ -29,9 +29,10 @@ class WordRel(models.Model):
 class WordRelResemble(models.Model):
     """近义词数据表
     """
+
     class Meta:
         app_label = 'api'
         db_table = 'api_wordrelresemble'
 
     wordrel = models.ForeignKey(WordRel, related_name='all_resembles')
-    word = models.CharField(u'近义词', max_length=50, db_index=True)
+    word = models.CharField(u'近义词', max_length=50, db_index=True)
\ No newline at end of file

trans2es/type_info.py

@@ -368,11 +368,11 @@ def get_type_info_map():
         ),
         TypeInfo(
             name='suggest-v1',
-            type='doctor_tips',  # doctor
+            type='doctor_tips-v1',  # doctor
             model=doctor.Doctor,
             query_deferred=lambda: doctor.Doctor.objects.all().filter(
                 doctor_type__in=[DOCTOR_TYPE.DOCTOR, DOCTOR_TYPE.OFFICER]).query,
-            get_data_func=DoctorTransfer.get_doctor_suggest_data_list,
+            get_data_func=DoctorTransferV1.get_doctor_suggest_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
             round_insert_period=2,

trans2es/utils/doctor_transfer.py

@@ -10,7 +10,7 @@ from libs.cache import redis_client
 import json
 from django.conf import settings
 
-from trans2es.commons.commons import get_tips_suggest_list
+from trans2es.commons.commons import get_tips_suggest_list, get_tips_suggest_list_v1
 from trans2es.commons.words_utils import QueryWordAttr, get_tips_word_type
 
 
@@ -200,7 +200,7 @@ class DoctorTransferV1(object):
 
                 ret_list.append(item_dict)
 
-                suggest_list = get_tips_suggest_list(instance.name)
+                suggest_list = get_tips_suggest_list_v1(instance.name)
 
             return (item_dict, suggest_list)
         except: