update sth. at 2025-01-05 15:24:55

more_core.py

@@ -3,10 +3,12 @@ import time
 import multiprocessing
 from typing import Dict, Any, List
 from fastapi import FastAPI, Request, Response, HTTPException
+from fastapi.responses import RedirectResponse
 import uvicorn
 import tiktoken
 from json.decoder import JSONDecodeError
 import random
+import json
 import string
 from apscheduler.schedulers.background import BackgroundScheduler
 
@@ -32,14 +34,21 @@ class APIServer:
 
     def _setup_routes(self) -> None:
         """Initialize API routes"""
+
+        # Home route with redirection to /web
+        @self.app.get("/")
+        async def root() -> RedirectResponse:
+            return RedirectResponse(url="/web")
+
+        # /web route
+        @self.app.get("/web")
+        async def web() -> str:
+            return "hello. It's web page."
+
         routes = self._get_routes()
         for path in routes:
             self._register_route(path)
 
-        @self.app.get("/")
-        async def root() -> str:
-            return "你好"
-
     def _get_routes(self) -> List[str]:
         """Get configured API routes"""
         default_path = "/v1/chat/completions"
@@ -97,15 +106,22 @@ class APIServer:
     def is_chatgpt_format(self, data):
         """Check if the data is in the expected ChatGPT format"""
         try:
-            # Check if the data is a dictionary and contains the necessary structure
+            # If the data is a string, try to parse it as JSON
+            if isinstance(data, str):
+                try:
+                    data = json.loads(data)
+                except json.JSONDecodeError:
+                    return False  # If the string can't be parsed, it's not in the expected format
+
+            # Now check if data is a dictionary and contains the necessary structure
             if isinstance(data, dict):
                 # Ensure 'choices' is a list and the first item has a 'message' field
                 if "choices" in data and isinstance(data["choices"], list) and len(data["choices"]) > 0:
                     if "message" in data["choices"][0]:
                         return True
         except Exception as e:
-            if debug:
-                print(f"Error checking ChatGPT format: {e}")
+            print(f"Error checking ChatGPT format: {e}")
+
         return False
 
     async def _generate_response(self, headers: Dict[str, str], data: Dict[str, Any]) -> Dict[str, Any]:
@@ -203,6 +219,7 @@ class APIServer:
     def _schedule_route_check(self) -> None:
         """Schedule the task to check and reload routes every 30 seconds"""
         self.scheduler.add_job(self._reload_routes_if_needed, 'interval', seconds=30)
+        pass
 
     def _reload_routes_if_needed(self) -> None:
         """Check if routes need to be reloaded based on environment variables"""
@@ -219,6 +236,7 @@ class APIServer:
                 print("Routes changed, reloading...")
             self._reload_routes(new_routes)
 
+
     def _reload_routes(self, new_routes: List[str]) -> None:
         """Reload the routes based on the updated configuration"""
         # Clear existing routes

some_base_method/degpt25.1.5.py

@@ -15,8 +15,27 @@ def get_models():
     return json.dumps(models)
 
 
+def is_model_available(model_id):
+    # Get the models JSON
+    models_json = get_models()
+
+    # Parse the JSON string into a Python dictionary
+    models_data = json.loads(models_json)
+
+    # Loop through the model list to check if the model ID exists
+    for model in models_data.get("data", []):
+        if model["id"] == model_id:
+            return True  # Model ID found
+
+    return False  # Model ID not found
+
+
+def get_auto_model(model_id=None):
+    return "Qwen2.5-72B"
+
+
 # 新的方法，检查model是否有效并返回id
-def get_model_by_id(model_id=None):
+def get_model_by_autoupdate(model_id=None):
     # 获取所有模型数据
     models_data = json.loads(get_models())["data"]
 
@@ -34,11 +53,31 @@ def get_model_by_id(model_id=None):
     return model_data["id"] if model_data else None
 
 
+def chat_completion_message(
+        user_prompt,
+        user_id: str = None,
+        session_id: str = None,
+        system_prompt="You are a helpful assistant.",
+        model="Qwen2.5-72B",
+        project="DecentralGPT", stream=False,
+        temperature=0.3, max_tokens=1024, top_p=0.5,
+        frequency_penalty=0, presence_penalty=0):
+    """未来会增加回话隔离: 单人对话,单次会话"""
+    messages = [
+        {"role": "system", "content": system_prompt},
+        {"role": "user", "content": user_prompt}
+    ]
+    return chat_completion_messages(messages,user_id,session_id, model, project, stream, temperature, max_tokens, top_p, frequency_penalty,
+                                    presence_penalty)
+
+
 def chat_completion_messages(
-        messages, user_id: str = None, system_prompt="You are a helpful assistant.", model="Qwen2.5-72B",
+        messages,
+        model="Qwen2.5-72B",
+        user_id: str = None,
+        session_id: str = None,
         project="DecentralGPT", stream=False, temperature=0.3, max_tokens=1024, top_p=0.5,
         frequency_penalty=0, presence_penalty=0):
-    """处理用户请求并保留上下文"""
     url = 'https://usa-chat.degpt.ai/api/v0/chat/completion/proxy'
     headers = {
         'sec-ch-ua-platform': '"macOS"',
@@ -50,17 +89,27 @@ def chat_completion_messages(
         'sec-ch-ua-mobile': '?0'
     }
     payload = {
-        "model": get_model_by_id(model),
+        "model": get_auto_model(model),
         "messages": messages,
         "project": project,
-        "stream": stream
+        "stream": stream,
+        "temperature": temperature,
+        "max_tokens": max_tokens,
+        "top_p": top_p,
+        "frequency_penalty": frequency_penalty,
+        "presence_penalty": presence_penalty
+
     }
+    return chat_completion(url, headers, payload)
 
+
+def chat_completion(url, headers, payload):
+    """处理用户请求并保留上下文"""
     try:
         response = requests.post(url, headers=headers, json=payload)
         response.encoding = 'utf-8'
         response.raise_for_status()
-        return response.text
+        return response.json()
     except requests.exceptions.RequestException as e:
         print(f"请求失败: {e}")
         return "请求失败，请检查网络或参数配置。"
@@ -70,9 +119,33 @@ def chat_completion_messages(
     return {}
 
 
+def is_chatgpt_format(data):
+    """Check if the data is in the expected ChatGPT format"""
+    try:
+        # If the data is a string, try to parse it as JSON
+        if isinstance(data, str):
+            try:
+                data = json.loads(data)
+            except json.JSONDecodeError:
+                return False  # If the string can't be parsed, it's not in the expected format
+
+        # Now check if data is a dictionary and contains the necessary structure
+        if isinstance(data, dict):
+            # Ensure 'choices' is a list and the first item has a 'message' field
+            if "choices" in data and isinstance(data["choices"], list) and len(data["choices"]) > 0:
+                if "message" in data["choices"][0]:
+                    return True
+    except Exception as e:
+        print(f"Error checking ChatGPT format: {e}")
+
+    return False
+
+
 if __name__ == '__main__':
-    print(get_model_by_id("Qwen2.5-72B"))
-    print(get_model_by_id("Qwen"))
+    print(get_auto_model("Qwen2.5-72B"))
+    print(get_auto_model("Qwen"))
+    print(is_model_available("Qwen2.5-72B"))
+    print(is_model_available("Qwen"))
     print(get_models())
     messages = [
         {'role': 'user', 'content': '你好，你是谁？'},
@@ -86,6 +159,11 @@ if __name__ == '__main__':
         model="Qwen2.5-72B"
     )
     print(response_content)
+    print(f"is chatgpt format: {is_chatgpt_format(response_content)}")
+
+    resp = chat_completion_message("你是什么模型？")
+    print(resp)
+    print(f"is chatgpt format: {is_chatgpt_format(resp)}")
 #     # support Chinese
 #     if isinstance(response_content, str):  # 如果已经是 JSON 字符串
 #         return Response(response_content, content_type="application/json; charset=utf-8")