- 新增图像生成接口,支持试用、积分和自定义API Key模式 - 实现生成图片结果异步上传至MinIO存储,带重试机制 - 优化积分预扣除和异常退还逻辑,保障用户积分准确 - 添加获取生成历史记录接口,支持时间范围和分页 - 提供本地字典配置接口,支持模型、比例、提示模板和尺寸 - 实现图片批量上传接口,支持S3兼容对象存储 feat(admin): 增加管理员角色管理与权限分配接口 - 实现角色列表查询、角色创建、更新及删除功能 - 增加权限列表查询接口 - 实现用户角色分配接口,便于统一管理用户权限 - 增加系统字典增删查改接口,支持分类过滤和排序 - 权限控制全面覆盖管理接口,保证安全访问 feat(auth): 完善用户登录注册及权限相关接口与页面 - 实现手机号验证码发送及校验功能,保障注册安全 - 支持手机号注册、登录及退出接口,集成日志记录 - 增加修改密码功能,验证原密码后更新 - 提供动态导航菜单接口,基于权限展示不同菜单 - 实现管理界面路由及日志、角色、字典管理页面访问权限控制 - 添加系统日志查询接口,支持关键词和等级筛选 feat(app): 初始化Flask应用并配置蓝图与数据库 - 创建应用程序工厂,加载配置,初始化数据库和Redis客户端 - 注册认证、API及管理员蓝图,整合路由 - 根路由渲染主页模板 - 应用上下文中自动创建数据库表,保证运行环境准备完毕 feat(database): 提供数据库创建与迁移支持脚本 - 新增数据库创建脚本,支持自动检测是否已存在 - 添加数据库表初始化脚本,支持创建和删除所有表 - 实现RBAC权限初始化,包含基础权限和角色创建 - 新增字段手动修复脚本,添加用户API Key和积分字段 - 强制迁移脚本支持清理连接和修复表结构,初始化默认数据及角色分配 feat(config): 新增系统配置参数 - 配置数据库、Redis、Session和MinIO相关参数 - 添加AI接口地址及试用Key配置 - 集成阿里云短信服务配置及开发模式相关参数 feat(extensions): 初始化数据库、Redis和MinIO客户端 - 创建全局SQLAlchemy数据库实例和Redis客户端 - 配置基于boto3的MinIO兼容S3客户端 chore(logs): 添加示例系统日志文件 - 记录用户请求、验证码发送成功与失败的日志信息
264 lines
9.8 KiB
Python
264 lines
9.8 KiB
Python
from logging import getLogger
|
|
from typing import Any, Union
|
|
|
|
from ..exceptions import ConnectionError, InvalidResponse, ResponseError
|
|
from ..typing import EncodableT
|
|
from .base import (
|
|
AsyncPushNotificationsParser,
|
|
PushNotificationsParser,
|
|
_AsyncRESPBase,
|
|
_RESPBase,
|
|
)
|
|
from .socket import SERVER_CLOSED_CONNECTION_ERROR
|
|
|
|
|
|
class _RESP3Parser(_RESPBase, PushNotificationsParser):
|
|
"""RESP3 protocol implementation"""
|
|
|
|
def __init__(self, socket_read_size):
|
|
super().__init__(socket_read_size)
|
|
self.pubsub_push_handler_func = self.handle_pubsub_push_response
|
|
self.node_moving_push_handler_func = None
|
|
self.maintenance_push_handler_func = None
|
|
self.invalidation_push_handler_func = None
|
|
|
|
def handle_pubsub_push_response(self, response):
|
|
logger = getLogger("push_response")
|
|
logger.debug("Push response: " + str(response))
|
|
return response
|
|
|
|
def read_response(self, disable_decoding=False, push_request=False):
|
|
pos = self._buffer.get_pos() if self._buffer else None
|
|
try:
|
|
result = self._read_response(
|
|
disable_decoding=disable_decoding, push_request=push_request
|
|
)
|
|
except BaseException:
|
|
if self._buffer:
|
|
self._buffer.rewind(pos)
|
|
raise
|
|
else:
|
|
self._buffer.purge()
|
|
return result
|
|
|
|
def _read_response(self, disable_decoding=False, push_request=False):
|
|
raw = self._buffer.readline()
|
|
if not raw:
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR)
|
|
|
|
byte, response = raw[:1], raw[1:]
|
|
|
|
# server returned an error
|
|
if byte in (b"-", b"!"):
|
|
if byte == b"!":
|
|
response = self._buffer.read(int(response))
|
|
response = response.decode("utf-8", errors="replace")
|
|
error = self.parse_error(response)
|
|
# if the error is a ConnectionError, raise immediately so the user
|
|
# is notified
|
|
if isinstance(error, ConnectionError):
|
|
raise error
|
|
# otherwise, we're dealing with a ResponseError that might belong
|
|
# inside a pipeline response. the connection's read_response()
|
|
# and/or the pipeline's execute() will raise this error if
|
|
# necessary, so just return the exception instance here.
|
|
return error
|
|
# single value
|
|
elif byte == b"+":
|
|
pass
|
|
# null value
|
|
elif byte == b"_":
|
|
return None
|
|
# int and big int values
|
|
elif byte in (b":", b"("):
|
|
return int(response)
|
|
# double value
|
|
elif byte == b",":
|
|
return float(response)
|
|
# bool value
|
|
elif byte == b"#":
|
|
return response == b"t"
|
|
# bulk response
|
|
elif byte == b"$":
|
|
response = self._buffer.read(int(response))
|
|
# verbatim string response
|
|
elif byte == b"=":
|
|
response = self._buffer.read(int(response))[4:]
|
|
# array response
|
|
elif byte == b"*":
|
|
response = [
|
|
self._read_response(disable_decoding=disable_decoding)
|
|
for _ in range(int(response))
|
|
]
|
|
# set response
|
|
elif byte == b"~":
|
|
# redis can return unhashable types (like dict) in a set,
|
|
# so we return sets as list, all the time, for predictability
|
|
response = [
|
|
self._read_response(disable_decoding=disable_decoding)
|
|
for _ in range(int(response))
|
|
]
|
|
# map response
|
|
elif byte == b"%":
|
|
# We cannot use a dict-comprehension to parse stream.
|
|
# Evaluation order of key:val expression in dict comprehension only
|
|
# became defined to be left-right in version 3.8
|
|
resp_dict = {}
|
|
for _ in range(int(response)):
|
|
key = self._read_response(disable_decoding=disable_decoding)
|
|
resp_dict[key] = self._read_response(
|
|
disable_decoding=disable_decoding, push_request=push_request
|
|
)
|
|
response = resp_dict
|
|
# push response
|
|
elif byte == b">":
|
|
response = [
|
|
self._read_response(
|
|
disable_decoding=disable_decoding, push_request=push_request
|
|
)
|
|
for _ in range(int(response))
|
|
]
|
|
response = self.handle_push_response(response)
|
|
|
|
# if this is a push request return the push response
|
|
if push_request:
|
|
return response
|
|
|
|
return self._read_response(
|
|
disable_decoding=disable_decoding,
|
|
push_request=push_request,
|
|
)
|
|
else:
|
|
raise InvalidResponse(f"Protocol Error: {raw!r}")
|
|
|
|
if isinstance(response, bytes) and disable_decoding is False:
|
|
response = self.encoder.decode(response)
|
|
|
|
return response
|
|
|
|
|
|
class _AsyncRESP3Parser(_AsyncRESPBase, AsyncPushNotificationsParser):
|
|
def __init__(self, socket_read_size):
|
|
super().__init__(socket_read_size)
|
|
self.pubsub_push_handler_func = self.handle_pubsub_push_response
|
|
self.invalidation_push_handler_func = None
|
|
|
|
async def handle_pubsub_push_response(self, response):
|
|
logger = getLogger("push_response")
|
|
logger.debug("Push response: " + str(response))
|
|
return response
|
|
|
|
async def read_response(
|
|
self, disable_decoding: bool = False, push_request: bool = False
|
|
):
|
|
if self._chunks:
|
|
# augment parsing buffer with previously read data
|
|
self._buffer += b"".join(self._chunks)
|
|
self._chunks.clear()
|
|
self._pos = 0
|
|
response = await self._read_response(
|
|
disable_decoding=disable_decoding, push_request=push_request
|
|
)
|
|
# Successfully parsing a response allows us to clear our parsing buffer
|
|
self._clear()
|
|
return response
|
|
|
|
async def _read_response(
|
|
self, disable_decoding: bool = False, push_request: bool = False
|
|
) -> Union[EncodableT, ResponseError, None]:
|
|
if not self._stream or not self.encoder:
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR)
|
|
raw = await self._readline()
|
|
response: Any
|
|
byte, response = raw[:1], raw[1:]
|
|
|
|
# if byte not in (b"-", b"+", b":", b"$", b"*"):
|
|
# raise InvalidResponse(f"Protocol Error: {raw!r}")
|
|
|
|
# server returned an error
|
|
if byte in (b"-", b"!"):
|
|
if byte == b"!":
|
|
response = await self._read(int(response))
|
|
response = response.decode("utf-8", errors="replace")
|
|
error = self.parse_error(response)
|
|
# if the error is a ConnectionError, raise immediately so the user
|
|
# is notified
|
|
if isinstance(error, ConnectionError):
|
|
self._clear() # Successful parse
|
|
raise error
|
|
# otherwise, we're dealing with a ResponseError that might belong
|
|
# inside a pipeline response. the connection's read_response()
|
|
# and/or the pipeline's execute() will raise this error if
|
|
# necessary, so just return the exception instance here.
|
|
return error
|
|
# single value
|
|
elif byte == b"+":
|
|
pass
|
|
# null value
|
|
elif byte == b"_":
|
|
return None
|
|
# int and big int values
|
|
elif byte in (b":", b"("):
|
|
return int(response)
|
|
# double value
|
|
elif byte == b",":
|
|
return float(response)
|
|
# bool value
|
|
elif byte == b"#":
|
|
return response == b"t"
|
|
# bulk response
|
|
elif byte == b"$":
|
|
response = await self._read(int(response))
|
|
# verbatim string response
|
|
elif byte == b"=":
|
|
response = (await self._read(int(response)))[4:]
|
|
# array response
|
|
elif byte == b"*":
|
|
response = [
|
|
(await self._read_response(disable_decoding=disable_decoding))
|
|
for _ in range(int(response))
|
|
]
|
|
# set response
|
|
elif byte == b"~":
|
|
# redis can return unhashable types (like dict) in a set,
|
|
# so we always convert to a list, to have predictable return types
|
|
response = [
|
|
(await self._read_response(disable_decoding=disable_decoding))
|
|
for _ in range(int(response))
|
|
]
|
|
# map response
|
|
elif byte == b"%":
|
|
# We cannot use a dict-comprehension to parse stream.
|
|
# Evaluation order of key:val expression in dict comprehension only
|
|
# became defined to be left-right in version 3.8
|
|
resp_dict = {}
|
|
for _ in range(int(response)):
|
|
key = await self._read_response(disable_decoding=disable_decoding)
|
|
resp_dict[key] = await self._read_response(
|
|
disable_decoding=disable_decoding, push_request=push_request
|
|
)
|
|
response = resp_dict
|
|
# push response
|
|
elif byte == b">":
|
|
response = [
|
|
(
|
|
await self._read_response(
|
|
disable_decoding=disable_decoding, push_request=push_request
|
|
)
|
|
)
|
|
for _ in range(int(response))
|
|
]
|
|
response = await self.handle_push_response(response)
|
|
if not push_request:
|
|
return await self._read_response(
|
|
disable_decoding=disable_decoding, push_request=push_request
|
|
)
|
|
else:
|
|
return response
|
|
else:
|
|
raise InvalidResponse(f"Protocol Error: {raw!r}")
|
|
|
|
if isinstance(response, bytes) and disable_decoding is False:
|
|
response = self.encoder.decode(response)
|
|
return response
|