jarvis-ai-assistant 0.3.4__tar.gz → 0.3.6__tar.gz

{jarvis_ai_assistant-0.3.4/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.4
+Version: 0.3.6
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.4 → jarvis_ai_assistant-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.4"
+version = "0.3.6"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -101,9 +101,8 @@ jst = "jarvis.jarvis_stats.cli:main"
 
 
 
-[[tool.uv.index]]
-name = "tsinghua"
-url = "https://pypi.tuna.tsinghua.edu.cn/simple"
+[tool.uv]
+index-strategy = "unsafe-first-match"
 
 [[tool.uv.index]]
 name = "aliyun"
@@ -112,3 +111,4 @@ url = "https://mirrors.aliyun.com/pypi/simple/"
 [[tool.uv.index]]
 name = "ustc"
 url = "https://pypi.mirrors.ustc.edu.cn/simple/"
+

{jarvis_ai_assistant-0.3.4 → jarvis_ai_assistant-0.3.6}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.4",
+    version="0.3.6",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.4 → jarvis_ai_assistant-0.3.6}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.4"
+__version__ = "0.3.6"

{jarvis_ai_assistant-0.3.4 → jarvis_ai_assistant-0.3.6}/src/jarvis/jarvis_memory_organizer/memory_organizer.py

@@ -163,11 +163,13 @@ class MemoryOrganizer:
             )
             all_tags.update(memory.get("tags", []))
 
+        memory_contents_str = (("="*50) + "\n").join(memory_contents)
+
         prompt = f"""请将以下{len(memories)}个相关记忆合并成一个综合性的记忆。
 
 原始记忆（按时间从新到旧排序）：
 {"="*50}
-{(("="*50) + "\n").join(memory_contents)}
+{memory_contents_str}
 {"="*50}
 
 原始标签集合：{', '.join(sorted(all_tags))}
@@ -278,8 +280,23 @@ tags:
         # 从高重叠度开始处理
         max_tags = max(len(m.get("tags", [])) for m in memories)
 
+        # 创建一个标记已删除记忆的集合
+        deleted_indices = set()
+
         for overlap_count in range(min(max_tags, 5), min_overlap - 1, -1):
-            overlap_groups = self._find_overlapping_memories(memories, overlap_count)
+            # 过滤掉已删除的记忆
+            active_memories = [
+                (i, mem) for i, mem in enumerate(memories) if i not in deleted_indices
+            ]
+            if not active_memories:
+                break
+
+            # 创建索引映射：原始索引 -> 活跃索引
+            active_memory_list = [mem for _, mem in active_memories]
+
+            overlap_groups = self._find_overlapping_memories(
+                active_memory_list, overlap_count
+            )
 
             if overlap_count in overlap_groups:
                 groups = overlap_groups[overlap_count]
@@ -289,7 +306,13 @@ tags:
                 )
 
                 for group in groups:
-                    group_memories = [memories[i] for i in group]
+                    # 将活跃索引转换回原始索引
+                    original_indices = set()
+                    for active_idx in group:
+                        original_idx = active_memories[active_idx][0]
+                        original_indices.add(original_idx)
+
+                    group_memories = [memories[i] for i in original_indices]
 
                     # 显示将要合并的记忆
                     PrettyOutput.print(
@@ -315,16 +338,17 @@ tags:
 
                         # 保存新记忆
                         self._save_merged_memory(
-                            merged_memory, memory_type, [memories[i] for i in group]
+                            merged_memory,
+                            memory_type,
+                            [memories[i] for i in original_indices],
                         )
 
                         stats["processed_groups"] += 1
-                        stats["merged_memories"] += len(group)
+                        stats["merged_memories"] += len(original_indices)
                         stats["created_memories"] += 1
 
-                        # 从列表中移除已合并的记忆
-                        for i in sorted(group, reverse=True):
-                            del memories[i]
+                        # 标记这些记忆已被删除
+                        deleted_indices.update(original_indices)
                     else:
                         PrettyOutput.print("  [模拟运行] 跳过实际合并", OutputType.INFO)
 
@@ -376,11 +400,18 @@ tags:
         for orig_memory in original_memories:
             if "file_path" in orig_memory:
                 try:
-                    Path(orig_memory["file_path"]).unlink()
-                    PrettyOutput.print(
-                        f"删除原始记忆: {orig_memory.get('id', '未知')}",
-                        OutputType.INFO,
-                    )
+                    file_path = Path(orig_memory["file_path"])
+                    if file_path.exists():
+                        file_path.unlink()
+                        PrettyOutput.print(
+                            f"删除原始记忆: {orig_memory.get('id', '未知')}",
+                            OutputType.INFO,
+                        )
+                    else:
+                        PrettyOutput.print(
+                            f"原始记忆文件已不存在，跳过删除: {orig_memory.get('id', '未知')}",
+                            OutputType.INFO,
+                        )
                 except Exception as e:
                     PrettyOutput.print(
                         f"删除记忆文件失败 {orig_memory['file_path']}: {str(e)}",
@@ -607,6 +638,9 @@ def organize(
         else:
             raise typer.Exit(0)  # 即使没有处理也是正常退出
 
+    except typer.Exit:
+        # typer.Exit 是正常的退出方式，直接传播
+        raise
     except Exception as e:
         PrettyOutput.print(f"记忆整理失败: {str(e)}", OutputType.ERROR)
         raise typer.Exit(1)

{jarvis_ai_assistant-0.3.4 → jarvis_ai_assistant-0.3.6}/src/jarvis/jarvis_platform/base.py

@@ -142,20 +142,9 @@ class BasePlatform(ABC):
                             live.update(panel)
                         end_time = time.time()
                         duration = end_time - start_time
-                        char_count = len(response)
-                        # 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
-                            )
-                        except Exception as e:
-                            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]"
+                        panel.subtitle = (
+                            f"[bold green]✓ 对话完成耗时: {duration:.2f}秒[/bold green]"
+                        )
                         live.update(panel)
                 else:
                     for s in self.chat(message):

{jarvis_ai_assistant-0.3.4 → jarvis_ai_assistant-0.3.6/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.4
+Version: 0.3.6
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire