- 新增图像生成接口,支持试用、积分和自定义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): 添加示例系统日志文件 - 记录用户请求、验证码发送成功与失败的日志信息
302 lines
11 KiB
Python
302 lines
11 KiB
Python
import asyncio
|
|
import socket
|
|
import sys
|
|
from logging import getLogger
|
|
from typing import Callable, List, Optional, TypedDict, Union
|
|
|
|
if sys.version_info.major >= 3 and sys.version_info.minor >= 11:
|
|
from asyncio import timeout as async_timeout
|
|
else:
|
|
from async_timeout import timeout as async_timeout
|
|
|
|
from ..exceptions import ConnectionError, InvalidResponse, RedisError
|
|
from ..typing import EncodableT
|
|
from ..utils import HIREDIS_AVAILABLE
|
|
from .base import (
|
|
AsyncBaseParser,
|
|
AsyncPushNotificationsParser,
|
|
BaseParser,
|
|
PushNotificationsParser,
|
|
)
|
|
from .socket import (
|
|
NONBLOCKING_EXCEPTION_ERROR_NUMBERS,
|
|
NONBLOCKING_EXCEPTIONS,
|
|
SENTINEL,
|
|
SERVER_CLOSED_CONNECTION_ERROR,
|
|
)
|
|
|
|
# Used to signal that hiredis-py does not have enough data to parse.
|
|
# Using `False` or `None` is not reliable, given that the parser can
|
|
# return `False` or `None` for legitimate reasons from RESP payloads.
|
|
NOT_ENOUGH_DATA = object()
|
|
|
|
|
|
class _HiredisReaderArgs(TypedDict, total=False):
|
|
protocolError: Callable[[str], Exception]
|
|
replyError: Callable[[str], Exception]
|
|
encoding: Optional[str]
|
|
errors: Optional[str]
|
|
|
|
|
|
class _HiredisParser(BaseParser, PushNotificationsParser):
|
|
"Parser class for connections using Hiredis"
|
|
|
|
def __init__(self, socket_read_size):
|
|
if not HIREDIS_AVAILABLE:
|
|
raise RedisError("Hiredis is not installed")
|
|
self.socket_read_size = socket_read_size
|
|
self._buffer = bytearray(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
|
|
self._hiredis_PushNotificationType = None
|
|
|
|
def __del__(self):
|
|
try:
|
|
self.on_disconnect()
|
|
except Exception:
|
|
pass
|
|
|
|
def handle_pubsub_push_response(self, response):
|
|
logger = getLogger("push_response")
|
|
logger.debug("Push response: " + str(response))
|
|
return response
|
|
|
|
def on_connect(self, connection, **kwargs):
|
|
import hiredis
|
|
|
|
self._sock = connection._sock
|
|
self._socket_timeout = connection.socket_timeout
|
|
kwargs = {
|
|
"protocolError": InvalidResponse,
|
|
"replyError": self.parse_error,
|
|
"errors": connection.encoder.encoding_errors,
|
|
"notEnoughData": NOT_ENOUGH_DATA,
|
|
}
|
|
|
|
if connection.encoder.decode_responses:
|
|
kwargs["encoding"] = connection.encoder.encoding
|
|
self._reader = hiredis.Reader(**kwargs)
|
|
self._next_response = NOT_ENOUGH_DATA
|
|
|
|
try:
|
|
self._hiredis_PushNotificationType = hiredis.PushNotification
|
|
except AttributeError:
|
|
# hiredis < 3.2
|
|
self._hiredis_PushNotificationType = None
|
|
|
|
def on_disconnect(self):
|
|
self._sock = None
|
|
self._reader = None
|
|
self._next_response = NOT_ENOUGH_DATA
|
|
|
|
def can_read(self, timeout):
|
|
if not self._reader:
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR)
|
|
|
|
if self._next_response is NOT_ENOUGH_DATA:
|
|
self._next_response = self._reader.gets()
|
|
if self._next_response is NOT_ENOUGH_DATA:
|
|
return self.read_from_socket(timeout=timeout, raise_on_timeout=False)
|
|
return True
|
|
|
|
def read_from_socket(self, timeout=SENTINEL, raise_on_timeout=True):
|
|
sock = self._sock
|
|
custom_timeout = timeout is not SENTINEL
|
|
try:
|
|
if custom_timeout:
|
|
sock.settimeout(timeout)
|
|
bufflen = self._sock.recv_into(self._buffer)
|
|
if bufflen == 0:
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR)
|
|
self._reader.feed(self._buffer, 0, bufflen)
|
|
# data was read from the socket and added to the buffer.
|
|
# return True to indicate that data was read.
|
|
return True
|
|
except socket.timeout:
|
|
if raise_on_timeout:
|
|
raise TimeoutError("Timeout reading from socket")
|
|
return False
|
|
except NONBLOCKING_EXCEPTIONS as ex:
|
|
# if we're in nonblocking mode and the recv raises a
|
|
# blocking error, simply return False indicating that
|
|
# there's no data to be read. otherwise raise the
|
|
# original exception.
|
|
allowed = NONBLOCKING_EXCEPTION_ERROR_NUMBERS.get(ex.__class__, -1)
|
|
if not raise_on_timeout and ex.errno == allowed:
|
|
return False
|
|
raise ConnectionError(f"Error while reading from socket: {ex.args}")
|
|
finally:
|
|
if custom_timeout:
|
|
sock.settimeout(self._socket_timeout)
|
|
|
|
def read_response(self, disable_decoding=False, push_request=False):
|
|
if not self._reader:
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR)
|
|
|
|
# _next_response might be cached from a can_read() call
|
|
if self._next_response is not NOT_ENOUGH_DATA:
|
|
response = self._next_response
|
|
self._next_response = NOT_ENOUGH_DATA
|
|
if self._hiredis_PushNotificationType is not None and isinstance(
|
|
response, self._hiredis_PushNotificationType
|
|
):
|
|
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,
|
|
)
|
|
return response
|
|
|
|
if disable_decoding:
|
|
response = self._reader.gets(False)
|
|
else:
|
|
response = self._reader.gets()
|
|
|
|
while response is NOT_ENOUGH_DATA:
|
|
self.read_from_socket()
|
|
if disable_decoding:
|
|
response = self._reader.gets(False)
|
|
else:
|
|
response = self._reader.gets()
|
|
# if the response is a ConnectionError or the response is a list and
|
|
# the first item is a ConnectionError, raise it as something bad
|
|
# happened
|
|
if isinstance(response, ConnectionError):
|
|
raise response
|
|
elif self._hiredis_PushNotificationType is not None and isinstance(
|
|
response, self._hiredis_PushNotificationType
|
|
):
|
|
response = self.handle_push_response(response)
|
|
if push_request:
|
|
return response
|
|
return self.read_response(
|
|
disable_decoding=disable_decoding,
|
|
push_request=push_request,
|
|
)
|
|
|
|
elif (
|
|
isinstance(response, list)
|
|
and response
|
|
and isinstance(response[0], ConnectionError)
|
|
):
|
|
raise response[0]
|
|
return response
|
|
|
|
|
|
class _AsyncHiredisParser(AsyncBaseParser, AsyncPushNotificationsParser):
|
|
"""Async implementation of parser class for connections using Hiredis"""
|
|
|
|
__slots__ = ("_reader",)
|
|
|
|
def __init__(self, socket_read_size: int):
|
|
if not HIREDIS_AVAILABLE:
|
|
raise RedisError("Hiredis is not available.")
|
|
super().__init__(socket_read_size=socket_read_size)
|
|
self._reader = None
|
|
self.pubsub_push_handler_func = self.handle_pubsub_push_response
|
|
self.invalidation_push_handler_func = None
|
|
self._hiredis_PushNotificationType = None
|
|
|
|
async def handle_pubsub_push_response(self, response):
|
|
logger = getLogger("push_response")
|
|
logger.debug("Push response: " + str(response))
|
|
return response
|
|
|
|
def on_connect(self, connection):
|
|
import hiredis
|
|
|
|
self._stream = connection._reader
|
|
kwargs: _HiredisReaderArgs = {
|
|
"protocolError": InvalidResponse,
|
|
"replyError": self.parse_error,
|
|
"notEnoughData": NOT_ENOUGH_DATA,
|
|
}
|
|
if connection.encoder.decode_responses:
|
|
kwargs["encoding"] = connection.encoder.encoding
|
|
kwargs["errors"] = connection.encoder.encoding_errors
|
|
|
|
self._reader = hiredis.Reader(**kwargs)
|
|
self._connected = True
|
|
|
|
try:
|
|
self._hiredis_PushNotificationType = getattr(
|
|
hiredis, "PushNotification", None
|
|
)
|
|
except AttributeError:
|
|
# hiredis < 3.2
|
|
self._hiredis_PushNotificationType = None
|
|
|
|
def on_disconnect(self):
|
|
self._connected = False
|
|
|
|
async def can_read_destructive(self):
|
|
if not self._connected:
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR)
|
|
if self._reader.gets() is not NOT_ENOUGH_DATA:
|
|
return True
|
|
try:
|
|
async with async_timeout(0):
|
|
return await self.read_from_socket()
|
|
except asyncio.TimeoutError:
|
|
return False
|
|
|
|
async def read_from_socket(self):
|
|
buffer = await self._stream.read(self._read_size)
|
|
if not buffer or not isinstance(buffer, bytes):
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR) from None
|
|
self._reader.feed(buffer)
|
|
# data was read from the socket and added to the buffer.
|
|
# return True to indicate that data was read.
|
|
return True
|
|
|
|
async def read_response(
|
|
self, disable_decoding: bool = False, push_request: bool = False
|
|
) -> Union[EncodableT, List[EncodableT]]:
|
|
# If `on_disconnect()` has been called, prohibit any more reads
|
|
# even if they could happen because data might be present.
|
|
# We still allow reads in progress to finish
|
|
if not self._connected:
|
|
raise ConnectionError(SERVER_CLOSED_CONNECTION_ERROR) from None
|
|
|
|
if disable_decoding:
|
|
response = self._reader.gets(False)
|
|
else:
|
|
response = self._reader.gets()
|
|
|
|
while response is NOT_ENOUGH_DATA:
|
|
await self.read_from_socket()
|
|
if disable_decoding:
|
|
response = self._reader.gets(False)
|
|
else:
|
|
response = self._reader.gets()
|
|
|
|
# if the response is a ConnectionError or the response is a list and
|
|
# the first item is a ConnectionError, raise it as something bad
|
|
# happened
|
|
if isinstance(response, ConnectionError):
|
|
raise response
|
|
elif self._hiredis_PushNotificationType is not None and isinstance(
|
|
response, self._hiredis_PushNotificationType
|
|
):
|
|
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
|
|
elif (
|
|
isinstance(response, list)
|
|
and response
|
|
and isinstance(response[0], ConnectionError)
|
|
):
|
|
raise response[0]
|
|
return response
|