Merge pull request #25 from beersoccer/feature/session-memory

refactor: update branch naming in plugin publish workflow

Author: beersoccer

.github/workflows/plugin-publish.yml

@@ -26,74 +26,75 @@ jobs:
           wget -q https://github.com/langgenius/dify-plugin-daemon/releases/latest/download/dify-plugin-linux-amd64
           chmod +x dify-plugin-linux-amd64
 
-      - name: Get plugin info from manifest
-        id: get_info
+      - name: Get basic info from manifest
+        id: get_basic_info
         run: |
           PLUGIN_NAME=$(grep "^name:" manifest.yaml | cut -d' ' -f2)
-          VERSION=$(grep "^version:" manifest.yaml | cut -d' ' -f2)
-          AUTHOR=$(grep "^author:" manifest.yaml | cut -d' ' -f2)
-          
+          echo "Plugin name: $PLUGIN_NAME"
           echo "plugin_name=$PLUGIN_NAME" >> $GITHUB_OUTPUT
+
+          VERSION=$(grep "^version:" manifest.yaml | cut -d' ' -f2)
+          echo "Plugin version: $VERSION"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+          AUTHOR=$(grep "^author:" manifest.yaml | cut -d' ' -f2)
+          echo "Plugin author: $AUTHOR"
           echo "author=$AUTHOR" >> $GITHUB_OUTPUT
-          
-          echo "Plugin: $PLUGIN_NAME v$VERSION (Author: $AUTHOR)"
 
-      - name: Package plugin
+      - name: Package Plugin
         id: package
         run: |
-          PACKAGE_NAME="${{ steps.get_info.outputs.plugin_name }}-${{ steps.get_info.outputs.version }}.difypkg"
+          cd $GITHUB_WORKSPACE
+          PACKAGE_NAME="${{ steps.get_basic_info.outputs.plugin_name }}-${{ steps.get_basic_info.outputs.version }}.difypkg"
           $RUNNER_TEMP/bin/dify-plugin-linux-amd64 plugin package . -o "$PACKAGE_NAME"
           echo "package_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT
-          echo "Package created: $PACKAGE_NAME"
 
       - name: Checkout target repo
         uses: actions/checkout@v4
         with:
-          repository: ${{ steps.get_info.outputs.author }}/dify-plugins
+          repository: ${{ steps.get_basic_info.outputs.author }}/dify-plugins
           path: dify-plugins
           token: ${{ secrets.PLUGIN_ACTION }}
           fetch-depth: 1
+          persist-credentials: true
 
-      - name: Prepare and push changes
+      - name: Prepare and create PR
         run: |
+          PACKAGE_NAME="${{ steps.get_basic_info.outputs.plugin_name }}-${{ steps.get_basic_info.outputs.version }}.difypkg"
+          mkdir -p dify-plugins/${{ steps.get_basic_info.outputs.author }}/${{ steps.get_basic_info.outputs.plugin_name }}
+          mv "$PACKAGE_NAME" dify-plugins/${{ steps.get_basic_info.outputs.author }}/${{ steps.get_basic_info.outputs.plugin_name }}/
+
           cd dify-plugins
-          
-          # Configure git
+
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
-          
-          # Ensure we are on the latest main branch
+
           git fetch origin main
           git checkout main
           git pull origin main
-          
-          # Create branch
-          BRANCH_NAME="bump-${{ steps.get_info.outputs.plugin_name }}-${{ steps.get_info.outputs.version }}"
+
+          BRANCH_NAME="bump-${{ steps.get_basic_info.outputs.plugin_name }}-plugin-${{ steps.get_basic_info.outputs.version }}"
           git checkout -b "$BRANCH_NAME"
-          
-          # Copy package file
-          mkdir -p ${{ steps.get_info.outputs.author }}/${{ steps.get_info.outputs.plugin_name }}
-          cp "$GITHUB_WORKSPACE/${{ steps.package.outputs.package_name }}" \
-             "${{ steps.get_info.outputs.author }}/${{ steps.get_info.outputs.plugin_name }}/"
-          
-          # Commit and push
+
           git add .
-          git commit -m "bump ${{ steps.get_info.outputs.plugin_name }} to version ${{ steps.get_info.outputs.version }}"
+          git commit -m "bump ${{ steps.get_basic_info.outputs.plugin_name }} plugin to version ${{ steps.get_basic_info.outputs.version }}"
+
           git push -u origin "$BRANCH_NAME" --force
 
-      - name: Create pull request
+          echo "Waiting for branch to sync..."
+          sleep 10
+
+      - name: Create PR via GitHub API
         env:
           GH_TOKEN: ${{ secrets.PLUGIN_ACTION }}
         run: |
-          cd dify-plugins
-          
-          BRANCH_NAME="bump-${{ steps.get_info.outputs.plugin_name }}-${{ steps.get_info.outputs.version }}"
-          
+          BRANCH_NAME="bump-${{ steps.get_basic_info.outputs.plugin_name }}-plugin-${{ steps.get_basic_info.outputs.version }}"
           gh pr create \
             --repo langgenius/dify-plugins \
-            --head "${{ steps.get_info.outputs.author }}:$BRANCH_NAME" \
+            --head "${{ steps.get_basic_info.outputs.author }}:$BRANCH_NAME" \
             --base main \
-            --title "bump ${{ steps.get_info.outputs.plugin_name }} to version ${{ steps.get_info.outputs.version }}" \
-            --body "Automated release: bump ${{ steps.get_info.outputs.plugin_name }} plugin to version ${{ steps.get_info.outputs.version }}" \
-            || echo "PR may already exist"
+            --title "bump ${{ steps.get_basic_info.outputs.plugin_name }} plugin to version ${{ steps.get_basic_info.outputs.version }}" \
+            --body "bump ${{ steps.get_basic_info.outputs.plugin_name }} plugin package to version ${{ steps.get_basic_info.outputs.version }}
+
+            Changes:
+            - Updated plugin package file" || echo "PR already exists or creation skipped."

main.py

@@ -16,6 +16,7 @@
 os.environ.setdefault("DIFY_PLUGIN_RUNTIME", "1")
 
 from dify_plugin import DifyPluginEnv, Plugin
+
 from utils.background_loop import BackgroundEventLoop
 from utils.constants import MAX_REQUEST_TIMEOUT
 from utils.logger import get_logger

tests/e2e/cleanup_test_memories.py

@@ -0,0 +1,122 @@
+"""清理测试记忆数据
+
+运行此脚本以清理之前测试创建的记忆,避免重复内容导致 Mem0 返回 NONE。
+
+使用方法:
+    cd tests/e2e
+    python cleanup_test_memories.py
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+# Add project root to path
+project_root = Path(__file__).parent.parent.parent
+sys.path.insert(0, str(project_root))
+
+from utils.mem0_client import get_sync_client
+
+
+def load_env_config() -> dict[str, str]:
+    """从.env文件加载配置"""
+    # .env 文件应该在 tests/.env，而不是 tests/e2e/.env
+    env_file = Path(__file__).parent.parent / ".env"
+    
+    if not env_file.exists():
+        print(f"❌ 未找到 .env 文件: {env_file}")
+        print("请创建 tests/.env 文件并配置以下变量:")
+        print("MEM0_LLM_CONFIG, MEM0_EMBEDDER_CONFIG, MEM0_VECTOR_DB_CONFIG")
+        sys.exit(1)
+    
+    env_vars: dict[str, str] = {}
+    with env_file.open() as f:
+        for line in f:
+            line = line.strip()
+            if not line or line.startswith("#"):
+                continue
+            if "=" not in line:
+                continue
+            key, _, value = line.partition("=")
+            # 去除单引号和双引号包裹
+            value = value.strip().strip('"').strip("'")
+            env_vars[key.strip()] = value
+    
+    print(f"✓ 已加载环境变量: {env_file}")
+    return env_vars
+
+
+def cleanup_test_memories():
+    """删除测试用户的所有记忆"""
+    print("\n" + "="*80)
+    print("清理测试记忆数据")
+    print("="*80)
+    
+    # Load environment config
+    env_config = load_env_config()
+    
+    # Build credentials from environment
+    credentials = {
+        "local_llm_json_secret": env_config.get("MEM0_LLM_CONFIG", ""),
+        "local_embedder_json_secret": env_config.get("MEM0_EMBEDDER_CONFIG", ""),
+        "local_vector_db_json_secret": env_config.get("MEM0_VECTOR_DB_CONFIG", ""),
+        "local_graph_db_json_secret": env_config.get("MEM0_GRAPH_DB_CONFIG", ""),
+        "local_reranker_json_secret": env_config.get("MEM0_RERANKER_CONFIG", ""),
+    }
+    
+    # Validate required configs
+    required_keys = ["MEM0_LLM_CONFIG", "MEM0_EMBEDDER_CONFIG", "MEM0_VECTOR_DB_CONFIG"]
+    missing = [key for key in required_keys if not env_config.get(key)]
+    if missing:
+        print(f"❌ 缺少必需的配置: {missing}")
+        sys.exit(1)
+    
+    # Build mem0 client
+    try:
+        client = get_sync_client(credentials)
+        print("✓ Mem0 客户端已初始化")
+    except Exception as e:
+        print(f"❌ 无法初始化 Mem0 客户端: {e}")
+        sys.exit(1)
+    
+    # Test user IDs
+    test_users = ["real_user", "test_user"]
+    
+    total_deleted = 0
+    for user_id in test_users:
+        print(f"\n清理用户: {user_id}")
+        try:
+            # Use delete_all to delete all memories for this user
+            result = client.delete_all({"user_id": user_id})
+            
+            # Extract deleted count from result if available
+            deleted_count = 0
+            if isinstance(result, dict):
+                deleted_count = result.get("deleted_count", result.get("count", 0))
+                if deleted_count == 0 and "message" in result:
+                    # If no explicit count, check if operation succeeded
+                    print(f"  ✓ {result.get('message', '删除操作已完成')}")
+                else:
+                    print(f"  ✓ 成功删除 {deleted_count} 条记忆")
+            else:
+                print(f"  ✓ 删除操作已完成")
+            
+            total_deleted += deleted_count
+        
+        except Exception as e:
+            print(f"  ❌ 清理失败: {e}")
+            import traceback
+            traceback.print_exc()
+    
+    print(f"\n{'='*80}")
+    if total_deleted > 0:
+        print(f"清理完成! 总共删除 {total_deleted} 条记忆")
+    else:
+        print("清理完成! (未统计删除数量)")
+    print(f"{'='*80}\n")
+
+
+if __name__ == "__main__":
+    cleanup_test_memories()
+

tests/unit/tools/test_extract_long_term_memory.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import pytest
-
 
 def test_parse_user_ids_variants() -> None:
     from utils.helpers import _parse_user_ids

tests/unit/tools/test_extraction_async.py

@@ -93,7 +93,9 @@ def test_successful_processing(
         with (
             patch("tools.extract_long_term_memory.load_checkpoint") as mock_load,
             patch("tools.extract_long_term_memory.save_checkpoint_atomic") as mock_save,
-            patch("tools.extract_long_term_memory.scan_user_conversations_incremental") as mock_scan,
+            patch(
+                "tools.extract_long_term_memory.scan_user_conversations_incremental"
+            ) as mock_scan,
         ):
             # Setup mocks
             mock_load.return_value = (None, None)
@@ -202,7 +204,9 @@ def test_dify_api_error(
         """Test error handling when Dify API fails."""
         with (
             patch("tools.extract_long_term_memory.load_checkpoint") as mock_load,
-            patch("tools.extract_long_term_memory.scan_user_conversations_incremental") as mock_scan,
+            patch(
+                "tools.extract_long_term_memory.scan_user_conversations_incremental"
+            ) as mock_scan,
         ):
             mock_load.return_value = (None, None)
             mock_scan.side_effect = Exception("Dify API error")
@@ -426,7 +430,7 @@ def test_invoke_returns_immediately(self):
             patch("tools.extract_long_term_memory.build_subtype_memories") as mock_subtypes,
             patch("tools.extract_long_term_memory.save_task_status"),  # noqa: F401
             patch("tools.extract_long_term_memory.BackgroundEventLoop") as mock_loop_cls,
-            patch("tools.extract_long_term_memory.TaskTracker") as mock_tracker,
+            patch("tools.extract_long_term_memory.TaskTracker"),
         ):
             mock_config.return_value = {}
             mock_memory = MagicMock()
@@ -457,9 +461,6 @@ def test_invoke_returns_immediately(self):
             json_msg = messages[0]
             assert hasattr(json_msg, "message")
 
-            # Verify task was tracked
-            assert mock_tracker.track_bg_task.called
-
     def test_invoke_validation_errors(self):
         """Test parameter validation errors."""
         mock_runtime = MagicMock()
@@ -499,7 +500,7 @@ def test_invoke_with_custom_limits(self):
             patch("tools.extract_long_term_memory.build_subtype_memories") as mock_subtypes,
             patch("tools.extract_long_term_memory.save_task_status"),  # noqa: F401
             patch("tools.extract_long_term_memory.BackgroundEventLoop") as mock_loop_cls,
-            patch("tools.extract_long_term_memory.TaskTracker") as mock_tracker,
+            patch("tools.extract_long_term_memory.TaskTracker"),
         ):
             mock_config.return_value = {}
             mock_memory = MagicMock()

tests/unit/tools/test_time_range_expansion.py

@@ -5,11 +5,8 @@
 from datetime import UTC, datetime, timedelta
 from typing import TYPE_CHECKING, Any
 
-import pytest
-
 from utils.extraction import (
     ConversationCheckpoint,
-    UserCheckpoint,
     scan_new_messages_for_conversation,
 )