basic-memory 0.12.2__py3-none-any.whl → 0.13.0__py3-none-any.whl

basic_memory/mcp/tools/read_note.py

@@ -1,6 +1,7 @@
 """Read note tool for Basic Memory MCP server."""
 
 from textwrap import dedent
+from typing import Optional
 
 from loguru import logger
 
@@ -8,13 +9,16 @@ from basic_memory.mcp.async_client import client
 from basic_memory.mcp.server import mcp
 from basic_memory.mcp.tools.search import search_notes
 from basic_memory.mcp.tools.utils import call_get
+from basic_memory.mcp.project_session import get_active_project
 from basic_memory.schemas.memory import memory_url_path
 
 
 @mcp.tool(
     description="Read a markdown note by title or permalink.",
 )
-async def read_note(identifier: str, page: int = 1, page_size: int = 10) -> str:
+async def read_note(
+    identifier: str, page: int = 1, page_size: int = 10, project: Optional[str] = None
+) -> str:
     """Read a markdown note from the knowledge base.
 
     This tool finds and retrieves a note by its title, permalink, or content search,
@@ -26,6 +30,7 @@ async def read_note(identifier: str, page: int = 1, page_size: int = 10) -> str:
                    Can be a full memory:// URL, a permalink, a title, or search text
         page: Page number for paginated results (default: 1)
         page_size: Number of items per page (default: 10)
+        project: Optional project name to read from. If not provided, uses current active project.
 
     Returns:
         The full markdown content of the note if found, or helpful guidance if not found.
@@ -42,10 +47,24 @@ async def read_note(identifier: str, page: int = 1, page_size: int = 10) -> str:
 
         # Read with pagination
         read_note("Project Updates", page=2, page_size=5)
+
+        # Read from specific project
+        read_note("Meeting Notes", project="work-project")
     """
+
+    # Check migration status and wait briefly if needed
+    from basic_memory.mcp.tools.utils import wait_for_migration_or_return_status
+
+    migration_status = await wait_for_migration_or_return_status(timeout=5.0)
+    if migration_status:  # pragma: no cover
+        return f"# System Status\n\n{migration_status}\n\nPlease wait for migration to complete before reading notes."
+
+    active_project = get_active_project(project)
+    project_url = active_project.project_url
+
     # Get the file via REST API - first try direct permalink lookup
     entity_path = memory_url_path(identifier)
-    path = f"/resource/{entity_path}"
+    path = f"{project_url}/resource/{entity_path}"
     logger.info(f"Attempting to read note from URL: {path}")
 
     try:
@@ -62,14 +81,14 @@ async def read_note(identifier: str, page: int = 1, page_size: int = 10) -> str:
 
     # Fallback 1: Try title search via API
     logger.info(f"Search title for: {identifier}")
-    title_results = await search_notes(query=identifier, search_type="title")
+    title_results = await search_notes.fn(query=identifier, search_type="title", project=project)
 
     if title_results and title_results.results:
         result = title_results.results[0]  # Get the first/best match
         if result.permalink:
             try:
                 # Try to fetch the content using the found permalink
-                path = f"/resource/{result.permalink}"
+                path = f"{project_url}/resource/{result.permalink}"
                 response = await call_get(
                     client, path, params={"page": page, "page_size": page_size}
                 )
@@ -86,7 +105,7 @@ async def read_note(identifier: str, page: int = 1, page_size: int = 10) -> str:
 
     # Fallback 2: Text search as a last resort
     logger.info(f"Title search failed, trying text search for: {identifier}")
-    text_results = await search_notes(query=identifier, search_type="text")
+    text_results = await search_notes.fn(query=identifier, search_type="text", project=project)
 
     # We didn't find a direct match, construct a helpful error message
     if not text_results or not text_results.results:
@@ -102,7 +121,7 @@ def format_not_found_message(identifier: str) -> str:
     return dedent(f"""
         # Note Not Found: "{identifier}"
         
-        I couldn't find any notes matching "{identifier}". Here are some suggestions:
+        I searched for "{identifier}" using multiple methods (direct lookup, title search, and text search) but couldn't find any matching notes. Here are some suggestions:
         
         ## Check Identifier Type
         - If you provided a title, try using the exact permalink instead
@@ -111,7 +130,7 @@ def format_not_found_message(identifier: str) -> str:
         ## Search Instead
         Try searching for related content:
         ```
-        search(query="{identifier}")
+        search_notes(query="{identifier}")
         ```
         
         ## Recent Activity
@@ -148,7 +167,7 @@ def format_related_results(identifier: str, results) -> str:
     message = dedent(f"""
         # Note Not Found: "{identifier}"
         
-        I couldn't find an exact match for "{identifier}", but I found some related notes:
+        I searched for "{identifier}" using direct lookup and title search but couldn't find an exact match. However, I found some related notes through text search:
         
         """)
 
@@ -172,7 +191,7 @@ def format_related_results(identifier: str, results) -> str:
         ## Search For More Results
         To see more related content:
         ```
-        search(query="{identifier}")
+        search_notes(query="{identifier}")
         ```
         
         ## Create New Note

basic_memory/mcp/tools/recent_activity.py

@@ -1,12 +1,13 @@
 """Recent activity tool for Basic Memory MCP server."""
 
-from typing import Optional, List
+from typing import List, Union, Optional
 
 from loguru import logger
 
 from basic_memory.mcp.async_client import client
 from basic_memory.mcp.server import mcp
 from basic_memory.mcp.tools.utils import call_get
+from basic_memory.mcp.project_session import get_active_project
 from basic_memory.schemas.base import TimeFrame
 from basic_memory.schemas.memory import GraphContext
 from basic_memory.schemas.search import SearchItemType
@@ -14,7 +15,7 @@ from basic_memory.schemas.search import SearchItemType
 
 @mcp.tool(
     description="""Get recent activity from across the knowledge base.
-    
+
     Timeframe supports natural language formats like:
     - "2 days ago"  
     - "last week"
@@ -25,21 +26,25 @@ from basic_memory.schemas.search import SearchItemType
     """,
 )
 async def recent_activity(
-    type: Optional[List[SearchItemType]] = None,
-    depth: Optional[int] = 1,
-    timeframe: Optional[TimeFrame] = "7d",
+    type: Union[str, List[str]] = "",
+    depth: int = 1,
+    timeframe: TimeFrame = "7d",
     page: int = 1,
     page_size: int = 10,
     max_related: int = 10,
+    project: Optional[str] = None,
 ) -> GraphContext:
     """Get recent activity across the knowledge base.
 
     Args:
-        type: Filter by content type(s). Valid options:
-            - ["entity"] for knowledge entities
-            - ["relation"] for connections between entities
-            - ["observation"] for notes and observations
+        type: Filter by content type(s). Can be a string or list of strings.
+            Valid options:
+            - "entity" or ["entity"] for knowledge entities
+            - "relation" or ["relation"] for connections between entities
+            - "observation" or ["observation"] for notes and observations
             Multiple types can be combined: ["entity", "relation"]
+            Case-insensitive: "ENTITY" and "entity" are treated the same.
+            Default is an empty string, which returns all types.
         depth: How many relation hops to traverse (1-3 recommended)
         timeframe: Time window to search. Supports natural language:
             - Relative: "2 days ago", "last week", "yesterday"
@@ -48,6 +53,7 @@ async def recent_activity(
         page: Page number of results to return (default: 1)
         page_size: Number of results to return per page (default: 10)
         max_related: Maximum number of related results to return (default: 10)
+        project: Optional project name to get activity from. If not provided, uses current active project.
 
     Returns:
         GraphContext containing:
@@ -59,14 +65,20 @@ async def recent_activity(
         # Get all entities for the last 10 days (default)
         recent_activity()
 
-        # Get all entities from yesterday
+        # Get all entities from yesterday (string format)
+        recent_activity(type="entity", timeframe="yesterday")
+
+        # Get all entities from yesterday (list format)
         recent_activity(type=["entity"], timeframe="yesterday")
 
         # Get recent relations and observations
         recent_activity(type=["relation", "observation"], timeframe="today")
 
         # Look back further with more context
-        recent_activity(type=["entity"], depth=2, timeframe="2 weeks ago")
+        recent_activity(type="entity", depth=2, timeframe="2 weeks ago")
+
+        # Get activity from specific project
+        recent_activity(type="entity", project="work-project")
 
     Notes:
         - Higher depth values (>3) may impact performance with large result sets
@@ -86,15 +98,34 @@ async def recent_activity(
     if timeframe:
         params["timeframe"] = timeframe  # pyright: ignore
 
-    # send enum values if we have an enum, else send string value
+    # Validate and convert type parameter
     if type:
-        params["type"] = [  # pyright: ignore
-            type.value if isinstance(type, SearchItemType) else type for type in type
-        ]
+        # Convert single string to list
+        if isinstance(type, str):
+            type_list = [type]
+        else:
+            type_list = type
+
+        # Validate each type against SearchItemType enum
+        validated_types = []
+        for t in type_list:
+            try:
+                # Try to convert string to enum
+                if isinstance(t, str):
+                    validated_types.append(SearchItemType(t.lower()))
+            except ValueError:
+                valid_types = [t.value for t in SearchItemType]
+                raise ValueError(f"Invalid type: {t}. Valid types are: {valid_types}")
+
+        # Add validated types to params
+        params["type"] = [t.value for t in validated_types]  # pyright: ignore
+
+    active_project = get_active_project(project)
+    project_url = active_project.project_url
 
     response = await call_get(
         client,
-        "/memory/recent",
+        f"{project_url}/memory/recent",
         params=params,
     )
     return GraphContext.model_validate(response.json())

basic_memory/mcp/tools/search.py

@@ -1,5 +1,6 @@
 """Search tools for Basic Memory MCP server."""
 
+from textwrap import dedent
 from typing import List, Optional
 
 from loguru import logger
@@ -7,9 +8,166 @@ from loguru import logger
 from basic_memory.mcp.async_client import client
 from basic_memory.mcp.server import mcp
 from basic_memory.mcp.tools.utils import call_post
+from basic_memory.mcp.project_session import get_active_project
 from basic_memory.schemas.search import SearchItemType, SearchQuery, SearchResponse
 
 
+def _format_search_error_response(error_message: str, query: str, search_type: str = "text") -> str:
+    """Format helpful error responses for search failures that guide users to successful searches."""
+
+    # FTS5 syntax errors
+    if "syntax error" in error_message.lower() or "fts5" in error_message.lower():
+        clean_query = (
+            query.replace('"', "")
+            .replace("(", "")
+            .replace(")", "")
+            .replace("+", "")
+            .replace("*", "")
+        )
+        return dedent(f"""
+            # Search Failed - Invalid Syntax
+
+            The search query '{query}' contains invalid syntax that the search engine cannot process.
+
+            ## Common syntax issues:
+            1. **Special characters**: Characters like `+`, `*`, `"`, `(`, `)` have special meaning in search
+            2. **Unmatched quotes**: Make sure quotes are properly paired
+            3. **Invalid operators**: Check AND, OR, NOT operators are used correctly
+
+            ## How to fix:
+            1. **Simplify your search**: Try using simple words instead: `{clean_query}`
+            2. **Remove special characters**: Use alphanumeric characters and spaces
+            3. **Use basic boolean operators**: `word1 AND word2`, `word1 OR word2`, `word1 NOT word2`
+
+            ## Examples of valid searches:
+            - Simple text: `project planning`
+            - Boolean AND: `project AND planning`
+            - Boolean OR: `meeting OR discussion`
+            - Boolean NOT: `project NOT archived`
+            - Grouped: `(project OR planning) AND notes`
+
+            ## Try again with:
+            ```
+            search_notes("INSERT_CLEAN_QUERY_HERE")
+            ```
+
+            Replace INSERT_CLEAN_QUERY_HERE with your simplified search terms.
+            """).strip()
+
+    # Project not found errors (check before general "not found")
+    if "project not found" in error_message.lower():
+        return dedent(f"""
+            # Search Failed - Project Not Found
+
+            The current project is not accessible or doesn't exist: {error_message}
+
+            ## How to resolve:
+            1. **Check available projects**: `list_projects()`
+            2. **Switch to valid project**: `switch_project("valid-project-name")`
+            3. **Verify project setup**: Ensure your project is properly configured
+
+            ## Current session info:
+            - Check current project: `get_current_project()`
+            - See available projects: `list_projects()`
+            """).strip()
+
+    # No results found
+    if "no results" in error_message.lower() or "not found" in error_message.lower():
+        simplified_query = (
+            " ".join(query.split()[:2])
+            if len(query.split()) > 2
+            else query.split()[0]
+            if query.split()
+            else "notes"
+        )
+        return dedent(f"""
+            # Search Complete - No Results Found
+
+            No content found matching '{query}' in the current project.
+
+            ## Suggestions to try:
+            1. **Broaden your search**: Try fewer or more general terms
+               - Instead of: `{query}`
+               - Try: `{simplified_query}`
+
+            2. **Check spelling**: Verify terms are spelled correctly
+            3. **Try different search types**:
+               - Text search: `search_notes("{query}", search_type="text")`
+               - Title search: `search_notes("{query}", search_type="title")`
+               - Permalink search: `search_notes("{query}", search_type="permalink")`
+
+            4. **Use boolean operators**:
+               - Try OR search for broader results
+
+            ## Check what content exists:
+            - Recent activity: `recent_activity(timeframe="7d")`
+            - List files: `list_directory("/")`
+            - Browse by folder: `list_directory("/notes")` or `list_directory("/docs")`
+            """).strip()
+
+    # Server/API errors
+    if "server error" in error_message.lower() or "internal" in error_message.lower():
+        return dedent(f"""
+            # Search Failed - Server Error
+
+            The search service encountered an error while processing '{query}': {error_message}
+
+            ## Immediate steps:
+            1. **Try again**: The error might be temporary
+            2. **Simplify the query**: Use simpler search terms
+            3. **Check project status**: Ensure your project is properly synced
+
+            ## Alternative approaches:
+            - Browse files directly: `list_directory("/")`
+            - Check recent activity: `recent_activity(timeframe="7d")`
+            - Try a different search type: `search_notes("{query}", search_type="title")`
+
+            ## If the problem persists:
+            The search index might need to be rebuilt. Send a message to support@basicmachines.co or check the project sync status.
+            """).strip()
+
+    # Permission/access errors
+    if (
+        "permission" in error_message.lower()
+        or "access" in error_message.lower()
+        or "forbidden" in error_message.lower()
+    ):
+        return f"""# Search Failed - Access Error
+
+You don't have permission to search in the current project: {error_message}
+
+## How to resolve:
+1. **Check your project access**: Verify you have read permissions for this project
+2. **Switch projects**: Try searching in a different project you have access to
+3. **Check authentication**: You might need to re-authenticate
+
+## Alternative actions:
+- List available projects: `list_projects()`
+- Switch to accessible project: `switch_project("project-name")`
+- Check current project: `get_current_project()`"""
+
+    # Generic fallback
+    return f"""# Search Failed
+
+Error searching for '{query}': {error_message}
+
+## General troubleshooting:
+1. **Check your query**: Ensure it uses valid search syntax
+2. **Try simpler terms**: Use basic words without special characters
+3. **Verify project access**: Make sure you can access the current project
+4. **Check recent activity**: `recent_activity(timeframe="7d")` to see if content exists
+
+## Alternative approaches:
+- Browse files: `list_directory("/")`
+- Try different search type: `search_notes("{query}", search_type="title")`
+- Search with filters: `search_notes("{query}", types=["entity"])`
+
+## Need help?
+- View recent changes: `recent_activity()`
+- List projects: `list_projects()` 
+- Check current project: `get_current_project()`"""
+
+
 @mcp.tool(
     description="Search across all content in the knowledge base.",
 )
@@ -21,7 +179,8 @@ async def search_notes(
     types: Optional[List[str]] = None,
     entity_types: Optional[List[str]] = None,
     after_date: Optional[str] = None,
-) -> SearchResponse:
+    project: Optional[str] = None,
+) -> SearchResponse | str:
     """Search across all content in the knowledge base.
 
     This tool searches the knowledge base using full-text search, pattern matching,
@@ -36,6 +195,7 @@ async def search_notes(
         types: Optional list of note types to search (e.g., ["note", "person"])
         entity_types: Optional list of entity types to filter by (e.g., ["entity", "observation"])
         after_date: Optional date filter for recent content (e.g., "1 week", "2d")
+        project: Optional project name to search in. If not provided, uses current active project.
 
     Returns:
         SearchResponse with results and pagination info
@@ -79,6 +239,9 @@ async def search_notes(
             query="docs/meeting-*",
             search_type="permalink"
         )
+
+        # Search in specific project
+        results = await search_notes("meeting notes", project="work-project")
     """
     # Create a SearchQuery object based on the parameters
     search_query = SearchQuery()
@@ -103,11 +266,29 @@ async def search_notes(
     if after_date:
         search_query.after_date = after_date
 
+    active_project = get_active_project(project)
+    project_url = active_project.project_url
+
     logger.info(f"Searching for {search_query}")
-    response = await call_post(
-        client,
-        "/search/",
-        json=search_query.model_dump(),
-        params={"page": page, "page_size": page_size},
-    )
-    return SearchResponse.model_validate(response.json())
+
+    try:
+        response = await call_post(
+            client,
+            f"{project_url}/search/",
+            json=search_query.model_dump(),
+            params={"page": page, "page_size": page_size},
+        )
+        result = SearchResponse.model_validate(response.json())
+
+        # Check if we got no results and provide helpful guidance
+        if not result.results:
+            logger.info(f"Search returned no results for query: {query}")
+            # Don't treat this as an error, but the user might want guidance
+            # We return the empty result as normal - the user can decide if they need help
+
+        return result
+
+    except Exception as e:
+        logger.error(f"Search failed for query '{query}': {e}")
+        # Return formatted error message as string for better user experience
+        return _format_search_error_response(str(e), query, search_type)