mirror of
https://github.com/lfnovo/open-notebook.git
synced 2026-04-30 12:30:01 +00:00
* feat: replace provider config with credential-based system (#477) Introduce a new credential management system replacing the old ProviderConfig singleton and standalone Models page. Each credential stores encrypted API keys and provider-specific configuration with full CRUD support via a unified settings UI. Backend: - Add Credential domain model with encrypted API key storage - Add credentials API router (CRUD, discovery, registration, testing) - Add encryption utilities for secure key storage - Add key_provider for DB-first env-var fallback provisioning - Add connection tester and model discovery services - Integrate ModelManager with credential-based config - Add provider name normalization for Esperanto compatibility - Add database migrations 11-12 for credential schema Frontend: - Rewrite settings/api-keys page with credential management UI - Add model discovery dialog with search and custom model support - Add compact default model assignments (primary/advanced layout) - Add inline model testing and credential connection testing - Add env-var migration banner - Update navigation to unified settings page - Remove standalone models page and old settings components i18n: - Update all 7 locale files with credential and model management keys Closes #477 Co-Authored-By: JFMD <git@jfmd.us> Co-Authored-By: OraCatQAQ <570768706@qq.com> * fix: address PR #540 review comments - Fix docs referencing removed Models page - Fix error-handler returning raw messages instead of i18n keys - Fix auth.py misleading docstring and missing no-password guard - Fix connection_tester using wrong env var for openai_compatible - Add provision_provider_keys before model discovery/sync - Update CLAUDE.md to reflect credential-based system - Fix missing closing brace in api-keys page useEffect * fix: add logging to credential migration and surface errors in UI - Add comprehensive logging to migrate-from-env and migrate-from-provider-config endpoints (start, per-provider progress, success/failure with stack traces, final summary) - Fix frontend migration hooks ignoring errors array from response - Show error toast when migration fails instead of "nothing to migrate" - Invalidate status/envStatus queries after migration so banner updates * docs: update CLAUDE.md files for credential system Replace stale ProviderConfig and /api-keys/ references across 8 CLAUDE.md files to reflect the new Credential-based system from PR #540. * docs: update user documentation for credential-based system Replace env var API key instructions with Settings UI credential workflow across all user-facing documentation. The new flow is: set OPEN_NOTEBOOK_ENCRYPTION_KEY → start services → add credential in Settings UI → test → discover models → register. - Rewrite ai-providers.md, api-configuration.md, environment-reference.md - Update all quick-start guides and installation docs - Update ollama.md, openai-compatible.md, local-tts/stt networking sections - Update reverse-proxy.md, development-setup.md, security.md - Fix broken links to non-existent docs/deployment/ paths - Add credentials endpoints to api-reference.md - Move all API key env vars to deprecated/legacy sections * chore: bump version to 1.7.0-rc1 Release candidate for credential-based provider management system. * fix: initialize provider before try block in test_credential Prevents UnboundLocalError when Credential.get() throws (e.g., invalid credential_id) before provider is assigned. * fix: reorder down migration to drop index before table Removes duplicate REMOVE FIELD statement and reorders so the index is dropped before the table, preventing rollback failures. * refactor: simplify encryption key to always derive via SHA-256 Remove the dual code path in _ensure_fernet_key() that detected native Fernet keys. Since the credential system is new, always deriving via SHA-256 removes unnecessary complexity. Also removes the generate_key() function and Fernet.generate_key() references from docs. * fix: correct mock patch targets in embedding tests and URL validation Fix embedding tests patching wrong module path for model_manager (was targeting open_notebook.utils.embedding.model_manager but it's imported locally from open_notebook.ai.models). Also fix URL validation to allow unresolvable hostnames since they may be valid in the deployment environment (e.g., Azure endpoints, internal DNS). * feat: add global setup banner for encryption and migration status Show a persistent banner in AppShell when encryption key is missing (red) or env var API keys can be migrated (amber), so users see these prompts on every page instead of only on Settings > API Keys. Includes a docs link for the encryption banner and i18n support across all 7 locales. * docs: several improvements to docker-compose e env examples * Update README.md Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> * docs: fix env var format in README and update model setup instructions Align the encryption key snippet in README Step 2 with the list format used in the compose file. Replace deprecated "Settings → Models" instructions with credential-based Discover Models flow. * fix: address credential system review issues - Fix SSRF bypass via IPv4-mapped IPv6 addresses (::ffff:169.254.x.x) - Fix TTS connection test missing config parameter - Add Azure-specific model discovery using api-key auth header - Add Vertex static model list for credential-based discovery - Fix PROVIDER_DISCOVERY_FUNCTIONS incorrect azure/vertex mapping - Extract business logic to api/credentials_service.py (service layer) - Move credential Pydantic schemas to api/models.py - Update tests to use new service imports and ValueError assertions * fix: sanitize error responses and migrate key_provider to Credential - Replace raw exception messages in all credential router 500 responses with generic error strings (internal details logged server-side only) - Refactor key_provider.py to use Credential.get_by_provider() instead of deprecated ProviderConfig.get_instance() - Remove unused functions (get_provider_configs, get_default_api_key, get_provider_config) that were dead code --------- Co-authored-by: JFMD <git@jfmd.us> Co-authored-by: OraCatQAQ <570768706@qq.com>
266 lines
9.6 KiB
Python
266 lines
9.6 KiB
Python
from typing import Any, ClassVar, Dict, Optional, Union
|
|
|
|
from esperanto import (
|
|
AIFactory,
|
|
EmbeddingModel,
|
|
LanguageModel,
|
|
SpeechToTextModel,
|
|
TextToSpeechModel,
|
|
)
|
|
from loguru import logger
|
|
|
|
from open_notebook.database.repository import ensure_record_id, repo_query
|
|
from open_notebook.domain.base import ObjectModel, RecordModel
|
|
|
|
ModelType = Union[LanguageModel, EmbeddingModel, SpeechToTextModel, TextToSpeechModel]
|
|
|
|
|
|
class Model(ObjectModel):
|
|
table_name: ClassVar[str] = "model"
|
|
nullable_fields: ClassVar[set[str]] = {"credential"}
|
|
name: str
|
|
provider: str
|
|
type: str
|
|
credential: Optional[str] = None
|
|
|
|
@classmethod
|
|
async def get_models_by_type(cls, model_type):
|
|
models = await repo_query(
|
|
"SELECT * FROM model WHERE type=$model_type;", {"model_type": model_type}
|
|
)
|
|
return [Model(**model) for model in models]
|
|
|
|
@classmethod
|
|
async def get_by_credential(cls, credential_id: str):
|
|
"""Get all models linked to a specific credential."""
|
|
models = await repo_query(
|
|
"SELECT * FROM model WHERE credential=$cred_id;",
|
|
{"cred_id": ensure_record_id(credential_id)},
|
|
)
|
|
return [Model(**model) for model in models]
|
|
|
|
def _prepare_save_data(self) -> Dict[str, Any]:
|
|
data = super()._prepare_save_data()
|
|
if data.get("credential"):
|
|
data["credential"] = ensure_record_id(data["credential"])
|
|
return data
|
|
|
|
async def get_credential_obj(self):
|
|
"""Get the Credential object linked to this model, if any."""
|
|
if not self.credential:
|
|
return None
|
|
from open_notebook.domain.credential import Credential
|
|
|
|
try:
|
|
return await Credential.get(self.credential)
|
|
except Exception:
|
|
logger.warning(f"Could not load credential {self.credential} for model {self.id}")
|
|
return None
|
|
|
|
|
|
class DefaultModels(RecordModel):
|
|
record_id: ClassVar[str] = "open_notebook:default_models"
|
|
default_chat_model: Optional[str] = None
|
|
default_transformation_model: Optional[str] = None
|
|
large_context_model: Optional[str] = None
|
|
default_text_to_speech_model: Optional[str] = None
|
|
default_speech_to_text_model: Optional[str] = None
|
|
# default_vision_model: Optional[str]
|
|
default_embedding_model: Optional[str] = None
|
|
default_tools_model: Optional[str] = None
|
|
|
|
@classmethod
|
|
async def get_instance(cls) -> "DefaultModels":
|
|
"""Always fetch fresh defaults from database (override parent caching behavior)"""
|
|
result = await repo_query(
|
|
"SELECT * FROM ONLY $record_id",
|
|
{"record_id": ensure_record_id(cls.record_id)},
|
|
)
|
|
|
|
if result:
|
|
if isinstance(result, list) and len(result) > 0:
|
|
data = result[0]
|
|
elif isinstance(result, dict):
|
|
data = result
|
|
else:
|
|
data = {}
|
|
else:
|
|
data = {}
|
|
|
|
# Create new instance with fresh data (bypass singleton cache)
|
|
instance = object.__new__(cls)
|
|
object.__setattr__(instance, "__dict__", {})
|
|
super(RecordModel, instance).__init__(**data)
|
|
return instance
|
|
|
|
|
|
class ModelManager:
|
|
def __init__(self):
|
|
pass # No caching needed
|
|
|
|
async def get_model(self, model_id: str, **kwargs) -> Optional[ModelType]:
|
|
"""Get a model by ID. Esperanto will cache the actual model instance."""
|
|
if not model_id:
|
|
return None
|
|
|
|
try:
|
|
model: Model = await Model.get(model_id)
|
|
except Exception:
|
|
raise ValueError(f"Model with ID {model_id} not found")
|
|
|
|
if not model.type or model.type not in [
|
|
"language",
|
|
"embedding",
|
|
"speech_to_text",
|
|
"text_to_speech",
|
|
]:
|
|
raise ValueError(f"Invalid model type: {model.type}")
|
|
|
|
# Build config from credential if linked, otherwise fall back to env vars
|
|
config: dict = {}
|
|
if model.credential:
|
|
credential = await model.get_credential_obj()
|
|
if credential:
|
|
config = credential.to_esperanto_config()
|
|
logger.debug(
|
|
f"Using credential '{credential.name}' for model {model.name}"
|
|
)
|
|
else:
|
|
logger.warning(
|
|
f"Model {model.id} has credential {model.credential} but it could not be loaded. "
|
|
f"Falling back to env vars."
|
|
)
|
|
# Fall back to env var provisioning
|
|
from open_notebook.ai.key_provider import provision_provider_keys
|
|
|
|
await provision_provider_keys(model.provider)
|
|
else:
|
|
# No credential linked - use env var fallback
|
|
from open_notebook.ai.key_provider import provision_provider_keys
|
|
|
|
await provision_provider_keys(model.provider)
|
|
|
|
# Merge any additional kwargs (e.g. temperature)
|
|
config.update(kwargs)
|
|
|
|
# Normalize provider name: DB stores underscores but Esperanto expects hyphens
|
|
provider = model.provider.replace("_", "-")
|
|
|
|
# Create model based on type (Esperanto will cache the instance)
|
|
if model.type == "language":
|
|
return AIFactory.create_language(
|
|
model_name=model.name,
|
|
provider=provider,
|
|
config=config,
|
|
)
|
|
elif model.type == "embedding":
|
|
return AIFactory.create_embedding(
|
|
model_name=model.name,
|
|
provider=provider,
|
|
config=config,
|
|
)
|
|
elif model.type == "speech_to_text":
|
|
return AIFactory.create_speech_to_text(
|
|
model_name=model.name,
|
|
provider=provider,
|
|
config=config,
|
|
)
|
|
elif model.type == "text_to_speech":
|
|
return AIFactory.create_text_to_speech(
|
|
model_name=model.name,
|
|
provider=provider,
|
|
config=config,
|
|
)
|
|
else:
|
|
raise ValueError(f"Invalid model type: {model.type}")
|
|
|
|
async def get_defaults(self) -> DefaultModels:
|
|
"""Get the default models configuration from database"""
|
|
defaults = await DefaultModels.get_instance()
|
|
if not defaults:
|
|
raise RuntimeError("Failed to load default models configuration")
|
|
return defaults
|
|
|
|
async def get_speech_to_text(self, **kwargs) -> Optional[SpeechToTextModel]:
|
|
"""Get the default speech-to-text model"""
|
|
defaults = await self.get_defaults()
|
|
model_id = defaults.default_speech_to_text_model
|
|
if not model_id:
|
|
return None
|
|
model = await self.get_model(model_id, **kwargs)
|
|
assert model is None or isinstance(model, SpeechToTextModel), (
|
|
f"Expected SpeechToTextModel but got {type(model)}"
|
|
)
|
|
return model
|
|
|
|
async def get_text_to_speech(self, **kwargs) -> Optional[TextToSpeechModel]:
|
|
"""Get the default text-to-speech model"""
|
|
defaults = await self.get_defaults()
|
|
model_id = defaults.default_text_to_speech_model
|
|
if not model_id:
|
|
return None
|
|
model = await self.get_model(model_id, **kwargs)
|
|
assert model is None or isinstance(model, TextToSpeechModel), (
|
|
f"Expected TextToSpeechModel but got {type(model)}"
|
|
)
|
|
return model
|
|
|
|
async def get_embedding_model(self, **kwargs) -> Optional[EmbeddingModel]:
|
|
"""Get the default embedding model"""
|
|
defaults = await self.get_defaults()
|
|
model_id = defaults.default_embedding_model
|
|
if not model_id:
|
|
return None
|
|
model = await self.get_model(model_id, **kwargs)
|
|
assert model is None or isinstance(model, EmbeddingModel), (
|
|
f"Expected EmbeddingModel but got {type(model)}"
|
|
)
|
|
return model
|
|
|
|
async def get_default_model(self, model_type: str, **kwargs) -> Optional[ModelType]:
|
|
"""
|
|
Get the default model for a specific type.
|
|
|
|
Args:
|
|
model_type: The type of model to retrieve (e.g., 'chat', 'embedding', etc.)
|
|
**kwargs: Additional arguments to pass to the model constructor
|
|
"""
|
|
defaults = await self.get_defaults()
|
|
model_id = None
|
|
|
|
if model_type == "chat":
|
|
model_id = defaults.default_chat_model
|
|
elif model_type == "transformation":
|
|
model_id = (
|
|
defaults.default_transformation_model or defaults.default_chat_model
|
|
)
|
|
elif model_type == "tools":
|
|
model_id = defaults.default_tools_model or defaults.default_chat_model
|
|
elif model_type == "embedding":
|
|
model_id = defaults.default_embedding_model
|
|
elif model_type == "text_to_speech":
|
|
model_id = defaults.default_text_to_speech_model
|
|
elif model_type == "speech_to_text":
|
|
model_id = defaults.default_speech_to_text_model
|
|
elif model_type == "large_context":
|
|
model_id = defaults.large_context_model
|
|
|
|
if not model_id:
|
|
logger.warning(
|
|
f"No default model configured for type '{model_type}'. "
|
|
f"Please go to Settings → Models and set a default model."
|
|
)
|
|
return None
|
|
|
|
try:
|
|
return await self.get_model(model_id, **kwargs)
|
|
except ValueError as e:
|
|
logger.error(
|
|
f"Failed to load default model for type '{model_type}': {e}. "
|
|
f"The configured model_id '{model_id}' may have been deleted or misconfigured. "
|
|
f"Please go to Settings → Models and reconfigure the default model."
|
|
)
|
|
return None
|
|
|
|
|
|
model_manager = ModelManager()
|