Skip to content

fix: 修复 UserValves 对象序列化问题,添加 _prepare_user_dict 方法处理 "Object of type… #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions resources/functions/openwebui_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ def __init__(self):
self.outage = False
self.start_time = None

def _prepare_user_dict(self, __user__: dict) -> dict:
"""将 __user__ 对象转换为可序列化的字典"""
user_dict = dict(__user__) # 创建副本以避免修改原始对象

# 如果存在 valves 且是 BaseModel 的实例,将其转换为字典
if "valves" in user_dict and hasattr(user_dict["valves"], "model_dump"):
user_dict["valves"] = user_dict["valves"].model_dump()

return user_dict

def inlet(
self, body: dict, user: Optional[dict] = None, __user__: dict = {}
) -> dict:
Expand All @@ -38,8 +48,12 @@ def inlet(
try:
post_url = f"{self.valves.API_ENDPOINT}/api/v1/inlet"
headers = {"Authorization": f"Bearer {self.valves.API_KEY}"}

# 使用 _prepare_user_dict 处理 __user__ 对象
user_dict = self._prepare_user_dict(__user__)

response = requests.post(
post_url, headers=headers, json={"user": __user__, "body": body}
post_url, headers=headers, json={"user": user_dict, "body": body}
)

if response.status_code == 401:
Expand Down Expand Up @@ -82,8 +96,12 @@ async def outlet(
try:
post_url = f"{self.valves.API_ENDPOINT}/api/v1/outlet"
headers = {"Authorization": f"Bearer {self.valves.API_KEY}"}

# 使用 _prepare_user_dict 处理 __user__ 对象
user_dict = self._prepare_user_dict(__user__)

request_data = {
"user": __user__,
"user": user_dict,
"body": body,
}

Expand Down