🔥 use env

gpt_server/_config.py

@@ -1,16 +1,3 @@
 from pathlib import Path
 
 Base = Path(__file__).resolve().parent.parent
-
-APIs = {}
-
-person_file = Base / '.person'
-
-if person_file.is_file():
-    with open(Base / ".person", "r") as f:
-        for line in f.readlines():
-            key, value = line.split("=")
-            APIs[key] = value.strip()
-
-    if 'proxy' not in APIs:
-        APIs['proxy'] = None  # type: ignore

gpt_server/routers/gemini.py

@@ -2,27 +2,29 @@
 from datetime import datetime, timedelta
 import json
 from functools import wraps
+import os
 
 from fastapi import APIRouter, Request
 from pydantic_settings import BaseSettings
 from sse_starlette import EventSourceResponse
 import aiohttp
 from redis.asyncio import Redis
 
-from .._config import APIs
-
 from gpt_server.schemas.prompt import Prompt
 
 router = APIRouter()
 
-API_URL = f"https://generativelanguage.googleapis.com/v1beta/models/gemini-pro:streamGenerateContent?alt=sse&key={APIs['gemini']}"
-API_URL_PRO = f"https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro-latest:streamGenerateContent?alt=sse&key={APIs['gemini']}"
+api_key = os.environ['GEMINI_KEY']
+
+API_URL = f"https://generativelanguage.googleapis.com/v1beta/models/gemini-pro:streamGenerateContent?alt=sse&key={api_key}"
+API_URL_PRO = f"https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro-latest:streamGenerateContent?alt=sse&key={api_key}"
+
+PROXY = os.environ['proxy'] if 'proxy' in os.environ else None
 
 
 class Settings(BaseSettings):
-    redis_password: str = APIs["redis_password"]
-    redis_host: str = APIs["redis"]
-    redis_port: int = int(APIs["redis_port"])
+    redis_host: str = os.environ['REDIS_HOST']
+    redis_port: int = int(os.environ['REDIS_PORT'])
     rate_limit_per_minute: int = 2
 
 
@@ -33,7 +35,6 @@ class Settings(BaseSettings):
     port=settings.redis_port,
     db=0,
     decode_responses=True,
-    password=settings.redis_password,
 )
 
 
@@ -101,7 +102,7 @@ async def wrapper(request: Request, *args, **kwargs):
 
 async def get_content(data, url):
     async with aiohttp.ClientSession() as sess:
-        async with sess.post(url, json=data, proxy=APIs["proxy"]) as res:
+        async with sess.post(url, json=data, proxy=PROXY) as res:
             async for chunk in res.content:
                 _data = chunk.decode("utf-8")
                 if _data.strip() != "":

gpt_server/routers/groq.py

@@ -1,25 +1,26 @@
-import asyncio
+import os
 
 from fastapi import APIRouter, Request
 from sse_starlette import EventSourceResponse
 import aiohttp
 
 from gpt_server.schemas.prompt import Prompt
-from .._config import APIs
 
 router = APIRouter()
 
 url = "https://api.groq.com/openai/v1/chat/completions"
 
 headers = {
-    "Authorization": f"Bearer {APIs['groq']}",
+    "Authorization": f"Bearer {os.environ['GROQ_KEY']}",
     "Content-Type": "application/json",
 }
 
+PROXY = os.environ['proxy'] if 'proxy' in os.environ else None
+
 
 async def get_content(data):
     async with aiohttp.ClientSession(headers=headers) as sess:
-        async with sess.post(url, json=data, proxy=APIs["proxy"]) as res:
+        async with sess.post(url, json=data, proxy=PROXY) as res:
             async for chunk in res.content:
                 if chunk:
                     yield chunk.decode("utf-8")[6:]
@@ -29,13 +30,6 @@ async def get_content(data):
                     break
 
 
-async def generate_data():
-    for i in range(10):
-        await asyncio.sleep(.1)  # Simulate some delay
-        yield '{"choices":[{"index":0,"delta":{"content":" handle"}}]}'
-    yield "[DONE]"
-
-
 @router.post("/chat", status_code=200)
 async def chat(request: Request, prompt: Prompt):
 

gpt_server/routers/openai.py

@@ -1,18 +1,17 @@
-import asyncio
+import os
 
 from fastapi import APIRouter, Request
 from sse_starlette import EventSourceResponse
 import aiohttp
 
 from gpt_server.schemas.prompt import Prompt
-from .._config import APIs
 
 router = APIRouter()
 
 url = "https://api.pumpkinaigc.online/v1/chat/completions"
 
 headers = {
-    "Authorization": f"Bearer {APIs['openai']}",
+    "Authorization": f"Bearer {os.environ['OPENAI_KEY']}",
     "Content-Type": "application/json",
 }
 
@@ -29,13 +28,6 @@ async def get_content(data):
                     break
 
 
-async def generate_data():
-    for i in range(10):
-        await asyncio.sleep(.1)  # Simulate some delay
-        yield '{"choices":[{"index":0,"delta":{"content":" handle"}}]}'
-    yield "[DONE]"
-
-
 @router.post("/chat", status_code=200)
 async def chat(request: Request, prompt: Prompt):