jarvis-ai-assistant 0.1.192__py3-none-any.whl → 0.1.194__py3-none-any.whl

jarvis/jarvis_methodology/main.py

@@ -17,8 +17,10 @@ import yaml  # type: ignore
 from yaspin import yaspin  # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.methodology import (_get_methodology_directory,
-                                             _load_all_methodologies)
+from jarvis.jarvis_utils.methodology import (
+    _get_methodology_directory,
+    _load_all_methodologies,
+)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
@@ -38,18 +40,24 @@ def import_methodology(input_file):
         # 保存合并后的方法论
         methodology_dir = _get_methodology_directory()
         for problem_type, content in merged_data.items():
-            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            safe_filename = hashlib.md5(problem_type.encode("utf-8")).hexdigest()
             file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
 
             with open(file_path, "w", encoding="utf-8") as f:
-                json.dump({
-                    "problem_type": problem_type,
-                    "content": content
-                }, f, ensure_ascii=False, indent=2)
-
-        print(f"成功导入 {len(import_data)} 个方法论（总计 {len(merged_data)} 个）")
+                json.dump(
+                    {"problem_type": problem_type, "content": content},
+                    f,
+                    ensure_ascii=False,
+                    indent=2,
+                )
+
+        PrettyOutput.print(
+            f"成功导入 {len(import_data)} 个方法论（总计 {len(merged_data)} 个）",
+            OutputType.SUCCESS,
+        )
     except (json.JSONDecodeError, OSError) as e:
-        print(f"导入失败: {str(e)}")
+        PrettyOutput.print(f"导入失败: {str(e)}", OutputType.ERROR)
+
 
 def export_methodology(output_file):
     """导出当前方法论到单个文件"""
@@ -59,9 +67,13 @@ def export_methodology(output_file):
         with open(output_file, "w", encoding="utf-8") as f:
             json.dump(methodologies, f, ensure_ascii=False, indent=2)
 
-        print(f"成功导出 {len(methodologies)} 个方法论到 {output_file}")
+        PrettyOutput.print(
+            f"成功导出 {len(methodologies)} 个方法论到 {output_file}",
+            OutputType.SUCCESS,
+        )
     except (OSError, TypeError) as e:
-        print(f"导出失败: {str(e)}")
+        PrettyOutput.print(f"导出失败: {str(e)}", OutputType.ERROR)
+
 
 def list_methodologies():
     """列出所有方法论"""
@@ -69,14 +81,15 @@ def list_methodologies():
         methodologies = _load_all_methodologies()
 
         if not methodologies:
-            print("没有找到方法论")
+            PrettyOutput.print("没有找到方法论", OutputType.INFO)
             return
 
-        print("可用方法论:")
+        PrettyOutput.print("可用方法论:", OutputType.INFO)
         for i, (problem_type, _) in enumerate(methodologies.items(), 1):
-            print(f"{i}. {problem_type}")
+            PrettyOutput.print(f"{i}. {problem_type}", OutputType.INFO)
     except (OSError, json.JSONDecodeError) as e:
-        print(f"列出方法论失败: {str(e)}")
+        PrettyOutput.print(f"列出方法论失败: {str(e)}", OutputType.ERROR)
+
 
 def extract_methodology(input_file):
     """从文本文件中提取方法论"""
@@ -87,7 +100,7 @@ def extract_methodology(input_file):
 
         # 获取平台实例
         platform = PlatformRegistry().get_normal_platform()
-        
+
         # 构建提取提示
         prompt = f"""请从以下文本中提取方法论：
         
@@ -127,21 +140,24 @@ def extract_methodology(input_file):
                 return
 
             # 提取YAML部分
-            methodologies_start = response.find('<methodologies>') + len('<methodologies>')
-            methodologies_end = response.find('</methodologies>')
+            methodologies_start = response.find("<methodologies>") + len(
+                "<methodologies>"
+            )
+            methodologies_end = response.find("</methodologies>")
             if methodologies_start == -1 or methodologies_end == -1:
                 spinner.text = "响应格式无效"
                 spinner.fail("❌")
-                PrettyOutput.print("大模型未返回有效的<methodologies>格式", OutputType.ERROR)
+                PrettyOutput.print(
+                    "大模型未返回有效的<methodologies>格式", OutputType.ERROR
+                )
                 return
-                
+
             yaml_content = response[methodologies_start:methodologies_end].strip()
-            
+
             try:
                 data = yaml.safe_load(yaml_content)
                 extracted_methodologies = {
-                    item['problem_type']: item['content']
-                    for item in data
+                    item["problem_type"]: item["content"] for item in data
                 }
             except (yaml.YAMLError, KeyError, TypeError) as e:
                 spinner.text = "YAML解析失败"
@@ -164,19 +180,25 @@ def extract_methodology(input_file):
         # 保存合并后的方法论
         methodology_dir = _get_methodology_directory()
         for problem_type, content in merged_data.items():
-            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            safe_filename = hashlib.md5(problem_type.encode("utf-8")).hexdigest()
             file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
 
             with open(file_path, "w", encoding="utf-8") as f:
-                json.dump({
-                    "problem_type": problem_type,
-                    "content": content
-                }, f, ensure_ascii=False, indent=2)
-
-        PrettyOutput.print(f"成功从文件提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）", OutputType.SUCCESS)
+                json.dump(
+                    {"problem_type": problem_type, "content": content},
+                    f,
+                    ensure_ascii=False,
+                    indent=2,
+                )
+
+        PrettyOutput.print(
+            f"成功从文件提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）",
+            OutputType.SUCCESS,
+        )
     except Exception as e:
         PrettyOutput.print(f"提取失败: {str(e)}", OutputType.ERROR)
 
+
 def extract_methodology_from_url(url):
     """从URL提取方法论"""
     try:
@@ -184,7 +206,7 @@ def extract_methodology_from_url(url):
         platform = PlatformRegistry().get_normal_platform()
 
         platform.web = True
-        
+
         # 构建提取提示
         prompt = f"""请从以下URL内容中提取方法论：
         
@@ -223,21 +245,24 @@ def extract_methodology_from_url(url):
                 return
 
             # 提取YAML部分
-            methodologies_start = response.find('<methodologies>') + len('<methodologies>')
-            methodologies_end = response.find('</methodologies>')
+            methodologies_start = response.find("<methodologies>") + len(
+                "<methodologies>"
+            )
+            methodologies_end = response.find("</methodologies>")
             if methodologies_start == -1 or methodologies_end == -1:
                 spinner.text = "响应格式无效"
                 spinner.fail("❌")
-                PrettyOutput.print("大模型未返回有效的<methodologies>格式", OutputType.ERROR)
+                PrettyOutput.print(
+                    "大模型未返回有效的<methodologies>格式", OutputType.ERROR
+                )
                 return
-                
+
             yaml_content = response[methodologies_start:methodologies_end].strip()
-            
+
             try:
                 data = yaml.safe_load(yaml_content)
                 extracted_methodologies = {
-                    item['problem_type']: item['content']
-                    for item in data
+                    item["problem_type"]: item["content"] for item in data
                 }
             except (yaml.YAMLError, KeyError, TypeError) as e:
                 spinner.text = "YAML解析失败"
@@ -260,19 +285,25 @@ def extract_methodology_from_url(url):
         # 保存合并后的方法论
         methodology_dir = _get_methodology_directory()
         for problem_type, content in merged_data.items():
-            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            safe_filename = hashlib.md5(problem_type.encode("utf-8")).hexdigest()
             file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
 
             with open(file_path, "w", encoding="utf-8") as f:
-                json.dump({
-                    "problem_type": problem_type,
-                    "content": content
-                }, f, ensure_ascii=False, indent=2)
-
-        PrettyOutput.print(f"成功从URL提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）", OutputType.SUCCESS)
+                json.dump(
+                    {"problem_type": problem_type, "content": content},
+                    f,
+                    ensure_ascii=False,
+                    indent=2,
+                )
+
+        PrettyOutput.print(
+            f"成功从URL提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）",
+            OutputType.SUCCESS,
+        )
     except Exception as e:
         PrettyOutput.print(f"从URL提取失败: {str(e)}", OutputType.ERROR)
 
+
 def main():
     """方法论管理工具主函数"""
     parser = argparse.ArgumentParser(description="方法论管理工具")
@@ -291,7 +322,9 @@ def main():
 
     # extract命令
     extract_parser = subparsers.add_parser("extract", help="从文本文件中提取方法论")
-    extract_parser.add_argument("input_file", type=str, help="要提取方法论的文本文件路径")
+    extract_parser.add_argument(
+        "input_file", type=str, help="要提取方法论的文本文件路径"
+    )
 
     # extract-url命令
     extract_url_parser = subparsers.add_parser("extract-url", help="从URL提取方法论")
@@ -310,5 +343,6 @@ def main():
     elif args.command == "extract-url":
         extract_methodology_from_url(args.url)
 
+
 if __name__ == "__main__":
     main()

jarvis/jarvis_multi_agent/__init__.py

@@ -67,11 +67,13 @@ content: |2
     def can_handle(self, response: str) -> bool:
         return len(self._extract_send_msg(response)) > 0
 
-
     def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
         send_messages = self._extract_send_msg(response)
         if len(send_messages) > 1:
-            return False, f"Send multiple messages, please only send one message at a time."
+            return (
+                False,
+                f"Send multiple messages, please only send one message at a time.",
+            )
         if len(send_messages) == 0:
             return False, ""
         return True, send_messages[0]
@@ -79,7 +81,6 @@ content: |2
     def name(self) -> str:
         return "SEND_MESSAGE"
 
-
     @staticmethod
     def _extract_send_msg(content: str) -> List[Dict]:
         """Extract send message from content.
@@ -87,12 +88,14 @@ content: |2
         Args:
             content: The content containing send message
         """
-        data = re.findall(ot("SEND_MESSAGE")+r'\n(.*?)\n'+ct("SEND_MESSAGE"), content, re.DOTALL)
+        data = re.findall(
+            ot("SEND_MESSAGE") + r"\n(.*?)\n" + ct("SEND_MESSAGE"), content, re.DOTALL
+        )
         ret = []
         for item in data:
             try:
                 msg = yaml.safe_load(item)
-                if 'to' in msg and 'content' in msg:
+                if "to" in msg and "content" in msg:
                     ret.append(msg)
             except Exception as e:
                 continue
@@ -100,7 +103,7 @@ content: |2
 
     def init_agents(self):
         for config in self.agents_config:
-            output_handler = config.get('output_handler', [])
+            output_handler = config.get("output_handler", [])
             if len(output_handler) == 0:
                 output_handler = [
                     ToolRegistry(),
@@ -108,9 +111,9 @@ content: |2
                 ]
             else:
                 output_handler.append(self)
-            config['output_handler'] = output_handler
+            config["output_handler"] = output_handler
             agent = Agent(**config)
-            self.agents[config['name']] = agent
+            self.agents[config["name"]] = agent
 
     def run(self, user_input: str) -> str:
         last_agent = self.main_agent_name
@@ -119,17 +122,22 @@ content: |2
             if isinstance(msg, str):
                 return msg
             elif isinstance(msg, Dict):
-                prompt  = f"""
+                prompt = f"""
 Please handle this message:
 from: {last_agent}
 content: {msg['content']}
 """
-                if msg['to'] not in self.agents:
-                    PrettyOutput.print(f"未找到智能体 {msg['to']}，正在重试...", OutputType.WARNING)
-                    msg = self.agents[last_agent].run(f"未找到智能体 {msg['to']}，可用智能体列表: {self.agents.keys()}")
+                if msg["to"] not in self.agents:
+                    PrettyOutput.print(
+                        f"未找到智能体 {msg['to']}，正在重试...", OutputType.WARNING
+                    )
+                    msg = self.agents[last_agent].run(
+                        f"未找到智能体 {msg['to']}，可用智能体列表: {self.agents.keys()}"
+                    )
                     continue
-                PrettyOutput.print(f"{last_agent} 正在向 {msg['to']} 发送消息...", OutputType.INFO)
-                last_agent = self.agents[msg['to']].name
-                msg = self.agents[msg['to']].run(prompt)
+                PrettyOutput.print(
+                    f"{last_agent} 正在向 {msg['to']} 发送消息...", OutputType.INFO
+                )
+                last_agent = self.agents[msg["to"]].name
+                msg = self.agents[msg["to"]].run(prompt)
         return ""
-

jarvis/jarvis_multi_agent/main.py

@@ -14,25 +14,30 @@ def main():
     """
     init_env("欢迎使用 Jarvis-MultiAgent，您的多智能体系统已准备就绪！")
     import argparse
+
     parser = argparse.ArgumentParser(description="多智能体系统启动器")
     parser.add_argument("--config", "-c", required=True, help="YAML配置文件路径")
     parser.add_argument("--input", "-i", help="用户输入（可选）")
     args = parser.parse_args()
 
     try:
-        with open(args.config, 'r', errors="ignore") as f:
+        with open(args.config, "r", errors="ignore") as f:
             config_data = yaml.safe_load(f)
 
         # 获取agents配置
-        agents_config = config_data.get('agents', [])
+        agents_config = config_data.get("agents", [])
 
-        main_agent_name = config_data.get('main_agent', '')
+        main_agent_name = config_data.get("main_agent", "")
         if not main_agent_name:
             raise ValueError("必须指定main_agent作为主智能体")
 
         # 创建并运行多智能体系统
         multi_agent = MultiAgent(agents_config, main_agent_name)
-        user_input = args.input if args.input is not None else get_multiline_input("请输入内容（输入空行结束）：")
+        user_input = (
+            args.input
+            if args.input is not None
+            else get_multiline_input("请输入内容（输入空行结束）：")
+        )
         if user_input == "":
             return
         return multi_agent.run(user_input)
@@ -42,5 +47,6 @@ def main():
     except Exception as e:
         raise RuntimeError(f"多智能体系统初始化失败: {str(e)}")
 
+
 if __name__ == "__main__":
     result = main()

jarvis/jarvis_platform/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from jarvis.jarvis_platform.base import BasePlatform
 
-__all__ = ['BasePlatform']
+__all__ = ["BasePlatform"]

jarvis/jarvis_platform/base.py

@@ -9,15 +9,16 @@ from rich.panel import Panel
 from rich.text import Text
 from yaspin import yaspin
 
-from jarvis.jarvis_utils.config import (get_max_input_token_count,
-                                        get_pretty_output, is_print_prompt)
+from jarvis.jarvis_utils.config import (
+    get_max_input_token_count,
+    get_pretty_output,
+    is_print_prompt,
+)
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
 from jarvis.jarvis_utils.globals import set_in_chat
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
-from jarvis.jarvis_utils.utils import (get_context_token_count,
-                                       is_context_overflow, while_success,
-                                       while_true)
+from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
 
 
 class BasePlatform(ABC):
@@ -45,7 +46,7 @@ class BasePlatform(ABC):
     def chat(self, message: str) -> Generator[str, None, None]:
         """Execute conversation"""
         raise NotImplementedError("chat is not implemented")
-    
+
     @abstractmethod
     def upload_files(self, file_list: List[str]) -> bool:
         raise NotImplementedError("upload_files is not implemented")
@@ -55,9 +56,9 @@ class BasePlatform(ABC):
         """Check if platform supports upload files"""
         return False
 
-    
     def _chat(self, message: str):
         import time
+
         start_time = time.time()
 
         input_token_count = get_context_token_count(message)
@@ -70,28 +71,47 @@ class BasePlatform(ABC):
                 prefix_prompt = f"""
                 我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
                 """
-                while_true(lambda: while_success(lambda: self.chat(prefix_prompt), 5), 5)
+                while_true(
+                    lambda: while_success(lambda: self.chat(prefix_prompt), 5), 5
+                )
                 submit_count = 0
                 length = 0
                 for input in inputs:
                     submit_count += 1
                     length += len(input)
                     spinner.text = f"正在提交第{submit_count}部分（共{len(inputs)}部分({length}/{len(message)})）"
-                    list(while_true(lambda: while_success(lambda: self.chat(f"<part_content>{input}</part_content>请返回已收到"), 5), 5))
-                    spinner.write(f"提交第{submit_count}部分完成，当前进度：{length}/{len(message)}")
+                    list(
+                        while_true(
+                            lambda: while_success(
+                                lambda: self.chat(
+                                    f"<part_content>{input}</part_content>请返回已收到"
+                                ),
+                                5,
+                            ),
+                            5,
+                        )
+                    )
+                    spinner.write(
+                        f"提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
+                    )
                 spinner.text = "提交完成"
                 spinner.ok("✅")
-            response = while_true(lambda: while_success(lambda: self._chat("内容已经全部提供完毕，请继续"), 5), 5)
+            response = while_true(
+                lambda: while_success(
+                    lambda: self._chat("内容已经全部提供完毕，请继续"), 5
+                ),
+                5,
+            )
         else:
             response = ""
 
             text_content = Text()
             panel = Panel(
-                text_content, 
-                title=f"[bold cyan]{self.name()}[/bold cyan]", 
-                subtitle="[dim]思考中...[/dim]", 
+                text_content,
+                title=f"[bold cyan]{self.name()}[/bold cyan]",
+                subtitle="[dim]思考中...[/dim]",
                 border_style="bright_blue",
-                box=box.ROUNDED
+                box=box.ROUNDED,
             )
 
             if not self.suppress_output:
@@ -108,9 +128,13 @@ class BasePlatform(ABC):
                         # Calculate token count and tokens per second
                         try:
                             token_count = get_context_token_count(response)
-                            tokens_per_second = token_count / duration if duration > 0 else 0
+                            tokens_per_second = (
+                                token_count / duration if duration > 0 else 0
+                            )
                         except Exception as e:
-                            PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
+                            PrettyOutput.print(
+                                f"Tokenization failed: {str(e)}", OutputType.WARNING
+                            )
                             token_count = 0
                             tokens_per_second = 0
                         panel.subtitle = f"[bold green]✓ 对话完成耗时: {duration:.2f}秒, 输入字符数: {len(message)}, 输入Token数量: {input_token_count}, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}[/bold green]"
@@ -124,16 +148,20 @@ class BasePlatform(ABC):
                 for s in self.chat(message):
                     response += s
         # Keep original think tag handling
-        response = re.sub(ot("think")+r'.*?'+ct("think"), '', response, flags=re.DOTALL)
+        response = re.sub(
+            ot("think") + r".*?" + ct("think"), "", response, flags=re.DOTALL
+        )
         return response
-    
+
     def chat_until_success(self, message: str) -> str:
         """Chat with model until successful response"""
         try:
             set_in_chat(True)
             if not self.suppress_output and is_print_prompt():
                 PrettyOutput.print(f"{message}", OutputType.USER)
-            result: str = while_true(lambda: while_success(lambda: self._chat(message), 5), 5)
+            result: str = while_true(
+                lambda: while_success(lambda: self._chat(message), 5), 5
+            )
             return result
         finally:
             set_in_chat(False)
@@ -144,7 +172,7 @@ class BasePlatform(ABC):
         raise NotImplementedError("name is not implemented")
 
     @abstractmethod
-    def delete_chat(self)->bool:
+    def delete_chat(self) -> bool:
         """Delete chat"""
         raise NotImplementedError("delete_chat is not implemented")
 

jarvis/jarvis_platform/human.py

@@ -39,7 +39,9 @@ class HumanPlatform(BasePlatform):
     def chat(self, message: str) -> Generator[str, None, None]:
         """发送消息并获取人类响应"""
         if not self.conversation_id:
-            self.conversation_id = ''.join(random.choices(string.ascii_letters + string.digits, k=8))
+            self.conversation_id = "".join(
+                random.choices(string.ascii_letters + string.digits, k=8)
+            )
             session_info = f"(会话ID: {self.conversation_id})"
         else:
             session_info = f"(会话ID: {self.conversation_id})"
@@ -49,7 +51,7 @@ class HumanPlatform(BasePlatform):
             self.first_message = False
         else:
             prompt = f"{message} {session_info}\n\n请回复:"
-        
+
         response = get_multiline_input(prompt)
         yield response
         return None
@@ -70,4 +72,4 @@ class HumanPlatform(BasePlatform):
         return self.model_name
 
     def support_web(self) -> bool:
-        return False
+        return False