24024
af7c11d7f9
- 新增图像生成接口，支持试用、积分和自定义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): 添加示例系统日志文件 - 记录用户请求、验证码发送成功与失败的日志信息
325 lines
12 KiB
Python
325 lines
12 KiB
Python
import logging
|
|
import os
|
|
import re
|
|
from typing import List, Optional, Tuple
|
|
|
|
from pip._internal.utils.misc import (
|
|
HiddenText,
|
|
display_path,
|
|
is_console_interactive,
|
|
is_installable_dir,
|
|
split_auth_from_netloc,
|
|
)
|
|
from pip._internal.utils.subprocess import CommandArgs, make_command
|
|
from pip._internal.vcs.versioncontrol import (
|
|
AuthInfo,
|
|
RemoteNotFoundError,
|
|
RevOptions,
|
|
VersionControl,
|
|
vcs,
|
|
)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
_svn_xml_url_re = re.compile('url="([^"]+)"')
|
|
_svn_rev_re = re.compile(r'committed-rev="(\d+)"')
|
|
_svn_info_xml_rev_re = re.compile(r'\s*revision="(\d+)"')
|
|
_svn_info_xml_url_re = re.compile(r"<url>(.*)</url>")
|
|
|
|
|
|
class Subversion(VersionControl):
|
|
name = "svn"
|
|
dirname = ".svn"
|
|
repo_name = "checkout"
|
|
schemes = ("svn+ssh", "svn+http", "svn+https", "svn+svn", "svn+file")
|
|
|
|
@classmethod
|
|
def should_add_vcs_url_prefix(cls, remote_url: str) -> bool:
|
|
return True
|
|
|
|
@staticmethod
|
|
def get_base_rev_args(rev: str) -> List[str]:
|
|
return ["-r", rev]
|
|
|
|
@classmethod
|
|
def get_revision(cls, location: str) -> str:
|
|
"""
|
|
Return the maximum revision for all files under a given location
|
|
"""
|
|
# Note: taken from setuptools.command.egg_info
|
|
revision = 0
|
|
|
|
for base, dirs, _ in os.walk(location):
|
|
if cls.dirname not in dirs:
|
|
dirs[:] = []
|
|
continue # no sense walking uncontrolled subdirs
|
|
dirs.remove(cls.dirname)
|
|
entries_fn = os.path.join(base, cls.dirname, "entries")
|
|
if not os.path.exists(entries_fn):
|
|
# FIXME: should we warn?
|
|
continue
|
|
|
|
dirurl, localrev = cls._get_svn_url_rev(base)
|
|
|
|
if base == location:
|
|
assert dirurl is not None
|
|
base = dirurl + "/" # save the root url
|
|
elif not dirurl or not dirurl.startswith(base):
|
|
dirs[:] = []
|
|
continue # not part of the same svn tree, skip it
|
|
revision = max(revision, localrev)
|
|
return str(revision)
|
|
|
|
@classmethod
|
|
def get_netloc_and_auth(
|
|
cls, netloc: str, scheme: str
|
|
) -> Tuple[str, Tuple[Optional[str], Optional[str]]]:
|
|
"""
|
|
This override allows the auth information to be passed to svn via the
|
|
--username and --password options instead of via the URL.
|
|
"""
|
|
if scheme == "ssh":
|
|
# The --username and --password options can't be used for
|
|
# svn+ssh URLs, so keep the auth information in the URL.
|
|
return super().get_netloc_and_auth(netloc, scheme)
|
|
|
|
return split_auth_from_netloc(netloc)
|
|
|
|
@classmethod
|
|
def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]:
|
|
# hotfix the URL scheme after removing svn+ from svn+ssh:// re-add it
|
|
url, rev, user_pass = super().get_url_rev_and_auth(url)
|
|
if url.startswith("ssh://"):
|
|
url = "svn+" + url
|
|
return url, rev, user_pass
|
|
|
|
@staticmethod
|
|
def make_rev_args(
|
|
username: Optional[str], password: Optional[HiddenText]
|
|
) -> CommandArgs:
|
|
extra_args: CommandArgs = []
|
|
if username:
|
|
extra_args += ["--username", username]
|
|
if password:
|
|
extra_args += ["--password", password]
|
|
|
|
return extra_args
|
|
|
|
@classmethod
|
|
def get_remote_url(cls, location: str) -> str:
|
|
# In cases where the source is in a subdirectory, we have to look up in
|
|
# the location until we find a valid project root.
|
|
orig_location = location
|
|
while not is_installable_dir(location):
|
|
last_location = location
|
|
location = os.path.dirname(location)
|
|
if location == last_location:
|
|
# We've traversed up to the root of the filesystem without
|
|
# finding a Python project.
|
|
logger.warning(
|
|
"Could not find Python project for directory %s (tried all "
|
|
"parent directories)",
|
|
orig_location,
|
|
)
|
|
raise RemoteNotFoundError
|
|
|
|
url, _rev = cls._get_svn_url_rev(location)
|
|
if url is None:
|
|
raise RemoteNotFoundError
|
|
|
|
return url
|
|
|
|
@classmethod
|
|
def _get_svn_url_rev(cls, location: str) -> Tuple[Optional[str], int]:
|
|
from pip._internal.exceptions import InstallationError
|
|
|
|
entries_path = os.path.join(location, cls.dirname, "entries")
|
|
if os.path.exists(entries_path):
|
|
with open(entries_path) as f:
|
|
data = f.read()
|
|
else: # subversion >= 1.7 does not have the 'entries' file
|
|
data = ""
|
|
|
|
url = None
|
|
if data.startswith("8") or data.startswith("9") or data.startswith("10"):
|
|
entries = list(map(str.splitlines, data.split("\n\x0c\n")))
|
|
del entries[0][0] # get rid of the '8'
|
|
url = entries[0][3]
|
|
revs = [int(d[9]) for d in entries if len(d) > 9 and d[9]] + [0]
|
|
elif data.startswith("<?xml"):
|
|
match = _svn_xml_url_re.search(data)
|
|
if not match:
|
|
raise ValueError(f"Badly formatted data: {data!r}")
|
|
url = match.group(1) # get repository URL
|
|
revs = [int(m.group(1)) for m in _svn_rev_re.finditer(data)] + [0]
|
|
else:
|
|
try:
|
|
# subversion >= 1.7
|
|
# Note that using get_remote_call_options is not necessary here
|
|
# because `svn info` is being run against a local directory.
|
|
# We don't need to worry about making sure interactive mode
|
|
# is being used to prompt for passwords, because passwords
|
|
# are only potentially needed for remote server requests.
|
|
xml = cls.run_command(
|
|
["info", "--xml", location],
|
|
show_stdout=False,
|
|
stdout_only=True,
|
|
)
|
|
match = _svn_info_xml_url_re.search(xml)
|
|
assert match is not None
|
|
url = match.group(1)
|
|
revs = [int(m.group(1)) for m in _svn_info_xml_rev_re.finditer(xml)]
|
|
except InstallationError:
|
|
url, revs = None, []
|
|
|
|
if revs:
|
|
rev = max(revs)
|
|
else:
|
|
rev = 0
|
|
|
|
return url, rev
|
|
|
|
@classmethod
|
|
def is_commit_id_equal(cls, dest: str, name: Optional[str]) -> bool:
|
|
"""Always assume the versions don't match"""
|
|
return False
|
|
|
|
def __init__(self, use_interactive: Optional[bool] = None) -> None:
|
|
if use_interactive is None:
|
|
use_interactive = is_console_interactive()
|
|
self.use_interactive = use_interactive
|
|
|
|
# This member is used to cache the fetched version of the current
|
|
# ``svn`` client.
|
|
# Special value definitions:
|
|
# None: Not evaluated yet.
|
|
# Empty tuple: Could not parse version.
|
|
self._vcs_version: Optional[Tuple[int, ...]] = None
|
|
|
|
super().__init__()
|
|
|
|
def call_vcs_version(self) -> Tuple[int, ...]:
|
|
"""Query the version of the currently installed Subversion client.
|
|
|
|
:return: A tuple containing the parts of the version information or
|
|
``()`` if the version returned from ``svn`` could not be parsed.
|
|
:raises: BadCommand: If ``svn`` is not installed.
|
|
"""
|
|
# Example versions:
|
|
# svn, version 1.10.3 (r1842928)
|
|
# compiled Feb 25 2019, 14:20:39 on x86_64-apple-darwin17.0.0
|
|
# svn, version 1.7.14 (r1542130)
|
|
# compiled Mar 28 2018, 08:49:13 on x86_64-pc-linux-gnu
|
|
# svn, version 1.12.0-SlikSvn (SlikSvn/1.12.0)
|
|
# compiled May 28 2019, 13:44:56 on x86_64-microsoft-windows6.2
|
|
version_prefix = "svn, version "
|
|
version = self.run_command(["--version"], show_stdout=False, stdout_only=True)
|
|
if not version.startswith(version_prefix):
|
|
return ()
|
|
|
|
version = version[len(version_prefix) :].split()[0]
|
|
version_list = version.partition("-")[0].split(".")
|
|
try:
|
|
parsed_version = tuple(map(int, version_list))
|
|
except ValueError:
|
|
return ()
|
|
|
|
return parsed_version
|
|
|
|
def get_vcs_version(self) -> Tuple[int, ...]:
|
|
"""Return the version of the currently installed Subversion client.
|
|
|
|
If the version of the Subversion client has already been queried,
|
|
a cached value will be used.
|
|
|
|
:return: A tuple containing the parts of the version information or
|
|
``()`` if the version returned from ``svn`` could not be parsed.
|
|
:raises: BadCommand: If ``svn`` is not installed.
|
|
"""
|
|
if self._vcs_version is not None:
|
|
# Use cached version, if available.
|
|
# If parsing the version failed previously (empty tuple),
|
|
# do not attempt to parse it again.
|
|
return self._vcs_version
|
|
|
|
vcs_version = self.call_vcs_version()
|
|
self._vcs_version = vcs_version
|
|
return vcs_version
|
|
|
|
def get_remote_call_options(self) -> CommandArgs:
|
|
"""Return options to be used on calls to Subversion that contact the server.
|
|
|
|
These options are applicable for the following ``svn`` subcommands used
|
|
in this class.
|
|
|
|
- checkout
|
|
- switch
|
|
- update
|
|
|
|
:return: A list of command line arguments to pass to ``svn``.
|
|
"""
|
|
if not self.use_interactive:
|
|
# --non-interactive switch is available since Subversion 0.14.4.
|
|
# Subversion < 1.8 runs in interactive mode by default.
|
|
return ["--non-interactive"]
|
|
|
|
svn_version = self.get_vcs_version()
|
|
# By default, Subversion >= 1.8 runs in non-interactive mode if
|
|
# stdin is not a TTY. Since that is how pip invokes SVN, in
|
|
# call_subprocess(), pip must pass --force-interactive to ensure
|
|
# the user can be prompted for a password, if required.
|
|
# SVN added the --force-interactive option in SVN 1.8. Since
|
|
# e.g. RHEL/CentOS 7, which is supported until 2024, ships with
|
|
# SVN 1.7, pip should continue to support SVN 1.7. Therefore, pip
|
|
# can't safely add the option if the SVN version is < 1.8 (or unknown).
|
|
if svn_version >= (1, 8):
|
|
return ["--force-interactive"]
|
|
|
|
return []
|
|
|
|
def fetch_new(
|
|
self, dest: str, url: HiddenText, rev_options: RevOptions, verbosity: int
|
|
) -> None:
|
|
rev_display = rev_options.to_display()
|
|
logger.info(
|
|
"Checking out %s%s to %s",
|
|
url,
|
|
rev_display,
|
|
display_path(dest),
|
|
)
|
|
if verbosity <= 0:
|
|
flag = "--quiet"
|
|
else:
|
|
flag = ""
|
|
cmd_args = make_command(
|
|
"checkout",
|
|
flag,
|
|
self.get_remote_call_options(),
|
|
rev_options.to_args(),
|
|
url,
|
|
dest,
|
|
)
|
|
self.run_command(cmd_args)
|
|
|
|
def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
|
|
cmd_args = make_command(
|
|
"switch",
|
|
self.get_remote_call_options(),
|
|
rev_options.to_args(),
|
|
url,
|
|
dest,
|
|
)
|
|
self.run_command(cmd_args)
|
|
|
|
def update(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
|
|
cmd_args = make_command(
|
|
"update",
|
|
self.get_remote_call_options(),
|
|
rev_options.to_args(),
|
|
dest,
|
|
)
|
|
self.run_command(cmd_args)
|
|
|
|
|
|
vcs.register(Subversion)
|