代码格式优化

applications/__init__.py

@@ -1,13 +1,14 @@
 """
 @author: luojunhui
 """
-from .denetMysql import DeNetMysql
-from .longArticlesMysql import longArticlesMySQL
-from .pqMysql import PQMySQL
+from .api import bot
+from .api import create_feishu_columns_sheet
+from .api import log
+from .api import WeixinSpider
+from .api import PQAPI
+
+from .db import DeNetMysql
+from .db import PQMySQL
+from .db import longArticlesMySQL
+
 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, create_feishu_columns_sheet

applications/algApi.py

@@ -1,29 +0,0 @@
-"""
-@author: luojunhui
-"""
-import requests
-
-
-class AlgApi(object):
-    """
-    算法api
-    """
-    @classmethod
-    def getScoreList(cls, accountName, title_list):
-        """
-        获取得分
-        :return:
-        """
-        url = "http://61.48.133.26:6060/score_list"
-        body = {
-            "account_nickname_list": [accountName],
-            "text_list": title_list,
-            "max_time": None,
-            "min_time": None,
-            "interest_type": "avg",
-            "sim_type": "mean",
-            "rate": 0.1
-        }
-        response = requests.post(url=url, headers={}, json=body)
-        return response.json()
-

applications/api/__init__.py

@@ -1,4 +1,8 @@
 """
 @author: luojunhui
 """
-from .moon_shot_api import generate_mini_program_title
+from .moon_shot_api import generate_mini_program_title
+from .alibaba_cloud_api import log
+from .feishu_api import *
+from .wx_spider_api import WeixinSpider
+from .piaoquan_api import PQAPI

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

@@ -4,7 +4,7 @@
 import json
 import requests
 
-from applications.decoratorApi import retryOnTimeout
+from applications.utils.decorator import retryOnTimeout
 
 mention_all = {
     "content": "<at id=all></at>\n",

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

@@ -4,7 +4,7 @@
 import json
 import requests
 
-from applications.decoratorApi import retryOnNone
+from applications.utils.decorator import retryOnNone
 
 
 class WeixinSpider(object):

applications/db/__init__.py

@@ -6,6 +6,9 @@ import pymysql
 from contextlib import contextmanager
 
 from applications.exception import QueryError, TransactionError
+from .denetMysql import DeNetMysql
+from .pqMysql import PQMySQL
+from .longArticlesMysql import longArticlesMySQL
 
 
 class DatabaseConnector:

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

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

applications/exception/query_error.py

@@ -3,7 +3,7 @@
 """
 import json
 
-from applications import log
+from applications.api import log
 
 
 class QueryError(Exception):

applications/exception/transaction_error.py

@@ -3,7 +3,7 @@
 事务异常
 """
 
-from applications import log
+from applications.api import log
 
 
 class TransactionError(Exception):

applications/utils/__init__.py

@@ -0,0 +1,4 @@
+"""
+@author: luojunhui
+"""
+from .odps_api import OdpsApi

applications/aiditApi.py → applications/utils/aiditApi.py

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

applications/data_works.py → applications/utils/odps_api.py

@@ -4,7 +4,7 @@
 from odps import ODPS
 
 
-class ODPSApi(object):
+class OdpsApi(object):
     """
     PyODPS class, get data from odps server
     """

coldStartTasks/crawler/weixin_account_crawler.py

@@ -8,9 +8,9 @@ from typing import List, Set, Dict, Tuple
 from tqdm import tqdm
 from pymysql.cursors import DictCursor
 
-from applications import WeixinSpider, longArticlesMySQL, log, bot, aiditApi
+from applications import WeixinSpider, longArticlesMySQL, log, bot, Functions
 from applications.const import WeixinVideoCrawlerConst
-from applications.functions import Functions
+from applications.utils import aiditApi
 
 const = WeixinVideoCrawlerConst()
 function = Functions()

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.utils import aiditApi
 from config import apolloConfig
 
 apollo = apolloConfig()

flow_pool/exit_article_with_title.py

@@ -7,7 +7,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.utils.aiditApi import get_generated_article_list
 from config import apolloConfig
 
 config = apolloConfig()

kimi_balance_monitor.py

@@ -5,7 +5,7 @@ import requests
 import traceback
 
 from applications import bot
-from applications.decoratorApi import retryOnTimeout
+from applications.utils.decorator import retryOnTimeout
 
 BALANCE_LIMIT_THRESHOLD = 200.0
 
@@ -25,6 +25,7 @@ def check_kimi_balance():
     response = requests.request("GET", url, headers=headers, data=payload, timeout=10)
     if response.status_code == 200:
         response_json = response.json()
+        print(response_json)
         try:
             balance = response_json['data']['available_balance']
             if balance < BALANCE_LIMIT_THRESHOLD:

not_used_tasks/getTencentReadDetails.py

@@ -10,7 +10,7 @@ import schedule
 from tqdm import tqdm
 from datetime import datetime, timedelta
 
-from applications.decoratorApi import retryOnTimeout
+from applications.utils.decoratorApi import retryOnTimeout
 from applications import longArticlesMySQL, Functions
 
 

updatePublishedMsgDaily.py

@@ -13,7 +13,7 @@ from typing import Dict, List, Tuple
 from pymysql.cursors import DictCursor
 from tqdm import tqdm
 
-from applications import aiditApi
+from applications.utils import aiditApi
 from applications import bot
 from applications import create_feishu_columns_sheet
 from applications import Functions