update

api_key_sb copy.py

@@ -1,30 +0,0 @@
-from supabase import create_client, Client
-import os
-from fastapi import FastAPI, Request, HTTPException, Depends, status
-from dotenv import load_dotenv
-
-load_dotenv()
-
-# Supabase 配置
-SUPABASE_URL = os.getenv("SUPABASE_URL")
-SUPABASE_KEY = os.getenv("SUPABASE_KEY")
-
-# 初始化 Supabase 客户端
-supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
-async def get_api_key_info(model: str = None):
-    try:
-        # 根据用户提供的SQL语句修改，从 'airs_model_api_keys_view' 视图中获取 'api_key'
-        if model:
-            response = supabase.from_('airs_model_api_keys_view').select('api_key', 'api_key_id').eq('model_name', model).order('api_key_ran_at', desc=False).limit(1).execute()
-        else:
-            # 如果没有提供model，则获取所有模型的api_key
-            raise HTTPException(status_code=400, detail="请提供模型名称！")
-        
-        if response.data:
-            api_key_info = response.data[0]
-            return api_key_info
-        else:
-            return None
-    except Exception as e:
-        print(f"从Supabase获取API密钥失败: {e}")
-        return None

api_key_sb.py

@@ -10,8 +10,12 @@ load_dotenv()
 SUPABASE_URL = os.getenv("SUPABASE_URL")
 SUPABASE_KEY = os.getenv("SUPABASE_KEY")
 
-# 初始化 Supabase 客户端
-supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
+def get_supabase_client() -> Client:
+    """Initializes and returns a Supabase client instance."""
+    return create_client(SUPABASE_URL, SUPABASE_KEY)
+
+supabase: Client = get_supabase_client()
+
 async def get_api_key_info(model: str = None):
     try:
         # 根据用户提供的SQL语句修改，从 'airs_model_api_keys_view' 视图中获取 'api_key'
@@ -23,26 +27,28 @@ async def get_api_key_info(model: str = None):
         
         if response.data:
             api_key_info = response.data[0]
-            api_key = api_key_info.get('api_key')
-            api_key_id = api_key_info.get('api_key_id')
-
-             
-            try:
-                # 创建北京时间时区对象（UTC+8）
-                beijing_tz = timezone(timedelta(hours=8))
-                now_beijing = datetime.now(beijing_tz)  # 带时区的datetime对象
-                current_local_time = now_beijing.isoformat()
-                # current_local_time = int(now_beijing.timestamp())  # 正确的时间戳
-                # current_local_time = datetime.now().isoformat()
-                supabase.table("airs_api_keys").update({"ran_at": current_local_time}).eq("id", api_key_id).execute()
-                print('更新成功')
-            except Exception as e:
-                # raise HTTPException(status_code=500, detail="更新API密钥运行时间失败！")
-                raise HTTPException(status_code=500, detail=f"更新API密钥运行时间失败！错误信息：{str(e)}")
-
             return api_key_info
         else:
             return None
     except Exception as e:
         print(f"从Supabase获取API密钥失败: {e}")
         return None
+
+async def update_api_key_ran_at(api_key_id: str, ran_at_time: datetime = None):
+    """
+    Updates the 'ran_at' field for a given API key in Supabase.
+    If ran_at_time is None, it defaults to the current Beijing time.
+    """
+    try:
+        if ran_at_time is None:
+            # 创建北京时间时区对象（UTC+8）
+            beijing_tz = timezone(timedelta(hours=8))
+            now_beijing = datetime.now(beijing_tz)  # 带时区的datetime对象
+            current_local_time = now_beijing.isoformat()
+        else:
+            current_local_time = ran_at_time.isoformat()
+
+        supabase.table("airs_api_keys").update({"ran_at": current_local_time}).eq("id", api_key_id).execute()
+        print(f'API 密钥 {api_key_id} 的 ran_at 更新成功为 {current_local_time}')
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"更新API密钥运行时间失败！错误信息：{str(e)}")

app.py

@@ -45,18 +45,6 @@ def greet_json():
 async def health_check():
     return {"status": "ok", "message": "Proxy service is running."}
 
-gemini_api_keys_str = os.getenv("GEMINI_API_KEYS_STR")
-try:
-    gemini_api_keys_arr = json.loads(gemini_api_keys_str)
-except json.JSONDecodeError as e:
-    print(f"JSON 解析错误：{e}")
-    gemini_api_keys_arr = []  # 解析失败时设置默认值
-except Exception as e:
-    print(f"其他错误：{e}")
-    gemini_api_keys_arr = []
-
-key_index = 0
-keys_count = len(gemini_api_keys_arr)
 
 @app.api_route("/v1/{protocol}/{host}/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
 # @app.api_route("/v1/{protocol}/{host}/{path:path}", methods=["POST"])

proxy copy 2.py

@@ -1,44 +0,0 @@
-import httpx
-import asyncio
-from starlette.responses import Response
-
-async def do_proxy(url: str, method: str, headers: dict, content: str, max_retries: int = 3):
-    print("Proxy service started.", url)
-    client = None
-    try:
-        async with httpx.AsyncClient() as client:
-            for attempt in range(max_retries):
-                response = await client.request(
-                    method=method,
-                    url=url,
-                    headers=headers,
-                    content=content,
-                    timeout=30
-                )
-                
-                # 关键：显式检查状态码
-                if response.status_code == 429:
-                    retry_after = response.headers.get("Retry-After", "5")  # 默认5秒
-                    wait_time = int(retry_after) + attempt * 2  # 指数退避基础值
-                    print(f"⚠️ 429错误！{wait_time}秒后重试 (尝试:{attempt+1})")
-                    await asyncio.sleep(wait_time)
-                    continue
-                    
-                response.raise_for_status()  # 触发其他4xx/5xx异常
-                return Response(
-                    content=response.content,
-                    status_code=response.status_code,
-                    headers=dict(response.headers)
-                )
-                
-    except httpx.HTTPStatusError as e:
-        print(f"🚨 服务器错误 {e.response.status_code}: {e.request.url}")
-        return Response(content=str(e), status_code=e.response.status_code)
-        
-    except Exception as e:
-        print(f"🔥 致命错误: {type(e).__name__}: {str(e)}")
-        return Response(content="Internal Server Error", status_code=500)
-        
-    finally:
-        if client: 
-            await client.aclose()  # 确保连接关闭

proxy copy.py

@@ -1,24 +0,0 @@
-from fastapi.responses import Response # 导入Response
-import httpx # 使用httpx替代requests，因为requests是同步的，而FastAPI是异步的
-
-async def do_proxy(url:str, method:str, headers:dict, content:str):
-    print("Proxy service started.", url)
-    try:
-        # 使用httpx异步客户端发起请求
-        async with httpx.AsyncClient() as client:
-            response = await client.request(
-            method=method,
-            url=url,
-            headers=headers,
-            content=content, # httpx使用content参数传递请求体
-            timeout=30  # 超时时间，可调整
-        )
-    except Exception as e:
-        print("Error:", e)
-    
-    # 将Gemini的响应透传给客户端
-    return Response(
-        content=response.content,
-        status_code=response.status_code,
-        headers=dict(response.headers)
-    )

proxy.py

@@ -1,8 +1,8 @@
 import httpx
 import asyncio
 from starlette.responses import Response
-from api_key_sb import get_api_key_info
-from supabase import create_client, Client
+from api_key_sb import get_api_key_info, get_supabase_client, update_api_key_ran_at
+from supabase import Client
 from dotenv import load_dotenv
 import os
 from datetime import timezone, timedelta, datetime
@@ -10,12 +10,8 @@ from fastapi import FastAPI, Request, HTTPException, Depends, status
 
 load_dotenv()
 
-# Supabase 配置
-SUPABASE_URL = os.getenv("SUPABASE_URL")
-SUPABASE_KEY = os.getenv("SUPABASE_KEY")
-
-# 初始化 Supabase 客户端
-supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
+# 获取共享的 Supabase 客户端实例
+supabase: Client = get_supabase_client()
 
 async def do_proxy(url: str, method: str, headers: dict, content: str, max_retries: int = 3):
     print("Proxy service started.", url)
@@ -54,7 +50,7 @@ async def do_proxy(url: str, method: str, headers: dict, content: str, max_retri
                         # future_timestamp = future_time.timestamp()
                         future_timestamp = future_time.isoformat()
                         print('future_timestamp',future_timestamp)
-                        supabase.table("airs_api_keys").update({"ran_at": future_timestamp}).eq("id", api_key_id).execute()
+                        await update_api_key_ran_at(api_key_id, future_time)
                         print('更新成功')
                     except Exception as e:
                         raise HTTPException(status_code=500, detail=f"更新API密钥运行时间失败！错误信息：{str(e)}")