* feat: Implement multi-tenant architecture with tenant and knowledge base models - Added data models for tenants, knowledge bases, and related configurations. - Introduced role and permission management for users in the multi-tenant system. - Created a service layer for managing tenants and knowledge bases, including CRUD operations. - Developed a tenant-aware instance manager for LightRAG with caching and isolation features. - Added a migration script to transition existing workspace-based deployments to the new multi-tenant architecture. * chore: ignore lightrag/api/webui/assets/ directory * chore: stop tracking lightrag/api/webui/assets (ignore in .gitignore) * feat: Initialize LightRAG Multi-Tenant Stack with PostgreSQL - Added README.md for project overview, setup instructions, and architecture details. - Created docker-compose.yml to define services: PostgreSQL, Redis, LightRAG API, and Web UI. - Introduced env.example for environment variable configuration. - Implemented init-postgres.sql for PostgreSQL schema initialization with multi-tenant support. - Added reproduce_issue.py for testing default tenant access via API. * feat: Enhance TenantSelector and update related components for improved multi-tenant support * feat: Enhance testing capabilities and update documentation - Updated Makefile to include new test commands for various modes (compatibility, isolation, multi-tenant, security, coverage, and dry-run). - Modified API health check endpoint in Makefile to reflect new port configuration. - Updated QUICK_START.md and README.md to reflect changes in service URLs and ports. - Added environment variables for testing modes in env.example. - Introduced run_all_tests.sh script to automate testing across different modes. - Created conftest.py for pytest configuration, including database fixtures and mock services. - Implemented database helper functions for streamlined database operations in tests. - Added test collection hooks to skip tests based on the current MULTITENANT_MODE. * feat: Implement multi-tenant support with demo mode enabled by default - Added multi-tenant configuration to the environment and Docker setup. - Created pre-configured demo tenants (acme-corp and techstart) for testing. - Updated API endpoints to support tenant-specific data access. - Enhanced Makefile commands for better service management and database operations. - Introduced user-tenant membership system with role-based access control. - Added comprehensive documentation for multi-tenant setup and usage. - Fixed issues with document visibility in multi-tenant environments. - Implemented necessary database migrations for user memberships and legacy support. * feat(audit): Add final audit report for multi-tenant implementation - Documented overall assessment, architecture overview, test results, security findings, and recommendations. - Included detailed findings on critical security issues and architectural concerns. fix(security): Implement security fixes based on audit findings - Removed global RAG fallback and enforced strict tenant context. - Configured super-admin access and required user authentication for tenant access. - Cleared localStorage on logout and improved error handling in WebUI. chore(logs): Create task logs for audit and security fixes implementation - Documented actions, decisions, and next steps for both audit and security fixes. - Summarized test results and remaining recommendations. chore(scripts): Enhance development stack management scripts - Added scripts for cleaning, starting, and stopping the development stack. - Improved output messages and ensured graceful shutdown of services. feat(starter): Initialize PostgreSQL with AGE extension support - Created initialization scripts for PostgreSQL extensions including uuid-ossp, vector, and AGE. - Ensured successful installation and verification of extensions. * feat: Implement auto-select for first tenant and KB on initial load in WebUI - Removed WEBUI_INITIAL_STATE_FIX.md as the issue is resolved. - Added useTenantInitialization hook to automatically select the first available tenant and KB on app load. - Integrated the new hook into the Root component of the WebUI. - Updated RetrievalTesting component to ensure a KB is selected before allowing user interaction. - Created end-to-end tests for multi-tenant isolation and real service interactions. - Added scripts for starting, stopping, and cleaning the development stack. - Enhanced API and tenant routes to support tenant-specific pipeline status initialization. - Updated constants for backend URL to reflect the correct port. - Improved error handling and logging in various components. * feat: Add multi-tenant support with enhanced E2E testing scripts and client functionality * update client * Add integration and unit tests for multi-tenant API, models, security, and storage - Implement integration tests for tenant and knowledge base management endpoints in `test_tenant_api_routes.py`. - Create unit tests for tenant isolation, model validation, and role permissions in `test_tenant_models.py`. - Add security tests to enforce role-based permissions and context validation in `test_tenant_security.py`. - Develop tests for tenant-aware storage operations and context isolation in `test_tenant_storage_phase3.py`. * feat(e2e): Implement OpenAI model support and database reset functionality * Add comprehensive test suite for gpt-5-nano compatibility - Introduced tests for parameter normalization, embeddings, and entity extraction. - Implemented direct API testing for gpt-5-nano. - Validated .env configuration loading and OpenAI API connectivity. - Analyzed reasoning token overhead with various token limits. - Documented test procedures and expected outcomes in README files. - Ensured all tests pass for production readiness. * kg(postgres_impl): ensure AGE extension is loaded in session and configure graph initialization * dev: add hybrid dev helper scripts, Makefile, docker-compose.dev-db and local development docs * feat(dev): add dev helper scripts and local development documentation for hybrid setup * feat(multi-tenant): add detailed specifications and logs for multi-tenant improvements, including UX, backend handling, and ingestion pipeline * feat(migration): add generated tenant/kb columns, indexes, triggers; drop unused tables; update schema and docs * test(backward-compat): adapt tests to new StorageNameSpace/TenantService APIs (use concrete dummy storages) * chore: multi-tenant and UX updates — docs, webui, storage, tenant service adjustments * tests: stabilize integration tests + skip external services; fix multi-tenant API behavior and idempotency - gpt5_nano_compatibility: add pytest-asyncio markers, skip when OPENAI key missing, prevent module-level asyncio.run collection, add conftest - Ollama tests: add server availability check and skip markers; avoid pytest collection warnings by renaming helper classes - Graph storage tests: rename interactive test functions to avoid pytest collection - Document & Tenant routes: support external_ids for idempotency; ensure HTTPExceptions are re-raised - LightRAG core: support external_ids in apipeline_enqueue_documents and idempotent logic - Tests updated to match API changes (tenant routes & document routes) - Add logs and scripts for inspection and audit
203 lines
6.8 KiB
Python
203 lines
6.8 KiB
Python
# Redis Multi-Tenant Support Module
|
|
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
|
|
class RedisTenantHelper:
|
|
"""Helper class for Redis multi-tenant key management"""
|
|
|
|
SEPARATOR = ":"
|
|
|
|
@staticmethod
|
|
def make_tenant_key(tenant_id: str, kb_id: str, original_key: str) -> str:
|
|
"""
|
|
Create a tenant-scoped Redis key.
|
|
Format: tenant_id:kb_id:original_key
|
|
"""
|
|
return f"{tenant_id}{RedisTenantHelper.SEPARATOR}{kb_id}{RedisTenantHelper.SEPARATOR}{original_key}"
|
|
|
|
@staticmethod
|
|
def parse_tenant_key(tenant_key: str) -> Dict[str, str]:
|
|
"""
|
|
Parse a tenant-scoped key to extract components.
|
|
|
|
Returns:
|
|
Dict with tenant_id, kb_id, and original_key
|
|
"""
|
|
parts = tenant_key.split(RedisTenantHelper.SEPARATOR, 2)
|
|
if len(parts) == 3:
|
|
return {
|
|
"tenant_id": parts[0],
|
|
"kb_id": parts[1],
|
|
"original_key": parts[2]
|
|
}
|
|
return {"original_key": tenant_key}
|
|
|
|
@staticmethod
|
|
def get_tenant_key_pattern(tenant_id: str, kb_id: str, pattern: str = "*") -> str:
|
|
"""
|
|
Get a key pattern for scanning tenant-specific keys.
|
|
Useful for operations like SCAN, KEYS.
|
|
|
|
Format: tenant_id:kb_id:*
|
|
"""
|
|
return f"{tenant_id}{RedisTenantHelper.SEPARATOR}{kb_id}{RedisTenantHelper.SEPARATOR}{pattern}"
|
|
|
|
@staticmethod
|
|
def extract_original_key(tenant_key: str) -> str:
|
|
"""Extract the original key from a tenant-scoped key"""
|
|
parts = tenant_key.split(RedisTenantHelper.SEPARATOR, 2)
|
|
return parts[2] if len(parts) == 3 else tenant_key
|
|
|
|
@staticmethod
|
|
def batch_make_tenant_keys(
|
|
tenant_id: str,
|
|
kb_id: str,
|
|
keys: List[str]
|
|
) -> List[str]:
|
|
"""Create multiple tenant-scoped keys at once"""
|
|
return [
|
|
RedisTenantHelper.make_tenant_key(tenant_id, kb_id, key)
|
|
for key in keys
|
|
]
|
|
|
|
@staticmethod
|
|
def batch_parse_tenant_keys(tenant_keys: List[str]) -> List[Dict[str, str]]:
|
|
return [RedisTenantHelper.parse_tenant_key(key) for key in tenant_keys]
|
|
|
|
|
|
class RedisTenantNamespace:
|
|
"""Context manager for tenant-scoped Redis operations"""
|
|
|
|
def __init__(self, redis_client, tenant_id: str, kb_id: str):
|
|
self.redis = redis_client
|
|
self.tenant_id = tenant_id
|
|
self.kb_id = kb_id
|
|
self._prefix = RedisTenantHelper.get_tenant_key_pattern(tenant_id, kb_id, "")
|
|
|
|
async def get(self, key: str) -> Optional[Any]:
|
|
"""Get a value with tenant scoping"""
|
|
tenant_key = RedisTenantHelper.make_tenant_key(self.tenant_id, self.kb_id, key)
|
|
return await self.redis.get(tenant_key)
|
|
|
|
async def set(self, key: str, value: Any, ex: Optional[int] = None) -> bool:
|
|
"""Set a value with tenant scoping"""
|
|
tenant_key = RedisTenantHelper.make_tenant_key(self.tenant_id, self.kb_id, key)
|
|
if ex:
|
|
return await self.redis.setex(tenant_key, ex, value)
|
|
return await self.redis.set(tenant_key, value)
|
|
|
|
async def delete(self, keys: List[str]) -> int:
|
|
"""Delete values with tenant scoping"""
|
|
tenant_keys = RedisTenantHelper.batch_make_tenant_keys(
|
|
self.tenant_id, self.kb_id, keys
|
|
)
|
|
return await self.redis.delete(*tenant_keys)
|
|
|
|
async def exists(self, key: str) -> bool:
|
|
"""Check if key exists with tenant scoping"""
|
|
tenant_key = RedisTenantHelper.make_tenant_key(self.tenant_id, self.kb_id, key)
|
|
return await self.redis.exists(tenant_key) > 0
|
|
|
|
async def scan_keys(self, pattern: str = "*") -> List[str]:
|
|
"""Scan keys for this tenant"""
|
|
tenant_pattern = self._prefix + pattern
|
|
keys = []
|
|
cursor = 0
|
|
while True:
|
|
cursor, batch = await self.redis.scan(cursor, match=tenant_pattern, count=100)
|
|
keys.extend([
|
|
RedisTenantHelper.extract_original_key(k.decode() if isinstance(k, bytes) else k)
|
|
for k in batch
|
|
])
|
|
if cursor == 0:
|
|
break
|
|
return keys
|
|
|
|
async def delete_all(self) -> int:
|
|
"""Delete all keys for this tenant"""
|
|
keys = await self.scan_keys()
|
|
if keys:
|
|
return await self.delete(keys)
|
|
return 0
|
|
|
|
|
|
# ============================================================================
|
|
# MIGRATION HELPER FOR EXISTING REDIS DATA
|
|
# ============================================================================
|
|
|
|
async def migrate_redis_to_tenant(
|
|
redis_client,
|
|
old_key_pattern: str = "*",
|
|
default_tenant_id: str = "default",
|
|
default_kb_id: str = "default",
|
|
dry_run: bool = True
|
|
) -> Dict[str, int]:
|
|
"""
|
|
Migrate existing Redis keys to tenant-scoped format.
|
|
|
|
This operation:
|
|
1. Scans all keys matching the pattern
|
|
2. For each key, creates a new tenant-scoped key
|
|
3. Optionally deletes the old key (if not dry_run)
|
|
|
|
Args:
|
|
redis_client: Redis async client
|
|
old_key_pattern: Pattern to match old keys (default: all keys)
|
|
default_tenant_id: Tenant ID to use for migration
|
|
default_kb_id: KB ID to use for migration
|
|
dry_run: If True, don't actually delete old keys
|
|
|
|
Returns:
|
|
Migration statistics
|
|
"""
|
|
stats = {
|
|
"migrated": 0,
|
|
"failed": 0,
|
|
"skipped": 0
|
|
}
|
|
|
|
cursor = 0
|
|
while True:
|
|
cursor, keys = await redis_client.scan(cursor, match=old_key_pattern, count=100)
|
|
|
|
for key_bytes in keys:
|
|
key = key_bytes.decode() if isinstance(key_bytes, bytes) else key_bytes
|
|
|
|
# Check if key is already tenant-scoped (skip if yes)
|
|
parts = key.split(":", 2)
|
|
if len(parts) == 3:
|
|
stats["skipped"] += 1
|
|
continue
|
|
|
|
try:
|
|
# Get the value
|
|
value = await redis_client.get(key)
|
|
if value is None:
|
|
stats["skipped"] += 1
|
|
continue
|
|
|
|
# Create tenant-scoped key
|
|
tenant_key = RedisTenantHelper.make_tenant_key(
|
|
default_tenant_id,
|
|
default_kb_id,
|
|
key
|
|
)
|
|
|
|
# Set the new key
|
|
await redis_client.set(tenant_key, value)
|
|
|
|
# Delete old key (unless dry_run)
|
|
if not dry_run:
|
|
await redis_client.delete(key)
|
|
|
|
stats["migrated"] += 1
|
|
|
|
except Exception as e:
|
|
print(f"Error migrating key {key}: {e}")
|
|
stats["failed"] += 1
|
|
|
|
if cursor == 0:
|
|
break
|
|
|
|
return stats
|