Skip to content
Open
Show file tree
Hide file tree
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
37 changes: 30 additions & 7 deletions backend/app/services/oasis_profile_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -527,16 +527,39 @@ def _generate_profile_with_llm(

for attempt in range(max_attempts):
try:
response = self.client.chat.completions.create(
model=self.model_name,
messages=[
kwargs = {
"model": self.model_name,
"messages": [
{"role": "system", "content": self._get_system_prompt(is_individual)},
{"role": "user", "content": prompt}
],
response_format={"type": "json_object"},
temperature=0.7 - (attempt * 0.1) # 每次重试降低温度
# 不设置max_tokens,让LLM自由发挥
)
"response_format": {"type": "json_object"},
# 部分模型不支持自定义温度,后续会自动降级重试
"temperature": 0.7 - (attempt * 0.1)
}

response = None
for _ in range(3):
try:
response = self.client.chat.completions.create(**kwargs)
break
except Exception as e:
err_text = str(e).lower()

if "unsupported parameter" in err_text and "max_tokens" in err_text and "max_tokens" in kwargs:
kwargs.pop("max_tokens", None)
continue

if "temperature" in err_text and (
"unsupported value" in err_text or "default (1) value" in err_text
) and "temperature" in kwargs:
kwargs.pop("temperature", None)
continue

raise

if response is None:
raise RuntimeError("OpenAI chat completion failed after compatibility retries")

content = response.choices[0].message.content

Expand Down
37 changes: 30 additions & 7 deletions backend/app/services/simulation_config_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,16 +440,39 @@ def _call_llm_with_retry(self, prompt: str, system_prompt: str) -> Dict[str, Any

for attempt in range(max_attempts):
try:
response = self.client.chat.completions.create(
model=self.model_name,
messages=[
kwargs = {
"model": self.model_name,
"messages": [
{"role": "system", "content": system_prompt},
{"role": "user", "content": prompt}
],
response_format={"type": "json_object"},
temperature=0.7 - (attempt * 0.1) # 每次重试降低温度
# 不设置max_tokens,让LLM自由发挥
)
"response_format": {"type": "json_object"},
# 部分模型不支持自定义温度,后续会自动降级重试
"temperature": 0.7 - (attempt * 0.1)
}

response = None
for _ in range(3):
try:
response = self.client.chat.completions.create(**kwargs)
break
except Exception as e:
err_text = str(e).lower()

if "unsupported parameter" in err_text and "max_tokens" in err_text and "max_tokens" in kwargs:
kwargs.pop("max_tokens", None)
continue

if "temperature" in err_text and (
"unsupported value" in err_text or "default (1) value" in err_text
) and "temperature" in kwargs:
kwargs.pop("temperature", None)
continue

raise

if response is None:
raise RuntimeError("OpenAI chat completion failed after compatibility retries")

content = response.choices[0].message.content
finish_reason = response.choices[0].finish_reason
Expand Down
194 changes: 170 additions & 24 deletions backend/app/utils/llm_client.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,47 @@
"""
LLM客户端封装
统一使用OpenAI格式调用
支持OpenAI和Anthropic格式的API调用
"""

import json
import re
from urllib.parse import urlparse
from typing import Optional, Dict, Any, List
from openai import OpenAI

from ..config import Config

# 尝试导入Anthropic SDK,如果不可用则设为None
try:
from anthropic import Anthropic
except ImportError:
Anthropic = None

try:
from anthropic import AnthropicFoundry
except ImportError:
AnthropicFoundry = None


def _foundry_resource_from_endpoint(endpoint: str) -> str:
"""从 Foundry endpoint 提取 resource 名称。"""
if not endpoint:
raise ValueError("LLM_BASE_URL is empty")
if "://" not in endpoint:
return endpoint.strip()

host = urlparse(endpoint).netloc
m = re.match(r"([^.]+)\.services\.ai\.azure\.com$", host)
if not m:
raise ValueError(
f"Could not parse Foundry resource from endpoint: {endpoint!r}. "
"Expected https://<resource>.services.ai.azure.com/anthropic/"
)
return m.group(1)


class LLMClient:
"""LLM客户端"""
"""LLM客户端 - 支持OpenAI和Anthropic格式"""

def __init__(
self,
Expand All @@ -27,10 +56,60 @@ def __init__(
if not self.api_key:
raise ValueError("LLM_API_KEY 未配置")

self.client = OpenAI(
api_key=self.api_key,
base_url=self.base_url
)
# 检测是否是Anthropic格式的端点
self.is_anthropic = "anthropic" in self.base_url.lower()

if self.is_anthropic:
# 使用Anthropic SDK
if Anthropic is None:
raise ImportError("Anthropic SDK未安装。请运行: pip install anthropic")
is_foundry_endpoint = "services.ai.azure.com" in self.base_url.lower()
if is_foundry_endpoint and AnthropicFoundry is not None:
resource = _foundry_resource_from_endpoint(self.base_url)
self.client = AnthropicFoundry(
api_key=self.api_key,
resource=resource,
)
else:
self.client = Anthropic(
api_key=self.api_key,
base_url=self.base_url
)
self.client_type = "anthropic"
else:
# 使用OpenAI SDK
self.client = OpenAI(
api_key=self.api_key,
base_url=self.base_url
)
self.client_type = "openai"

@staticmethod
def _convert_messages_for_anthropic(messages: List[Dict[str, str]]) -> Dict[str, Any]:
"""将 OpenAI 风格消息转换为 Anthropic Messages API 所需格式。"""
system_parts: List[str] = []
anthropic_messages: List[Dict[str, str]] = []

for msg in messages:
role = msg.get("role", "")
content = msg.get("content", "")
if role == "system":
if content:
system_parts.append(content)
continue

if role not in {"user", "assistant"}:
role = "user"

anthropic_messages.append({"role": role, "content": content})

if not anthropic_messages:
anthropic_messages = [{"role": "user", "content": ""}]

result: Dict[str, Any] = {"messages": anthropic_messages}
if system_parts:
result["system"] = "\n\n".join(system_parts)
return result

def chat(
self,
Expand All @@ -51,18 +130,65 @@ def chat(
Returns:
模型响应文本
"""
kwargs = {
"model": self.model,
"messages": messages,
"temperature": temperature,
"max_tokens": max_tokens,
}

if response_format:
kwargs["response_format"] = response_format
if self.client_type == "anthropic":
# 使用Anthropic SDK(system 需单独传递,messages 仅支持 user/assistant)
converted = self._convert_messages_for_anthropic(messages)
create_kwargs = {
"model": self.model,
"messages": converted["messages"],
"system": converted.get("system"),
"max_tokens": max_tokens,
"temperature": temperature,
}
try:
response = self.client.messages.create(**create_kwargs)
except Exception as e:
# 某些新模型会拒绝 temperature 参数(报错: temperature is deprecated)
if "temperature" in str(e).lower() and "deprecated" in str(e).lower():
create_kwargs.pop("temperature", None)
response = self.client.messages.create(**create_kwargs)
else:
raise
content = response.content[0].text
else:
# 使用OpenAI SDK
kwargs = {
"model": self.model,
"messages": messages,
"temperature": temperature,
"max_tokens": max_tokens,
}

if response_format:
kwargs["response_format"] = response_format

response = None
for _ in range(3):
try:
response = self.client.chat.completions.create(**kwargs)
break
except Exception as e:
err_text = str(e).lower()

# 某些模型(如部分 GPT-5 系列)不支持 max_tokens,仅支持 max_completion_tokens
if "unsupported parameter" in err_text and "max_tokens" in err_text and "max_tokens" in kwargs:
kwargs.pop("max_tokens", None)
kwargs["max_completion_tokens"] = max_tokens
continue

# 某些模型仅支持默认 temperature(通常是 1)
if "temperature" in err_text and (
"unsupported value" in err_text or "default (1) value" in err_text
) and "temperature" in kwargs:
kwargs.pop("temperature", None)
continue

raise

if response is None:
raise RuntimeError("OpenAI chat completion failed after compatibility retries")
content = response.choices[0].message.content

response = self.client.chat.completions.create(**kwargs)
content = response.choices[0].message.content
# 部分模型(如MiniMax M2.5)会在content中包含<think>思考内容,需要移除
content = re.sub(r'<think>[\s\S]*?</think>', '', content).strip()
return content
Expand All @@ -84,14 +210,34 @@ def chat_json(
Returns:
解析后的JSON对象
"""
response = self.chat(
messages=messages,
temperature=temperature,
max_tokens=max_tokens,
response_format={"type": "json_object"}
)
if self.client_type == "anthropic":
modified_messages = [dict(m) for m in messages]
json_instruction = "IMPORTANT: You must respond with valid JSON only, no other text."
system_index = next((i for i, m in enumerate(modified_messages) if m.get("role") == "system"), None)
if system_index is None:
modified_messages.insert(0, {"role": "system", "content": json_instruction})
else:
modified_messages[system_index]["content"] = (
f"{modified_messages[system_index].get('content', '')}\n\n{json_instruction}"
)

response_text = self.chat(
messages=modified_messages,
temperature=temperature,
max_tokens=max_tokens,
)
else:
# OpenAI格式:使用response_format
response = self.chat(
messages=messages,
temperature=temperature,
max_tokens=max_tokens,
response_format={"type": "json_object"}
)
response_text = response

# 清理markdown代码块标记
cleaned_response = response.strip()
cleaned_response = response_text.strip()
cleaned_response = re.sub(r'^```(?:json)?\s*\n?', '', cleaned_response, flags=re.IGNORECASE)
cleaned_response = re.sub(r'\n?```\s*$', '', cleaned_response)
cleaned_response = cleaned_response.strip()
Expand Down
1 change: 1 addition & 0 deletions backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies = [

# LLM 相关
"openai>=1.0.0",
"anthropic>=0.71.0",

# Zep Cloud
"zep-cloud==3.13.0",
Expand Down
2 changes: 2 additions & 0 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ flask-cors>=6.0.0
# ============= LLM 相关 =============
# OpenAI SDK(统一使用 OpenAI 格式调用 LLM)
openai>=1.0.0
# Anthropic SDK(支持 Azure Foundry Anthropic 端点)
anthropic>=0.71.0

# ============= Zep Cloud =============
zep-cloud==3.13.0
Expand Down
21 changes: 21 additions & 0 deletions backend/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading