f624971613
* chore(core.utils): 🚨 修正错误Lint
* chore(core.provider): 🚨 修复基类错误Lint
* chore(core.utils): 补全session_get()的重载
* chore(core.provider): 🚨 修正实现错误Lint
* chore(core.platform): 🚨 修正platform基类和webchat的错误Lint
* chore(core.platform): 修正错误实现Lint
* fix(core.provider): 修复循环调用和错误assert
* chore(core.platform): 修复部分实现Lint
* chore(core.provider): 补充Dify.text_chat_stream的参数类型
* chore(core.pipeline): 🚨 修复错误Lint
* fix(core.slack): 补充遗漏导入
* chore(core.utils): 修复错误的session_get声明
* chore(core.platform): 移除Lark adapter import中的wildcard
* chore(core.db): 修复声明和部分逻辑
* chore(core.db): 添加typings,使faiss参数能被正确识别。
* chore(core): 修复声明
* chore(core): 修改声明
* chore: 补充faiss声明
* chore(dashboard): 修改实现,减少报错
* chore(package): 修改部分声明与实现,减少报错
* chore(core): 添加Handler的overload,以去除部分assert同时通过类型检查
* chore(core.pipeline): 修改Pipeline Scheduler的execute,将判断属性改为判断类型,通过静态类型检查
* chore(core.config): 添加类型标注,通过类型检查
* chore(core.message): 为File._download_file添加检查,通过类型检查
* fix: 将断言改为条件判断以实现优雅关闭的容错性
* refactor: 移除 discord 客户端中的 assert,改用 if None 判断并抛出异常
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: DiscordPlatformAdapter 对 self.client.user 为 None 做日志并返回,移除断言
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 增强 Lark 相关空值/异常检查并完善日志输出
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 将断言替换为条件检查并加入日志与错误处理
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* chore: 移除LLM生成的无用注释
* refactor: 使用 File.get_file 替换下载逻辑并移除 assert,提供默认 filename
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: Slack Socket 未初始化抛出运行时异常,图片 URL 判空改为非空判断
* refactor: 将 WeChatPadProAdapter 的断言改为空值判断并添加日志
* refactor: 使用 isinstance 替代断言实现类型判断,便于静态检查
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 去除cast,直接使用字段与字典访问,修正端口解析
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 使用 match-case 重构 ProviderManager 加载并通过类型检查抛出 TypeError
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: group_name_display 时若 group 对象为空则记录错误并返回
* fix: 将 _get_current_persona_id 的 assert 替换成 if guard 并返回 None
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 优化插件目录存在性检查及图片URL非空验证,更新JSON排序配置
* fix: 将 datetime_str 的 assert 替换为显式检查并抛出异常
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除 cast,改为运行时检查并在找不到调度器时跳过
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除 cast,改用 isinstance 检查 FaissVecDB 并警告
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 删除 typing.cast 导入,并在获取文件绝对路径前校验 file_
* refactor: 移除 typing.cast,简化内容安全检查调用
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 将 PlatformMetadata.id 设为必填并在注册时传入 id,移除 cast
* refactor: 移除 cast,改用 HasInitialize 与 isinstance 进行初始化
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 为 ProviderManager.initialize 增加ID类型判断,避免 None 导致 get 失败
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 为 OTTSProvider 与 AzureNativeProvider 引入 _client 与 client 属性改进上下文管理
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 为 Whisper 自托管源添加模型未初始化校验并直接调用 transcribe
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 移除未使用的 cast 导入并简化 platform_name 赋值
* refactor: 引入 cast 并对 id 使用 cast(str, ...) 提升类型安全
* fix: 将 _id_to_sid 返回改为 str,空值返回空串;对 id 与 message_id 使用 cast
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 重构 Discord 处理逻辑:强制 类型转换、优先斜杠指令并优化提及判断
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* fix: 统一对 id 获取执行 cast,并在微信消息解析失败时抛错
* Revert "fix: 去除cast,直接使用字段与字典访问,修正端口解析"
This reverts commit 1cbfdf9d1b.
* fix: 百炼 Rerank 会话关闭时返回空结果;初始化 request.prompt 避免空值拼接
* fix: 统一处理搜索结果链接为字符串,新增 _get_url 助手并适配 Bing/Sogo
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
* refactor: 调整 call_handler 泛型、Discord 通道注解及 FishAudioTTS API 请求类型
* refactor: 使用 col(...) 替代列引用并对结果进行 CursorResult 强转
* chore: ruff format
---------
Co-authored-by: aider (openai/gemini-3-pro-high) <aider@aider.chat>
Co-authored-by: Soulter <905617992@qq.com>
211 lines
6.6 KiB
Python
211 lines
6.6 KiB
Python
import asyncio
|
||
import os
|
||
import threading
|
||
from typing import Any, TypeVar, overload
|
||
|
||
from astrbot.core.db import BaseDatabase
|
||
from astrbot.core.db.po import Preference
|
||
|
||
from .astrbot_path import get_astrbot_data_path
|
||
|
||
_VT = TypeVar("_VT")
|
||
|
||
|
||
class SharedPreferences:
|
||
def __init__(self, db_helper: BaseDatabase, json_storage_path=None):
|
||
if json_storage_path is None:
|
||
json_storage_path = os.path.join(
|
||
get_astrbot_data_path(),
|
||
"shared_preferences.json",
|
||
)
|
||
self.path = json_storage_path
|
||
self.db_helper = db_helper
|
||
|
||
self._sync_loop = asyncio.new_event_loop()
|
||
t = threading.Thread(target=self._sync_loop.run_forever, daemon=True)
|
||
t.start()
|
||
|
||
async def get_async(
|
||
self,
|
||
scope: str,
|
||
scope_id: str,
|
||
key: str,
|
||
default: _VT = None,
|
||
) -> _VT:
|
||
"""获取指定范围和键的偏好设置"""
|
||
if scope_id is not None and key is not None:
|
||
result = await self.db_helper.get_preference(scope, scope_id, key)
|
||
if result:
|
||
ret = result.value["val"]
|
||
else:
|
||
ret = default
|
||
return ret
|
||
|
||
async def range_get_async(
|
||
self,
|
||
scope: str,
|
||
scope_id: str | None = None,
|
||
key: str | None = None,
|
||
) -> list[Preference]:
|
||
"""获取指定范围的偏好设置
|
||
Note: 返回 Preference 列表,其中的 value 属性是一个 dict,value["val"] 为值。scope_id 和 key 可以为 None,这时返回该范围下所有的偏好设置。
|
||
"""
|
||
ret = await self.db_helper.get_preferences(scope, scope_id, key)
|
||
return ret
|
||
|
||
@overload
|
||
async def session_get(
|
||
self,
|
||
umo: str,
|
||
key: str,
|
||
default: _VT = None,
|
||
) -> _VT: ...
|
||
|
||
@overload
|
||
async def session_get(
|
||
self,
|
||
umo: None,
|
||
key: str,
|
||
default: Any = None,
|
||
) -> list[Preference]: ...
|
||
|
||
@overload
|
||
async def session_get(
|
||
self,
|
||
umo: str,
|
||
key: None,
|
||
default: Any = None,
|
||
) -> list[Preference]: ...
|
||
|
||
@overload
|
||
async def session_get(
|
||
self,
|
||
umo: None,
|
||
key: None,
|
||
default: Any = None,
|
||
) -> list[Preference]: ...
|
||
|
||
async def session_get(
|
||
self,
|
||
umo: str | None,
|
||
key: str | None = None,
|
||
default: _VT = None,
|
||
) -> _VT | list[Preference]:
|
||
"""获取会话范围的偏好设置
|
||
|
||
Note: 当 umo 或者 key 为 None,时,返回 Preference 列表,其中的 value 属性是一个 dict,value["val"] 为值。
|
||
"""
|
||
if umo is None or key is None:
|
||
return await self.range_get_async("umo", umo, key)
|
||
return await self.get_async("umo", umo, key, default)
|
||
|
||
@overload
|
||
async def global_get(self, key: None, default: Any = None) -> list[Preference]: ...
|
||
|
||
@overload
|
||
async def global_get(self, key: str, default: _VT = None) -> _VT: ...
|
||
|
||
async def global_get(
|
||
self,
|
||
key: str | None,
|
||
default: _VT = None,
|
||
) -> _VT | list[Preference]:
|
||
"""获取全局范围的偏好设置
|
||
|
||
Note: 当 scope_id 或者 key 为 None,时,返回 Preference 列表,其中的 value 属性是一个 dict,value["val"] 为值。
|
||
"""
|
||
if key is None:
|
||
return await self.range_get_async("global", "global", key)
|
||
return await self.get_async("global", "global", key, default)
|
||
|
||
async def put_async(self, scope: str, scope_id: str, key: str, value: Any):
|
||
"""设置指定范围和键的偏好设置"""
|
||
await self.db_helper.insert_preference_or_update(
|
||
scope,
|
||
scope_id,
|
||
key,
|
||
{"val": value},
|
||
)
|
||
|
||
async def session_put(self, umo: str, key: str, value: Any):
|
||
await self.put_async("umo", umo, key, value)
|
||
|
||
async def global_put(self, key: str, value: Any):
|
||
await self.put_async("global", "global", key, value)
|
||
|
||
async def remove_async(self, scope: str, scope_id: str, key: str):
|
||
"""删除指定范围和键的偏好设置"""
|
||
await self.db_helper.remove_preference(scope, scope_id, key)
|
||
|
||
async def session_remove(self, umo: str, key: str):
|
||
await self.remove_async("umo", umo, key)
|
||
|
||
async def global_remove(self, key: str):
|
||
"""删除全局偏好设置"""
|
||
await self.remove_async("global", "global", key)
|
||
|
||
async def clear_async(self, scope: str, scope_id: str):
|
||
"""清空指定范围的所有偏好设置"""
|
||
await self.db_helper.clear_preferences(scope, scope_id)
|
||
|
||
# ====
|
||
# DEPRECATED METHODS
|
||
# ====
|
||
|
||
def get(
|
||
self,
|
||
key: str,
|
||
default: _VT = None,
|
||
scope: str | None = None,
|
||
scope_id: str | None = "",
|
||
) -> _VT:
|
||
"""获取偏好设置(已弃用)"""
|
||
if scope_id == "":
|
||
scope_id = "unknown"
|
||
if scope_id is None or key is None:
|
||
# result = asyncio.run(self.range_get_async(scope, scope_id, key))
|
||
raise ValueError(
|
||
"scope_id and key cannot be None when getting a specific preference.",
|
||
)
|
||
result = asyncio.run_coroutine_threadsafe(
|
||
self.get_async(scope or "unknown", scope_id or "unknown", key, default),
|
||
self._sync_loop,
|
||
).result()
|
||
|
||
return result if result is not None else default
|
||
|
||
def range_get(
|
||
self,
|
||
scope: str,
|
||
scope_id: str | None = None,
|
||
key: str | None = None,
|
||
) -> list[Preference]:
|
||
"""获取指定范围的偏好设置(已弃用)"""
|
||
result = asyncio.run_coroutine_threadsafe(
|
||
self.range_get_async(scope, scope_id, key),
|
||
self._sync_loop,
|
||
).result()
|
||
|
||
return result
|
||
|
||
def put(self, key, value, scope: str | None = None, scope_id: str | None = None):
|
||
"""设置偏好设置(已弃用)"""
|
||
asyncio.run_coroutine_threadsafe(
|
||
self.put_async(scope or "unknown", scope_id or "unknown", key, value),
|
||
self._sync_loop,
|
||
).result()
|
||
|
||
def remove(self, key, scope: str | None = None, scope_id: str | None = None):
|
||
"""删除偏好设置(已弃用)"""
|
||
asyncio.run_coroutine_threadsafe(
|
||
self.remove_async(scope or "unknown", scope_id or "unknown", key),
|
||
self._sync_loop,
|
||
).result()
|
||
|
||
def clear(self, scope: str | None = None, scope_id: str | None = None):
|
||
"""清空偏好设置(已弃用)"""
|
||
asyncio.run_coroutine_threadsafe(
|
||
self.clear_async(scope or "unknown", scope_id or "unknown"),
|
||
self._sync_loop,
|
||
).result()
|