fix: environment variable name mismatch (OPENAI_API_BASE/MODEL_NAME) and stream data format normalization
这个提交包含在:
二进制文件未显示。
@ -109,8 +109,8 @@ async def chat_endpoint(req: ChatRequest):
|
|||||||
from openai import AsyncOpenAI
|
from openai import AsyncOpenAI
|
||||||
|
|
||||||
api_key = os.getenv("OPENAI_API_KEY")
|
api_key = os.getenv("OPENAI_API_KEY")
|
||||||
base_url = os.getenv("OPENAI_BASE_URL", "https://api.openai.com/v1")
|
base_url = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1")
|
||||||
model_name = os.getenv("MODEL_NAME", "gpt-4o-mini")
|
model_name = os.getenv("OPENAI_MODEL_NAME", "gpt-4o-mini")
|
||||||
|
|
||||||
if not api_key:
|
if not api_key:
|
||||||
raise HTTPException(status_code=500, detail="OPENAI_API_KEY environment variable not set")
|
raise HTTPException(status_code=500, detail="OPENAI_API_KEY environment variable not set")
|
||||||
@ -130,8 +130,15 @@ async def chat_endpoint(req: ChatRequest):
|
|||||||
stream=True
|
stream=True
|
||||||
)
|
)
|
||||||
async for chunk in stream:
|
async for chunk in stream:
|
||||||
if chunk.choices[0].delta.content:
|
content = chunk.choices[0].delta.content
|
||||||
yield f"data: {json.dumps({'content': chunk.choices[0].delta.content}, ensure_ascii=False)}\n\n"
|
if content:
|
||||||
|
# 转换成兼容 OpenAI 格式的 JSON,让前端解析逻辑更稳定
|
||||||
|
data = {
|
||||||
|
"choices": [{
|
||||||
|
"delta": {"content": content}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
yield f"data: {json.dumps(data, ensure_ascii=False)}\n\n"
|
||||||
yield "data: [DONE]\n\n"
|
yield "data: [DONE]\n\n"
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
yield f"data: {json.dumps({'error': str(e)})}\n\n"
|
yield f"data: {json.dumps({'error': str(e)})}\n\n"
|
||||||
|
|||||||
47
test_connection.py
普通文件
47
test_connection.py
普通文件
@ -0,0 +1,47 @@
|
|||||||
|
import os
|
||||||
|
import time
|
||||||
|
import httpx
|
||||||
|
from dotenv import load_dotenv
|
||||||
|
|
||||||
|
def test_api():
|
||||||
|
dotenv_path = r'E:\物理竞赛\agents\.env'
|
||||||
|
load_dotenv(dotenv_path)
|
||||||
|
|
||||||
|
api_key = os.getenv('OPENAI_API_KEY')
|
||||||
|
base_url = os.getenv('OPENAI_API_BASE')
|
||||||
|
model = os.getenv('OPENAI_MODEL_NAME')
|
||||||
|
|
||||||
|
# 规范化 base_url,如果包含 /openai/v1/ 则移除,httpx 会根据完整 URL 请求
|
||||||
|
if not base_url.endswith('/chat/completions'):
|
||||||
|
request_url = f"{base_url.rstrip('/')}/chat/completions"
|
||||||
|
else:
|
||||||
|
request_url = base_url
|
||||||
|
|
||||||
|
print(f"--- API Diagnostic ---")
|
||||||
|
print(f"URL: {request_url}")
|
||||||
|
print(f"Model: {model}")
|
||||||
|
print(f"Key Prefix: {api_key[:5]}...")
|
||||||
|
|
||||||
|
start_time = time.time()
|
||||||
|
try:
|
||||||
|
response = httpx.post(
|
||||||
|
request_url,
|
||||||
|
headers={"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"},
|
||||||
|
json={
|
||||||
|
"model": model,
|
||||||
|
"messages": [{"role": "user", "content": "你好,请回复'pong'"}],
|
||||||
|
"stream": False
|
||||||
|
},
|
||||||
|
timeout=10.0
|
||||||
|
)
|
||||||
|
duration = time.time() - start_time
|
||||||
|
print(f"Status: {response.status_code}")
|
||||||
|
print(f"Time: {duration:.2f}s")
|
||||||
|
print(f"Body: {response.text[:200]}")
|
||||||
|
except httpx.ConnectTimeout:
|
||||||
|
print(f"Error: Connection Timed Out (10s)")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error: {str(e)}")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
test_api()
|
||||||
在新工单中引用
屏蔽一个用户