Spaces:

dan92
/

notdiamond2api2

Running

App Files Files Community

dan92 commited on Nov 26, 2024

Commit

7a19dbb

verified ·

1 Parent(s): 3ad739c

Update app.py

Browse files

Files changed (1) hide show

app.py +24 -149

app.py CHANGED Viewed

@@ -11,15 +11,13 @@ from functools import lru_cache, wraps
 from typing import Dict, Any, Callable, List, Tuple
 import requests
 import tiktoken
-from flask import Flask, Response, jsonify, request, stream_with_context, render_template
 from flask_cors import CORS
 from requests.adapters import HTTPAdapter
 from urllib3.util.connection import create_connection
 import urllib3
 from cachetools import TTLCache
 import threading
-from datetime import datetime
-from werkzeug.exceptions import HTTPException
 # 新增导入
 import register_bot
@@ -57,7 +55,7 @@ if not NOTDIAMOND_IP:
     logger.error("NOTDIAMOND_IP environment variable is not set!")
     raise ValueError("NOTDIAMOND_IP must be set")
-# API钥验证装饰器
 def require_api_key(f):
     @wraps(f)
     def decorated_function(*args, **kwargs):
@@ -120,10 +118,6 @@ class AuthManager:
         self._session: requests.Session = create_custom_session()
         self._logger: logging.Logger = logging.getLogger(__name__)
         self.model_status = {model: True for model in MODEL_INFO.keys()}
-        self.total_requests = 0
-        self.success_requests = 0
-        self.failed_requests = 0
-        self.last_used_time = None
     def login(self) -> bool:
         """使用电子邮件和密码进行用户登录,并获取用户信息。"""
@@ -258,14 +252,6 @@ class AuthManager:
     def reset_model_status(self):
         self.model_status = {model: True for model in MODEL_INFO.keys()}
-    def record_request(self, success: bool):
-        self.total_requests += 1
-        if success:
-            self.success_requests += 1
-        else:
-            self.failed_requests += 1
-        self.last_used_time = datetime.now()
 class MultiAuthManager:
     def __init__(self, credentials):
         self.auth_managers = [AuthManager(email, password) for email, password in credentials]
@@ -491,7 +477,7 @@ def get_auth_credentials():
             if data.get('status') == 'success' and data.get('content'):
                 content = data['content']
                 credentials = []
-                # 分割多个凭据（如果的话）
                 for cred in content.split(';'):
                     if '|' in cred:
                         email, password = cred.strip().split('|')
@@ -535,109 +521,29 @@ def before_request():
     else:
         multi_auth_manager = None
-def get_accounts_status():
-    """获取所有账号的状态信息"""
-    if not multi_auth_manager:
-        return []
-    accounts_status = []
-    for auth_manager in multi_auth_manager.auth_managers:
-        account_info = {
-            "email": auth_manager._email,
-            "is_valid": auth_manager.is_token_valid(),
-            "token_expiry": datetime.fromtimestamp(auth_manager._token_expiry).strftime('%Y-%m-%d %H:%M:%S'),
-            "models_status": {
-                model: status
-                for model, status in auth_manager.model_status.items()
-            }
-        }
-        accounts_status.append(account_info)
-    return accounts_status
 @app.route('/', methods=['GET'])
 def root():
-    try:
-        accounts_status = get_accounts_status()
-        if request.headers.get('Accept') == 'application/json':
-            return get_json_status(accounts_status)
-        template_data = get_template_data(accounts_status)
-        return render_template('monitor.html', **template_data)
-    except Exception as e:
-        logger.error(f"Error in root route: {str(e)}", exc_info=True)
-        if request.headers.get('Accept') == 'application/json':
-            return jsonify({
-                "error": "Internal Server Error",
-                "message": str(e)
-            }), 500
-        # 对于 HTML 请求，返回一个简单的错误页面
-        error_html = """
-        <html>
-            <head><title>Error</title></head>
-            <body>
-                <h1>Internal Server Error</h1>
-                <p>An error occurred while processing your request.</p>
-                <p>Error details: {}</p>
-                <p><a href="javascript:location.reload()">Retry</a></p>
-            </body>
-        </html>
-        """.format(str(e) if app.debug else "Please try again later")
-        return error_html, 500
-def get_template_data(accounts_status):
-    try:
-        if not multi_auth_manager or not multi_auth_manager.auth_managers:
-            logger.warning("No auth managers available")
-            return {
-                "total_accounts": 0,
-                "valid_accounts": 0,
-                "total_requests": 0,
-                "accounts": [],
-                "last_update": datetime.now().strftime('%Y-%m-%d %H:%M:%S')
             }
-        total_accounts = len(accounts_status)
-        valid_accounts = sum(1 for acc in accounts_status if acc["is_valid"])
-        accounts_data = []
-        total_requests = 0
-        for auth_manager in multi_auth_manager.auth_managers:
-            try:
-                success_rate = 0
-                if hasattr(auth_manager, 'total_requests') and auth_manager.total_requests > 0:
-                    success_rate = (auth_manager.success_requests / auth_manager.total_requests) * 100
-                account_info = {
-                    "email": auth_manager._email,
-                    "is_valid": auth_manager.is_token_valid(),
-                    "total_requests": getattr(auth_manager, 'total_requests', 0),
-                    "success_requests": getattr(auth_manager, 'success_requests', 0),
-                    "failed_requests": getattr(auth_manager, 'failed_requests', 0),
-                    "success_rate": success_rate,
-                    "last_used_time": auth_manager.last_used_time.strftime('%m/%d/%Y, %I:%M:%S %p') if hasattr(auth_manager, 'last_used_time') and auth_manager.last_used_time else "从未使用"
-                }
-                accounts_data.append(account_info)
-                total_requests += getattr(auth_manager, 'total_requests', 0)
-            except Exception as e:
-                logger.error(f"Error processing account {auth_manager._email}: {str(e)}", exc_info=True)
-                continue
-        return {
-            "total_accounts": total_accounts,
-            "valid_accounts": valid_accounts,
-            "total_requests": total_requests,
-            "accounts": accounts_data,
-            "last_update": datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        }
-    except Exception as e:
-        logger.error(f"Error in get_template_data: {str(e)}", exc_info=True)
-        raise
-def get_json_status(accounts_status):
-    template_data = get_template_data(accounts_status)
-    return jsonify(template_data)
 @app.route('/ai/v1/models', methods=['GET'])
 def proxy_models():
@@ -815,9 +721,6 @@ def make_request(payload, auth_manager, model_id):
                     stream=True
                 ).result()
-                success = response.status_code == 200
-                auth_manager.record_request(success)
                 if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
                     return response
@@ -840,7 +743,6 @@ def make_request(payload, auth_manager, model_id):
                 logger.error(f"Request failed with status {response.status_code} for account {auth_manager._email}")
             except Exception as e:
-                auth_manager.record_request(False)
                 logger.error(f"Request attempt {attempt + 1} failed for account {auth_manager._email}: {e}")
                 if attempt < max_retries - 1:
                     time.sleep(retry_delay)
@@ -880,31 +782,4 @@ if __name__ == "__main__":
     health_check_thread.start()
     port = int(os.environ.get("PORT", 3000))
-    app.run(debug=False, host='0.0.0.0', port=port, threaded=True)
-# 添加错误处理器
-@app.errorhandler(Exception)
-def handle_exception(e):
-    """处理所有异常"""
-    logger.error(f"Unhandled exception: {str(e)}", exc_info=True)
-    # 如果是 HTTP 异常，返回其状态码
-    if isinstance(e, HTTPException):
-        return jsonify({
-            "error": {
-                "type": "http_error",
-                "code": e.code,
-                "name": e.name,
-                "description": e.description
-            }
-        }), e.code
-    # 其他异常返回 500
-    return jsonify({
-        "error": {
-            "type": "server_error",
-            "message": "Internal Server Error",
-            "details": str(e) if app.debug else "An unexpected error occurred"
-        }
-    }), 500

 from typing import Dict, Any, Callable, List, Tuple
 import requests
 import tiktoken
+from flask import Flask, Response, jsonify, request, stream_with_context
 from flask_cors import CORS
 from requests.adapters import HTTPAdapter
 from urllib3.util.connection import create_connection
 import urllib3
 from cachetools import TTLCache
 import threading
 # 新增导入
 import register_bot
     logger.error("NOTDIAMOND_IP environment variable is not set!")
     raise ValueError("NOTDIAMOND_IP must be set")
+# API密钥验证装饰器
 def require_api_key(f):
     @wraps(f)
     def decorated_function(*args, **kwargs):
         self._session: requests.Session = create_custom_session()
         self._logger: logging.Logger = logging.getLogger(__name__)
         self.model_status = {model: True for model in MODEL_INFO.keys()}
     def login(self) -> bool:
         """使用电子邮件和密码进行用户登录,并获取用户信息。"""
     def reset_model_status(self):
         self.model_status = {model: True for model in MODEL_INFO.keys()}
 class MultiAuthManager:
     def __init__(self, credentials):
         self.auth_managers = [AuthManager(email, password) for email, password in credentials]
             if data.get('status') == 'success' and data.get('content'):
                 content = data['content']
                 credentials = []
+                # 分割多个凭据（如果有的话）
                 for cred in content.split(';'):
                     if '|' in cred:
                         email, password = cred.strip().split('|')
     else:
         multi_auth_manager = None
 @app.route('/', methods=['GET'])
 def root():
+    return jsonify({
+        "service": "AI Chat Completion Proxy",
+        "usage": {
+            "endpoint": "/ai/v1/chat/completions",
+            "method": "POST",
+            "headers": {
+                "Authorization": "Bearer YOUR_API_KEY"
+            },
+            "body": {
+                "model": "One of: " + ", ".join(MODEL_INFO.keys()),
+                "messages": [
+                    {"role": "system", "content": "You are a helpful assistant."},
+                    {"role": "user", "content": "Hello, who are you?"}
+                ],
+                "stream": False,
+                "temperature": 0.7
             }
+        },
+        "availableModels": list(MODEL_INFO.keys()),
+        "note": "API key authentication is required for other endpoints."
+    })
 @app.route('/ai/v1/models', methods=['GET'])
 def proxy_models():
                     stream=True
                 ).result()
                 if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
                     return response
                 logger.error(f"Request failed with status {response.status_code} for account {auth_manager._email}")
             except Exception as e:
                 logger.error(f"Request attempt {attempt + 1} failed for account {auth_manager._email}: {e}")
                 if attempt < max_retries - 1:
                     time.sleep(retry_delay)
     health_check_thread.start()
     port = int(os.environ.get("PORT", 3000))
+    app.run(debug=False, host='0.0.0.0', port=port, threaded=True)