mirror of
https://github.com/zhayujie/chatgpt-on-wechat.git
synced 2026-06-02 00:57:41 +08:00
formatting code
This commit is contained in:
@@ -2,4 +2,4 @@
|
||||
OPEN_AI = "openAI"
|
||||
CHATGPT = "chatGPT"
|
||||
BAIDU = "baidu"
|
||||
CHATGPTONAZURE = "chatGPTOnAzure"
|
||||
CHATGPTONAZURE = "chatGPTOnAzure"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
from queue import Full, Queue
|
||||
from time import monotonic as time
|
||||
|
||||
|
||||
# add implementation of putleft to Queue
|
||||
class Dequeue(Queue):
|
||||
def putleft(self, item, block=True, timeout=None):
|
||||
@@ -30,4 +30,4 @@ class Dequeue(Queue):
|
||||
return self.putleft(item, block=False)
|
||||
|
||||
def _putleft(self, item):
|
||||
self.queue.appendleft(item)
|
||||
self.queue.appendleft(item)
|
||||
|
||||
@@ -39,4 +39,4 @@ class ExpiredDict(dict):
|
||||
return [(key, self[key]) for key in self.keys()]
|
||||
|
||||
def __iter__(self):
|
||||
return self.keys().__iter__()
|
||||
return self.keys().__iter__()
|
||||
|
||||
@@ -10,20 +10,29 @@ def _reset_logger(log):
|
||||
log.handlers.clear()
|
||||
log.propagate = False
|
||||
console_handle = logging.StreamHandler(sys.stdout)
|
||||
console_handle.setFormatter(logging.Formatter('[%(levelname)s][%(asctime)s][%(filename)s:%(lineno)d] - %(message)s',
|
||||
datefmt='%Y-%m-%d %H:%M:%S'))
|
||||
file_handle = logging.FileHandler('run.log', encoding='utf-8')
|
||||
file_handle.setFormatter(logging.Formatter('[%(levelname)s][%(asctime)s][%(filename)s:%(lineno)d] - %(message)s',
|
||||
datefmt='%Y-%m-%d %H:%M:%S'))
|
||||
console_handle.setFormatter(
|
||||
logging.Formatter(
|
||||
"[%(levelname)s][%(asctime)s][%(filename)s:%(lineno)d] - %(message)s",
|
||||
datefmt="%Y-%m-%d %H:%M:%S",
|
||||
)
|
||||
)
|
||||
file_handle = logging.FileHandler("run.log", encoding="utf-8")
|
||||
file_handle.setFormatter(
|
||||
logging.Formatter(
|
||||
"[%(levelname)s][%(asctime)s][%(filename)s:%(lineno)d] - %(message)s",
|
||||
datefmt="%Y-%m-%d %H:%M:%S",
|
||||
)
|
||||
)
|
||||
log.addHandler(file_handle)
|
||||
log.addHandler(console_handle)
|
||||
|
||||
|
||||
def _get_logger():
|
||||
log = logging.getLogger('log')
|
||||
log = logging.getLogger("log")
|
||||
_reset_logger(log)
|
||||
log.setLevel(logging.INFO)
|
||||
return log
|
||||
|
||||
|
||||
# 日志句柄
|
||||
logger = _get_logger()
|
||||
logger = _get_logger()
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import time
|
||||
|
||||
import pip
|
||||
from pip._internal import main as pipmain
|
||||
from common.log import logger,_reset_logger
|
||||
|
||||
from common.log import _reset_logger, logger
|
||||
|
||||
|
||||
def install(package):
|
||||
pipmain(['install', package])
|
||||
pipmain(["install", package])
|
||||
|
||||
|
||||
def install_requirements(file):
|
||||
pipmain(['install', '-r', file, "--upgrade"])
|
||||
pipmain(["install", "-r", file, "--upgrade"])
|
||||
_reset_logger(logger)
|
||||
|
||||
|
||||
def check_dulwich():
|
||||
needwait = False
|
||||
for i in range(2):
|
||||
@@ -18,13 +23,14 @@ def check_dulwich():
|
||||
needwait = False
|
||||
try:
|
||||
import dulwich
|
||||
|
||||
return
|
||||
except ImportError:
|
||||
try:
|
||||
install('dulwich')
|
||||
install("dulwich")
|
||||
except:
|
||||
needwait = True
|
||||
try:
|
||||
import dulwich
|
||||
except ImportError:
|
||||
raise ImportError("Unable to import dulwich")
|
||||
raise ImportError("Unable to import dulwich")
|
||||
|
||||
@@ -62,4 +62,4 @@ class SortedDict(dict):
|
||||
return iter(self.keys())
|
||||
|
||||
def __repr__(self):
|
||||
return f'{type(self).__name__}({dict(self)}, sort_func={self.sort_func.__name__}, reverse={self.reverse})'
|
||||
return f"{type(self).__name__}({dict(self)}, sort_func={self.sort_func.__name__}, reverse={self.reverse})"
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
import time,re,hashlib
|
||||
import hashlib
|
||||
import re
|
||||
import time
|
||||
|
||||
import config
|
||||
from common.log import logger
|
||||
|
||||
|
||||
def time_checker(f):
|
||||
def _time_checker(self, *args, **kwargs):
|
||||
_config = config.conf()
|
||||
@@ -9,17 +13,25 @@ def time_checker(f):
|
||||
if chat_time_module:
|
||||
chat_start_time = _config.get("chat_start_time", "00:00")
|
||||
chat_stopt_time = _config.get("chat_stop_time", "24:00")
|
||||
time_regex = re.compile(r'^([01]?[0-9]|2[0-4])(:)([0-5][0-9])$') #时间匹配,包含24:00
|
||||
time_regex = re.compile(
|
||||
r"^([01]?[0-9]|2[0-4])(:)([0-5][0-9])$"
|
||||
) # 时间匹配,包含24:00
|
||||
|
||||
starttime_format_check = time_regex.match(chat_start_time) # 检查停止时间格式
|
||||
stoptime_format_check = time_regex.match(chat_stopt_time) # 检查停止时间格式
|
||||
chat_time_check = chat_start_time < chat_stopt_time # 确定启动时间<停止时间
|
||||
chat_time_check = chat_start_time < chat_stopt_time # 确定启动时间<停止时间
|
||||
|
||||
# 时间格式检查
|
||||
if not (starttime_format_check and stoptime_format_check and chat_time_check):
|
||||
logger.warn('时间格式不正确,请在config.json中修改您的CHAT_START_TIME/CHAT_STOP_TIME,否则可能会影响您正常使用,开始({})-结束({})'.format(starttime_format_check,stoptime_format_check))
|
||||
if chat_start_time>"23:59":
|
||||
logger.error('启动时间可能存在问题,请修改!')
|
||||
if not (
|
||||
starttime_format_check and stoptime_format_check and chat_time_check
|
||||
):
|
||||
logger.warn(
|
||||
"时间格式不正确,请在config.json中修改您的CHAT_START_TIME/CHAT_STOP_TIME,否则可能会影响您正常使用,开始({})-结束({})".format(
|
||||
starttime_format_check, stoptime_format_check
|
||||
)
|
||||
)
|
||||
if chat_start_time > "23:59":
|
||||
logger.error("启动时间可能存在问题,请修改!")
|
||||
|
||||
# 服务时间检查
|
||||
now_time = time.strftime("%H:%M", time.localtime())
|
||||
@@ -27,12 +39,12 @@ def time_checker(f):
|
||||
f(self, *args, **kwargs)
|
||||
return None
|
||||
else:
|
||||
if args[0]['Content'] == "#更新配置": # 不在服务时间内也可以更新配置
|
||||
if args[0]["Content"] == "#更新配置": # 不在服务时间内也可以更新配置
|
||||
f(self, *args, **kwargs)
|
||||
else:
|
||||
logger.info('非服务时间内,不接受访问')
|
||||
logger.info("非服务时间内,不接受访问")
|
||||
return None
|
||||
else:
|
||||
f(self, *args, **kwargs) # 未开启时间模块则直接回答
|
||||
return _time_checker
|
||||
|
||||
return _time_checker
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
|
||||
import os
|
||||
import pathlib
|
||||
|
||||
from config import conf
|
||||
|
||||
|
||||
class TmpDir(object):
|
||||
"""A temporary directory that is deleted when the object is destroyed.
|
||||
"""
|
||||
"""A temporary directory that is deleted when the object is destroyed."""
|
||||
|
||||
tmpFilePath = pathlib.Path("./tmp/")
|
||||
|
||||
tmpFilePath = pathlib.Path('./tmp/')
|
||||
|
||||
def __init__(self):
|
||||
pathExists = os.path.exists(self.tmpFilePath)
|
||||
if not pathExists:
|
||||
os.makedirs(self.tmpFilePath)
|
||||
|
||||
def path(self):
|
||||
return str(self.tmpFilePath) + '/'
|
||||
|
||||
return str(self.tmpFilePath) + "/"
|
||||
|
||||
Reference in New Issue
Block a user