Merge branch 'zhao' into 'master'

把没有用户画像的日记队列也写到数据表

See merge request !35

eda/esmm/Model_pipline/rerank_esmm.py

@@ -87,7 +87,7 @@ def get_queues(device_id,city_id):
 
 
 def tag_boost(cid_str, tag_list):
-    if cid_str is not None and cid_str != "":
+    if cid_str is not None and cid_str != "" and len(tag_list) > 0:
         cids = cid_str.split(",")
         try:
             if len(cids) > 6 and len(tag_list) > 0:
@@ -183,7 +183,7 @@ if __name__ == "__main__":
             for uid_city in child_users_list:
                 tag_list = get_user_profile(uid_city[0])
                 queues = get_queues(uid_city[0], uid_city[1])
-                if len(queues) > 0 and len(tag_list) > 0:
+                if len(queues) > 0:
                     new_native = tag_boost(queues[0], tag_list)
                     new_nearby = tag_boost(queues[1], tag_list)
 

rerank.py

@@ -90,7 +90,7 @@ def get_queues(device_id,city_id):
 
 
 def tag_boost(cid_str, tag_list):
-    if cid_str is not None and cid_str != "":
+    if cid_str is not None and cid_str != "" and len(tag_list) != 0:
         cids = cid_str.split(",")
         try:
             if len(cids) > 6 and len(tag_list) > 0:
@@ -196,7 +196,7 @@ if __name__ == "__main__":
         for uid_city in child_users_list:
             tag_list = get_user_profile(uid_city[0])
             queues = get_queues(uid_city[0], uid_city[1])
-            if len(queues) > 0 and len(tag_list) > 0:
+            if len(queues) > 0:
                 new_native = tag_boost(queues[0], tag_list)
                 new_nearby = tag_boost(queues[1], tag_list)
 
@@ -209,6 +209,8 @@ if __name__ == "__main__":
             df = df.rename(columns={0: "device_id", 1: "city_id",2:"native_queue",
                                     3:"nearby_queue",4:"nation_queue",5:"megacity_queue",6:"time"})
 
+            print("数量")
+            print(df.shape[0])
             to_data_base(df)