Przeglądaj źródła

采用gh_id作为key

luojunhui 4 miesięcy temu
rodzic
commit
9934ecab1d
2 zmienionych plików z 6 dodań i 7 usunięć
  1. 4 5
      cal_account_read_rate_avg_daily.py
  2. 2 2
      updateAccountV3.py

+ 4 - 5
cal_account_read_rate_avg_daily.py

@@ -6,7 +6,7 @@ import json
 from tqdm import tqdm
 from pandas import DataFrame
 from argparse import ArgumentParser
-from datetime import datetime, timedelta
+from datetime import datetime
 
 from applications import DeNetMysql, PQMySQL, longArticlesMySQL, bot, Functions
 from applications.const import updateAccountReadRateTaskConst
@@ -14,9 +14,9 @@ from config import apolloConfig
 
 const = updateAccountReadRateTaskConst()
 config = apolloConfig()
-unauthorized_account = json.loads(config.getConfigValue("unauthed_account_fans"))
+unauthorized_account = json.loads(config.getConfigValue("unauthorized_gh_id_fans"))
 functions = Functions()
-read_rate_table = "long_articles_read_rate"
+read_rate_table = "long_articles_read_rate_dev"
 
 
 def filter_outlier_data(group, key='show_view_count'):
@@ -150,8 +150,7 @@ def cal_account_read_rate(gh_id_tuple) -> DataFrame:
         dt = functions.timestamp_to_str(timestamp=line['publish_timestamp'], string_format='%Y-%m-%d')
         fans = fans_dict_each_day.get(gh_id, {}).get(dt, 0)
         if not fans:
-            account_name = line['accountName']
-            fans = int(unauthorized_account.get(account_name, 0))
+            fans = int(unauthorized_account.get(gh_id, 0))
         line['fans'] = fans
         if fans > 1000:
             line['readRate'] = line['show_view_count'] / fans if fans else 0

+ 2 - 2
updateAccountV3.py

@@ -13,7 +13,7 @@ from applications.const import updateAccountReadAvgTaskConst
 from config import apolloConfig
 
 config = apolloConfig()
-unauthorized_account = json.loads(config.getConfigValue("unauthed_account_fans"))
+unauthorized_account = json.loads(config.getConfigValue("unauthorized_gh_id_fans"))
 
 
 def get_account_fans_by_dt(db_client) -> dict:
@@ -134,7 +134,7 @@ class UpdateAccountInfoVersion3(object):
                                                      'gh_id'] in self.const.TOULIU_ACCOUNTS else self.const.ARTICLES_DAILY
             fans = fans_dict.get(account['gh_id'], {}).get(dt, 0)
             if not fans:
-                fans = int(unauthorized_account.get(account['account_name'], 0))
+                fans = int(unauthorized_account.get(account['gh_id'], 0))
             if fans:
                 for index in range(1, 9):
                     gh_id_position = "{}_{}".format(account['gh_id'], index)