fix: don't sync *.tmp files on watch (#31)

Fixes #30

Signed-off-by: phernandez <paul@basicmachines.co>

src/basic_memory/sync/watch_service.py

@@ -5,16 +5,15 @@ from datetime import datetime
 from pathlib import Path
 from typing import List, Optional, Set
 
+from basic_memory.config import ProjectConfig
+from basic_memory.services.file_service import FileService
+from basic_memory.sync.sync_service import SyncService
 from loguru import logger
 from pydantic import BaseModel
 from rich.console import Console
 from watchfiles import awatch
 from watchfiles.main import FileChange, Change
 
-from basic_memory.config import ProjectConfig
-from basic_memory.services.file_service import FileService
-from basic_memory.sync.sync_service import SyncService
-
 WATCH_STATUS_JSON = "watch-status.json"
 
 
@@ -138,6 +137,10 @@ class WatchService:
             if part.startswith("."):
                 return False
 
+        # Skip temp files used in atomic operations
+        if path.endswith(".tmp"):
+            return False
+
         return True
 
     async def write_status(self):
@@ -161,6 +164,11 @@ class WatchService:
         for change, path in changes:
             # convert to relative path
             relative_path = str(Path(path).relative_to(directory))
+
+            # Skip .tmp files - they're temporary and shouldn't be synced
+            if relative_path.endswith(".tmp"):
+                continue
+
             if change == Change.added:
                 adds.append(relative_path)
             elif change == Change.deleted:
@@ -184,8 +192,8 @@ class WatchService:
             # We don't need to process directories, only the files inside them
             # This prevents errors when trying to compute checksums or read directories as files
             added_full_path = directory / added_path
-            if added_full_path.is_dir():
-                logger.debug("Skipping directory for move detection", path=added_path)
+            if not added_full_path.exists() or added_full_path.is_dir():
+                logger.debug("Skipping non-existent or directory path", path=added_path)
                 processed.add(added_path)
                 continue
 
@@ -247,10 +255,12 @@ class WatchService:
             if path not in processed:
                 # Skip directories - only process files
                 full_path = directory / path
-                if full_path.is_dir():  # pragma: no cover
-                    logger.debug("Skipping directory", path=path)
-                    processed.add(path)
-                    continue
+                if not full_path.exists() or full_path.is_dir():
+                    logger.debug(
+                        "Skipping non-existent or directory path", path=path
+                    )  # pragma: no cover
+                    processed.add(path)  # pragma: no cover
+                    continue  # pragma: no cover
 
                 logger.debug("Processing new file", path=path)
                 entity, checksum = await self.sync_service.sync_file(path, new=True)
@@ -281,8 +291,8 @@ class WatchService:
             if path not in processed:
                 # Skip directories - only process files
                 full_path = directory / path
-                if full_path.is_dir():
-                    logger.debug("Skipping directory", path=path)
+                if not full_path.exists() or full_path.is_dir():
+                    logger.debug("Skipping non-existent or directory path", path=path)
                     processed.add(path)
                     continue
 
@@ -341,4 +351,4 @@ class WatchService:
             duration_ms=duration_ms,
         )
 
-        await self.write_status()
+        await self.write_status()

tests/sync/test_tmp_files.py

@@ -0,0 +1,181 @@
+"""Test proper handling of .tmp files during sync."""
+
+import asyncio
+from pathlib import Path
+
+import pytest
+from watchfiles import Change
+
+from basic_memory.sync.watch_service import WatchService
+
+
+async def create_test_file(path: Path, content: str = "test content") -> None:
+    """Create a test file with given content."""
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(content)
+
+
+@pytest.mark.asyncio
+async def test_temp_file_filter(watch_service):
+    """Test that .tmp files are correctly filtered out."""
+    # Test filter_changes method directly
+    tmp_path = str(watch_service.config.home / "test.tmp")
+    assert not watch_service.filter_changes(Change.added, tmp_path)
+    
+    # Test with valid file
+    valid_path = str(watch_service.config.home / "test.md") 
+    assert watch_service.filter_changes(Change.added, valid_path)
+
+
+@pytest.mark.asyncio
+async def test_handle_tmp_files(watch_service, test_config, monkeypatch):
+    """Test handling of .tmp files during sync process."""
+    project_dir = test_config.home
+    
+    # Create a .tmp file - this simulates a file being written with write_file_atomic
+    tmp_file = project_dir / "test.tmp"
+    await create_test_file(tmp_file, "This is a temporary file")
+    
+    # Create the target final file
+    final_file = project_dir / "test.md"
+    await create_test_file(final_file, "This is the final file")
+    
+    # Setup changes that include both the .tmp and final file
+    changes = {
+        (Change.added, str(tmp_file)),
+        (Change.added, str(final_file)),
+    }
+    
+    # Track sync_file calls
+    sync_calls = []
+    
+    # Mock sync_file to track calls
+    original_sync_file = watch_service.sync_service.sync_file
+    
+    async def mock_sync_file(path, new=True):
+        sync_calls.append(path)
+        return await original_sync_file(path, new)
+    
+    monkeypatch.setattr(watch_service.sync_service, "sync_file", mock_sync_file)
+    
+    # Handle changes
+    await watch_service.handle_changes(project_dir, changes)
+    
+    # Verify .tmp file was not processed
+    assert "test.tmp" not in sync_calls
+    assert "test.md" in sync_calls
+    
+    # Verify only the final file got an entity
+    tmp_entity = await watch_service.sync_service.entity_repository.get_by_file_path("test.tmp")
+    final_entity = await watch_service.sync_service.entity_repository.get_by_file_path("test.md")
+    
+    assert tmp_entity is None, "Temp file should not have an entity"
+    assert final_entity is not None, "Final file should have an entity"
+
+
+@pytest.mark.asyncio
+async def test_atomic_write_tmp_file_handling(watch_service, test_config, monkeypatch):
+    """Test handling of file changes during atomic write operations."""
+    project_dir = test_config.home
+    
+    # This test simulates the full atomic write process:
+    # 1. First a .tmp file is created
+    # 2. Then the .tmp file is renamed to the final file 
+    # 3. Both events are processed by the watch service
+    
+    # Setup file paths
+    tmp_path = project_dir / "document.tmp"
+    final_path = project_dir / "document.md"
+    
+    # Create mockup of the atomic write process
+    await create_test_file(tmp_path, "Content for document")
+    
+    # First batch of changes - .tmp file created
+    changes1 = {(Change.added, str(tmp_path))}
+    
+    # Process first batch
+    await watch_service.handle_changes(project_dir, changes1)
+    
+    # Now "replace" the temp file with the final file
+    tmp_path.rename(final_path)
+    
+    # Second batch of changes - .tmp file deleted, final file added
+    changes2 = {
+        (Change.deleted, str(tmp_path)), 
+        (Change.added, str(final_path))
+    }
+    
+    # Process second batch
+    await watch_service.handle_changes(project_dir, changes2)
+    
+    # Verify only the final file is in the database
+    tmp_entity = await watch_service.sync_service.entity_repository.get_by_file_path("document.tmp")
+    final_entity = await watch_service.sync_service.entity_repository.get_by_file_path("document.md")
+    
+    assert tmp_entity is None, "Temp file should not have an entity"
+    assert final_entity is not None, "Final file should have an entity"
+    
+    # Check events
+    new_events = [e for e in watch_service.state.recent_events if e.action == "new"]
+    assert len(new_events) == 1
+    assert new_events[0].path == "document.md"
+
+
+@pytest.mark.asyncio
+async def test_rapid_atomic_writes(watch_service, test_config):
+    """Test handling of rapid atomic writes to the same destination."""
+    project_dir = test_config.home
+    
+    # This test simulates multiple rapid atomic writes to the same file:
+    # 1. Several .tmp files are created one after another 
+    # 2. Each is then renamed to the same final file
+    # 3. Events are batched and processed together
+    
+    # Setup file paths
+    tmp1_path = project_dir / "document.1.tmp"
+    tmp2_path = project_dir / "document.2.tmp" 
+    final_path = project_dir / "document.md"
+    
+    # Create multiple temp files that will be used in sequence
+    await create_test_file(tmp1_path, "First version")
+    await create_test_file(tmp2_path, "Second version")
+    
+    # Simulate the first atomic write
+    tmp1_path.rename(final_path)
+    
+    # Brief pause to ensure file system registers the change
+    await asyncio.sleep(0.1)
+    
+    # Read content to verify
+    content1 = final_path.read_text()
+    assert content1 == "First version"
+    
+    # Simulate the second atomic write
+    tmp2_path.rename(final_path)
+    
+    # Verify content was updated
+    content2 = final_path.read_text()
+    assert content2 == "Second version"
+    
+    # Create a batch of changes that might arrive in mixed order
+    changes = {
+        (Change.added, str(tmp1_path)),
+        (Change.deleted, str(tmp1_path)),
+        (Change.added, str(tmp2_path)), 
+        (Change.deleted, str(tmp2_path)),
+        (Change.added, str(final_path)),
+        (Change.modified, str(final_path)),
+    }
+    
+    # Process all changes
+    await watch_service.handle_changes(project_dir, changes)
+    
+    # Verify only the final file is in the database
+    final_entity = await watch_service.sync_service.entity_repository.get_by_file_path("document.md")
+    assert final_entity is not None
+    
+    # Also verify no tmp entities were created
+    tmp1_entity = await watch_service.sync_service.entity_repository.get_by_file_path("document.1.tmp")
+    tmp2_entity = await watch_service.sync_service.entity_repository.get_by_file_path("document.2.tmp")
+    assert tmp1_entity is None
+    assert tmp2_entity is None