Update app.py

app.py

@@ -3,14 +3,19 @@ import time
 import json
 import asyncio
 import aiohttp
+import logging
 from aiohttp import web
 
+# 设置日志
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
 PROJECT_ID = os.getenv('PROJECT_ID')
 CLIENT_ID = os.getenv('CLIENT_ID')
 CLIENT_SECRET = os.getenv('CLIENT_SECRET')
 REFRESH_TOKEN = os.getenv('REFRESH_TOKEN')
 API_KEY = os.getenv('API_KEY')
-MODEL = 'claude-3-5-sonnet@20240620'  # 直接在代码中指定 MODEL
+MODEL = 'claude-3-5-sonnet@20240620'
 
 TOKEN_URL = 'https://www.googleapis.com/oauth2/v4/token'
 
@@ -24,13 +29,16 @@ async def get_access_token():
     now = time.time()
 
     if token_cache['access_token'] and now < token_cache['expiry'] - 120:
+        logger.info("Using cached access token")
         return token_cache['access_token']
 
     if token_cache['refresh_promise']:
+        logger.info("Waiting for ongoing token refresh")
         await token_cache['refresh_promise']
         return token_cache['access_token']
 
     async def refresh_token():
+        logger.info("Refreshing access token")
         async with aiohttp.ClientSession() as session:
             async with session.post(TOKEN_URL, json={
                 'client_id': CLIENT_ID,
@@ -41,6 +49,7 @@ async def get_access_token():
                 data = await response.json()
                 token_cache['access_token'] = data['access_token']
                 token_cache['expiry'] = now + data['expires_in']
+                logger.info("Access token refreshed successfully")
 
     token_cache['refresh_promise'] = refresh_token()
     await token_cache['refresh_promise']
@@ -49,10 +58,14 @@ async def get_access_token():
 
 def get_location():
     current_seconds = time.localtime().tm_sec
-    return 'europe-west1' if current_seconds < 30 else 'us-east5'
+    location = 'europe-west1' if current_seconds < 30 else 'us-east5'
+    logger.info(f"Selected location: {location}")
+    return location
 
 def construct_api_url(location, model):
-    return f'https://{location}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{location}/publishers/anthropic/models/{model}:streamRawPredict'
+    url = f'https://{location}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{location}/publishers/anthropic/models/{model}:streamRawPredict'
+    logger.info(f"Constructed API URL: {url}")
+    return url
 
 def format_model_name(model):
     if model == 'claude-3-5-sonnet-20240620':
@@ -60,32 +73,33 @@ def format_model_name(model):
     return model
 
 async def handle_request(request):
+    logger.info(f"Received {request.method} request to {request.path}")
+    
     if request.method == 'OPTIONS':
+        logger.info("Handling OPTIONS request")
         return handle_options()
 
     api_key = request.headers.get('x-api-key')
     if api_key != API_KEY:
-        error_response = web.Response(
-            text=json.dumps({
-                'type': 'error',
-                'error': {
-                    'type': 'permission_error',
-                    'message': 'Your API key does not have permission to use the specified resource.'
-                }
-            }),
-            status=403,
-            content_type='application/json'
-        )
-        error_response.headers['Access-Control-Allow-Origin'] = '*'
-        error_response.headers['Access-Control-Allow-Methods'] = 'POST, GET, OPTIONS, DELETE, HEAD'
-        error_response.headers['Access-Control-Allow-Headers'] = 'Content-Type, Authorization, x-api-key, anthropic-version, model'
-        return error_response
+        logger.warning("Invalid API key")
+        return create_error_response('Your API key does not have permission to use the specified resource.', 403)
+
+    try:
+        request_body = await request.json()
+        logger.info(f"Received request body: {json.dumps(request_body)}")
+    except json.JSONDecodeError:
+        logger.error("Invalid JSON in request body")
+        return create_error_response('Invalid JSON in request body', 400)
+
+    if not request_body:
+        logger.error("Empty request body")
+        return create_error_response('Empty request body', 400)
 
     access_token = await get_access_token()
     location = get_location()
 
-    request_body = await request.json()
-    model = format_model_name(request_body.get('model', MODEL))  # 使用 format_model_name 处理模型名称
+    model = format_model_name(request_body.get('model', MODEL))
+    logger.info(f"Using model: {model}")
 
     if 'anthropic_version' in request_body:
         del request_body['anthropic_version']
@@ -101,11 +115,13 @@ async def handle_request(request):
         'Content-Type': 'application/json; charset=utf-8'
     }
 
+    logger.info(f"Sending request to Anthropic API: {api_url}")
     async with aiohttp.ClientSession() as session:
         async with session.post(api_url, json=request_body, headers=headers) as response:
             response_body = await response.read()
             response_headers = response.headers
             response_status = response.status
+            logger.info(f"Received response from Anthropic API. Status: {response_status}")
 
     modified_response = web.Response(
         body=response_body,
@@ -116,9 +132,29 @@ async def handle_request(request):
     modified_response.headers['Access-Control-Allow-Methods'] = 'POST, GET, OPTIONS'
     modified_response.headers['Access-Control-Allow-Headers'] = 'Content-Type, Authorization, x-api-key, anthropic-version, model'
 
+    logger.info("Sending response back to client")
     return modified_response
 
+def create_error_response(message, status_code):
+    logger.error(f"Creating error response: {message} (Status: {status_code})")
+    response = web.Response(
+        text=json.dumps({
+            'type': 'error',
+            'error': {
+                'type': 'request_error',
+                'message': message
+            }
+        }),
+        status=status_code,
+        content_type='application/json'
+    )
+    response.headers['Access-Control-Allow-Origin'] = '*'
+    response.headers['Access-Control-Allow-Methods'] = 'POST, GET, OPTIONS, DELETE, HEAD'
+    response.headers['Access-Control-Allow-Headers'] = 'Content-Type, Authorization, x-api-key, anthropic-version, model'
+    return response
+
 def handle_options():
+    logger.info("Handling OPTIONS request")
     headers = {
         'Access-Control-Allow-Origin': '*',
         'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
@@ -130,4 +166,5 @@ app = web.Application()
 app.router.add_route('*', '/ai/v1/messages', handle_request)
 
 if __name__ == '__main__':
+    logger.info("Starting server on port 8080")
     web.run_app(app, port=8080)