jarvis-ai-assistant 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

jarvis/__init__.py

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

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/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.dist-info → jarvis_ai_assistant-0.3.6.dist-info}/METADATA

@@ -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.dist-info → jarvis_ai_assistant-0.3.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=OeCDz6Z11rF2cp6sXEe7CwvIdTZ_EPzUJwW35kFF6BY,73
+jarvis/__init__.py,sha256=1uSGtB9vMIaVHsdbxj-kXL0H2jqGhCOqcL6yp5wEM-U,73
 jarvis/jarvis_agent/__init__.py,sha256=NF_eUF85RRplGJyLmInIsTn-09aEPtjj4utYvEALvJw,31802
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=Qs4LAr4xdKLBJpQE81YP4CkucAop86ms0iVoKa1nnso,2468
@@ -54,13 +54,13 @@ jarvis/jarvis_mcp/sse_mcp_client.py,sha256=neKrgFxwLDPWjVrl9uDt1ricNwbLZbv1ZEFh0
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=APYUksYKlMx7AVNODKOLrTkKZPnp4kqTQIYIuNDDKko,11286
 jarvis/jarvis_mcp/streamable_mcp_client.py,sha256=sP0KEsxVcXGht0eA7a_m-ECtZAk39s4PL9OUdm35x2Y,14467
 jarvis/jarvis_memory_organizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_memory_organizer/memory_organizer.py,sha256=TP-h3CCoQh9E3kdCDbrKORKneRZYnoaWm-JOZqDY1B0,25178
+jarvis/jarvis_memory_organizer/memory_organizer.py,sha256=nUySOLUfWtGTu92XH2w5Jez46HZl_CFIdxEE_feFqpQ,26502
 jarvis/jarvis_methodology/main.py,sha256=6QF8hH3vB6rfxim0fPR34uVPf41zVpb4ZLqrFN2qONg,10983
 jarvis/jarvis_multi_agent/__init__.py,sha256=kCgtAX7VvliyEOQxIj2DvNjRAuh6bpNaOtDn60nzph4,6089
 jarvis/jarvis_multi_agent/main.py,sha256=Wbarez48QxXexlKEOcRsoMbcQEOP5rv_DzGkNk0SfpY,1779
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
 jarvis/jarvis_platform/ai8.py,sha256=W3947AGMpk3RRBfsfZmf222sEP0VIGoSU0vPkgiVnl0,11683
-jarvis/jarvis_platform/base.py,sha256=XfazAKRE9HnLCqoYaRG38HlEkCWHRWGcAftHsaMN-Tc,10179
+jarvis/jarvis_platform/base.py,sha256=VyZhXgtGbUTrhXaDwA3kYUo03mfM-nNCYaTGgpY_TZQ,9365
 jarvis/jarvis_platform/human.py,sha256=jWjW8prEag79e6ddqTPV4nz_Gz6zFBfO4a1EbvP8QWA,4908
 jarvis/jarvis_platform/kimi.py,sha256=imbH575fazyDai5pxB6zbHmzwzS4Ig0RP7WVpni-ooI,15175
 jarvis/jarvis_platform/openai.py,sha256=0YSeDGHRSPQP2haEzFARx_aZH_d_UZ-HSCsJLh2hW5k,8037
@@ -119,9 +119,9 @@ jarvis/jarvis_utils/methodology.py,sha256=IIMU17WVSunsWXsnXROd4G77LxgYs4xEC_xm_0
 jarvis/jarvis_utils/output.py,sha256=QRLlKObQKT0KuRSeZRqYb7NlTQvsd1oZXZ41WxeWEuU,10894
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=ZyLL-X0EGi8fnofAdP5Qd99lYlP5U5qGY50elR4uS08,44291
-jarvis_ai_assistant-0.3.4.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.4.dist-info/METADATA,sha256=rgbEn1DYq_u7mcMyId7rgP4s3oJJwdCc0IQdppTU2_4,18184
-jarvis_ai_assistant-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.4.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.4.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.4.dist-info/RECORD,,
+jarvis_ai_assistant-0.3.6.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.6.dist-info/METADATA,sha256=4mXgTnz8af0Ep74zSji4PXqlIkzFSOlCgtnKAejz_gA,18184
+jarvis_ai_assistant-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.6.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.6.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.6.dist-info/RECORD,,