Update app.py

app.py

@@ -189,8 +189,6 @@ async def try_openai_api(openai_messages):
         print(f"OpenAI API error: {str(e)}")
         raise e
 
-
-
 class Demo:
     def __init__(self):
         init_db()
@@ -199,99 +197,96 @@ class Demo:
     async def generation_code(self, query: Optional[str], _setting: Dict[str, str], _history: Optional[History]):
         if not query or query.strip() == '':
             query = random.choice(DEMO_LIST)['description']
-
-
-    
-    if _history is None:
-        _history = []
-    
-    messages = history_to_messages(_history, _setting['system'])
-    system_message = messages[0]['content']
-    
-    # Claude 메시지 포맷
-    claude_messages = [
-        {"role": msg["role"] if msg["role"] != "system" else "user", "content": msg["content"]} 
-        for msg in messages[1:] + [{'role': Role.USER, 'content': query}]
-        if msg["content"].strip() != ''
-    ]
-    
-    # OpenAI 메시지 포맷
-    openai_messages = [{"role": "system", "content": system_message}]
-    for msg in messages[1:]:
-        openai_messages.append({
-            "role": msg["role"],
-            "content": msg["content"]
-        })
-    openai_messages.append({"role": "user", "content": query})
-    
-    try:
-        # 먼저 코드 뷰어를 열기
-        yield [
-            "Generating code...",
-            _history,
-            None,
-            gr.update(active_key="loading"),
-            gr.update(open=True)
+        
+        if _history is None:
+            _history = []
+        
+        messages = history_to_messages(_history, _setting['system'])
+        system_message = messages[0]['content']
+        
+        # Claude 메시지 포맷
+        claude_messages = [
+            {"role": msg["role"] if msg["role"] != "system" else "user", "content": msg["content"]} 
+            for msg in messages[1:] + [{'role': Role.USER, 'content': query}]
+            if msg["content"].strip() != ''
         ]
-        await asyncio.sleep(0)  # UI 업데이트를 위한 양보
-
-        collected_content = None
-        # Claude API 시도
-        try:
-            async for content in try_claude_api(system_message, claude_messages):
-                yield [
-                    content,
-                    _history,
-                    None,
-                    gr.update(active_key="loading"),
-                    gr.update(open=True)
-                ]
-                await asyncio.sleep(0)  # UI 업데이트를 위한 양보
-            collected_content = content
-            
-        except Exception as claude_error:
-            print(f"Falling back to OpenAI API due to Claude error: {str(claude_error)}")
-            
-            # OpenAI API로 폴백
-            async for content in try_openai_api(openai_messages):
-                yield [
-                    content,
-                    _history,
-                    None,
-                    gr.update(active_key="loading"),
-                    gr.update(open=True)
-                ]
-                await asyncio.sleep(0)  # UI 업데이트를 위한 양보
-            collected_content = content
-
-
-        if collected_content:
-        # 채팅 내용 저장
-            save_chat(self.current_session, query, collected_content)    
-            _history = messages_to_history([...])
         
-                {'role': Role.SYSTEM, 'content': system_message}
-            ] + claude_messages + [{
-                'role': Role.ASSISTANT,
-                'content': collected_content
-            }])
-            
+        # OpenAI 메시지 포맷
+        openai_messages = [{"role": "system", "content": system_message}]
+        for msg in messages[1:]:
+            openai_messages.append({
+                "role": msg["role"],
+                "content": msg["content"]
+            })
+        openai_messages.append({"role": "user", "content": query})
+        
+        try:
+            # 먼저 코드 뷰어를 열기
             yield [
-                collected_content,
+                "Generating code...",
                 _history,
-                send_to_sandbox(remove_code_block(collected_content)),
-                gr.update(active_key="render"),
+                None,
+                gr.update(active_key="loading"),
                 gr.update(open=True)
             ]
-        else:
-            raise ValueError("No content was generated from either API")
-    
-
-            
+            await asyncio.sleep(0)  # UI 업데이트를 위한 양보
+
+            collected_content = None
+            # Claude API 시도
+            try:
+                async for content in try_claude_api(system_message, claude_messages):
+                    yield [
+                        content,
+                        _history,
+                        None,
+                        gr.update(active_key="loading"),
+                        gr.update(open=True)
+                    ]
+                    await asyncio.sleep(0)
+                collected_content = content
+                
+            except Exception as claude_error:
+                print(f"Falling back to OpenAI API due to Claude error: {str(claude_error)}")
+                
+                # OpenAI API로 폴백
+                async for content in try_openai_api(openai_messages):
+                    yield [
+                        content,
+                        _history,
+                        None,
+                        gr.update(active_key="loading"),
+                        gr.update(open=True)
+                    ]
+                    await asyncio.sleep(0)
+                collected_content = content
+
+            if collected_content:
+                # 채팅 내용 저장
+                save_chat(self.current_session, query, collected_content)
+                
+                _history = messages_to_history([
+                    {'role': Role.SYSTEM, 'content': system_message}
+                ] + claude_messages + [{
+                    'role': Role.ASSISTANT,
+                    'content': collected_content
+                }])
+                
+                yield [
+                    collected_content,
+                    _history,
+                    send_to_sandbox(remove_code_block(collected_content)),
+                    gr.update(active_key="render"),
+                    gr.update(open=True)
+                ]
+            else:
+                raise ValueError("No content was generated from either API")
+                
         except Exception as e:
             print(f"Error details: {str(e)}")
             raise ValueError(f'Error calling APIs: {str(e)}')
 
+
+
     def clear_history(self):
         self.current_session = create_session()
         return []