format code

applications/__init__.py

@@ -1,13 +1,7 @@
 """
 @author: luojunhui
 """
-from .denetMysql import DeNetMysql
-from .longArticlesMysql import longArticlesMySQL
-from .pqMysql import PQMySQL
+
+from .db import longArticlesMySQL, DeNetMysql, PQMySQL
 from .functions import Functions
-from .data_works import ODPSApi
-from .wxSpiderApi import WeixinSpider
-from .algApi import AlgApi
-from .pqFunctionApi import PQAPI
-from .aliyunLogApi import log
-from .feishuBotApi import bot
+from .api import bot, log, PQAPI, WeixinSpider, ODPSApi

applications/api/__init__.py

@@ -0,0 +1,8 @@
+"""
+@author: luojunhui
+"""
+from .feishu_api import bot
+from .aliyun_api import log
+from .pq_functions_api import PQAPI
+from .data_works import ODPSApi
+from .wxSpiderApi import WeixinSpider

applications/aiditApi.py → applications/api/aidit_api.py

@@ -5,8 +5,8 @@
 import requests
 import json
 
-from applications.decoratorApi import retryOnTimeout
-from applications.denetMysql import DeNetMysql
+from applications.decorator import retryOnTimeout
+from applications.db.denetMysql import DeNetMysql
 
 HEADERS = {
     'Accept': 'application/json',

applications/feishuBotApi.py → applications/api/feishu_api.py

@@ -4,7 +4,7 @@
 import json
 import requests
 
-from applications.decoratorApi import retryOnTimeout
+from applications.decorator import retryOnTimeout
 
 
 @retryOnTimeout()

applications/wxSpiderApi.py → applications/api/wxSpiderApi.py

@@ -4,7 +4,7 @@
 import json
 import requests
 
-from applications.decoratorApi import retryOnNone
+from applications.decorator import retryOnNone
 
 
 class WeixinSpider(object):
@@ -52,7 +52,7 @@ class WeixinSpider(object):
         return response.json()
 
     @classmethod
-    @retryOnNone()
+    # @retryOnNone()
     def update_msg_list(cls, ghId, index) -> dict:
         """
         :return:

applications/db/__init__.py

@@ -0,0 +1,6 @@
+"""
+@author: luojunhui
+"""
+from .denetMysql import DeNetMysql
+from .longArticlesMysql import longArticlesMySQL
+from .pqMysql import PQMySQL

applications/pqMysql.py → applications/db/pqMysql.py

@@ -2,7 +2,7 @@
 @author: luojunhui
 """
 import pymysql
-from applications.decoratorApi import retryOnTimeout
+from applications.decorator import retryOnTimeout
 
 
 class PQMySQL(object):

applications/decorator/__init__.py

@@ -0,0 +1,4 @@
+"""
+@author: luojunhui
+"""
+from .decorator import *

applications/functions/__init__.py

@@ -0,0 +1,4 @@
+"""
+@author: luojunhui
+"""
+from .functions import Functions

applications/functions/spider_function.py

@@ -0,0 +1,3 @@
+"""
+@author: luojunhui
+"""

coldStartTasks/publish/publishCategoryArticles.py

@@ -9,7 +9,8 @@ import traceback
 
 from pandas import DataFrame
 
-from applications import aiditApi, log, bot
+from applications import log, bot
+from applications.api import aidit_api
 from config import apolloConfig
 
 apollo = apolloConfig()
@@ -107,7 +108,7 @@ class CategoryColdStartTask(object):
         """
         plan_id = self.category_map.get(category)
         if plan_id:
-            article_list = aiditApi.get_generated_article_list(plan_id)
+            article_list = aidit_api.get_generated_article_list(plan_id)
             title_list = [i[1] for i in article_list]
             if title_list:
                 # update
@@ -227,7 +228,7 @@ class CategoryColdStartTask(object):
         )
         if url_list:
             # create_crawler_plan
-            crawler_plan_response = aiditApi.auto_create_crawler_task(
+            crawler_plan_response = aidit_api.auto_create_crawler_task(
                 plan_id=None,
                 plan_name="自动绑定-{}--{}--{}".format(category, datetime.date.today().__str__(), len(url_list)),
                 plan_tag="品类冷启动",
@@ -259,7 +260,7 @@ class CategoryColdStartTask(object):
                     "inputSourceChannel": 5
                 }
             ]
-            generate_plan_response = aiditApi.bind_crawler_task_to_generate_task(
+            generate_plan_response = aidit_api.bind_crawler_task_to_generate_task(
                 crawler_task_list=new_crawler_task_list,
                 generate_task_id=self.category_map[category]
             )

flow_pool/exit_article_with_title.py

@@ -6,7 +6,7 @@ import traceback
 from datetime import datetime, timedelta
 
 from applications import PQMySQL, longArticlesMySQL, bot, log
-from applications.aiditApi import get_generated_article_list
+from applications.api.aidit_api import get_generated_article_list
 
 
 def get_level_up_articles() -> set:

updatePublishedMsgDaily.py

@@ -12,7 +12,8 @@ from tqdm import tqdm
 from datetime import datetime
 
 
-from applications import PQMySQL, WeixinSpider, Functions, log, bot, aiditApi
+from applications import PQMySQL, WeixinSpider, Functions, log, bot
+from applications.api import aidit_api
 from applications.const import updatePublishedMsgTaskConst
 
 ARTICLE_TABLE = "official_articles_v2"
@@ -44,7 +45,7 @@ def get_accounts():
     "account_auth": line[5]
     """
     using_account_set = get_account_using_status()
-    account_list_with_out_using_status = aiditApi.get_publish_account_from_aigc()
+    account_list_with_out_using_status = aidit_api.get_publish_account_from_aigc()
     account_list = []
     for item in account_list_with_out_using_status:
         if item['ghId'] in using_account_set: