basic-memory 0.15.0__py3-none-any.whl → 0.15.1__py3-none-any.whl

basic_memory/ignore_utils.py

@@ -11,9 +11,9 @@ DEFAULT_IGNORE_PATTERNS = {
     # Hidden files (files starting with dot)
     ".*",
     # Basic Memory internal files
-    "memory.db",
-    "memory.db-shm",
-    "memory.db-wal",
+    "*.db",
+    "*.db-shm",
+    "*.db-wal",
     "config.json",
     # Version control
     ".git",
@@ -84,10 +84,10 @@ def create_default_bmignore() -> None:
 # Hidden files (files starting with dot)
 .*
 
-# Basic Memory internal files
-memory.db
-memory.db-shm
-memory.db-wal
+# Basic Memory internal files (includes test databases)
+*.db
+*.db-shm
+*.db-wal
 config.json
 
 # Version control

basic_memory/mcp/async_client.py

@@ -1,3 +1,6 @@
+from contextlib import asynccontextmanager, AbstractAsyncContextManager
+from typing import AsyncIterator, Callable, Optional
+
 from httpx import ASGITransport, AsyncClient, Timeout
 from loguru import logger
 
@@ -5,9 +8,108 @@ from basic_memory.api.app import app as fastapi_app
 from basic_memory.config import ConfigManager
 
 
+# Optional factory override for dependency injection
+_client_factory: Optional[Callable[[], AbstractAsyncContextManager[AsyncClient]]] = None
+
+
+def set_client_factory(factory: Callable[[], AbstractAsyncContextManager[AsyncClient]]) -> None:
+    """Override the default client factory (for cloud app, testing, etc).
+
+    Args:
+        factory: An async context manager that yields an AsyncClient
+
+    Example:
+        @asynccontextmanager
+        async def custom_client_factory():
+            async with AsyncClient(...) as client:
+                yield client
+
+        set_client_factory(custom_client_factory)
+    """
+    global _client_factory
+    _client_factory = factory
+
+
+@asynccontextmanager
+async def get_client() -> AsyncIterator[AsyncClient]:
+    """Get an AsyncClient as a context manager.
+
+    This function provides proper resource management for HTTP clients,
+    ensuring connections are closed after use. It supports three modes:
+
+    1. **Factory injection** (cloud app, tests):
+       If a custom factory is set via set_client_factory(), use that.
+
+    2. **CLI cloud mode**:
+       When cloud_mode_enabled is True, create HTTP client with auth
+       token from CLIAuth for requests to cloud proxy endpoint.
+
+    3. **Local mode** (default):
+       Use ASGI transport for in-process requests to local FastAPI app.
+
+    Usage:
+        async with get_client() as client:
+            response = await client.get("/path")
+
+    Yields:
+        AsyncClient: Configured HTTP client for the current mode
+
+    Raises:
+        RuntimeError: If cloud mode is enabled but user is not authenticated
+    """
+    if _client_factory:
+        # Use injected factory (cloud app, tests)
+        async with _client_factory() as client:
+            yield client
+    else:
+        # Default: create based on config
+        config = ConfigManager().config
+        timeout = Timeout(
+            connect=10.0,  # 10 seconds for connection
+            read=30.0,  # 30 seconds for reading response
+            write=30.0,  # 30 seconds for writing request
+            pool=30.0,  # 30 seconds for connection pool
+        )
+
+        if config.cloud_mode_enabled:
+            # CLI cloud mode: inject auth when creating client
+            from basic_memory.cli.auth import CLIAuth
+
+            auth = CLIAuth(client_id=config.cloud_client_id, authkit_domain=config.cloud_domain)
+            token = await auth.get_valid_token()
+
+            if not token:
+                raise RuntimeError(
+                    "Cloud mode enabled but not authenticated. "
+                    "Run 'basic-memory cloud login' first."
+                )
+
+            # Auth header set ONCE at client creation
+            proxy_base_url = f"{config.cloud_host}/proxy"
+            logger.info(f"Creating HTTP client for cloud proxy at: {proxy_base_url}")
+            async with AsyncClient(
+                base_url=proxy_base_url,
+                headers={"Authorization": f"Bearer {token}"},
+                timeout=timeout,
+            ) as client:
+                yield client
+        else:
+            # Local mode: ASGI transport for in-process calls
+            logger.info("Creating ASGI client for local Basic Memory API")
+            async with AsyncClient(
+                transport=ASGITransport(app=fastapi_app), base_url="http://test", timeout=timeout
+            ) as client:
+                yield client
+
+
 def create_client() -> AsyncClient:
     """Create an HTTP client based on configuration.
 
+    DEPRECATED: Use get_client() context manager instead for proper resource management.
+
+    This function is kept for backward compatibility but will be removed in a future version.
+    The returned client should be closed manually by calling await client.aclose().
+
     Returns:
         AsyncClient configured for either local ASGI or remote proxy
     """
@@ -34,7 +136,3 @@ def create_client() -> AsyncClient:
         return AsyncClient(
             transport=ASGITransport(app=fastapi_app), base_url="http://test", timeout=timeout
         )
-
-
-# Create shared async client
-client = create_client()

basic_memory/mcp/prompts/continue_conversation.py

@@ -10,7 +10,7 @@ from loguru import logger
 from pydantic import Field
 
 from basic_memory.config import get_project_config
-from basic_memory.mcp.async_client import client
+from basic_memory.mcp.async_client import get_client
 from basic_memory.mcp.server import mcp
 from basic_memory.mcp.tools.utils import call_post
 from basic_memory.schemas.base import TimeFrame
@@ -42,20 +42,21 @@ async def continue_conversation(
     """
     logger.info(f"Continuing session, topic: {topic}, timeframe: {timeframe}")
 
-    # Create request model
-    request = ContinueConversationRequest(  # pyright: ignore [reportCallIssue]
-        topic=topic, timeframe=timeframe
-    )
+    async with get_client() as client:
+        # Create request model
+        request = ContinueConversationRequest(  # pyright: ignore [reportCallIssue]
+            topic=topic, timeframe=timeframe
+        )
 
-    project_url = get_project_config().project_url
+        project_url = get_project_config().project_url
 
-    # Call the prompt API endpoint
-    response = await call_post(
-        client,
-        f"{project_url}/prompt/continue-conversation",
-        json=request.model_dump(exclude_none=True),
-    )
+        # Call the prompt API endpoint
+        response = await call_post(
+            client,
+            f"{project_url}/prompt/continue-conversation",
+            json=request.model_dump(exclude_none=True),
+        )
 
-    # Extract the rendered prompt from the response
-    result = response.json()
-    return result["prompt"]
+        # Extract the rendered prompt from the response
+        result = response.json()
+        return result["prompt"]

basic_memory/mcp/prompts/search.py

@@ -9,7 +9,7 @@ from loguru import logger
 from pydantic import Field
 
 from basic_memory.config import get_project_config
-from basic_memory.mcp.async_client import client
+from basic_memory.mcp.async_client import get_client
 from basic_memory.mcp.server import mcp
 from basic_memory.mcp.tools.utils import call_post
 from basic_memory.schemas.base import TimeFrame
@@ -41,16 +41,17 @@ async def search_prompt(
     """
     logger.info(f"Searching knowledge base, query: {query}, timeframe: {timeframe}")
 
-    # Create request model
-    request = SearchPromptRequest(query=query, timeframe=timeframe)
+    async with get_client() as client:
+        # Create request model
+        request = SearchPromptRequest(query=query, timeframe=timeframe)
 
-    project_url = get_project_config().project_url
+        project_url = get_project_config().project_url
 
-    # Call the prompt API endpoint
-    response = await call_post(
-        client, f"{project_url}/prompt/search", json=request.model_dump(exclude_none=True)
-    )
+        # Call the prompt API endpoint
+        response = await call_post(
+            client, f"{project_url}/prompt/search", json=request.model_dump(exclude_none=True)
+        )
 
-    # Extract the rendered prompt from the response
-    result = response.json()
-    return result["prompt"]
+        # Extract the rendered prompt from the response
+        result = response.json()
+        return result["prompt"]