Update app.py

app.py

@@ -174,60 +174,45 @@ class Demo:
     def __init__(self):
         pass
 
-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 = []
-    
-    try:
-        messages = history_to_messages(_history, _setting['system'])
-        system_message = messages[0]['content']
-        
-        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_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})
-        
-        yield [
-            "Generating code...",
-            _history,
-            None,
-            gr.update(active_key="loading"),
-            gr.update(open=True)
-        ]
+    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']
         
-        collected_content = None
-        error_message = None
+        if _history is None:
+            _history = []
         
-        # Claude API 시도
         try:
-            async for content in try_claude_api(system_message, claude_messages):
-                collected_content = content
-                yield [
-                    content,
-                    _history,
-                    None,
-                    gr.update(active_key="loading"),
-                    gr.update(open=True)
-                ]
-        except Exception as claude_error:
-            print(f"Claude API error: {str(claude_error)}")
-            error_message = str(claude_error)
+            messages = history_to_messages(_history, _setting['system'])
+            system_message = messages[0]['content']
             
-            # OpenAI API 시도
+            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_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})
+            
+            yield [
+                "Generating code...",
+                _history,
+                None,
+                gr.update(active_key="loading"),
+                gr.update(open=True)
+            ]
+            
+            collected_content = None
+            error_message = None
+            
+            # Claude API 시도
             try:
-                async for content in try_openai_api(openai_messages):
+                async for content in try_claude_api(system_message, claude_messages):
                     collected_content = content
                     yield [
                         content,
@@ -236,37 +221,52 @@ async def generation_code(self, query: Optional[str], _setting: Dict[str, str],
                         gr.update(active_key="loading"),
                         gr.update(open=True)
                     ]
-            except Exception as openai_error:
-                print(f"OpenAI API error: {str(openai_error)}")
-                error_message = f"Both APIs failed: Claude - {str(claude_error)}, OpenAI - {str(openai_error)}"
-        
-        if collected_content:
-            _history = messages_to_history([
-                {'role': Role.SYSTEM, 'content': system_message}
-            ] + claude_messages + [{
-                'role': Role.ASSISTANT,
-                'content': collected_content
-            }])
+            except Exception as claude_error:
+                print(f"Claude API error: {str(claude_error)}")
+                error_message = str(claude_error)
+                
+                # OpenAI API 시도
+                try:
+                    async for content in try_openai_api(openai_messages):
+                        collected_content = content
+                        yield [
+                            content,
+                            _history,
+                            None,
+                            gr.update(active_key="loading"),
+                            gr.update(open=True)
+                        ]
+                except Exception as openai_error:
+                    print(f"OpenAI API error: {str(openai_error)}")
+                    error_message = f"Both APIs failed: Claude - {str(claude_error)}, OpenAI - {str(openai_error)}"
             
+            if 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(error_message or "No content was generated")
+                
+        except Exception as e:
+            print(f"Error details: {str(e)}")
             yield [
-                collected_content,
+                f"Error: {str(e)}",
                 _history,
-                send_to_sandbox(remove_code_block(collected_content)),
-                gr.update(active_key="render"),
-                gr.update(open=True)
+                None,
+                gr.update(active_key="empty"),
+                gr.update(open=False)
             ]
-        else:
-            raise ValueError(error_message or "No content was generated")
-            
-    except Exception as e:
-        print(f"Error details: {str(e)}")
-        yield [
-            f"Error: {str(e)}",
-            _history,
-            None,
-            gr.update(active_key="empty"),
-            gr.update(open=False)
-        ]
 
     def clear_history(self):
         return []