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>
199 lines
7.1 KiB
Python
199 lines
7.1 KiB
Python
"""
|
|
Credential domain model for storing individual provider credentials.
|
|
|
|
Each credential is a standalone record in the 'credential' table, replacing
|
|
the old ProviderConfig singleton. Credentials store API keys (encrypted at
|
|
rest) and provider-specific configuration fields.
|
|
|
|
Usage:
|
|
cred = Credential(
|
|
name="Production",
|
|
provider="openai",
|
|
modalities=["language", "embedding"],
|
|
api_key=SecretStr("sk-..."),
|
|
)
|
|
await cred.save()
|
|
"""
|
|
|
|
from datetime import datetime
|
|
from typing import Any, ClassVar, Dict, List, Optional
|
|
|
|
from loguru import logger
|
|
from pydantic import SecretStr
|
|
|
|
from open_notebook.database.repository import ensure_record_id, repo_query
|
|
from open_notebook.domain.base import ObjectModel
|
|
from open_notebook.utils.encryption import decrypt_value, encrypt_value
|
|
|
|
|
|
class Credential(ObjectModel):
|
|
"""
|
|
Individual credential record for an AI provider.
|
|
|
|
Each record stores authentication and configuration for a single provider
|
|
account. Models link to credentials via the credential field.
|
|
"""
|
|
|
|
table_name: ClassVar[str] = "credential"
|
|
nullable_fields: ClassVar[set[str]] = {
|
|
"api_key",
|
|
"base_url",
|
|
"endpoint",
|
|
"api_version",
|
|
"endpoint_llm",
|
|
"endpoint_embedding",
|
|
"endpoint_stt",
|
|
"endpoint_tts",
|
|
"project",
|
|
"location",
|
|
"credentials_path",
|
|
}
|
|
|
|
name: str
|
|
provider: str
|
|
modalities: List[str] = []
|
|
api_key: Optional[SecretStr] = None
|
|
base_url: Optional[str] = None
|
|
endpoint: Optional[str] = None
|
|
api_version: Optional[str] = None
|
|
endpoint_llm: Optional[str] = None
|
|
endpoint_embedding: Optional[str] = None
|
|
endpoint_stt: Optional[str] = None
|
|
endpoint_tts: Optional[str] = None
|
|
project: Optional[str] = None
|
|
location: Optional[str] = None
|
|
credentials_path: Optional[str] = None
|
|
|
|
def to_esperanto_config(self) -> Dict[str, Any]:
|
|
"""
|
|
Build config dict for AIFactory.create_*() calls.
|
|
|
|
Returns a dict that can be passed as the 'config' parameter to
|
|
Esperanto's AIFactory methods, overriding env var lookup.
|
|
"""
|
|
config: Dict[str, Any] = {}
|
|
if self.api_key:
|
|
config["api_key"] = self.api_key.get_secret_value()
|
|
if self.base_url:
|
|
config["base_url"] = self.base_url
|
|
if self.endpoint:
|
|
config["endpoint"] = self.endpoint
|
|
if self.api_version:
|
|
config["api_version"] = self.api_version
|
|
if self.endpoint_llm:
|
|
config["endpoint_llm"] = self.endpoint_llm
|
|
if self.endpoint_embedding:
|
|
config["endpoint_embedding"] = self.endpoint_embedding
|
|
if self.endpoint_stt:
|
|
config["endpoint_stt"] = self.endpoint_stt
|
|
if self.endpoint_tts:
|
|
config["endpoint_tts"] = self.endpoint_tts
|
|
if self.project:
|
|
config["project"] = self.project
|
|
if self.location:
|
|
config["location"] = self.location
|
|
if self.credentials_path:
|
|
config["credentials_path"] = self.credentials_path
|
|
return config
|
|
|
|
@classmethod
|
|
async def get_by_provider(cls, provider: str) -> List["Credential"]:
|
|
"""Get all credentials for a provider."""
|
|
results = await repo_query(
|
|
"SELECT * FROM credential WHERE string::lowercase(provider) = string::lowercase($provider) ORDER BY created ASC",
|
|
{"provider": provider},
|
|
)
|
|
credentials = []
|
|
for row in results:
|
|
try:
|
|
cred = cls._from_db_row(row)
|
|
credentials.append(cred)
|
|
except Exception as e:
|
|
logger.warning(f"Skipping invalid credential: {e}")
|
|
return credentials
|
|
|
|
@classmethod
|
|
async def get(cls, id: str) -> "Credential":
|
|
"""Override get() to handle api_key decryption."""
|
|
instance = await super().get(id)
|
|
# Pydantic auto-wraps the raw DB string in SecretStr, so we need
|
|
# to extract, decrypt, and re-wrap regardless of type.
|
|
if instance.api_key:
|
|
raw = (
|
|
instance.api_key.get_secret_value()
|
|
if isinstance(instance.api_key, SecretStr)
|
|
else instance.api_key
|
|
)
|
|
decrypted = decrypt_value(raw)
|
|
object.__setattr__(instance, "api_key", SecretStr(decrypted))
|
|
return instance
|
|
|
|
@classmethod
|
|
async def get_all(cls, order_by=None) -> List["Credential"]:
|
|
"""Override get_all() to handle api_key decryption."""
|
|
instances = await super().get_all(order_by=order_by)
|
|
for instance in instances:
|
|
if instance.api_key:
|
|
raw = (
|
|
instance.api_key.get_secret_value()
|
|
if isinstance(instance.api_key, SecretStr)
|
|
else instance.api_key
|
|
)
|
|
decrypted = decrypt_value(raw)
|
|
object.__setattr__(instance, "api_key", SecretStr(decrypted))
|
|
return instances
|
|
|
|
async def get_linked_models(self) -> list:
|
|
"""Get all models linked to this credential."""
|
|
if not self.id:
|
|
return []
|
|
from open_notebook.ai.models import Model
|
|
|
|
results = await repo_query(
|
|
"SELECT * FROM model WHERE credential = $cred_id",
|
|
{"cred_id": ensure_record_id(self.id)},
|
|
)
|
|
return [Model(**row) for row in results]
|
|
|
|
def _prepare_save_data(self) -> Dict[str, Any]:
|
|
"""Override to encrypt api_key before storage."""
|
|
data = {}
|
|
for key, value in self.model_dump().items():
|
|
if key == "api_key":
|
|
# Handle SecretStr: extract, encrypt, store
|
|
if self.api_key:
|
|
secret_value = self.api_key.get_secret_value()
|
|
data["api_key"] = encrypt_value(secret_value)
|
|
else:
|
|
data["api_key"] = None
|
|
elif value is not None or key in self.__class__.nullable_fields:
|
|
data[key] = value
|
|
|
|
return data
|
|
|
|
async def save(self) -> None:
|
|
"""Save credential, handling api_key re-hydration after DB round-trip."""
|
|
# Remember the original SecretStr before save
|
|
original_api_key = self.api_key
|
|
|
|
await super().save()
|
|
|
|
# After save, the api_key field may be set to the encrypted string
|
|
# from the DB result. Restore the original SecretStr.
|
|
if original_api_key:
|
|
object.__setattr__(self, "api_key", original_api_key)
|
|
elif self.api_key and isinstance(self.api_key, str):
|
|
# Decrypt if DB returned an encrypted string
|
|
decrypted = decrypt_value(self.api_key)
|
|
object.__setattr__(self, "api_key", SecretStr(decrypted))
|
|
|
|
@classmethod
|
|
def _from_db_row(cls, row: dict) -> "Credential":
|
|
"""Create a Credential from a database row, decrypting api_key."""
|
|
api_key_val = row.get("api_key")
|
|
if api_key_val and isinstance(api_key_val, str):
|
|
decrypted = decrypt_value(api_key_val)
|
|
row["api_key"] = SecretStr(decrypted)
|
|
elif api_key_val is None:
|
|
row["api_key"] = None
|
|
return cls(**row)
|