Update web_ui.py

web_ui.py

@@ -66,133 +66,120 @@ class WebUI:
         messages: The chat history.
     """
 
-    def run(self,
-            messages: List[Message] = None,
-            share: bool = False,
-            server_name: str = None,
-            server_port: int = None,
-            concurrency_limit: int = 10,
-            enable_mention: bool = False,
-            **kwargs):
-        self.run_kwargs = kwargs
-
-        from qwen_agent.gui.gradio import gr, mgr
-
-        customTheme = gr.themes.Default(
-            primary_hue=gr.themes.utils.colors.blue,
-            radius_size=gr.themes.utils.sizes.radius_none,
-        )
+def run(self,
+        messages: List[Message] = None,
+        share: bool = False,
+        server_name: str = None,
+        server_port: int = None,
+        concurrency_limit: int = 10,
+        enable_mention: bool = False,
+        **kwargs):
+    self.run_kwargs = kwargs
+
+    from qwen_agent.gui.gradio import gr, mgr
+
+    # Создаем более современную цветовую схему
+    customTheme = gr.themes.Soft(
+        primary_hue=gr.themes.colors.blue,
+        secondary_hue=gr.themes.colors.gray,
+        radius_size=gr.themes.sizes.radius_md,
+    )
+
+    with gr.Blocks(
+            css=os.path.join(os.path.dirname(__file__), 'assets/appBot.css'),
+            theme=customTheme,
+    ) as demo:
+        history = gr.State([])
+
+        with gr.Container():
+            with gr.Row():
+                with gr.Column(scale=3):
+                    # Улучшенный чатбот с расширенными опциями
+                    chatbot = mgr.Chatbot(
+                        value=convert_history_to_chatbot(messages=messages),
+                        avatar_images=[
+                            self.user_config,
+                            self.agent_config_list,
+                        ],
+                        height=700,
+                        avatar_image_width=60,
+                        bubble_full_width=False,
+                        layout='bubble',
+                        show_copy_button=True,
+                        show_share_button=True,
+                        latex_delimiters=[
+                            {'left': '\\(', 'right': '\\)', 'display': False},
+                            {'left': '\\[', 'right': '\\]', 'display': True},
+                        ]
+                    )
 
-        with gr.Blocks(
-                css=os.path.join(os.path.dirname(__file__), 'assets/appBot.css'),
-                theme=customTheme,
-        ) as demo:
-            history = gr.State([])
-
-            with gr.Row(elem_classes='container'):
-                with gr.Column(scale=4):
-                    chatbot = mgr.Chatbot(value=convert_history_to_chatbot(messages=messages),
-                                          avatar_images=[
-                                              self.user_config,
-                                              self.agent_config_list,
-                                          ],
-                                          height=650,
-                                          avatar_image_width=80,
-                                          flushing=False,
-                                          show_copy_button=True,
-                                          latex_delimiters=[{
-                                              'left': '\\(',
-                                              'right': '\\)',
-                                              'display': True
-                                          }, {
-                                              'left': '\\begin{equation}',
-                                              'right': '\\end{equation}',
-                                              'display': True
-                                          }, {
-                                              'left': '\\begin{align}',
-                                              'right': '\\end{align}',
-                                              'display': True
-                                          }, {
-                                              'left': '\\begin{alignat}',
-                                              'right': '\\end{alignat}',
-                                              'display': True
-                                          }, {
-                                              'left': '\\begin{gather}',
-                                              'right': '\\end{gather}',
-                                              'display': True
-                                          }, {
-                                              'left': '\\begin{CD}',
-                                              'right': '\\end{CD}',
-                                              'display': True
-                                          }, {
-                                              'left': '\\[',
-                                              'right': '\\]',
-                                              'display': True
-                                          }])
-
-                    input = mgr.MultimodalInput(placeholder=self.input_placeholder, upload_button_props=dict(file_types=[".pdf", ".docx", ".pptx", ".txt", ".html", ".csv", ".tsv", ".xlsx", ".xls"] + ["." + file_type for file_type in common_programming_language_extensions]))
-
-                with gr.Column(scale=1):
-                    if len(self.agent_list) > 1:
-                        agent_selector = gr.Dropdown(
-                            [(agent.name, i) for i, agent in enumerate(self.agent_list)],
-                            label='Agents',
-                            info='选择一个Agent',
-                            value=0,
-                            interactive=True,
+                    # Улучшенный мультимодальный ввод
+                    with gr.Row():
+                        input = mgr.MultimodalInput(
+                            placeholder=self.input_placeholder, 
+                            upload_button_props=dict(
+                                file_types=[
+                                    ".pdf", ".docx", ".pptx", ".txt", 
+                                    ".html", ".csv", ".tsv", ".xlsx", ".xls"
+                                ] + ["." + file_type for file_type in common_programming_language_extensions]
+                            ),
+                            show_label=False
                         )
-
-                    agent_info_block = self._create_agent_info_block()
-
-                    # agent_plugins_block = self._create_agent_plugins_block()
-
+                        send_btn = gr.Button("Отправить", variant="primary", size="lg")
+
+                with gr.Column(scale=1, min_width=300):
+                    # Боковая панель с информацией об агенте
+                    with gr.Card(variant="filled"):
+                        agent_info_block = self._create_agent_info_block()
+                        
+                        # Селектор агентов (если их несколько)
+                        if len(self.agent_list) > 1:
+                            agent_selector = gr.Dropdown(
+                                [(agent.name, i) for i, agent in enumerate(self.agent_list)],
+                                label='Выберите агента',
+                                value=0,
+                                interactive=True,
+                            )
+
+                        # Блок с возможностями агента
+                        agent_plugins_block = self._create_agent_plugins_block()
+
+                    # Рекомендованные промпты
                     if self.prompt_suggestions:
                         gr.Examples(
-                            label='推荐对话',
+                            label='Быстрый старт',
                             examples=self.prompt_suggestions,
                             inputs=[input],
                         )
 
-                if len(self.agent_list) > 1:
-                    agent_selector.change(
-                        fn=self.change_agent,
-                        inputs=[agent_selector],
-                        outputs=[agent_selector, agent_info_block, agent_plugins_block],
-                        queue=False,
-                    )
-
-                input_promise = input.submit(
-                    fn=self.add_text,
-                    inputs=[input, chatbot, history],
-                    outputs=[input, chatbot, history],
-                    queue=False,
-                )
-
-                if len(self.agent_list) > 1 and enable_mention:
-                    input_promise = input_promise.then(
-                        self.add_mention,
-                        [chatbot, agent_selector],
-                        [chatbot, agent_selector],
-                    ).then(
-                        self.agent_run,
-                        [chatbot, history, agent_selector],
-                        [chatbot, history, agent_selector],
-                    )
-                else:
-                    input_promise = input_promise.then(
-                        self.agent_run,
-                        [chatbot, history],
-                        [chatbot, history],
-                    )
-
-                input_promise.then(self.flushed, None, [input])
-
-            demo.load(None)
+            # Привязка событий
+            send_btn.click(
+                fn=self.add_text,
+                inputs=[input, chatbot, history],
+                outputs=[input, chatbot, history]
+            ).then(
+                self.agent_run,
+                [chatbot, history],
+                [chatbot, history]
+            )
 
-        demo.queue(default_concurrency_limit=concurrency_limit).launch(share=share,
-                                                                       server_name=server_name,
-                                                                       server_port=server_port)
+            # Обработка ввода по нажатию Enter
+            input.submit(
+                fn=self.add_text,
+                inputs=[input, chatbot, history],
+                outputs=[input, chatbot, history]
+            ).then(
+                self.agent_run,
+                [chatbot, history],
+                [chatbot, history]
+            )
 
+        # Запуск демо
+        demo.queue(default_concurrency_limit=concurrency_limit).launch(
+            share=share,
+            server_name=server_name,
+            server_port=server_port
+        )
     def change_agent(self, agent_selector):
         yield agent_selector, self._create_agent_info_block(agent_selector), self._create_agent_plugins_block(
             agent_selector)