Update app.py

app.py

@@ -100,43 +100,58 @@ def messages_to_history(messages: Messages) -> History:
         history.append([q['content'], r['content']])
     return history
 
-# API 클라이언트 초기화
-YOUR_ANTHROPIC_TOKEN = os.getenv('ANTHROPIC_API_KEY')
-YOUR_OPENAI_TOKEN = os.getenv('OPENAI_API_KEY')
 
-claude_client = anthropic.Anthropic(api_key=YOUR_ANTHROPIC_TOKEN)
-openai_client = openai.OpenAI(api_key=YOUR_OPENAI_TOKEN)
+# API 클라이언트 초기화
+YOUR_ANTHROPIC_TOKEN = os.getenv('ANTHROPIC_API_KEY', '')  # 기본값 추가
+YOUR_OPENAI_TOKEN = os.getenv('OPENAI_API_KEY', '')  # 기본값 추가
+
+# API 키 검증
+if not YOUR_ANTHROPIC_TOKEN or not YOUR_OPENAI_TOKEN:
+    print("Warning: API keys not found in environment variables")
+
+# API 클라이언트 초기화 시 예외 처리 추가
+try:
+    claude_client = anthropic.Anthropic(api_key=YOUR_ANTHROPIC_TOKEN)
+    openai_client = openai.OpenAI(api_key=YOUR_OPENAI_TOKEN)
+except Exception as e:
+    print(f"Error initializing API clients: {str(e)}")
+    claude_client = None
+    openai_client = None
 
+    
 async def try_claude_api(system_message, claude_messages, timeout=15):
+    if not claude_client:
+        raise Exception("Claude client not initialized")
+    
     try:
         start_time = time.time()
-        with claude_client.messages.stream(
-            model="claude-3-5-sonnet-20241022",
-            max_tokens=7800,
-            system=system_message,
-            messages=claude_messages
-        ) as stream:
-            collected_content = ""
-            for chunk in stream:
-                current_time = time.time()
-                if current_time - start_time > timeout:
-                    print(f"Claude API response time: {current_time - start_time:.2f} seconds")
-                    raise TimeoutError("Claude API timeout")
-                if chunk.type == "content_block_delta":
-                    collected_content += chunk.delta.text
-                    yield collected_content
-                    await asyncio.sleep(0)
-                
-                start_time = current_time
+        async with asyncio.timeout(timeout):  # 타임아웃 설정
+            with claude_client.messages.stream(
+                model="claude-3-5-sonnet-20241022",
+                max_tokens=7800,
+                system=system_message,
+                messages=claude_messages
+            ) as stream:
+                collected_content = ""
+                async for chunk in stream:
+                    if chunk.type == "content_block_delta":
+                        collected_content += chunk.delta.text
+                        yield collected_content
+                        await asyncio.sleep(0)
                 
+    except asyncio.TimeoutError:
+        raise TimeoutError(f"Claude API timeout after {timeout} seconds")
     except Exception as e:
         print(f"Claude API error: {str(e)}")
-        raise e
+        raise
 
 async def try_openai_api(openai_messages):
+    if not openai_client:
+        raise Exception("OpenAI client not initialized")
+    
     try:
-        stream = openai_client.chat.completions.create(
-            model="gpt-4o",
+        stream = await openai_client.chat.completions.create(
+            model="gpt-4",  # 모델명 수정
             messages=openai_messages,
             stream=True,
             max_tokens=4096,
@@ -144,14 +159,16 @@ async def try_openai_api(openai_messages):
         )
         
         collected_content = ""
-        for chunk in stream:
-            if chunk.choices[0].delta.content is not None:
+        async for chunk in stream:
+            if chunk.choices[0].delta.content:
                 collected_content += chunk.choices[0].delta.content
                 yield collected_content
                 
     except Exception as e:
         print(f"OpenAI API error: {str(e)}")
-        raise e
+        raise
+
+
 
 class Demo:
     def __init__(self):