Spaces:

javaeeduke
/

FreeLLMAPI

Runtime error

App Files Files Community

javaeeduke commited on 14 days ago

Commit

d87d2e8

verified ·

1 Parent(s): b78e2db

Update main.py

Browse files

Files changed (1) hide show

main.py +50 -26

main.py CHANGED Viewed

@@ -1,5 +1,6 @@
 from fastapi import FastAPI, HTTPException, Depends, Header
 from fastapi.middleware.cors import CORSMiddleware
 import uvicorn
 import os
 import logging
@@ -21,7 +22,6 @@ app.add_middleware(
 # 读取原项目固定命名的 Secrets
 # ──────────────────────────────────────────
-# 原项目的 Provider Key 映射表
 PROVIDER_MAP = {
     "GOOGLE_API_KEY":        "google",
     "GROQ_API_KEY":          "groq",
@@ -38,7 +38,6 @@ PROVIDER_MAP = {
     "ZHIPU_API_KEY":         "zhipu",
 }
-# Provider 对应的 base_url 和支持的模型
 PROVIDER_CONFIG = {
     "google": {
         "base_url": "https://generativelanguage.googleapis.com/v1beta/openai",
@@ -134,29 +133,34 @@ PROVIDER_CONFIG = {
 def load_config():
     """从环境变量读取所有配置"""
-    # ── 读取用户 API Keys（用于鉴权） ──
-    raw_keys = os.getenv("API_KEYS", "")
     api_keys = set(k.strip() for k in raw_keys.split(",") if k.strip())
     # ── 读取 Provider Keys ──
     providers = {}
     for env_name, provider_name in PROVIDER_MAP.items():
         key_value = os.getenv(env_name, "").strip()
         if not key_value:
-            continue  # 没配置该 Provider，跳过
         cfg = PROVIDER_CONFIG.get(provider_name, {})
         providers[provider_name] = {
             "api_key":  key_value,
-            "base_url": cfg.get("base_url", ""),
             "models":   cfg.get("models", []),
         }
         logger.info(f"✅ 加载 Provider: {provider_name}")
-    logger.info(f"✅ 加载了 {len(api_keys)} 个 API Key")
-    logger.info(f"✅ 加载了 {len(providers)} 个 Provider: {list(providers.keys())}")
     return api_keys, providers
@@ -173,11 +177,27 @@ def verify_api_key(authorization: str = Header(...)):
     return token
 # ──────────────────────────────────────────
-# 路由
 # ──────────────────────────────────────────
 @app.get("/health")
 async def health():
     return {
         "status":    "ok",
         "keys":      len(API_KEYS),
@@ -195,11 +215,8 @@ async def list_models(_: str = Depends(verify_api_key)):
 @app.post("/v1/chat/completions")
-async def chat_completions(
-    body: dict,
-    _: str = Depends(verify_api_key)
-):
-    model    = body.get("model", "")
     provider = None
     for p_cfg in PROVIDERS.values():
@@ -213,18 +230,25 @@ async def chat_completions(
             detail=f"没有 Provider 支持模型: {model}"
         )
-    async with httpx.AsyncClient(timeout=60) as client:
-        resp = await client.post(
-            f"{provider['base_url']}/chat/completions",
-            headers={"Authorization": f"Bearer {provider['api_key']}"},
-            json=body,
-        )
-        return resp.json()
-@app.get("/health")
-async def health():
-    return {"status": "ok"}
 if __name__ == "__main__":

 from fastapi import FastAPI, HTTPException, Depends, Header
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import StreamingResponse, HTMLResponse
 import uvicorn
 import os
 import logging
 # 读取原项目固定命名的 Secrets
 # ──────────────────────────────────────────
 PROVIDER_MAP = {
     "GOOGLE_API_KEY":        "google",
     "GROQ_API_KEY":          "groq",
     "ZHIPU_API_KEY":         "zhipu",
 }
 PROVIDER_CONFIG = {
     "google": {
         "base_url": "https://generativelanguage.googleapis.com/v1beta/openai",
 def load_config():
     """从环境变量读取所有配置"""
+    # ── 读取用户 API Keys ──
+    raw_keys = os.getenv("API_KEYS", "").strip()
     api_keys = set(k.strip() for k in raw_keys.split(",") if k.strip())
     # ── 读取 Provider Keys ──
     providers = {}
+    cf_account = os.getenv("CLOUDFLARE_ACCOUNT_ID", "default_id")
     for env_name, provider_name in PROVIDER_MAP.items():
         key_value = os.getenv(env_name, "").strip()
         if not key_value:
+            continue
         cfg = PROVIDER_CONFIG.get(provider_name, {})
+        base_url = cfg.get("base_url", "")
+        # 安全修复：动态组装 Cloudflare 的账户 ID 路径
+        if provider_name == "cloudflare" and "{}" in base_url:
+            base_url = base_url.format(cf_account)
         providers[provider_name] = {
             "api_key":  key_value,
+            "base_url": base_url,
             "models":   cfg.get("models", []),
         }
         logger.info(f"✅ 加载 Provider: {provider_name}")
+    logger.info(f"🚀 加载成功！用户授权 Key 数量: {len(api_keys)} | 通道网关数量: {len(providers)}")
     return api_keys, providers
     return token
 # ──────────────────────────────────────────
+# 路由映射
 # ──────────────────────────────────────────
+@app.get("/", response_class=HTMLResponse)
+async def index():
+    return """
+    <html>
+        <head><title>FreeLLMAPI Gateway</title></head>
+        <body style="font-family: Arial, sans-serif; text-align: center; margin-top: 100px; background-color: #f4f4f9;">
+            <h1 style="color: #4f46e5;">🚀 FreeLLMAPI 环境变量极速版</h1>
+            <p style="color: #6b7280;">云端轻量化无持久化转发网关运行中...</p>
+            <div style="margin-top: 20px;">
+                <span style="background-color: #10b981; color: white; padding: 6px 16px; border-radius: 20px; font-size: 0.9em; font-weight: bold;">STATUS: ONLINE</span>
+            </div>
+        </body>
+    </html>
+    """
 @app.get("/health")
 async def health():
+    # 完美合并后的检查路由
     return {
         "status":    "ok",
         "keys":      len(API_KEYS),
 @app.post("/v1/chat/completions")
+async def chat_completions(body: dict, _: str = Depends(verify_api_key)):
+    model = body.get("model", "")
     provider = None
     for p_cfg in PROVIDERS.values():
             detail=f"没有 Provider 支持模型: {model}"
         )
+    # 完美支持流式输出与普通响应的核心中转逻辑
+    async def stream_generator(target_url, headers, payload):
+        async with httpx.AsyncClient(timeout=60.0) as client:
+            async with client.stream("POST", target_url, headers=headers, json=payload) as response:
+                async for chunk in response.aiter_bytes():
+                    yield chunk
+    target_url = f"{provider['base_url']}/chat/completions"
+    headers = {"Authorization": f"Bearer {provider['api_key']}"}
+    if body.get("stream", False):
+        return StreamingResponse(
+            stream_generator(target_url, headers, body),
+            media_type="text/event-stream"
+        )
+    else:
+        async with httpx.AsyncClient(timeout=60.0) as client:
+            resp = await client.post(target_url, headers=headers, json=body)
+            return resp.json()
 if __name__ == "__main__":