basic-memory 0.12.3__py3-none-any.whl → 0.13.0b2__py3-none-any.whl

basic_memory/services/initialization.py

@@ -5,19 +5,18 @@ to ensure consistent application startup across all entry points.
 """
 
 import asyncio
-from typing import Optional
+import shutil
+from pathlib import Path
 
 from loguru import logger
 
 from basic_memory import db
-from basic_memory.config import ProjectConfig, config_manager
-from basic_memory.sync import WatchService
+from basic_memory.config import BasicMemoryConfig
+from basic_memory.models import Project
+from basic_memory.repository import ProjectRepository
 
-# Import this inside functions to avoid circular imports
-# from basic_memory.cli.commands.sync import get_sync_service
 
-
-async def initialize_database(app_config: ProjectConfig) -> None:
+async def initialize_database(app_config: BasicMemoryConfig) -> None:
     """Run database migrations to ensure schema is up to date.
 
     Args:
@@ -34,80 +33,175 @@ async def initialize_database(app_config: ProjectConfig) -> None:
         # more specific error if the database is actually unusable
 
 
+async def reconcile_projects_with_config(app_config: BasicMemoryConfig):
+    """Ensure all projects in config.json exist in the projects table and vice versa.
+
+    This uses the ProjectService's synchronize_projects method to ensure bidirectional
+    synchronization between the configuration file and the database.
+
+    Args:
+        app_config: The Basic Memory application configuration
+    """
+    logger.info("Reconciling projects from config with database...")
+
+    # Get database session
+    _, session_maker = await db.get_or_create_db(
+        db_path=app_config.database_path, db_type=db.DatabaseType.FILESYSTEM
+    )
+    project_repository = ProjectRepository(session_maker)
+
+    # Import ProjectService here to avoid circular imports
+    from basic_memory.services.project_service import ProjectService
+
+    try:
+        # Create project service and synchronize projects
+        project_service = ProjectService(repository=project_repository)
+        await project_service.synchronize_projects()
+        logger.info("Projects successfully reconciled between config and database")
+    except Exception as e:
+        # Log the error but continue with initialization
+        logger.error(f"Error during project synchronization: {e}")
+        logger.info("Continuing with initialization despite synchronization error")
+
+
+async def migrate_legacy_projects(app_config: BasicMemoryConfig):
+    # Get database session
+    _, session_maker = await db.get_or_create_db(
+        db_path=app_config.database_path, db_type=db.DatabaseType.FILESYSTEM
+    )
+    logger.info("Migrating legacy projects...")
+    project_repository = ProjectRepository(session_maker)
+
+    # For each project in config.json, check if it has a .basic-memory dir
+    for project_name, project_path in app_config.projects.items():
+        legacy_dir = Path(project_path) / ".basic-memory"
+        if not legacy_dir.exists():
+            continue
+        logger.info(f"Detected legacy project directory: {legacy_dir}")
+        project = await project_repository.get_by_name(project_name)
+        if not project:  # pragma: no cover
+            logger.error(f"Project {project_name} not found in database, skipping migration")
+            continue
+
+        await migrate_legacy_project_data(project, legacy_dir)
+    logger.info("Legacy projects successfully migrated")
+
+
+async def migrate_legacy_project_data(project: Project, legacy_dir: Path) -> bool:
+    """Check if project has legacy .basic-memory dir and migrate if needed.
+
+    Args:
+        project: The project to check and potentially migrate
+
+    Returns:
+        True if migration occurred, False otherwise
+    """
+
+    # avoid circular imports
+    from basic_memory.cli.commands.sync import get_sync_service
+
+    sync_service = await get_sync_service(project)
+    sync_dir = Path(project.path)
+
+    logger.info(f"Sync starting project: {project.name}")
+    await sync_service.sync(sync_dir)
+    logger.info(f"Sync completed successfully for project: {project.name}")
+
+    # After successful sync, remove the legacy directory
+    try:
+        logger.info(f"Removing legacy directory: {legacy_dir}")
+        shutil.rmtree(legacy_dir)
+        return True
+    except Exception as e:
+        logger.error(f"Error removing legacy directory: {e}")
+        return False
+
+
 async def initialize_file_sync(
-    app_config: ProjectConfig,
-) -> asyncio.Task:
-    """Initialize file synchronization services.
+    app_config: BasicMemoryConfig,
+):
+    """Initialize file synchronization services. This function starts the watch service and does not return
 
     Args:
         app_config: The Basic Memory project configuration
 
     Returns:
-        Tuple of (sync_service, watch_service, watch_task) if sync is enabled,
-        or (None, None, None) if sync is disabled
+        The watch service task that's monitoring file changes
     """
-    # Load app configuration
-    # Import here to avoid circular imports
-    from basic_memory.cli.commands.sync import get_sync_service
 
-    # Initialize sync service
-    sync_service = await get_sync_service()
+    # delay import
+    from basic_memory.sync import WatchService
+
+    # Load app configuration
+    _, session_maker = await db.get_or_create_db(
+        db_path=app_config.database_path, db_type=db.DatabaseType.FILESYSTEM
+    )
+    project_repository = ProjectRepository(session_maker)
 
     # Initialize watch service
     watch_service = WatchService(
-        sync_service=sync_service,
-        file_service=sync_service.entity_service.file_service,
-        config=app_config,
+        app_config=app_config,
+        project_repository=project_repository,
         quiet=True,
     )
 
-    # Create the background task for running sync
-    async def run_background_sync():  # pragma: no cover
-        # Run initial full sync
-        await sync_service.sync(app_config.home)
-        logger.info("Sync completed successfully")
+    # Get active projects
+    active_projects = await project_repository.get_active_projects()
+
+    # First, sync all projects sequentially
+    for project in active_projects:
+        # avoid circular imports
+        from basic_memory.cli.commands.sync import get_sync_service
+
+        logger.info(f"Starting sync for project: {project.name}")
+        sync_service = await get_sync_service(project)
+        sync_dir = Path(project.path)
 
-        # Start background sync task
-        logger.info(f"Starting watch service to sync file changes in dir: {app_config.home}")
+        try:
+            await sync_service.sync(sync_dir)
+            logger.info(f"Sync completed successfully for project: {project.name}")
+        except Exception as e:  # pragma: no cover
+            logger.error(f"Error syncing project {project.name}: {e}")
+            # Continue with other projects even if one fails
 
-        # Start watching for changes
+    # Then start the watch service in the background
+    logger.info("Starting watch service for all projects")
+    # run the watch service
+    try:
         await watch_service.run()
+        logger.info("Watch service started")
+    except Exception as e:  # pragma: no cover
+        logger.error(f"Error starting watch service: {e}")
 
-    watch_task = asyncio.create_task(run_background_sync())
-    logger.info("Watch service started")
-    return watch_task
+    return None
 
 
 async def initialize_app(
-    app_config: ProjectConfig,
-) -> Optional[asyncio.Task]:
+    app_config: BasicMemoryConfig,
+):
     """Initialize the Basic Memory application.
 
-    This function handles all initialization steps needed for both API and shor lived CLI commands.
-    For long running commands like mcp, a
+    This function handles all initialization steps:
     - Running database migrations
+    - Reconciling projects from config.json with projects table
     - Setting up file synchronization
+    - Migrating legacy project data
 
     Args:
         app_config: The Basic Memory project configuration
     """
+    logger.info("Initializing app...")
     # Initialize database first
     await initialize_database(app_config)
 
-    basic_memory_config = config_manager.load_config()
-    logger.info(f"Sync changes enabled: {basic_memory_config.sync_changes}")
-    logger.info(
-        f"Update permalinks on move enabled: {basic_memory_config.update_permalinks_on_move}"
-    )
-    if not basic_memory_config.sync_changes:  # pragma: no cover
-        logger.info("Sync changes disabled. Skipping watch service.")
-        return
+    # Reconcile projects from config.json with projects table
+    await reconcile_projects_with_config(app_config)
 
-    # Initialize file sync services
-    return await initialize_file_sync(app_config)
+    # migrate legacy project data
+    await migrate_legacy_projects(app_config)
 
 
-def ensure_initialization(app_config: ProjectConfig) -> None:
+def ensure_initialization(app_config: BasicMemoryConfig) -> None:
     """Ensure initialization runs in a synchronous context.
 
     This is a wrapper for the async initialize_app function that can be
@@ -117,27 +211,10 @@ def ensure_initialization(app_config: ProjectConfig) -> None:
         app_config: The Basic Memory project configuration
     """
     try:
-        asyncio.run(initialize_app(app_config))
-    except Exception as e:
-        logger.error(f"Error during initialization: {e}")
-        # Continue execution even if initialization fails
-        # The command might still work, or will fail with a
-        # more specific error message
-
-
-def ensure_initialize_database(app_config: ProjectConfig) -> None:
-    """Ensure initialization runs in a synchronous context.
-
-    This is a wrapper for the async initialize_database function that can be
-    called from synchronous code like CLI entry points.
-
-    Args:
-        app_config: The Basic Memory project configuration
-    """
-    try:
-        asyncio.run(initialize_database(app_config))
-    except Exception as e:
-        logger.error(f"Error during initialization: {e}")
+        result = asyncio.run(initialize_app(app_config))
+        logger.info(f"Initialization completed successfully: result={result}")
+    except Exception as e:  # pragma: no cover
+        logger.exception(f"Error during initialization: {e}")
         # Continue execution even if initialization fails
         # The command might still work, or will fail with a
         # more specific error message

basic_memory/services/link_resolver.py

@@ -15,10 +15,10 @@ class LinkResolver:
 
     Uses a combination of exact matching and search-based resolution:
     1. Try exact permalink match (fastest)
-    2. Try permalink pattern match (for wildcards)
-    3. Try exact title match
-    4. Fall back to search for fuzzy matching
-    5. Generate new permalink if no match found
+    2. Try exact title match
+    3. Try exact file path match
+    4. Try file path with .md extension (for folder/title patterns)
+    5. Fall back to search for fuzzy matching
     """
 
     def __init__(self, entity_repository: EntityRepository, search_service: SearchService):
@@ -28,7 +28,7 @@ class LinkResolver:
 
     async def resolve_link(self, link_text: str, use_search: bool = True) -> Optional[Entity]:
         """Resolve a markdown link to a permalink."""
-        logger.debug(f"Resolving link: {link_text}")
+        logger.trace(f"Resolving link: {link_text}")
 
         # Clean link text and extract any alias
         clean_text, alias = self._normalize_link_text(link_text)
@@ -52,17 +52,25 @@ class LinkResolver:
             logger.debug(f"Found entity with path: {found_path.file_path}")
             return found_path
 
+        # 4. Try file path with .md extension if not already present
+        if not clean_text.endswith(".md") and "/" in clean_text:
+            file_path_with_md = f"{clean_text}.md"
+            found_path_md = await self.entity_repository.get_by_file_path(file_path_with_md)
+            if found_path_md:
+                logger.debug(f"Found entity with path (with .md): {found_path_md.file_path}")
+                return found_path_md
+
         # search if indicated
         if use_search and "*" not in clean_text:
-            # 3. Fall back to search for fuzzy matching on title
+            # 5. Fall back to search for fuzzy matching on title (use text search for prefix matching)
             results = await self.search_service.search(
-                query=SearchQuery(title=clean_text, entity_types=[SearchItemType.ENTITY]),
+                query=SearchQuery(text=clean_text, entity_types=[SearchItemType.ENTITY]),
             )
 
             if results:
                 # Look for best match
                 best_match = min(results, key=lambda x: x.score)  # pyright: ignore
-                logger.debug(
+                logger.trace(
                     f"Selected best match from {len(results)} results: {best_match.permalink}"
                 )
                 if best_match.permalink: