Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
feat(api): validate models before knowledge base upgrades (#45312)
FFXN96b1b20c76cf
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.pyindex d3297e2bbc3..2aa81344ab0 100644--- a/api/controllers/console/datasets/datasets.py+++ b/api/controllers/console/datasets/datasets.py@@ -21,6 +21,7 @@ from controllers.console.datasets.error import (DatasetAccessDeniedRequestError,DatasetNameDuplicateError,IndexingEstimateError,+ KnowledgeFSUpgradeModelsUnavailableHTTPError,)from controllers.console.error import ApiKeyLimitExceededHTTPErrorfrom controllers.console.flask_admission import console_account_admission@@ -49,6 +50,7 @@ from models.enums import PermissionEnum as DatasetPermissionEnumfrom models.model import AppMode, IconTypefrom services.dataset_knowledge_fs_upgrade_service import (KnowledgeFSUpgradeConflictError,+ KnowledgeFSUpgradeModelsUnavailableError,KnowledgeFSUpgradeNotFoundError,upgrade_job_response,)@@ -76,7 +78,9 @@ from services.knowledge_fs.product_dto import (KnowledgeFSUpgradeDiscoveryResponse,KnowledgeFSUpgradeJobListResponse,KnowledgeFSUpgradeJobResponse,+ KnowledgeFSUpgradePreparationResponse,KnowledgeFSUpgradeRetryResponse,+ KnowledgeFSUpgradeStartPayload,)_DATASET_EDIT_ROLES = frozenset(@@ -122,6 +126,8 @@ def _upgrade_errors() -> Generator[None]:raise NotFound(str(error) or None) from errorexcept KnowledgeFSUpgradeConflictError as error:raise Conflict(str(error)) from error+ except KnowledgeFSUpgradeModelsUnavailableError as error:+ raise KnowledgeFSUpgradeModelsUnavailableHTTPError(error.issues) from errordef _knowledge_fs_upgrade_idempotency_key() -> str:@@ -386,6 +392,7 @@ register_schema_models(IndexingEstimatePayload,ConsoleDatasetListQuery,DatasetApiKeyCreatePayload,+ KnowledgeFSUpgradeStartPayload,)register_response_schema_models(console_ns,@@ -403,6 +410,7 @@ register_response_schema_models(KnowledgeFSUpgradeJobResponse,KnowledgeFSUpgradeRetryResponse,KnowledgeFSUpgradeDiscoveryResponse,+ KnowledgeFSUpgradePreparationResponse,KnowledgeFSUpgradeJobListResponse,)@@ -526,15 +534,17 @@ class DatasetKnowledgeFSUpgradeApi(Resource):@console_ns.response(200,"Upgrade availability from the Classic Knowledge Base to an Agent Knowledge Base",- console_ns.models[KnowledgeFSUpgradeDiscoveryResponse.__name__],+ console_ns.models[KnowledgeFSUpgradePreparationResponse.__name__],)@console_account_admission(rbac_checks=(RBACCheck(RBACPermission.DATASET_READONLY, DatasetId()),))def get(self, request_context: RequestContext, dataset_id: UUID):with _upgrade_errors():discovery = application_services().knowledge.upgrades.discovery(request_context, dataset_id=str(dataset_id))- return dump_response(KnowledgeFSUpgradeDiscoveryResponse, discovery)+ return dump_response(KnowledgeFSUpgradePreparationResponse, discovery)+ @error_responses(KnowledgeFSUpgradeModelsUnavailableHTTPError)@console_ns.doc(params=_KNOWLEDGE_FS_UPGRADE_IDEMPOTENCY_HEADER_PARAMS)+ @console_ns.expect(console_ns.models[KnowledgeFSUpgradeStartPayload.__name__])@console_ns.response(202,"Upgrade from the Classic Knowledge Base to an Agent Knowledge Base accepted",@@ -545,12 +555,17 @@ class DatasetKnowledgeFSUpgradeApi(Resource):rbac_checks=(RBACCheck(RBACPermission.DATASET_EDIT, DatasetId()),),)def post(self, request_context: RequestContext, dataset_id: UUID):+ try:+ payload = KnowledgeFSUpgradeStartPayload.model_validate(request.get_json() if request.is_json else {})+ except ValidationError as error:+ raise BadRequest("Invalid upgrade model selection") from errorupgrades = application_services().knowledge.upgradeswith _upgrade_errors():job = upgrades.start(request_context,dataset_id=str(dataset_id),idempotency_key=_knowledge_fs_upgrade_idempotency_key(),+ models=payload.models,)return dump_response(KnowledgeFSUpgradeJobResponse, upgrade_job_response(job)), 202diff --git a/api/controllers/console/datasets/error.py b/api/controllers/console/datasets/error.pyindex 83db091c854..2b5196e5308 100644--- a/api/controllers/console/datasets/error.py+++ b/api/controllers/console/datasets/error.py@@ -1,4 +1,8 @@from libs.exception import BaseHTTPException+from services.knowledge_fs.product_dto import (+ KnowledgeFSUpgradeModelErrorDetailsResponse,+ KnowledgeFSUpgradeModelIssueResponse,+)class DatasetNotInitializedError(BaseHTTPException):@@ -7,6 +11,18 @@ class DatasetNotInitializedError(BaseHTTPException):code = 400+class KnowledgeFSUpgradeModelsUnavailableHTTPError(BaseHTTPException):+ error_code = "knowledge_fs_upgrade_models_unavailable"+ description = "One or more selected upgrade models are unavailable."+ code = 422+ details_model = KnowledgeFSUpgradeModelErrorDetailsResponse++ def __init__(self, issues: list[KnowledgeFSUpgradeModelIssueResponse]) -> None:+ super().__init__()+ assert self.data is not None+ self.data["details"] = KnowledgeFSUpgradeModelErrorDetailsResponse(issues=issues).model_dump(mode="json")++class ArchivedDocumentImmutableError(BaseHTTPException):error_code = "archived_document_immutable"description = "The archived document is not editable."diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.mdindex 73df71ce511..fe98a7f7e92 100644--- a/api/openapi/markdown/console-openapi.md+++ b/api/openapi/markdown/console-openapi.md@@ -7159,7 +7159,7 @@ Get dataset indexing status| Code | Description | Schema || ---- | ----------- | ------ |-| 200 | Upgrade availability from the Classic Knowledge Base to an Agent Knowledge Base | **application/json**: [KnowledgeFSUpgradeDiscoveryResponse](#knowledgefsupgradediscoveryresponse)<br> |+| 200 | Upgrade availability from the Classic Knowledge Base to an Agent Knowledge Base | **application/json**: [KnowledgeFSUpgradePreparationResponse](#knowledgefsupgradepreparationresponse)<br> || default | Error | **application/json**: [ErrorResponse](#errorresponse)<br> |### [POST] /datasets/{dataset_id}/knowledge-fs-upgrades@@ -7170,11 +7170,18 @@ Get dataset indexing status| Idempotency-Key | header | Stable key used to make the Dataset upgrade safe to retry | Yes | string || dataset_id | path | | Yes | string (uuid) |+#### Request Body++| Required | Schema |+| -------- | ------ |+| Yes | **application/json**: [KnowledgeFSUpgradeStartPayload](#knowledgefsupgradestartpayload)<br> |+#### Responses| Code | Description | Schema || ---- | ----------- | ------ || 202 | Upgrade from the Classic Knowledge Base to an Agent Knowledge Base accepted | **application/json**: [KnowledgeFSUpgradeJobResponse](#knowledgefsupgradejobresponse)<br> |+| 422 | Unprocessable Entity | **application/json**: [KnowledgeFsUpgradeModelsUnavailableError](#knowledgefsupgrademodelsunavailableerror)<br>[ErrorResponse](#errorresponse)<br> || default | Error | **application/json**: [ErrorResponse](#errorresponse)<br> |### [GET] /datasets/{dataset_id}/knowledge-fs-upgrades/{job_id}@@ -30228,6 +30235,63 @@ the file name and a short-lived signed preview URL for files the caller still ow| ---- | ---- | ----------- | -------- || KnowledgeFSUpgradeJobStatus | string | | |+#### KnowledgeFSUpgradeModelChoice++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| model | string | | Yes |+| provider | string | | Yes |++#### KnowledgeFSUpgradeModelErrorDetailsResponse++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| issues | [ [KnowledgeFSUpgradeModelIssueResponse](#knowledgefsupgrademodelissueresponse) ] | | Yes |++#### KnowledgeFSUpgradeModelIssueResponse++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| field | string, <br>**Available values:** "embedding", "reasoning", "rerank" | *Enum:* `"embedding"`, `"reasoning"`, `"rerank"` | Yes |+| model | string | | No |+| provider | string | | No |+| reason | string, <br>**Available values:** "credential-removed", "deprecated", "disabled", "missing", "no-configure", "no-permission", "not_found", "quota-exceeded" | *Enum:* `"credential-removed"`, `"deprecated"`, `"disabled"`, `"missing"`, `"no-configure"`, `"no-permission"`, `"not_found"`, `"quota-exceeded"` | Yes |++#### KnowledgeFSUpgradeModelRecommendationResponse++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| available | boolean | | Yes |+| source | string, <br>**Available values:** "legacy", "workspace_default" | | Yes |+| unavailable_reason | string, <br>**Available values:** "credential-removed", "deprecated", "disabled", "missing", "no-configure", "no-permission", "not_found", "quota-exceeded" | | No |+| value | [KnowledgeFSUpgradeModelChoice](#knowledgefsupgrademodelchoice) | | Yes |++#### KnowledgeFSUpgradeModelRecommendationsResponse++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| embedding | [KnowledgeFSUpgradeModelRecommendationResponse](#knowledgefsupgrademodelrecommendationresponse) | | Yes |+| reasoning | [KnowledgeFSUpgradeModelRecommendationResponse](#knowledgefsupgrademodelrecommendationresponse) | | Yes |+| rerank | [KnowledgeFSUpgradeModelRecommendationResponse](#knowledgefsupgrademodelrecommendationresponse) | | Yes |++#### KnowledgeFSUpgradeModelsPayload++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| embedding | [KnowledgeFSUpgradeModelChoice](#knowledgefsupgrademodelchoice) | | Yes |+| reasoning | [KnowledgeFSUpgradeModelChoice](#knowledgefsupgrademodelchoice) | | Yes |+| rerank | [KnowledgeFSUpgradeModelChoice](#knowledgefsupgrademodelchoice) | | Yes |++#### KnowledgeFSUpgradePreparationResponse++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| block_reason | [KnowledgeFSUpgradeBlockReason](#knowledgefsupgradeblockreason) | | No |+| can_retry | boolean | | Yes |+| can_upgrade | boolean | | Yes |+| job | [KnowledgeFSUpgradeJobResponse](#knowledgefsupgradejobresponse) | | No |+| models | [KnowledgeFSUpgradeModelRecommendationsResponse](#knowledgefsupgrademodelrecommendationsresponse) | | No |+#### KnowledgeFSUpgradeRetryResponse| Name | Type | Description | Required |@@ -30241,6 +30305,12 @@ the file name and a short-lived signed preview URL for files the caller still ow| ---- | ---- | ----------- | -------- || KnowledgeFSUpgradeStage | string | | |+#### KnowledgeFSUpgradeStartPayload++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| models | [KnowledgeFSUpgradeModelsPayload](#knowledgefsupgrademodelspayload) | | No |+#### KnowledgeFSUploadPartPresignPayload| Name | Type | Description | Required |@@ -30402,6 +30472,14 @@ Agent Knowledge Base was not found.| ---- | ---- | ----------- | -------- || KnowledgeFsSpaceNotFoundError | | Agent Knowledge Base was not found. | |+#### KnowledgeFsUpgradeModelsUnavailableError++One or more selected upgrade models are unavailable.++| Name | Type | Description | Required |+| ---- | ---- | ----------- | -------- |+| KnowledgeFsUpgradeModelsUnavailableError | | One or more selected upgrade models are unavailable. | |+#### KnowledgeFsUpstreamUnavailableErrorAgent Knowledge Base is unavailable.diff --git a/api/services/dataset_knowledge_fs_upgrade_service.py b/api/services/dataset_knowledge_fs_upgrade_service.pyindex 1496b33d305..a1c81ab3370 100644--- a/api/services/dataset_knowledge_fs_upgrade_service.py+++ b/api/services/dataset_knowledge_fs_upgrade_service.py@@ -6,6 +6,8 @@ import jsonimport reimport uuidfrom collections import defaultdict+from collections.abc import Mapping+from dataclasses import dataclassfrom datetime import UTC, datetime, timedeltafrom enum import Enumfrom hashlib import sha256@@ -15,6 +17,7 @@ import sqlalchemy as safrom pydantic import TypeAdapterfrom sqlalchemy.orm import Session, sessionmaker+from core.entities.model_entities import ModelStatus, ModelWithProviderEntityfrom core.plugin.impl.model_runtime_factory import create_plugin_provider_managerfrom core.rag.index_processor.constant.built_in_field import BuiltInFieldfrom extensions.ext_storage import storage@@ -63,6 +66,12 @@ from services.knowledge_fs.product_dto import (KnowledgeFSSpaceCreatePayload,KnowledgeFSUpgradeDiscoveryResponse,KnowledgeFSUpgradeJobResponse,+ KnowledgeFSUpgradeModelChoice,+ KnowledgeFSUpgradeModelIssueResponse,+ KnowledgeFSUpgradeModelRecommendationResponse,+ KnowledgeFSUpgradeModelRecommendationsResponse,+ KnowledgeFSUpgradeModelsPayload,+ KnowledgeFSUpgradeModelUnavailableReason,)from services.knowledge_fs.product_remote import KnowledgeFSProductResourceNotFoundErrorfrom services.knowledge_fs.runtime import get_knowledge_fs_runtime@@ -98,6 +107,209 @@ class KnowledgeFSUpgradeBusyError(KnowledgeFSUpgradeError):"""Another delivery still owns this checkpoint's bounded execution window."""+class KnowledgeFSUpgradeModelsUnavailableError(KnowledgeFSUpgradeError):+ """At least one chosen model cannot be used for this upgrade right now."""++ def __init__(self, issues: list[KnowledgeFSUpgradeModelIssueResponse]) -> None:+ super().__init__("One or more upgrade models are unavailable")+ self.issues = issues+++@dataclass(frozen=True)+class KnowledgeFSUpgradeModelPreferences:+ """Legacy choices and saved workspace defaults read before model-provider I/O."""++ embedding: KnowledgeFSUpgradeModelChoice | None+ rerank: KnowledgeFSUpgradeModelChoice | None+ defaults: Mapping[ModelType, KnowledgeFSUpgradeModelChoice]+++@dataclass(frozen=True)+class KnowledgeFSUpgradeResolvedModels:+ """Validated model identities; never reselect them after a job is accepted."""++ embedding: KnowledgeFSModelIntent+ rerank: KnowledgeFSModelIntent+ reasoning: KnowledgeFSModelIntent+++class KnowledgeFSUpgradeModelResolver:+ """Use the same workspace model statuses for suggestions and start admission."""++ def __init__(self, *, tenant_id: str) -> None:+ provider_manager = create_plugin_provider_manager(tenant_id=tenant_id)+ configurations = provider_manager.get_configurations(tenant_id)+ self._models = {+ model_type: configurations.get_models(model_type=model_type, only_active=False)+ for model_type in (ModelType.TEXT_EMBEDDING, ModelType.RERANK, ModelType.LLM)+ }++ @staticmethod+ def _provider_id(provider: str) -> str | None:+ try:+ return str(ModelProviderID(provider))+ except ValueError:+ return None++ def _match(self, model_type: ModelType, choice: KnowledgeFSUpgradeModelChoice) -> ModelWithProviderEntity | None:+ provider_id = self._provider_id(choice.provider)+ if provider_id is None:+ return None+ return next(+ (+ item+ for item in self._models[model_type]+ if item.model == choice.model and self._provider_id(item.provider.provider) == provider_id+ ),+ None,+ )++ def _unavailable_reason(+ self, model_type: ModelType, choice: KnowledgeFSUpgradeModelChoice+ ) -> KnowledgeFSUpgradeModelUnavailableReason | None:+ """Map a configured model to its unavailable reason without changing provider state."""+ model = self._match(model_type, choice)+ if model is None:+ return "not_found"+ match model.status:+ case ModelStatus.ACTIVE:+ return "deprecated" if model.deprecated else None+ case ModelStatus.NO_CONFIGURE:+ return "no-configure"+ case ModelStatus.QUOTA_EXCEEDED:+ return "quota-exceeded"+ case ModelStatus.NO_PERMISSION:+ return "no-permission"+ case ModelStatus.CREDENTIAL_REMOVED:+ return "credential-removed"+ case _:+ return "disabled"++ def _recommend(+ self,+ model_type: ModelType,+ *,+ legacy: KnowledgeFSUpgradeModelChoice | None,+ default: KnowledgeFSUpgradeModelChoice | None,+ ) -> KnowledgeFSUpgradeModelRecommendationResponse:+ if legacy is not None and self._unavailable_reason(model_type, legacy) is None:+ return KnowledgeFSUpgradeModelRecommendationResponse(value=legacy, source="legacy", available=True)+ if default is not None and self._unavailable_reason(model_type, default) is None:+ return KnowledgeFSUpgradeModelRecommendationResponse(+ value=default, source="workspace_default", available=True+ )+ value = default or legacy+ source = "workspace_default" if default is not None else "legacy" if legacy is not None else None+ reason = self._unavailable_reason(model_type, value) if value is not None else "missing"+ return KnowledgeFSUpgradeModelRecommendationResponse(+ value=value, source=source, available=False, unavailable_reason=reason+ )++ def recommend(+ self, preferences: KnowledgeFSUpgradeModelPreferences+ ) -> KnowledgeFSUpgradeModelRecommendationsResponse:+ return KnowledgeFSUpgradeModelRecommendationsResponse(+ embedding=self._recommend(+ ModelType.TEXT_EMBEDDING,+ legacy=preferences.embedding,+ default=preferences.defaults.get(ModelType.TEXT_EMBEDDING),+ ),+ rerank=self._recommend(+ ModelType.RERANK,+ legacy=preferences.rerank,+ default=preferences.defaults.get(ModelType.RERANK),+ ),+ reasoning=self._recommend(ModelType.LLM, legacy=None, default=preferences.defaults.get(ModelType.LLM)),+ )++ def validate(self, models: KnowledgeFSUpgradeModelsPayload) -> KnowledgeFSUpgradeResolvedModels:+ """Resolve all three choices or report each unusable field without creating a job."""+ selected: dict[str, KnowledgeFSModelIntent] = {}+ issues: list[KnowledgeFSUpgradeModelIssueResponse] = []+ for field, model_type, choice in (+ ("embedding", ModelType.TEXT_EMBEDDING, models.embedding),+ ("rerank", ModelType.RERANK, models.rerank),+ ("reasoning", ModelType.LLM, models.reasoning),+ ):+ reason = self._unavailable_reason(model_type, choice)+ if reason is not None:+ issues.append(+ KnowledgeFSUpgradeModelIssueResponse(+ field=field, reason=reason, provider=choice.provider, model=choice.model+ )+ )+ else:+ matched = self._match(model_type, choice)+ assert matched is not None+ selected[field] = _model_intent(matched.provider.provider, matched.model)+ if issues:+ raise KnowledgeFSUpgradeModelsUnavailableError(issues)+ return KnowledgeFSUpgradeResolvedModels(+ embedding=selected["embedding"], rerank=selected["rerank"], reasoning=selected["reasoning"]+ )++ def resolve_recommendations(+ self, preferences: KnowledgeFSUpgradeModelPreferences+ ) -> KnowledgeFSUpgradeResolvedModels:+ recommendations = self.recommend(preferences)+ issues = [+ KnowledgeFSUpgradeModelIssueResponse(+ field=field,+ reason=recommendation.unavailable_reason or "missing",+ provider=recommendation.value.provider if recommendation.value else None,+ model=recommendation.value.model if recommendation.value else None,+ )+ for field, recommendation in (+ ("embedding", recommendations.embedding),+ ("rerank", recommendations.rerank),+ ("reasoning", recommendations.reasoning),+ )+ if not recommendation.available+ ]+ if issues:+ raise KnowledgeFSUpgradeModelsUnavailableError(issues)+ assert recommendations.embedding.value is not None+ assert recommendations.rerank.value is not None+ assert recommendations.reasoning.value is not None+ return self.validate(+ KnowledgeFSUpgradeModelsPayload(+ embedding=recommendations.embedding.value,+ rerank=recommendations.rerank.value,+ reasoning=recommendations.reasoning.value,+ )+ )+++def upgrade_job_matches_models(job: KnowledgeFSUpgradeJob, models: KnowledgeFSUpgradeResolvedModels) -> bool:+ """A replay may reuse a job only when its persisted model identities match."""+ if job.resolved_configuration is None:+ return False+ try:+ resolved = job.resolved_configuration+ embedding = KnowledgeFSModelIntent.model_validate(resolved["embedding"])+ retrieval = KnowledgeFSRetrievalProfileIntent.model_validate(resolved["retrieval"])+ except (KeyError, TypeError, ValueError):+ return False+ return (+ embedding == models.embedding+ and retrieval.rerank.model == models.rerank+ and retrieval.reasoning_model == models.reasoning+ )+++def upgrade_job_matches_model_choices(job: KnowledgeFSUpgradeJob, choices: KnowledgeFSUpgradeModelsPayload) -> bool:+ """Compare an idempotent replay without querying provider status again."""+ try:+ models = KnowledgeFSUpgradeResolvedModels(+ embedding=_model_intent(choices.embedding.provider, choices.embedding.model),+ rerank=_model_intent(choices.rerank.provider, choices.rerank.model),+ reasoning=_model_intent(choices.reasoning.provider, choices.reasoning.model),+ )+ except ValueError:+ return False+ return upgrade_job_matches_models(job, models)++class KnowledgeFSUpgradeSnapshotService:"""Persist the exact click-time Dataset manifest without external I/O."""@@ -111,6 +323,7 @@ class KnowledgeFSUpgradeSnapshotService:dataset_id: str,requested_by_account_id: str,idempotency_key: str | None = None,+ models: KnowledgeFSUpgradeResolvedModels | None = None,) -> KnowledgeFSUpgradeJob:snapshot_at = naive_utc_now()with self._session_maker(expire_on_commit=False) as session, session.begin():@@ -132,6 +345,8 @@ class KnowledgeFSUpgradeSnapshotService:if idempotent is not None:if idempotent.old_dataset_id != dataset_id:raise KnowledgeFSUpgradeConflictError("Idempotency key belongs to another Dataset upgrade")+ if models is not None and not upgrade_job_matches_models(idempotent, models):+ raise KnowledgeFSUpgradeConflictError("Idempotency key belongs to another model selection")return idempotentexisting = session.scalar(@@ -145,6 +360,8 @@ class KnowledgeFSUpgradeSnapshotService:.limit(1))if existing is not None:+ if models is not None and not upgrade_job_matches_models(existing, models):+ raise KnowledgeFSUpgradeConflictError("Another Dataset upgrade is already in progress")return existingowner_account_id = str(dataset.maintainer or dataset.created_by)@@ -194,6 +411,11 @@ class KnowledgeFSUpgradeSnapshotService:)))+ config_snapshot = _config_snapshot(session, dataset)+ try:+ resolved_configuration = _build_resolved_configuration(config_snapshot, models) if models else None+ except (ValueError, TypeError) as error:+ raise KnowledgeFSUpgradeConflictError("Legacy retrieval settings cannot be upgraded") from errorjob = KnowledgeFSUpgradeJob(tenant_id=tenant_id,old_dataset_id=dataset_id,@@ -201,13 +423,14 @@ class KnowledgeFSUpgradeSnapshotService:owner_account_id=owner_account_id,idempotency_key=idempotency_key or str(uuid.uuid4()),snapshot_at=snapshot_at,- config_snapshot=_config_snapshot(session, dataset),+ config_snapshot=config_snapshot,permission_snapshot={"visibility": _enum_value(dataset.permission),"member_account_ids": permission_members,},app_binding_snapshot=app_bindings,tag_ids_snapshot=[str(tag_id) for tag_id in tag_ids if tag_id is not None],+ resolved_configuration=resolved_configuration,)session.add(job)session.flush()@@ -290,6 +513,18 @@ class KnowledgeFSUpgradeSnapshotService:session.flush()return job+ def get_by_idempotency_key(self, *, tenant_id: str, idempotency_key: str) -> KnowledgeFSUpgradeJob | None:+ with self._session_maker() as session:+ job = session.scalar(+ sa.select(KnowledgeFSUpgradeJob).where(+ KnowledgeFSUpgradeJob.tenant_id == tenant_id,+ KnowledgeFSUpgradeJob.idempotency_key == idempotency_key,+ )+ )+ if job is not None:+ session.expunge(job)+ return job+def get(self, *, tenant_id: str, job_id: str) -> KnowledgeFSUpgradeJob:with self._session_maker() as session:job = session.scalar(@@ -600,7 +835,7 @@ class KnowledgeFSUpgradeRunner:return jobdef _create_space(self, job: KnowledgeFSUpgradeJob) -> None:- resolved = _resolve_configuration(job)+ resolved = job.resolved_configuration or _resolve_configuration(job)runtime = get_knowledge_fs_runtime(self._session_maker)response = runtime.application.create_space(tenant_id=job.tenant_id,@@ -621,7 +856,8 @@ class KnowledgeFSUpgradeRunner:if persisted is None:raise KnowledgeFSUpgradeNotFoundError("Upgrade job disappeared")persisted.new_control_space_id = response.control_space_id- persisted.resolved_configuration = resolved+ if persisted.resolved_configuration is None:+ persisted.resolved_configuration = resolvedpersisted.stage = KnowledgeFSUpgradeStage.WAITING_FOR_SPACEdef _advance_when_space_is_active(self, job: KnowledgeFSUpgradeJob) -> None:@@ -1413,12 +1649,24 @@ def _resolve_configuration(job: KnowledgeFSUpgradeJob) -> dict[str, object]:preferred_provider=None,preferred_model=None,)+ return _build_resolved_configuration(+ job.config_snapshot,+ KnowledgeFSUpgradeResolvedModels(embedding=embedding, rerank=rerank, reasoning=reasoning),+ )+++def _build_resolved_configuration(+ config_snapshot: Mapping[str, object], models: KnowledgeFSUpgradeResolvedModels+) -> dict[str, object]:+ """Build a new-space profile from validated models without changing the click-time snapshot."""+ retrieval_value = config_snapshot.get("retrieval_model")+ retrieval = retrieval_value if isinstance(retrieval_value, dict) else {}threshold_enabled = bool(retrieval.get("score_threshold_enabled"))threshold_value = retrieval.get("score_threshold")profile = KnowledgeFSRetrievalProfileIntent(default_mode="fast",- reasoning_model=reasoning,- rerank=KnowledgeFSRerankIntent(enabled=True, model=rerank),+ reasoning_model=models.reasoning,+ rerank=KnowledgeFSRerankIntent(enabled=True, model=models.rerank),score_threshold=KnowledgeFSScoreThresholdIntent(enabled=threshold_enabled,stage="mode-final",@@ -1427,7 +1675,7 @@ def _resolve_configuration(job: KnowledgeFSUpgradeJob) -> dict[str, object]:top_k=max(1, min(100, int(retrieval.get("top_k") or 4))),)return {- "embedding": embedding.model_dump(mode="json", by_alias=True),+ "embedding": models.embedding.model_dump(mode="json", by_alias=True),"retrieval": profile.model_dump(mode="json", by_alias=True),}diff --git a/api/services/knowledge/datasets/upgrades.py b/api/services/knowledge/datasets/upgrades.pyindex e8cdafaabe4..4c6b15bc9dd 100644--- a/api/services/knowledge/datasets/upgrades.py+++ b/api/services/knowledge/datasets/upgrades.py@@ -6,18 +6,28 @@ from uuid import uuid4from sqlalchemy import selectfrom sqlalchemy.orm import Session, sessionmaker+from graphon.model_runtime.entities.model_entities import ModelTypefrom machinery.context import RequestContextfrom models import Datasetfrom models.knowledge_fs import KnowledgeFSUpgradeJob, KnowledgeFSUpgradeJobStatus+from models.provider import TenantDefaultModelfrom services.dataset_knowledge_fs_upgrade_service import (+ KnowledgeFSUpgradeConflictError,+ KnowledgeFSUpgradeModelPreferences,+ KnowledgeFSUpgradeModelResolver,KnowledgeFSUpgradeNotFoundError,KnowledgeFSUpgradeSnapshotService,upgrade_discovery_response,+ upgrade_job_matches_model_choices,)from services.knowledge.dataset_access import DatasetAccess, DatasetAccessErrorfrom services.knowledge.dataset_service import DatasetServicefrom services.knowledge.datasets.adapters import SQLAlchemyDatasetOperations, load_actor-from services.knowledge_fs.product_dto import KnowledgeFSUpgradeDiscoveryResponse+from services.knowledge_fs.product_dto import (+ KnowledgeFSUpgradeModelChoice,+ KnowledgeFSUpgradeModelsPayload,+ KnowledgeFSUpgradePreparationResponse,+)_RECOVERABLE_STATUSES = (KnowledgeFSUpgradeJobStatus.QUEUED,@@ -51,6 +61,41 @@ class KnowledgeUpgradeApplicationService:def _snapshots(self) -> KnowledgeFSUpgradeSnapshotService:return KnowledgeFSUpgradeSnapshotService(self._sessions)+ @staticmethod+ def _choice(provider: str | None, model: str | None) -> KnowledgeFSUpgradeModelChoice | None:+ if not provider or not model:+ return None+ return KnowledgeFSUpgradeModelChoice(provider=provider, model=model)++ def _load_model_preferences(+ self, *, tenant_id: str, dataset_id: str+ ) -> tuple[str, KnowledgeFSUpgradeModelPreferences]:+ """Read the legacy settings and saved defaults in a short, tenant-scoped session."""+ with self._sessions() as session:+ dataset = session.scalar(select(Dataset).where(Dataset.id == dataset_id, Dataset.tenant_id == tenant_id))+ if dataset is None:+ raise KnowledgeFSUpgradeNotFoundError("Dataset was not found")+ defaults: dict[ModelType, KnowledgeFSUpgradeModelChoice] = {}+ for row in session.scalars(+ select(TenantDefaultModel).where(+ TenantDefaultModel.tenant_id == tenant_id,+ TenantDefaultModel.model_type.in_((ModelType.TEXT_EMBEDDING, ModelType.RERANK, ModelType.LLM)),+ )+ ):+ choice = self._choice(row.provider_name, row.model_name)+ if choice is not None:+ defaults[row.model_type] = choice+ retrieval = dataset.retrieval_model if isinstance(dataset.retrieval_model, dict) else {}+ reranking = retrieval.get("reranking_model") or {}+ if not isinstance(reranking, dict):+ reranking = {}+ preferences = KnowledgeFSUpgradeModelPreferences(+ embedding=self._choice(dataset.embedding_model_provider, dataset.embedding_model),+ rerank=self._choice(reranking.get("reranking_provider_name"), reranking.get("reranking_model_name")),+ defaults=defaults,+ )+ return str(dataset.provider or ""), preferences+def list_recoverable_jobs(self, context: RequestContext) -> list[KnowledgeFSUpgradeJob]:workspace_id = context.active_workspace_idjobs = self._snapshots().list_by_statuses(tenant_id=workspace_id, statuses=_RECOVERABLE_STATUSES)@@ -76,27 +121,57 @@ class KnowledgeUpgradeApplicationService:allowed_ids.add(dataset_id)return [job for job in jobs if job.old_dataset_id in allowed_ids]- def discovery(self, context: RequestContext, *, dataset_id: str) -> KnowledgeFSUpgradeDiscoveryResponse:+ def discovery(self, context: RequestContext, *, dataset_id: str) -> KnowledgeFSUpgradePreparationResponse:dataset = self._dataset_access.require_accessible(context, dataset_id)with self._sessions() as session:provider = session.scalar(select(Dataset.provider).where(Dataset.id == dataset.id, Dataset.tenant_id == dataset.workspace_id))job = self._snapshots().get_latest(tenant_id=dataset.workspace_id, dataset_id=dataset.id)- return upgrade_discovery_response(+ eligibility = upgrade_discovery_response(job, feature_enabled=self._feature_enabled(), dataset_provider=str(provider or ""))+ recommendations = None+ if eligibility.can_upgrade:+ _, preferences = self._load_model_preferences(tenant_id=dataset.workspace_id, dataset_id=dataset.id)+ recommendations = KnowledgeFSUpgradeModelResolver(tenant_id=dataset.workspace_id).recommend(preferences)+ return KnowledgeFSUpgradePreparationResponse.model_validate(+ {**eligibility.model_dump(mode="json"), "models": recommendations}+ )- def start(self, context: RequestContext, *, dataset_id: str, idempotency_key: str) -> KnowledgeFSUpgradeJob:+ def start(+ self,+ context: RequestContext,+ *,+ dataset_id: str,+ idempotency_key: str,+ models: KnowledgeFSUpgradeModelsPayload | None = None,+ ) -> KnowledgeFSUpgradeJob:if not self._feature_enabled():raise KnowledgeFSUpgradeUnavailableError()dataset = self._dataset_access.require_accessible(context, dataset_id)snapshots = self._snapshots()+ idempotent = snapshots.get_by_idempotency_key(tenant_id=dataset.workspace_id, idempotency_key=idempotency_key)+ if idempotent is not None:+ if idempotent.old_dataset_id != dataset.id:+ raise KnowledgeFSUpgradeConflictError("Idempotency key belongs to another Dataset upgrade")+ if models is not None and not upgrade_job_matches_model_choices(idempotent, models):+ raise KnowledgeFSUpgradeConflictError("Idempotency key belongs to another model selection")+ self._enqueue(snapshots, dataset.workspace_id, idempotent.id)+ return idempotent+ provider, preferences = self._load_model_preferences(tenant_id=dataset.workspace_id, dataset_id=dataset.id)+ if provider == "external":+ raise KnowledgeFSUpgradeConflictError("External-provider Datasets cannot be upgraded")+ resolver = KnowledgeFSUpgradeModelResolver(tenant_id=dataset.workspace_id)+ resolved_models = (+ resolver.validate(models) if models is not None else resolver.resolve_recommendations(preferences)+ )job = snapshots.create(tenant_id=dataset.workspace_id,dataset_id=dataset.id,requested_by_account_id=context.account_id,idempotency_key=idempotency_key,+ models=resolved_models,)self._enqueue(snapshots, dataset.workspace_id, job.id)return jobdiff --git a/api/services/knowledge_fs/product_dto.py b/api/services/knowledge_fs/product_dto.pyindex da0db325238..69e84e4176e 100644--- a/api/services/knowledge_fs/product_dto.py+++ b/api/services/knowledge_fs/product_dto.py@@ -486,6 +486,90 @@ class KnowledgeFSUpgradeDiscoveryResponse(ResponseModel):block_reason: KnowledgeFSUpgradeBlockReason | None = None+class KnowledgeFSUpgradeModelChoice(BaseModel):+ provider: str = Field(min_length=1, max_length=255)+ model: str = Field(min_length=1, max_length=255)++ model_config = ConfigDict(extra="forbid")+++class KnowledgeFSUpgradeModelsPayload(BaseModel):+ embedding: KnowledgeFSUpgradeModelChoice+ rerank: KnowledgeFSUpgradeModelChoice+ reasoning: KnowledgeFSUpgradeModelChoice++ model_config = ConfigDict(extra="forbid")+++class KnowledgeFSUpgradeStartPayload(BaseModel):+ # Older callers may omit the body; the server still resolves and validates all three models.+ models: KnowledgeFSUpgradeModelsPayload | None = None++ model_config = ConfigDict(extra="forbid")+++type KnowledgeFSUpgradeModelUnavailableReason = Literal[+ "missing",+ "not_found",+ "deprecated",+ "no-configure",+ "quota-exceeded",+ "no-permission",+ "disabled",+ "credential-removed",+]+++class KnowledgeFSUpgradeModelRecommendationResponse(ResponseModel):+ value: KnowledgeFSUpgradeModelChoice | None+ source: Literal["legacy", "workspace_default"] | None+ available: bool+ unavailable_reason: (+ Literal[+ "missing",+ "not_found",+ "deprecated",+ "no-configure",+ "quota-exceeded",+ "no-permission",+ "disabled",+ "credential-removed",+ ]+ | None+ ) = None+++class KnowledgeFSUpgradeModelRecommendationsResponse(ResponseModel):+ embedding: KnowledgeFSUpgradeModelRecommendationResponse+ rerank: KnowledgeFSUpgradeModelRecommendationResponse+ reasoning: KnowledgeFSUpgradeModelRecommendationResponse+++class KnowledgeFSUpgradePreparationResponse(KnowledgeFSUpgradeDiscoveryResponse):+ # A blocked upgrade does not need model-provider I/O merely to explain its block reason.+ models: KnowledgeFSUpgradeModelRecommendationsResponse | None = None+++class KnowledgeFSUpgradeModelIssueResponse(ResponseModel):+ field: Literal["embedding", "reasoning", "rerank"]+ reason: Literal[+ "credential-removed",+ "deprecated",+ "disabled",+ "missing",+ "no-configure",+ "no-permission",+ "not_found",+ "quota-exceeded",+ ]+ provider: str | None = None+ model: str | None = None+++class KnowledgeFSUpgradeModelErrorDetailsResponse(ResponseModel):+ issues: list[KnowledgeFSUpgradeModelIssueResponse] = Field(min_length=1, max_length=3)++class KnowledgeFSSpaceUpdatePayload(BaseModel):name: str | None = Field(default=None, min_length=1, max_length=40)icon: KnowledgeFSIconIdentity | None = Nonediff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets.pyindex 18e48bcdc4c..6ae2e7364f9 100644--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py@@ -41,12 +41,14 @@ from controllers.console.datasets.error import (DatasetAccessDeniedRequestError,DatasetNameDuplicateError,IndexingEstimateError,+ KnowledgeFSUpgradeModelsUnavailableHTTPError,)from machinery.context import RequestContextfrom models.knowledge_fs import KnowledgeFSUpgradeJob, KnowledgeFSUpgradeJobStatus, KnowledgeFSUpgradeStagefrom services.data_source.entities.notion_import import NotionPageTypefrom services.dataset_knowledge_fs_upgrade_service import (KnowledgeFSUpgradeConflictError,+ KnowledgeFSUpgradeModelsUnavailableError,KnowledgeFSUpgradeNotFoundError,)from services.knowledge.dataset_access import DatasetAccessDeniedError, DatasetNotFoundError@@ -67,7 +69,11 @@ from services.knowledge.indexing.estimate import (IndexingEstimateProviderUnavailableError,UnsupportedEstimateSourceError,)-from services.knowledge_fs.product_dto import KnowledgeFSUpgradeDiscoveryResponse+from services.knowledge_fs.product_dto import (+ KnowledgeFSUpgradeModelIssueResponse,+ KnowledgeFSUpgradeModelsPayload,+ KnowledgeFSUpgradePreparationResponse,+)from tests.helpers.unit.controllers.rbac_introspection import rbac_checksCONTEXT = RequestContext("request-1", None, "account-1", "tenant-1")@@ -424,7 +430,73 @@ def test_upgrade_start_forwards_idempotency_key(app, upgrades):)assert status == 202assert response["id"] == "upgrade-job-1"- upgrades.start.assert_called_once_with(CONTEXT, dataset_id=str(DATASET_ID), idempotency_key="upgrade-request-1")+ upgrades.start.assert_called_once_with(+ CONTEXT, dataset_id=str(DATASET_ID), idempotency_key="upgrade-request-1", models=None+ )+++def test_upgrade_start_forwards_all_model_choices(app, upgrades):+ upgrades.start.return_value = _upgrade_job()+ choices = {+ "embedding": {"provider": "langgenius/openai/openai", "model": "embedding"},+ "rerank": {"provider": "langgenius/cohere/cohere", "model": "rerank"},+ "reasoning": {"provider": "langgenius/anthropic/anthropic", "model": "reasoning"},+ }+ with app.test_request_context(+ f"/datasets/{DATASET_ID}/knowledge-fs-upgrades",+ method="POST",+ headers={"Idempotency-Key": "upgrade-request-1"},+ json={"models": choices},+ ):+ response, status = unwrap(DatasetKnowledgeFSUpgradeApi.post)(+ DatasetKnowledgeFSUpgradeApi(), CONTEXT, DATASET_ID+ )+ assert status == 202+ assert response["id"] == "upgrade-job-1"+ upgrades.start.assert_called_once_with(+ CONTEXT,+ dataset_id=str(DATASET_ID),+ idempotency_key="upgrade-request-1",+ models=KnowledgeFSUpgradeModelsPayload.model_validate(choices),+ )+++def test_upgrade_start_rejects_incomplete_model_selection(app, upgrades):+ with (+ app.test_request_context(+ f"/datasets/{DATASET_ID}/knowledge-fs-upgrades",+ method="POST",+ headers={"Idempotency-Key": "upgrade-request-1"},+ json={"models": {"embedding": {"provider": "openai", "model": "embedding"}}},+ ),+ pytest.raises(BadRequest, match="Invalid upgrade model selection"),+ ):+ unwrap(DatasetKnowledgeFSUpgradeApi.post)(DatasetKnowledgeFSUpgradeApi(), CONTEXT, DATASET_ID)++ upgrades.start.assert_not_called()+++def test_upgrade_start_returns_field_specific_model_errors(app, upgrades):+ upgrades.start.side_effect = KnowledgeFSUpgradeModelsUnavailableError(+ [+ KnowledgeFSUpgradeModelIssueResponse(+ field="embedding", reason="credential-removed", provider="openai", model="embedding"+ )+ ]+ )+ with (+ app.test_request_context(+ f"/datasets/{DATASET_ID}/knowledge-fs-upgrades",+ method="POST",+ headers={"Idempotency-Key": "upgrade-request-1"},+ ),+ pytest.raises(KnowledgeFSUpgradeModelsUnavailableHTTPError) as error,+ ):+ unwrap(DatasetKnowledgeFSUpgradeApi.post)(DatasetKnowledgeFSUpgradeApi(), CONTEXT, DATASET_ID)+ assert error.value.data is not None+ assert error.value.data["details"]["issues"] == [+ {"field": "embedding", "reason": "credential-removed", "provider": "openai", "model": "embedding"}+ ]def test_upgrade_start_requires_idempotency_key(app, upgrades):@@ -457,13 +529,37 @@ def test_upgrade_start_maps_domain_errors(app, upgrades, error, http_error):def test_upgrade_discovery_serializes_service_result(app, upgrades):- upgrades.discovery.return_value = KnowledgeFSUpgradeDiscoveryResponse(- job=None, can_upgrade=True, can_retry=False, block_reason=None+ upgrades.discovery.return_value = KnowledgeFSUpgradePreparationResponse.model_validate(+ {+ "job": None,+ "can_upgrade": True,+ "can_retry": False,+ "models": {+ "embedding": {+ "value": {"provider": "openai", "model": "embedding"},+ "source": "legacy",+ "available": True,+ },+ "rerank": {+ "value": {"provider": "cohere", "model": "rerank"},+ "source": "workspace_default",+ "available": True,+ },+ "reasoning": {+ "value": {"provider": "anthropic", "model": "reasoning"},+ "source": "workspace_default",+ "available": False,+ "unavailable_reason": "credential-removed",+ },+ },+ })with app.test_request_context(f"/datasets/{DATASET_ID}/knowledge-fs-upgrades"):response = unwrap(DatasetKnowledgeFSUpgradeApi.get)(DatasetKnowledgeFSUpgradeApi(), CONTEXT, DATASET_ID)upgrades.discovery.assert_called_once_with(CONTEXT, dataset_id=str(DATASET_ID))assert response["can_upgrade"] is True+ assert response["models"]["embedding"]["value"] == {"provider": "openai", "model": "embedding"}+ assert response["models"]["reasoning"]["unavailable_reason"] == "credential-removed"def test_upgrade_job_status_maps_missing_job_to_not_found(app, upgrades):diff --git a/api/tests/unit_tests/services/knowledge/datasets/test_upgrades.py b/api/tests/unit_tests/services/knowledge/datasets/test_upgrades.pyindex f9affa23c26..8bdd373d869 100644--- a/api/tests/unit_tests/services/knowledge/datasets/test_upgrades.py+++ b/api/tests/unit_tests/services/knowledge/datasets/test_upgrades.py@@ -8,17 +8,31 @@ from unittest.mock import patchimport pytestfrom sqlalchemy.orm import Session, sessionmaker+from graphon.model_runtime.entities.model_entities import ModelTypefrom machinery.context import RequestContextfrom models import Datasetfrom models.knowledge_fs import KnowledgeFSUpgradeJob, KnowledgeFSUpgradeJobStatus+from models.provider import TenantDefaultModelfrom services.dataset_knowledge_fs_upgrade_service import (+ KnowledgeFSUpgradeConflictError,+ KnowledgeFSUpgradeModelPreferences,+ KnowledgeFSUpgradeModelsUnavailableError,KnowledgeFSUpgradeNotFoundError,+ KnowledgeFSUpgradeResolvedModels,KnowledgeFSUpgradeSnapshotService,)from services.knowledge.dataset_access import AccessibleDataset, DatasetAccess, DatasetAccessDeniedErrorfrom services.knowledge.datasets.adapters import SQLAlchemyDatasetOperationsfrom services.knowledge.datasets.application import DatasetVisibilityfrom services.knowledge.datasets.upgrades import KnowledgeFSUpgradeUnavailableError, KnowledgeUpgradeApplicationService+from services.knowledge_fs.product_dto import (+ KnowledgeFSModelIntent,+ KnowledgeFSUpgradeModelChoice,+ KnowledgeFSUpgradeModelIssueResponse,+ KnowledgeFSUpgradeModelRecommendationResponse,+ KnowledgeFSUpgradeModelRecommendationsResponse,+ KnowledgeFSUpgradeModelsPayload,+)from tests.helpers.unit.services.knowledge_fs_services_a_fakes import UnusedSessionFactory, upgrade_jobCONTEXT = RequestContext("request", None, "account-1", "tenant-1")@@ -55,12 +69,23 @@ class FakeEnqueue:class FakeSnapshots:job: KnowledgeFSUpgradeJob | None = Nonejobs: list[KnowledgeFSUpgradeJob] = field(default_factory=list)- create_calls: list[dict[str, str]] = field(default_factory=list)+ create_calls: list[dict[str, object]] = field(default_factory=list)list_calls: list[dict[str, object]] = field(default_factory=list)retry_calls: list[dict[str, str]] = field(default_factory=list)+ def get_by_idempotency_key(self, *, tenant_id: str, idempotency_key: str) -> KnowledgeFSUpgradeJob | None:+ assert tenant_id == "tenant-1"+ assert idempotency_key == "upgrade-request-1"+ return None+def create(- self, *, tenant_id: str, dataset_id: str, requested_by_account_id: str, idempotency_key: str+ self,+ *,+ tenant_id: str,+ dataset_id: str,+ requested_by_account_id: str,+ idempotency_key: str,+ models: KnowledgeFSUpgradeResolvedModels,) -> KnowledgeFSUpgradeJob:self.create_calls.append({@@ -68,6 +93,7 @@ class FakeSnapshots:"dataset_id": dataset_id,"requested_by_account_id": requested_by_account_id,"idempotency_key": idempotency_key,+ "models": models,})assert self.job is not None@@ -86,10 +112,14 @@ class FakeSnapshots:def _service(- *, feature_enabled: bool = True, access: FakeDatasetAccess | None = None, enqueue: FakeEnqueue | None = None+ *,+ feature_enabled: bool = True,+ access: FakeDatasetAccess | None = None,+ enqueue: FakeEnqueue | None = None,+ session_factory: sessionmaker[Session] | None = None,) -> KnowledgeUpgradeApplicationService:return KnowledgeUpgradeApplicationService(- session_factory=cast("sessionmaker[Session]", UnusedSessionFactory()),+ session_factory=session_factory or cast("sessionmaker[Session]", UnusedSessionFactory()),dataset_access=cast(DatasetAccess, access or FakeDatasetAccess()),datasets=cast(SQLAlchemyDatasetOperations, FakeDatasets()),rbac_enabled=False,@@ -104,6 +134,152 @@ def _dataset(dataset_id: str) -> Dataset:return dataset+def test_load_model_preferences_reads_tenant_defaults_and_handles_invalid_legacy_settings(+ sqlite_session_factory: sessionmaker[Session],+) -> None:+ with sqlite_session_factory.begin() as session:+ dataset = Dataset(+ tenant_id="tenant-1",+ name="Legacy knowledge base",+ created_by="account-1",+ provider="vendor",+ embedding_model_provider="legacy-provider",+ embedding_model="legacy-embedding",+ retrieval_model={+ "reranking_model": {+ "reranking_provider_name": "legacy-rerank-provider",+ "reranking_model_name": "legacy-rerank",+ }+ },+ )+ session.add(dataset)+ session.flush()+ dataset_id = dataset.id+ session.add_all(+ [+ TenantDefaultModel(+ tenant_id="tenant-1",+ model_type=ModelType.TEXT_EMBEDDING,+ provider_name="default-embedding-provider",+ model_name="default-embedding",+ ),+ TenantDefaultModel(+ tenant_id="tenant-1",+ model_type=ModelType.RERANK,+ provider_name="default-rerank-provider",+ model_name="default-rerank",+ ),+ TenantDefaultModel(+ tenant_id="tenant-1",+ model_type=ModelType.LLM,+ provider_name="default-llm-provider",+ model_name="default-llm",+ ),+ TenantDefaultModel(+ tenant_id="tenant-2",+ model_type=ModelType.LLM,+ provider_name="other-tenant-provider",+ model_name="other-tenant-model",+ ),+ ]+ )++ service = _service(session_factory=sqlite_session_factory)+ provider, preferences = service._load_model_preferences(tenant_id="tenant-1", dataset_id=dataset_id)++ assert provider == "vendor"+ assert preferences.embedding == KnowledgeFSUpgradeModelChoice(provider="legacy-provider", model="legacy-embedding")+ assert preferences.rerank == KnowledgeFSUpgradeModelChoice(provider="legacy-rerank-provider", model="legacy-rerank")+ assert preferences.defaults == {+ ModelType.TEXT_EMBEDDING: KnowledgeFSUpgradeModelChoice(+ provider="default-embedding-provider", model="default-embedding"+ ),+ ModelType.RERANK: KnowledgeFSUpgradeModelChoice(provider="default-rerank-provider", model="default-rerank"),+ ModelType.LLM: KnowledgeFSUpgradeModelChoice(provider="default-llm-provider", model="default-llm"),+ }++ with sqlite_session_factory.begin() as session:+ persisted = session.get(Dataset, dataset_id)+ assert persisted is not None+ persisted.embedding_model_provider = None+ persisted.embedding_model = None+ persisted.retrieval_model = {"reranking_model": "invalid"}++ _, invalid_preferences = service._load_model_preferences(tenant_id="tenant-1", dataset_id=dataset_id)+ assert invalid_preferences.embedding is None+ assert invalid_preferences.rerank is None+ assert invalid_preferences.defaults == preferences.defaults+ with pytest.raises(KnowledgeFSUpgradeNotFoundError):+ service._load_model_preferences(tenant_id="tenant-2", dataset_id=dataset_id)+++def test_discovery_includes_recommendations_only_for_eligible_datasets(+ sqlite_session_factory: sessionmaker[Session],+) -> None:+ with sqlite_session_factory.begin() as session:+ dataset = Dataset(tenant_id="tenant-1", name="Legacy", created_by="account-1", provider="vendor")+ session.add(dataset)+ session.flush()+ dataset_id = dataset.id++ selection = KnowledgeFSUpgradeModelChoice(provider="default-provider", model="default-model")+ recommendation = KnowledgeFSUpgradeModelRecommendationResponse(+ value=selection, source="workspace_default", available=True+ )+ recommendations = KnowledgeFSUpgradeModelRecommendationsResponse(+ embedding=recommendation, rerank=recommendation, reasoning=recommendation+ )+ service = _service(session_factory=sqlite_session_factory)+ with (+ patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeSnapshotService") as snapshots,+ patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeModelResolver") as resolver,+ ):+ snapshots.return_value.get_latest.return_value = None+ resolver.return_value.recommend.return_value = recommendations++ available = service.discovery(CONTEXT, dataset_id=dataset_id)+ assert available.can_upgrade is True+ assert available.models == recommendations+ resolver.return_value.recommend.assert_called_once()++ with sqlite_session_factory.begin() as session:+ persisted = session.get(Dataset, dataset_id)+ assert persisted is not None+ persisted.provider = "external"++ blocked = service.discovery(CONTEXT, dataset_id=dataset_id)+ assert blocked.can_upgrade is False+ assert blocked.models is None+ resolver.return_value.recommend.assert_called_once()+++def test_start_rejects_reusing_an_idempotency_key_for_a_different_model_selection() -> None:+ enqueue = FakeEnqueue()+ service = _service(enqueue=enqueue)+ existing = upgrade_job(job_id="job-1", old_dataset_id="dataset-1")+ snapshots = FakeSnapshots(job=existing)+ choices = KnowledgeFSUpgradeModelsPayload(+ embedding=KnowledgeFSUpgradeModelChoice(provider="langgenius/openai/openai", model="embedding"),+ rerank=KnowledgeFSUpgradeModelChoice(provider="langgenius/cohere/cohere", model="rerank"),+ reasoning=KnowledgeFSUpgradeModelChoice(provider="langgenius/openai/openai", model="reasoning"),+ )++ with (+ patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeSnapshotService", return_value=snapshots),+ patch.object(snapshots, "get_by_idempotency_key", return_value=existing),+ ):+ with pytest.raises(KnowledgeFSUpgradeConflictError, match="model selection"):+ service.start(CONTEXT, dataset_id="dataset-1", idempotency_key="upgrade-request-1", models=choices)+ assert enqueue.calls == []+ assert snapshots.create_calls == []++ replay = service.start(CONTEXT, dataset_id="dataset-1", idempotency_key="upgrade-request-1")++ assert replay is existing+ assert len(enqueue.calls) == 1+ assert enqueue.calls[0][1:] == ("tenant-1", "job-1")++def test_start_is_unavailable_when_knowledge_fs_is_disabled() -> None:access = FakeDatasetAccess()service = _service(feature_enabled=False, access=access)@@ -133,8 +309,19 @@ def test_start_snapshots_and_enqueues_without_remote_work() -> None:enqueue = FakeEnqueue()service = _service(enqueue=enqueue)snapshots = FakeSnapshots(job=upgrade_job(job_id="job-1", old_dataset_id="dataset-1"))+ model_intent = KnowledgeFSModelIntent(plugin_id="langgenius/openai", provider="openai", model="chosen")+ resolved = KnowledgeFSUpgradeResolvedModels(embedding=model_intent, rerank=model_intent, reasoning=model_intent)- with patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeSnapshotService", return_value=snapshots):+ with (+ patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeSnapshotService", return_value=snapshots),+ patch.object(+ service,+ "_load_model_preferences",+ return_value=("vendor", KnowledgeFSUpgradeModelPreferences(embedding=None, rerank=None, defaults={})),+ ),+ patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeModelResolver") as resolver,+ ):+ resolver.return_value.resolve_recommendations.return_value = resolvedjob = service.start(CONTEXT, dataset_id="dataset-1", idempotency_key="upgrade-request-1")assert job.id == "job-1"@@ -144,11 +331,42 @@ def test_start_snapshots_and_enqueues_without_remote_work() -> None:"dataset_id": "dataset-1","requested_by_account_id": "account-1","idempotency_key": "upgrade-request-1",+ "models": resolved,}]assert enqueue.calls == [(snapshots, "tenant-1", "job-1")]+def test_start_rejects_unavailable_models_before_snapshot_or_enqueue() -> None:+ enqueue = FakeEnqueue()+ service = _service(enqueue=enqueue)+ snapshots = FakeSnapshots()+ choices = KnowledgeFSUpgradeModelsPayload(+ embedding=KnowledgeFSUpgradeModelChoice(provider="openai", model="missing-embedding"),+ rerank=KnowledgeFSUpgradeModelChoice(provider="cohere", model="rerank"),+ reasoning=KnowledgeFSUpgradeModelChoice(provider="anthropic", model="reasoning"),+ )+ issue = KnowledgeFSUpgradeModelIssueResponse(+ field="embedding", reason="not_found", provider="openai", model="missing-embedding"+ )++ with (+ patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeSnapshotService", return_value=snapshots),+ patch.object(+ service,+ "_load_model_preferences",+ return_value=("vendor", KnowledgeFSUpgradeModelPreferences(embedding=None, rerank=None, defaults={})),+ ),+ patch("services.knowledge.datasets.upgrades.KnowledgeFSUpgradeModelResolver") as resolver,+ ):+ resolver.return_value.validate.side_effect = KnowledgeFSUpgradeModelsUnavailableError([issue])+ with pytest.raises(KnowledgeFSUpgradeModelsUnavailableError):+ service.start(CONTEXT, dataset_id="dataset-1", idempotency_key="upgrade-request-1", models=choices)++ assert snapshots.create_calls == []+ assert enqueue.calls == []++def test_start_rejects_an_inaccessible_dataset() -> None:def deny(_context: RequestContext, _dataset_id: str) -> AccessibleDataset:raise DatasetAccessDeniedError()diff --git a/api/tests/unit_tests/services/test_dataset_knowledge_fs_upgrade_service.py b/api/tests/unit_tests/services/test_dataset_knowledge_fs_upgrade_service.pyindex 1ead3b8c6a8..d977becc0d5 100644--- a/api/tests/unit_tests/services/test_dataset_knowledge_fs_upgrade_service.py+++ b/api/tests/unit_tests/services/test_dataset_knowledge_fs_upgrade_service.py@@ -12,6 +12,7 @@ import pytestfrom sqlalchemy import selectfrom sqlalchemy.orm import Session, sessionmaker+from core.entities.model_entities import ModelStatusfrom extensions.storage.storage_type import StorageTypefrom graphon.model_runtime.entities.model_entities import ModelTypefrom libs.datetime_utils import naive_utc_now@@ -41,8 +42,12 @@ from services.dataset_knowledge_fs_upgrade_service import (KnowledgeFSUpgradeConflictError,KnowledgeFSUpgradeDocumentReconciler,KnowledgeFSUpgradeError,+ KnowledgeFSUpgradeModelPreferences,+ KnowledgeFSUpgradeModelResolver,+ KnowledgeFSUpgradeModelsUnavailableError,KnowledgeFSUpgradeNotFoundError,KnowledgeFSUpgradeNotReadyError,+ KnowledgeFSUpgradeResolvedModels,KnowledgeFSUpgradeRunner,KnowledgeFSUpgradeSnapshotService,)@@ -64,10 +69,13 @@ from services.knowledge_fs.product_dto import (KnowledgeFSLogicalDocumentResponse,KnowledgeFSMetadataFieldCreatePayload,KnowledgeFSMetadataFieldListResponse,+ KnowledgeFSModelIntent,KnowledgeFSResolvedDocumentReferenceResponse,KnowledgeFSSpaceCreatePayload,KnowledgeFSSpaceCreateResponse,KnowledgeFSStagedUploadResponse,+ KnowledgeFSUpgradeModelChoice,+ KnowledgeFSUpgradeModelsPayload,)from services.knowledge_fs.product_remote import KnowledgeFSProductResourceNotFoundErrorfrom tests.helpers.unit.services.knowledge_fs_services_a_fakes import CallRecorder, RecordedCall, UnusedSessionFactory@@ -178,6 +186,8 @@ class FakeModelProvider:class FakeActiveModel:provider: FakeModelProvidermodel: str+ status: ModelStatus = ModelStatus.ACTIVE+ deprecated: bool = False@dataclass@@ -185,8 +195,8 @@ class FakeProviderConfigurations:models_by_type: Mapping[ModelType, list[FakeActiveModel]]def get_models(self, *, model_type: ModelType, only_active: bool) -> list[FakeActiveModel]:- assert only_active is True- return self.models_by_type[model_type]+ models = self.models_by_type[model_type]+ return [model for model in models if model.status is ModelStatus.ACTIVE] if only_active else models@dataclass@@ -653,19 +663,40 @@ def test_snapshot_is_immutable_after_the_legacy_dataset_changes(owner_id = owner.iddataset_id = dataset.id+ models = KnowledgeFSUpgradeResolvedModels(+ embedding=KnowledgeFSModelIntent(plugin_id="langgenius/openai", provider="openai", model="selected-embedding"),+ rerank=KnowledgeFSModelIntent(plugin_id="langgenius/cohere", provider="cohere", model="selected-rerank"),+ reasoning=KnowledgeFSModelIntent(plugin_id="langgenius/anthropic", provider="anthropic", model="selected-llm"),+ )job = KnowledgeFSUpgradeSnapshotService(sqlite_session_factory).create(tenant_id=tenant_id,dataset_id=dataset_id,requested_by_account_id=owner_id,idempotency_key="immutable-snapshot",+ models=models,)replayed = KnowledgeFSUpgradeSnapshotService(sqlite_session_factory).create(tenant_id=tenant_id,dataset_id=dataset_id,requested_by_account_id=owner_id,idempotency_key="immutable-snapshot",+ models=models,)assert replayed.id == job.id+ with pytest.raises(KnowledgeFSUpgradeConflictError, match="model selection"):+ KnowledgeFSUpgradeSnapshotService(sqlite_session_factory).create(+ tenant_id=tenant_id,+ dataset_id=dataset_id,+ requested_by_account_id=owner_id,+ idempotency_key="immutable-snapshot",+ models=KnowledgeFSUpgradeResolvedModels(+ embedding=models.embedding,+ rerank=models.rerank,+ reasoning=KnowledgeFSModelIntent(+ plugin_id="langgenius/anthropic", provider="anthropic", model="different-llm"+ ),+ ),+ )with sqlite_session_factory.begin() as session:persisted_dataset = session.get(Dataset, dataset_id)persisted_document = session.get(Document, document.id)@@ -686,6 +717,16 @@ def test_snapshot_is_immutable_after_the_legacy_dataset_changes(assert persisted_job.config_snapshot["embedding_model"] == "text-embedding-3-large"assert persisted_job.config_snapshot["embedding_model_provider"] == "openai"assert persisted_job.config_snapshot["retrieval_model"] == {"top_k": 8, "reranking_enable": True}+ assert persisted_job.resolved_configuration is not None+ embedding_config = persisted_job.resolved_configuration["embedding"]+ retrieval_config = persisted_job.resolved_configuration["retrieval"]+ assert isinstance(embedding_config, dict)+ assert isinstance(retrieval_config, dict)+ reasoning_model = retrieval_config["reasoningModel"]+ assert isinstance(reasoning_model, dict)+ assert embedding_config["model"] == "selected-embedding"+ assert reasoning_model["model"] == "selected-llm"+ assert retrieval_config["topK"] == 8assert persisted_job.config_snapshot["enable_api"] is Trueassert persisted_job.config_snapshot["metadata_fields"] == [{"name": "department", "type": "string"}]assert snapshot_document.desired_enabled is False@@ -948,6 +989,190 @@ def _active_model(provider: str, model: str) -> FakeActiveModel:return FakeActiveModel(provider=FakeModelProvider(provider=provider), model=model)+def test_upgrade_model_recommendations_preserve_legacy_priority_and_show_unavailable_defaults(+ monkeypatch: pytest.MonkeyPatch,+) -> None:+ embedding = _active_model("langgenius/openai/openai", "legacy-embedding")+ rerank = _active_model("langgenius/cohere/cohere", "default-rerank")+ reasoning = FakeActiveModel(+ provider=FakeModelProvider(provider="langgenius/anthropic/anthropic"),+ model="default-llm",+ status=ModelStatus.CREDENTIAL_REMOVED,+ )+ manager = FakeProviderManager(+ configurations=FakeProviderConfigurations(+ {+ ModelType.TEXT_EMBEDDING: [embedding],+ ModelType.RERANK: [rerank],+ ModelType.LLM: [reasoning],+ }+ ),+ defaults={},+ )+ monkeypatch.setattr(upgrade_module, "create_plugin_provider_manager", lambda **_kwargs: manager)+ resolver = KnowledgeFSUpgradeModelResolver(tenant_id=_TENANT_ID)+ preferences = KnowledgeFSUpgradeModelPreferences(+ embedding=KnowledgeFSUpgradeModelChoice(provider="openai", model="legacy-embedding"),+ rerank=KnowledgeFSUpgradeModelChoice(provider="cohere", model="old-rerank"),+ defaults={+ ModelType.TEXT_EMBEDDING: KnowledgeFSUpgradeModelChoice(provider="openai", model="default-embedding"),+ ModelType.RERANK: KnowledgeFSUpgradeModelChoice(provider="cohere", model="default-rerank"),+ ModelType.LLM: KnowledgeFSUpgradeModelChoice(provider="anthropic", model="default-llm"),+ },+ )++ recommendations = resolver.recommend(preferences)++ assert recommendations.embedding.value == preferences.embedding+ assert recommendations.embedding.source == "legacy"+ assert recommendations.rerank.value == preferences.defaults[ModelType.RERANK]+ assert recommendations.rerank.source == "workspace_default"+ assert recommendations.reasoning.available is False+ assert recommendations.reasoning.unavailable_reason == "credential-removed"+ with pytest.raises(KnowledgeFSUpgradeModelsUnavailableError) as error:+ resolver.resolve_recommendations(preferences)+ assert [(issue.field, issue.reason) for issue in error.value.issues] == [("reasoning", "credential-removed")]+++def test_upgrade_model_recommendations_resolve_active_workspace_defaults(+ monkeypatch: pytest.MonkeyPatch,+) -> None:+ models = {+ ModelType.TEXT_EMBEDDING: _active_model("langgenius/openai/openai", "default-embedding"),+ ModelType.RERANK: _active_model("langgenius/cohere/cohere", "default-rerank"),+ ModelType.LLM: _active_model("langgenius/anthropic/anthropic", "default-reasoning"),+ }+ manager = FakeProviderManager(+ configurations=FakeProviderConfigurations({model_type: [model] for model_type, model in models.items()}),+ defaults=models,+ )+ monkeypatch.setattr(upgrade_module, "create_plugin_provider_manager", lambda **_kwargs: manager)+ preferences = KnowledgeFSUpgradeModelPreferences(+ embedding=None,+ rerank=None,+ defaults={+ model_type: KnowledgeFSUpgradeModelChoice(provider=model.provider.provider, model=model.model)+ for model_type, model in models.items()+ },+ )++ resolved = KnowledgeFSUpgradeModelResolver(tenant_id=_TENANT_ID).resolve_recommendations(preferences)++ assert resolved.embedding.model == "default-embedding"+ assert resolved.rerank.model == "default-rerank"+ assert resolved.reasoning.model == "default-reasoning"+++ ("status", "expected_reason"),+ [+ (ModelStatus.NO_CONFIGURE, "no-configure"),+ (ModelStatus.NO_PERMISSION, "no-permission"),+ (ModelStatus.DISABLED, "disabled"),+ ],+)+def test_upgrade_model_validation_reports_unavailable_provider_status(+ monkeypatch: pytest.MonkeyPatch, status: ModelStatus, expected_reason: str+) -> None:+ embedding = FakeActiveModel(+ provider=FakeModelProvider(provider="langgenius/openai/openai"), model="embedding", status=status+ )+ manager = FakeProviderManager(+ configurations=FakeProviderConfigurations(+ {+ ModelType.TEXT_EMBEDDING: [embedding],+ ModelType.RERANK: [_active_model("langgenius/cohere/cohere", "rerank")],+ ModelType.LLM: [_active_model("langgenius/anthropic/anthropic", "reasoning")],+ }+ ),+ defaults={},+ )+ monkeypatch.setattr(upgrade_module, "create_plugin_provider_manager", lambda **_kwargs: manager)+ choices = KnowledgeFSUpgradeModelsPayload(+ embedding=KnowledgeFSUpgradeModelChoice(provider="openai", model="embedding"),+ rerank=KnowledgeFSUpgradeModelChoice(provider="cohere", model="rerank"),+ reasoning=KnowledgeFSUpgradeModelChoice(provider="anthropic", model="reasoning"),+ )++ with pytest.raises(KnowledgeFSUpgradeModelsUnavailableError) as error:+ KnowledgeFSUpgradeModelResolver(tenant_id=_TENANT_ID).validate(choices)++ assert [(issue.field, issue.reason) for issue in error.value.issues] == [("embedding", expected_reason)]+++def test_upgrade_model_validation_reports_each_unavailable_field(+ monkeypatch: pytest.MonkeyPatch,+) -> None:+ embedding = _active_model("langgenius/openai/openai", "embedding")+ rerank = FakeActiveModel(+ provider=FakeModelProvider(provider="langgenius/cohere/cohere"), model="rerank", deprecated=True+ )+ reasoning = FakeActiveModel(+ provider=FakeModelProvider(provider="langgenius/anthropic/anthropic"),+ model="reasoning",+ status=ModelStatus.QUOTA_EXCEEDED,+ )+ manager = FakeProviderManager(+ configurations=FakeProviderConfigurations(+ {+ ModelType.TEXT_EMBEDDING: [embedding],+ ModelType.RERANK: [rerank],+ ModelType.LLM: [reasoning],+ }+ ),+ defaults={},+ )+ monkeypatch.setattr(upgrade_module, "create_plugin_provider_manager", lambda **_kwargs: manager)+ resolver = KnowledgeFSUpgradeModelResolver(tenant_id=_TENANT_ID)++ with pytest.raises(KnowledgeFSUpgradeModelsUnavailableError) as error:+ resolver.validate(+ KnowledgeFSUpgradeModelsPayload(+ embedding=KnowledgeFSUpgradeModelChoice(provider="langgenius/cohere/cohere", model="rerank"),+ rerank=KnowledgeFSUpgradeModelChoice(provider="cohere", model="rerank"),+ reasoning=KnowledgeFSUpgradeModelChoice(provider="anthropic", model="reasoning"),+ )+ )++ assert [(issue.field, issue.reason) for issue in error.value.issues] == [+ ("embedding", "not_found"),+ ("rerank", "deprecated"),+ ("reasoning", "quota-exceeded"),+ ]+++def test_upgrade_model_validation_keeps_the_explicit_active_choices(monkeypatch: pytest.MonkeyPatch) -> None:+ manager = FakeProviderManager(+ configurations=FakeProviderConfigurations(+ {+ ModelType.TEXT_EMBEDDING: [_active_model("langgenius/openai/openai", "chosen-embedding")],+ ModelType.RERANK: [_active_model("langgenius/cohere/cohere", "chosen-rerank")],+ ModelType.LLM: [_active_model("langgenius/anthropic/anthropic", "chosen-llm")],+ }+ ),+ defaults={},+ )+ monkeypatch.setattr(upgrade_module, "create_plugin_provider_manager", lambda **_kwargs: manager)++ resolved = KnowledgeFSUpgradeModelResolver(tenant_id=_TENANT_ID).validate(+ KnowledgeFSUpgradeModelsPayload(+ embedding=KnowledgeFSUpgradeModelChoice(provider="openai", model="chosen-embedding"),+ rerank=KnowledgeFSUpgradeModelChoice(provider="cohere", model="chosen-rerank"),+ reasoning=KnowledgeFSUpgradeModelChoice(provider="anthropic", model="chosen-llm"),+ )+ )++ assert resolved.embedding == KnowledgeFSModelIntent(+ plugin_id="langgenius/openai", provider="openai", model="chosen-embedding"+ )+ assert resolved.rerank == KnowledgeFSModelIntent(+ plugin_id="langgenius/cohere", provider="cohere", model="chosen-rerank"+ )+ assert resolved.reasoning == KnowledgeFSModelIntent(+ plugin_id="langgenius/anthropic", provider="anthropic", model="chosen-llm"+ )++def test_configuration_prefers_active_legacy_models_and_uses_default_reasoning(monkeypatch: pytest.MonkeyPatch,) -> None:@@ -1254,6 +1479,7 @@ def test_runner_creates_space_and_advances_after_activation(stage=KnowledgeFSUpgradeStage.VALIDATING,total_sources=1,config_snapshot={"name": "Legacy", "description": "Description", "icon": "book"},+ resolved_configuration=_resolved_configuration(),)with sqlite_session_factory.begin() as session:session.add(job)@@ -1268,7 +1494,7 @@ def test_runner_creates_space_and_advances_after_activation()))- monkeypatch.setattr(upgrade_module, "_resolve_configuration", lambda _job: _resolved_configuration())+ monkeypatch.setattr(upgrade_module, "_resolve_configuration", lambda _job: pytest.fail("models were reselected"))monkeypatch.setattr(upgrade_module,"get_knowledge_fs_runtime",diff --git a/oxlint-suppressions.json b/oxlint-suppressions.jsonindex 9136a54a93d..db3e7351966 100644--- a/oxlint-suppressions.json+++ b/oxlint-suppressions.json@@ -6731,11 +6731,6 @@"count": 2}},- "web/features/new-rag/upgrade/knowledge-upgrade-dialog.tsx": {- "better-tailwindcss/enforce-logical-properties": {- "count": 1- }- },"web/features/new-rag/upload/file-list.tsx": {"better-tailwindcss/enforce-logical-properties": {"count": 3diff --git a/packages/contracts/generated/api/console/datasets/errors.gen.ts b/packages/contracts/generated/api/console/datasets/errors.gen.tsindex 0d3187d69a4..88017af15ff 100644--- a/packages/contracts/generated/api/console/datasets/errors.gen.ts+++ b/packages/contracts/generated/api/console/datasets/errors.gen.ts@@ -130,6 +130,37 @@ const zCompletionRequestError = /* @__PURE__ */ (() =>}),))()+const zKnowledgeFsUpgradeModelIssueResponse = /* @__PURE__ */ (() =>+ z.object({+ field: z.enum(['embedding', 'reasoning', 'rerank']),+ model: z.string().nullish(),+ provider: z.string().nullish(),+ reason: z.enum([+ 'credential-removed',+ 'deprecated',+ 'disabled',+ 'missing',+ 'no-configure',+ 'no-permission',+ 'not_found',+ 'quota-exceeded',+ ]),+ }))()++const zKnowledgeFsUpgradeModelErrorDetailsResponse = /* @__PURE__ */ (() =>+ z.object({+ issues: z.array(zKnowledgeFsUpgradeModelIssueResponse).min(1).max(3),+ }))()++const zKnowledgeFsUpgradeModelsUnavailableError = /* @__PURE__ */ (() =>+ zErrorResponse.and(+ z.object({+ code: z.literal('knowledge_fs_upgrade_models_unavailable'),+ details: zKnowledgeFsUpgradeModelErrorDetailsResponse.optional(),+ status: z.literal(422),+ }),+ ))()+export const postErrors = { max_keys_exceeded: { status: 400, data: zMaxKeysExceededError } }export const post2Errors = {@@ -254,6 +285,13 @@ export const post17Errors = {provider_quota_exceeded: { status: 400, data: zProviderQuotaExceededError },}+export const post19Errors = {+ knowledge_fs_upgrade_models_unavailable: {+ status: 422,+ data: zKnowledgeFsUpgradeModelsUnavailableError,+ },+}+export const get31Errors = {dataset_access_denied: { status: 403, data: zDatasetAccessDeniedError },}diff --git a/packages/contracts/generated/api/console/datasets/orpc.gen.ts b/packages/contracts/generated/api/console/datasets/orpc.gen.tsindex d214ae69c73..c402010a84c 100644--- a/packages/contracts/generated/api/console/datasets/orpc.gen.ts+++ b/packages/contracts/generated/api/console/datasets/orpc.gen.ts@@ -14,6 +14,7 @@ import {zIndexingEstimateError,zInvalidActionError,zInvalidMetadataError,+ zKnowledgeFsUpgradeModelsUnavailableError,zMaxKeysExceededError,zModelCurrentlyNotSupportError,zProviderNotInitializeError,@@ -183,6 +184,7 @@ import {zPostDatasetsByDatasetIdHitTestingBody,zPostDatasetsByDatasetIdHitTestingPath,zPostDatasetsByDatasetIdHitTestingResponse,+ zPostDatasetsByDatasetIdKnowledgeFsUpgradesBody,zPostDatasetsByDatasetIdKnowledgeFsUpgradesByJobIdPath,zPostDatasetsByDatasetIdKnowledgeFsUpgradesByJobIdResponse,zPostDatasetsByDatasetIdKnowledgeFsUpgradesHeaders,@@ -1566,11 +1568,18 @@ export const post19 = oc}).input(z.object({+ body: zPostDatasetsByDatasetIdKnowledgeFsUpgradesBody,headers: zPostDatasetsByDatasetIdKnowledgeFsUpgradesHeaders,params: zPostDatasetsByDatasetIdKnowledgeFsUpgradesPath,}),).output(zPostDatasetsByDatasetIdKnowledgeFsUpgradesResponse)+ .errors({+ knowledge_fs_upgrade_models_unavailable: {+ status: 422,+ data: zKnowledgeFsUpgradeModelsUnavailableError,+ },+ })export const knowledgeFsUpgrades = {get: get29,diff --git a/packages/contracts/generated/api/console/datasets/types.gen.ts b/packages/contracts/generated/api/console/datasets/types.gen.tsindex 986fe050bc4..6354540cadd 100644--- a/packages/contracts/generated/api/console/datasets/types.gen.ts+++ b/packages/contracts/generated/api/console/datasets/types.gen.ts@@ -638,11 +638,16 @@ export type CompletionRequestError = ErrorResponse & {status: 400}-export type KnowledgeFsUpgradeDiscoveryResponse = {+export type KnowledgeFsUpgradePreparationResponse = {block_reason?: KnowledgeFsUpgradeBlockReason | nullcan_retry: booleancan_upgrade: booleanjob?: KnowledgeFsUpgradeJobResponse | null+ models?: KnowledgeFsUpgradeModelRecommendationsResponse | null+}++export type KnowledgeFsUpgradeStartPayload = {+ models?: KnowledgeFsUpgradeModelsPayload | null}export type KnowledgeFsUpgradeJobResponse = {@@ -661,6 +666,12 @@ export type KnowledgeFsUpgradeJobResponse = {total_sources: number}+export type KnowledgeFsUpgradeModelsUnavailableError = ErrorResponse & {+ code: 'knowledge_fs_upgrade_models_unavailable'+ details?: KnowledgeFsUpgradeModelErrorDetailsResponse+ status: 422+}+export type KnowledgeFsUpgradeRetryResponse = {id: stringstatus?: 'queued'@@ -1046,6 +1057,18 @@ export type KnowledgeFsUpgradeBlockReason =| 'unsupported_dataset_provider'| 'upgrade_in_progress'+export type KnowledgeFsUpgradeModelRecommendationsResponse = {+ embedding: KnowledgeFsUpgradeModelRecommendationResponse+ reasoning: KnowledgeFsUpgradeModelRecommendationResponse+ rerank: KnowledgeFsUpgradeModelRecommendationResponse+}++export type KnowledgeFsUpgradeModelsPayload = {+ embedding: KnowledgeFsUpgradeModelChoice+ reasoning: KnowledgeFsUpgradeModelChoice+ rerank: KnowledgeFsUpgradeModelChoice+}+export type KnowledgeFsUpgradeStage =| 'completed'| 'creating_sources'@@ -1057,6 +1080,10 @@ export type KnowledgeFsUpgradeStage =export type KnowledgeFsUpgradeJobStatus = 'failed' | 'queued' | 'running' | 'succeeded'+export type KnowledgeFsUpgradeModelErrorDetailsResponse = {+ issues: Array<KnowledgeFsUpgradeModelIssueResponse>+}+export type DatasetMetadataListItemResponse = {count?: numberid: string@@ -1085,6 +1112,13 @@ export type RelatedAppResponse = {name: string}+export type KnowledgeFsUpgradeDiscoveryResponse = {+ block_reason?: KnowledgeFsUpgradeBlockReason | null+ can_retry: boolean+ can_upgrade: boolean+ job?: KnowledgeFsUpgradeJobResponse | null+}+export type DatasetRerankingModelResponse = {reranking_model_name?: string | nullreranking_provider_name?: string | null@@ -1215,6 +1249,42 @@ export type HitTestingSegment = {word_count: number}+export type KnowledgeFsUpgradeModelRecommendationResponse = {+ available: boolean+ source: 'legacy' | 'workspace_default' | null+ unavailable_reason?:+ | 'credential-removed'+ | 'deprecated'+ | 'disabled'+ | 'missing'+ | 'no-configure'+ | 'no-permission'+ | 'not_found'+ | 'quota-exceeded'+ | null+ value: KnowledgeFsUpgradeModelChoice | null+}++export type KnowledgeFsUpgradeModelChoice = {+ model: string+ provider: string+}++export type KnowledgeFsUpgradeModelIssueResponse = {+ field: 'embedding' | 'reasoning' | 'rerank'+ model?: string | null+ provider?: string | null+ reason:+ | 'credential-removed'+ | 'deprecated'+ | 'disabled'+ | 'missing'+ | 'no-configure'+ | 'no-permission'+ | 'not_found'+ | 'quota-exceeded'+}+export type CreatorUserRole = 'account' | 'dataset_api_key' | 'end_user'export type DatasetQueryContentResponse = {@@ -3011,14 +3081,14 @@ export type GetDatasetsByDatasetIdKnowledgeFsUpgradesError =GetDatasetsByDatasetIdKnowledgeFsUpgradesErrors[keyof GetDatasetsByDatasetIdKnowledgeFsUpgradesErrors]export type GetDatasetsByDatasetIdKnowledgeFsUpgradesResponses = {- 200: KnowledgeFsUpgradeDiscoveryResponse+ 200: KnowledgeFsUpgradePreparationResponse}export type GetDatasetsByDatasetIdKnowledgeFsUpgradesResponse =GetDatasetsByDatasetIdKnowledgeFsUpgradesResponses[keyof GetDatasetsByDatasetIdKnowledgeFsUpgradesResponses]export type PostDatasetsByDatasetIdKnowledgeFsUpgradesData = {- body?: never+ body: KnowledgeFsUpgradeStartPayloadheaders: {'Idempotency-Key': string}@@ -3030,6 +3100,7 @@ export type PostDatasetsByDatasetIdKnowledgeFsUpgradesData = {}export type PostDatasetsByDatasetIdKnowledgeFsUpgradesErrors = {+ 422: KnowledgeFsUpgradeModelsUnavailableError | ErrorResponsedefault: ErrorResponse}diff --git a/packages/contracts/generated/api/console/datasets/zod.gen.ts b/packages/contracts/generated/api/console/datasets/zod.gen.tsindex 7b65faf37af..636b949a454 100644--- a/packages/contracts/generated/api/console/datasets/zod.gen.ts+++ b/packages/contracts/generated/api/console/datasets/zod.gen.ts@@ -931,16 +931,6 @@ export const zKnowledgeFsUpgradeJobListResponse = z.object({data: z.array(zKnowledgeFsUpgradeJobResponse),})-/**- * KnowledgeFSUpgradeDiscoveryResponse- */-export const zKnowledgeFsUpgradeDiscoveryResponse = z.object({- block_reason: zKnowledgeFsUpgradeBlockReason.nullish(),- can_retry: z.boolean(),- can_upgrade: z.boolean(),- job: zKnowledgeFsUpgradeJobResponse.nullish(),-})-/*** DatasetMetadataListItemResponse*/@@ -959,6 +949,16 @@ export const zDatasetMetadataListResponse = z.object({doc_metadata: z.array(zDatasetMetadataListItemResponse),})+/**+ * KnowledgeFSUpgradeDiscoveryResponse+ */+export const zKnowledgeFsUpgradeDiscoveryResponse = z.object({+ block_reason: zKnowledgeFsUpgradeBlockReason.nullish(),+ can_retry: z.boolean(),+ can_upgrade: z.boolean(),+ job: zKnowledgeFsUpgradeJobResponse.nullish(),+})+/*** DatasetRerankingModelResponse*/@@ -1168,6 +1168,110 @@ export const zHitTestingFile = z.object({source_url: z.string(),})+/**+ * KnowledgeFSUpgradeModelChoice+ */+export const zKnowledgeFsUpgradeModelChoice = z.object({+ model: z.string().min(1).max(255),+ provider: z.string().min(1).max(255),+})++/**+ * KnowledgeFSUpgradeModelsPayload+ */+export const zKnowledgeFsUpgradeModelsPayload = z.object({+ embedding: zKnowledgeFsUpgradeModelChoice,+ reasoning: zKnowledgeFsUpgradeModelChoice,+ rerank: zKnowledgeFsUpgradeModelChoice,+})++/**+ * KnowledgeFSUpgradeStartPayload+ */+export const zKnowledgeFsUpgradeStartPayload = z.object({+ models: zKnowledgeFsUpgradeModelsPayload.nullish(),+})++/**+ * KnowledgeFSUpgradeModelRecommendationResponse+ */+export const zKnowledgeFsUpgradeModelRecommendationResponse = z.object({+ available: z.boolean(),+ source: z.enum(['legacy', 'workspace_default']).nullable(),+ unavailable_reason: z+ .enum([+ 'credential-removed',+ 'deprecated',+ 'disabled',+ 'missing',+ 'no-configure',+ 'no-permission',+ 'not_found',+ 'quota-exceeded',+ ])+ .nullish(),+ value: zKnowledgeFsUpgradeModelChoice.nullable(),+})++/**+ * KnowledgeFSUpgradeModelRecommendationsResponse+ */+export const zKnowledgeFsUpgradeModelRecommendationsResponse = z.object({+ embedding: zKnowledgeFsUpgradeModelRecommendationResponse,+ reasoning: zKnowledgeFsUpgradeModelRecommendationResponse,+ rerank: zKnowledgeFsUpgradeModelRecommendationResponse,+})++/**+ * KnowledgeFSUpgradePreparationResponse+ */+export const zKnowledgeFsUpgradePreparationResponse = z.object({+ block_reason: zKnowledgeFsUpgradeBlockReason.nullish(),+ can_retry: z.boolean(),+ can_upgrade: z.boolean(),+ job: zKnowledgeFsUpgradeJobResponse.nullish(),+ models: zKnowledgeFsUpgradeModelRecommendationsResponse.nullish(),+})++/**+ * KnowledgeFSUpgradeModelIssueResponse+ */+export const zKnowledgeFsUpgradeModelIssueResponse = z.object({+ field: z.enum(['embedding', 'reasoning', 'rerank']),+ model: z.string().nullish(),+ provider: z.string().nullish(),+ reason: z.enum([+ 'credential-removed',+ 'deprecated',+ 'disabled',+ 'missing',+ 'no-configure',+ 'no-permission',+ 'not_found',+ 'quota-exceeded',+ ]),+})++/**+ * KnowledgeFSUpgradeModelErrorDetailsResponse+ */+export const zKnowledgeFsUpgradeModelErrorDetailsResponse = z.object({+ issues: z.array(zKnowledgeFsUpgradeModelIssueResponse).min(1).max(3),+})++/**+ * KnowledgeFsUpgradeModelsUnavailableError+ *+ * One or more selected upgrade models are unavailable.+ */+export const zKnowledgeFsUpgradeModelsUnavailableError = zErrorResponse.and(+ z.object({+ code: z.literal('knowledge_fs_upgrade_models_unavailable'),+ details: zKnowledgeFsUpgradeModelErrorDetailsResponse.optional(),+ status: z.literal(422),+ }),+)+/*** CreatorUserRole*/@@ -2646,7 +2750,9 @@ export const zGetDatasetsByDatasetIdKnowledgeFsUpgradesPath = z.object({* Upgrade availability from the Classic Knowledge Base to an Agent Knowledge Base*/export const zGetDatasetsByDatasetIdKnowledgeFsUpgradesResponse =- zKnowledgeFsUpgradeDiscoveryResponse+ zKnowledgeFsUpgradePreparationResponse++export const zPostDatasetsByDatasetIdKnowledgeFsUpgradesBody = zKnowledgeFsUpgradeStartPayloadexport const zPostDatasetsByDatasetIdKnowledgeFsUpgradesHeaders = z.object({'Idempotency-Key': z.string().min(8).max(255),diff --git a/packages/contracts/generated/api/console/errors.gen.ts b/packages/contracts/generated/api/console/errors.gen.tsindex a76961cb811..89f30deea20 100644--- a/packages/contracts/generated/api/console/errors.gen.ts+++ b/packages/contracts/generated/api/console/errors.gen.ts@@ -371,6 +371,7 @@ export { post18Errors as 'POST /knowledge-fs/spaces/{control_space_id}/query-strexport { post18Errors as 'POST /rag/pipelines/{pipeline_id}/workflows/published/datasource/nodes/{node_id}/run' } from './rag/errors.gen.ts'export { post19Errors as 'POST /agent/{agent_id}/trace' } from './agent/errors.gen.ts'export { post19Errors as 'POST /apps/{app_id}/audio-to-text' } from './apps/errors.gen.ts'+export { post19Errors as 'POST /datasets/{dataset_id}/knowledge-fs-upgrades' } from './datasets/errors.gen.ts'export { post19Errors as 'POST /knowledge-fs/spaces/{control_space_id}/research-tasks/plan' } from './knowledge-fs/errors.gen.ts'export { post19Errors as 'POST /rag/pipelines/{pipeline_id}/workflows/published/run' } from './rag/errors.gen.ts'export { post20Errors as 'POST /agent/{agent_id}/trace-config' } from './agent/errors.gen.ts'diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.spec.tsxindex ab81f653213..8ba95f4e1b0 100644--- a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.spec.tsx+++ b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.spec.tsx@@ -7,8 +7,10 @@ import userEvent from '@testing-library/user-event'import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'import { KnowledgeUpgradeProvider } from '@/features/new-rag/upgrade/knowledge-upgrade-context'import { consoleQuery } from '@/service/console'+import { seedModelProviderQueries } from '@/test/console/model-provider'import { createConsoleQueryClient, renderWithConsoleQuery } from '@/test/console/query-data'import { createDatasetFixture } from '@/test/fixtures/dataset'+import { QueryTestingAdapter } from '@/test/query-state-testing-adapter'import { DatasetACLPermission } from '@/utils/permission'import OperationsMenu from '../operations-menu'@@ -16,6 +18,7 @@ let mockIsRbacEnabled = trueconst render = (ui: Parameters<typeof renderWithConsoleQuery>[0]) => {const queryClient = createConsoleQueryClient()+ seedModelProviderQueries(queryClient)const discoveryOptions = consoleQuery.datasets.byDatasetId.knowledgeFsUpgrades.get.queryOptions({input: { params: { dataset_id: 'dataset-1' } },})@@ -26,7 +29,7 @@ const render = (ui: Parameters<typeof renderWithConsoleQuery>[0]) => {job: null,})- return renderWithConsoleQuery(ui, {+ return renderWithConsoleQuery(<QueryTestingAdapter>{ui}</QueryTestingAdapter>, {queryClient,accountProfile: { id: 'user-1' },workspacePermissionKeys: [],diff --git a/web/features/new-rag/create/model-settings.tsx b/web/features/new-rag/create/model-settings.tsxindex 9aea0a2a315..e02285b899f 100644--- a/web/features/new-rag/create/model-settings.tsx+++ b/web/features/new-rag/create/model-settings.tsx@@ -1,6 +1,7 @@import type { Ref } from 'react'-import type { useCreationModels } from './use-creation-models'+import type { CreationModelFieldState, useCreationModels } from './use-creation-models'import { Button } from '@langgenius/dify-ui/button'+import { cn } from '@langgenius/dify-ui/cn'import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from '@langgenius/dify-ui/collapsible'import { useEffect, useId, useRef } from 'react'import { useTranslation } from 'react-i18next'@@ -8,20 +9,23 @@ import { ModelSelector } from '@/app/components/header/account-setting/model-protype CreationModels = ReturnType<typeof useCreationModels>-function CreationModelField({+export function CreationModelField({field,label,requiredMessage,disabled,onChange,triggerRef,+ inline = false,}: {- field: CreationModels['fields']['reasoning']+ field: CreationModelFieldStatelabel: stringrequiredMessage: stringdisabled: booleanonChange: () => voidtriggerRef?: Ref<HTMLButtonElement>+ /** Puts the label beside the selector for compact forms such as dialogs. */+ inline?: boolean}) {const { t } = useTranslation(['knowledgeCreate', 'common', 'modelProvider'])const labelId = useId()@@ -48,7 +52,13 @@ function CreationModelField({: undefinedreturn (- <div className="flex min-w-0 flex-col gap-1.5">+ <div+ className={+ inline+ ? 'grid min-w-0 grid-cols-[8.5rem_minmax(0,1fr)] items-center gap-x-3 gap-y-1'+ : 'flex min-w-0 flex-col gap-1.5'+ }+ ><div id={labelId} className="system-sm-medium text-text-secondary">{label}<span aria-hidden className="ms-0.5 text-text-destructive">@@ -72,7 +82,10 @@ function CreationModelField({}}/>{error && (- <p id={errorId} className="system-xs-regular text-text-destructive">+ <p+ id={errorId}+ className={cn('system-xs-regular text-text-destructive', inline && 'col-start-2')}+ >{error}</p>)}@@ -80,7 +93,7 @@ function CreationModelField({<Buttontype="button"size="small"- className="self-start"+ className={cn('self-start', inline && 'col-start-2 justify-self-start')}loading={field.refreshing}disabled={disabled}onClick={() => void field.retry()}diff --git a/web/features/new-rag/create/use-creation-models.ts b/web/features/new-rag/create/use-creation-models.tsindex b708c413d6d..65e0fcf16cc 100644--- a/web/features/new-rag/create/use-creation-models.ts+++ b/web/features/new-rag/create/use-creation-models.ts@@ -1,4 +1,7 @@-import type { ModelStatus } from '@dify/contracts/api/console/workspaces/types.gen'+import type {+ ModelStatus,+ ProviderWithModelsResponse,+} from '@dify/contracts/api/console/workspaces/types.gen'import type { ModelSelectorValue } from '@/app/components/header/account-setting/model-provider-page/model-selector/types'import { useQuery } from '@tanstack/react-query'import { useState } from 'react'@@ -10,9 +13,37 @@ export type CreationModelSelections = {rerank: ModelSelectorValue}-type CreationModelIssue = Exclude<ModelStatus, 'active'> | 'missing' | 'load-error' | 'unavailable'+export type CreationModelIssue =+ | Exclude<ModelStatus, 'active'>+ | 'missing'+ | 'load-error'+ | 'unavailable'-function useCreationModel(modelType: 'llm' | 'text-embedding' | 'rerank') {+export type CreationModelType = 'llm' | 'text-embedding' | 'rerank'++export type CreationModelFieldState = {+ issue: CreationModelIssue | undefined+ models: ProviderWithModelsResponse[]+ pending: boolean+ refreshing: boolean+ retry: () => Promise<unknown>+ setSelection: (value: ModelSelectorValue | undefined) => void+ value: ModelSelectorValue | undefined+}++export function modelIssueFromCatalog(+ models: ProviderWithModelsResponse[],+ value: ModelSelectorValue | undefined,+): CreationModelIssue | undefined {+ if (!value) return 'missing'+ const currentModel = models+ .find((provider) => provider.provider === value.provider)+ ?.models.find((model) => model.model === value.model)+ if (!currentModel) return 'unavailable'+ return currentModel.status === 'active' ? undefined : currentModel.status+}++function useCreationModel(modelType: CreationModelType): CreationModelFieldState {const [selection, setSelection] = useState<ModelSelectorValue>()const defaultModel = useQuery(consoleQuery.workspaces.current.defaultModel.get.queryOptions({@@ -30,21 +61,12 @@ function useCreationModel(modelType: 'llm' | 'text-embedding' | 'rerank') {const value = selection ?? defaultModel.dataconst models = catalog.data ?? []const pending = catalog.isPending || (!selection && defaultModel.isPending)- const currentModel = models- .find((provider) => provider.provider === value?.provider)- ?.models.find((model) => model.model === value?.model)const issue: CreationModelIssue | undefined =catalog.isError || (!selection && defaultModel.isError)? 'load-error': pending? undefined- : !value- ? 'missing'- : !currentModel- ? 'unavailable'- : currentModel.status === 'active'- ? undefined- : currentModel.status+ : modelIssueFromCatalog(models, value)return {issue,diff --git a/web/features/new-rag/upgrade/__tests__/knowledge-upgrade-dialog.spec.tsx b/web/features/new-rag/upgrade/__tests__/knowledge-upgrade-dialog.spec.tsxindex fbe422062e5..a5386ef70d7 100644--- a/web/features/new-rag/upgrade/__tests__/knowledge-upgrade-dialog.spec.tsx+++ b/web/features/new-rag/upgrade/__tests__/knowledge-upgrade-dialog.spec.tsx@@ -1,12 +1,23 @@-import type { KnowledgeFsUpgradeJobResponse } from '@dify/contracts/api/console/datasets/types.gen'+import type {+ KnowledgeFsUpgradeJobResponse,+ KnowledgeFsUpgradePreparationResponse,+} from '@dify/contracts/api/console/datasets/types.gen'+import { ORPCError } from '@orpc/client'import { screen, waitFor } from '@testing-library/react'import userEvent from '@testing-library/user-event'-import { renderWithConsoleQuery } from '@/test/console/query-data'+import {+ createCatalogModelFixture,+ createModelCatalogFixture,+ seedModelProviderQueries,+} from '@/test/console/model-provider'+import { createConsoleQueryClient, renderWithConsoleQuery } from '@/test/console/query-data'import { createDatasetFixture } from '@/test/fixtures/dataset'+import { QueryTestingAdapter } from '@/test/query-state-testing-adapter'import { KnowledgeUpgradeDialog } from '../knowledge-upgrade-dialog'const startUpgradeMock = vi.hoisted(() => vi.fn())const discoverUpgradeMock = vi.hoisted(() => vi.fn())+const getModelsMock = vi.hoisted(() => vi.fn())vi.mock('@/service/console', async (importOriginal) => {const actual = await importOriginal<typeof import('@/service/console')>()@@ -16,6 +27,7 @@ vi.mock('@/service/console', async (importOriginal) => {consoleQuery: withConsoleResponses(actual.consoleQuery, {'datasets.byDatasetId.knowledgeFsUpgrades.get': discoverUpgradeMock,'datasets.byDatasetId.knowledgeFsUpgrades.post': startUpgradeMock,+ 'workspaces.current.models.modelTypes.byModelType.get': getModelsMock,}),}})@@ -34,21 +46,100 @@ const job = {total_sources: 0,} satisfies KnowledgeFsUpgradeJobResponse+const modelCatalogs = [+ createModelCatalogFixture({+ provider: 'langgenius/openai/openai',+ models: [+ ...['gpt-4o', 'gpt-4o-mini'].map((model) =>+ createCatalogModelFixture({ model, label: { en_US: model }, model_type: 'llm' }),+ ),+ createCatalogModelFixture({+ model: 'text-embedding-3-small',+ label: { en_US: 'text-embedding-3-small' },+ model_type: 'text-embedding',+ }),+ ],+ }),+ createModelCatalogFixture({+ provider: 'langgenius/cohere/cohere',+ models: ['rerank-english', 'rerank-multilingual'].map((model) =>+ createCatalogModelFixture({ model, label: { en_US: model }, model_type: 'rerank' }),+ ),+ }),+]++const recommendedModels = {+ embedding: {+ available: true,+ source: 'legacy',+ value: { model: 'text-embedding-3-small', provider: 'openai' },+ },+ rerank: {+ available: true,+ source: 'workspace_default',+ value: { model: 'rerank-english', provider: 'langgenius/cohere/cohere' },+ },+ reasoning: {+ available: true,+ source: 'workspace_default',+ value: { model: 'gpt-4o', provider: 'langgenius/openai/openai' },+ },+} satisfies NonNullable<KnowledgeFsUpgradePreparationResponse['models']>++const expectedPayload = {+ embedding: { model: 'text-embedding-3-small', provider: 'langgenius/openai/openai' },+ rerank: { model: 'rerank-english', provider: 'langgenius/cohere/cohere' },+ reasoning: { model: 'gpt-4o', provider: 'langgenius/openai/openai' },+}++function renderDialog({ onCancel = vi.fn(), onStarted = vi.fn() } = {}) {+ const queryClient = createConsoleQueryClient()+ seedModelProviderQueries(queryClient, modelCatalogs)+ return renderWithConsoleQuery(+ <QueryTestingAdapter>+ <KnowledgeUpgradeDialog dataset={dataset} onCancel={onCancel} onStarted={onStarted} />+ </QueryTestingAdapter>,+ { queryClient },+ )+}++const startButton = () => screen.getByRole('button', { name: 'knowledgeUpgrade.upgrade.start' })+// The start button only reports its loading state through data attributes, so wait for the+// recommended models to render before treating the dialog as ready.+async function waitForRecommendedModels() {+ await screen.findByRole('button', {+ name: /knowledgeSettings.settings.systemReasoningModelLabel.*gpt-4o/,+ })+ await waitFor(() => expect(startButton()).toBeEnabled())+}+const reasoningSelector = () =>+ screen.getByRole('button', { name: /knowledgeSettings.settings.systemReasoningModelLabel/ })+describe('KnowledgeUpgradeDialog', () => {beforeEach(() => {+ vi.clearAllMocks()discoverUpgradeMock.mockResolvedValue({can_retry: false,can_upgrade: true,job: null,- })+ models: recommendedModels,+ } satisfies KnowledgeFsUpgradePreparationResponse)+ getModelsMock.mockImplementation(({ params }: { params: { model_type: string } }) =>+ Promise.resolve({+ data: modelCatalogs+ .map((provider) => ({+ ...provider,+ models: provider.models.filter((model) => model.model_type === params.model_type),+ }))+ .filter((provider) => provider.models.length),+ }),+ )})it('offers upgrade details and documentation before requiring an explicit confirmation', async () => {const user = userEvent.setup()const onCancel = vi.fn()- renderWithConsoleQuery(- <KnowledgeUpgradeDialog dataset={dataset} onCancel={onCancel} onStarted={vi.fn()} />,- )+ renderDialog({ onCancel })expect(screen.getByText('knowledgeUpgrade.upgrade.dialogDuration')).toBeVisible()expect(screen.getByText('knowledgeUpgrade.upgrade.dialogLinkedApps')).toBeVisible()@@ -61,11 +152,10 @@ describe('KnowledgeUpgradeDialog', () => {expect(screen.getByRole('region', { name: 'knowledgeSpace.modelCost.title' }),).toHaveTextContent('knowledgeUpgrade.upgrade.modelCostDescription')- const startButton = screen.getByRole('button', { name: 'knowledgeUpgrade.upgrade.start' })- expect(startButton).toHaveAccessibleDescription(+ expect(startButton()).toHaveAccessibleDescription(expect.stringContaining('knowledgeUpgrade.upgrade.modelCostDescription'),)- await waitFor(() => expect(startButton).toBeEnabled())+ await waitForRecommendedModels()expect(startUpgradeMock).not.toHaveBeenCalled()await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))@@ -73,33 +163,148 @@ describe('KnowledgeUpgradeDialog', () => {expect(startUpgradeMock).not.toHaveBeenCalled()})- it('reuses the idempotency key when the same upgrade intent is retried', async () => {- startUpgradeMock.mockRejectedValueOnce(new Error('response lost')).mockResolvedValueOnce(job)+ it('prefills recommended models and sends them with the upgrade request', async () => {+ startUpgradeMock.mockResolvedValue(job)const onStarted = vi.fn()const user = userEvent.setup()+ renderDialog({ onStarted })- renderWithConsoleQuery(- <KnowledgeUpgradeDialog dataset={dataset} onCancel={vi.fn()} onStarted={onStarted} />,- )+ expect(+ await screen.findByRole('button', {+ name: /knowledgeSettings.settings.embeddingModelLabel.*text-embedding-3-small/,+ }),+ ).toBeInTheDocument()+ expect(+ screen.getByRole('region', { name: 'knowledgeCreate.modelSettings' }),+ ).toBeInTheDocument()+ await user.click(startButton())- const startButton = await screen.findByRole('button', {- name: 'knowledgeUpgrade.upgrade.start',+ await waitFor(() => expect(onStarted).toHaveBeenCalledWith(dataset, job))+ expect(startUpgradeMock).toHaveBeenCalledWith({+ body: { models: expectedPayload },+ headers: { 'Idempotency-Key': expect.any(String) },+ params: { dataset_id: 'dataset-1' },})- await waitFor(() => expect(startButton).toBeEnabled())- await user.click(startButton)+ })++ it('requires a choice when a recommended model is unavailable', async () => {+ discoverUpgradeMock.mockResolvedValue({+ can_retry: false,+ can_upgrade: true,+ job: null,+ models: {+ ...recommendedModels,+ reasoning: {+ available: false,+ source: 'legacy',+ unavailable_reason: 'not_found',+ value: { model: 'retired-model', provider: 'langgenius/openai/openai' },+ },+ },+ } satisfies KnowledgeFsUpgradePreparationResponse)+ startUpgradeMock.mockResolvedValue(job)+ const user = userEvent.setup()+ renderDialog()++ expect(+ await screen.findByText('knowledgeSettings.settings.systemReasoningModelRequired'),+ ).toBeVisible()+ expect(reasoningSelector()).not.toHaveTextContent('retired-model')+ expect(startButton()).toBeDisabled()++ await user.click(reasoningSelector())+ await user.click(await screen.findByRole('button', { name: 'gpt-4o-mini' }))+ await waitFor(() => expect(startButton()).toBeEnabled())+ await user.click(startButton())++ await waitFor(() =>+ expect(startUpgradeMock).toHaveBeenCalledWith(+ expect.objectContaining({+ body: {+ models: {+ ...expectedPayload,+ reasoning: { model: 'gpt-4o-mini', provider: 'langgenius/openai/openai' },+ },+ },+ }),+ ),+ )+ })++ it('reuses the idempotency key for retries and rotates it when the model choice changes', async () => {+ startUpgradeMock+ .mockRejectedValueOnce(new Error('response lost'))+ .mockRejectedValueOnce(new Error('response lost'))+ .mockResolvedValueOnce(job)+ const onStarted = vi.fn()+ const user = userEvent.setup()+ renderDialog({ onStarted })++ await waitForRecommendedModels()+ await user.click(startButton())expect(await screen.findByRole('alert')).toHaveTextContent('knowledgeUpgrade.upgrade.startFailed',)- await user.click(startButton)+ await user.click(startButton())+ await waitFor(() => expect(startUpgradeMock).toHaveBeenCalledTimes(2))++ await user.click(reasoningSelector())+ await user.click(await screen.findByRole('button', { name: 'gpt-4o-mini' }))+ await user.click(startButton())await waitFor(() => expect(onStarted).toHaveBeenCalledWith(dataset, job))- const firstInput = startUpgradeMock.mock.calls[0]?.[0]- const secondInput = startUpgradeMock.mock.calls[1]?.[0]- expect(firstInput).toEqual({- headers: { 'Idempotency-Key': expect.any(String) },- params: { dataset_id: 'dataset-1' },- })- expect(secondInput.headers['Idempotency-Key']).toBe(firstInput.headers['Idempotency-Key'])+ const keys = startUpgradeMock.mock.calls.map(([input]) => input.headers['Idempotency-Key'])+ expect(keys[1]).toBe(keys[0])+ expect(keys[2]).not.toBe(keys[0])expect(discoverUpgradeMock).toHaveBeenCalledWith({ params: { dataset_id: 'dataset-1' } })})++ it('keeps the dialog open and marks rejected models when the backend reports them unavailable', async () => {+ startUpgradeMock.mockRejectedValueOnce(+ new ORPCError('knowledge_fs_upgrade_models_unavailable', {+ defined: true,+ status: 422,+ data: {+ code: 'knowledge_fs_upgrade_models_unavailable',+ message: 'Models unavailable',+ status: 422,+ details: {+ issues: [+ {+ field: 'reasoning',+ model: 'gpt-4o',+ provider: 'langgenius/openai/openai',+ reason: 'quota-exceeded',+ },+ ],+ },+ },+ }),+ )+ const user = userEvent.setup()+ renderDialog()++ await waitForRecommendedModels()+ getModelsMock.mockClear()+ await user.click(startButton())++ expect(await screen.findByRole('alert')).toHaveTextContent(+ 'knowledgeUpgrade.upgrade.modelsUnavailable',+ )+ expect(reasoningSelector()).toHaveAccessibleDescription(+ expect.stringContaining('knowledgeCreate.modelUnavailable'),+ )+ expect(startButton()).toBeDisabled()+ await waitFor(() =>+ expect(getModelsMock).toHaveBeenCalledWith({ params: { model_type: 'llm' } }),+ )++ await user.click(reasoningSelector())+ await user.click(await screen.findByRole('button', { name: 'gpt-4o-mini' }))+ expect(screen.queryByRole('alert')).not.toBeInTheDocument()+ expect(reasoningSelector()).not.toHaveAccessibleDescription(+ expect.stringContaining('knowledgeCreate.modelUnavailable'),+ )+ await waitFor(() => expect(startButton()).toBeEnabled())+ })})diff --git a/web/features/new-rag/upgrade/knowledge-upgrade-dialog.tsx b/web/features/new-rag/upgrade/knowledge-upgrade-dialog.tsxindex d908b99497a..a252d30514e 100644--- a/web/features/new-rag/upgrade/knowledge-upgrade-dialog.tsx+++ b/web/features/new-rag/upgrade/knowledge-upgrade-dialog.tsx@@ -5,6 +5,7 @@ import type { RefObject } from 'react'import type { DatasetCardItem } from '@/app/components/datasets/list/dataset-card/types'import {AlertDialog,+ AlertDialogBody,AlertDialogCancelButton,AlertDialogConfirmButton,AlertDialogContent,@@ -13,13 +14,20 @@ import {AlertDialogHeader,AlertDialogTitle,} from '@langgenius/dify-ui/alert-dialog'+import { isDefinedError } from '@orpc/client'import { skipToken, useMutation, useQuery } from '@tanstack/react-query'import { useId, useRef } from 'react'import { Trans, useTranslation } from 'react-i18next'import { useDocLink } from '@/context/i18n'import { ModelCostNotice } from '@/features/new-rag/components/model-cost-notice'+import { CreationModelField } from '@/features/new-rag/create/model-settings'import { createRequestId } from '@/features/new-rag/request-id'import { consoleQuery } from '@/service/console'+import {+ UPGRADE_MODEL_KEYS,+ upgradeModelsFingerprint,+ useUpgradeModels,+} from './use-upgrade-models'export function KnowledgeUpgradeDialog({dataset,@@ -34,26 +42,43 @@ export function KnowledgeUpgradeDialog({}) {const { t } = useTranslation(['knowledgeUpgrade', 'knowledgeSpace'])const { t: tCommon } = useTranslation(['common'])+ const { t: tModels } = useTranslation(['knowledgeSettings', 'modelProvider', 'knowledgeCreate'])const docLink = useDocLink()const cancelRef = useRef<HTMLButtonElement>(null)const modelCostNoticeId = useId()- const idempotencyKeyRef = useRef<string | undefined>(undefined)+ // Network retries of the same model choice reuse the key; any model change starts a new intent.+ const idempotencyKeyRef = useRef<{ fingerprint: string; key: string } | undefined>(undefined)+ const modelSettingsLabelId = useId()const discoveryQuery = useQuery(consoleQuery.datasets.byDatasetId.knowledgeFsUpgrades.get.queryOptions({input: dataset ? { params: { dataset_id: dataset.id } } : skipToken,}),)+ const canUpgrade = discoveryQuery.data?.can_upgrade === true+ const models = useUpgradeModels({+ datasetId: dataset?.id,+ recommendations: canUpgrade ? discoveryQuery.data?.models : undefined,+ })const startMutation = useMutation({...consoleQuery.datasets.byDatasetId.knowledgeFsUpgrades.post.mutationOptions(),onSuccess: (job) => {idempotencyKeyRef.current = undefinedif (dataset) onStarted(dataset, job)},+ onError: (error, { body }) => {+ if (!isDefinedError(error) || error.code !== 'knowledge_fs_upgrade_models_unavailable') return+ if (body.models) models.reject(body.models, error.data.details?.issues ?? [])+ void models.refresh()+ },})+ const modelsRejected =+ isDefinedError(startMutation.error) &&+ startMutation.error.code === 'knowledge_fs_upgrade_models_unavailable'const closeDialog = () => {if (startMutation.isPending) returnstartMutation.reset()+ models.reset()idempotencyKeyRef.current = undefinedonCancel()}@@ -62,16 +87,34 @@ export function KnowledgeUpgradeDialog({if (!dataset ||discoveryQuery.isFetching ||- discoveryQuery.data?.can_upgrade !== true ||+ !canUpgrade ||+ !models.payload ||startMutation.isPending)return- idempotencyKeyRef.current ??= createRequestId()+ const fingerprint = `${dataset.id}|${upgradeModelsFingerprint(models.payload)}`+ if (idempotencyKeyRef.current?.fingerprint !== fingerprint)+ idempotencyKeyRef.current = { fingerprint, key: createRequestId() }startMutation.mutate({- headers: { 'Idempotency-Key': idempotencyKeyRef.current },+ body: { models: models.payload },+ headers: { 'Idempotency-Key': idempotencyKeyRef.current.key },params: { dataset_id: dataset.id },})}+ const modelLabels = {+ embedding: tModels(($) => $['settings.embeddingModelLabel'], { ns: 'knowledgeSettings' }),+ rerank: tModels(($) => $['modelProvider.rerankModel.key'], { ns: 'modelProvider' }),+ reasoning: tModels(($) => $['settings.systemReasoningModelLabel'], {+ ns: 'knowledgeSettings',+ }),+ }+ const modelRequiredMessages = {+ embedding: tModels(($) => $['settings.embeddingModelRequired'], { ns: 'knowledgeSettings' }),+ rerank: tModels(($) => $['settings.rerankModelRequired'], { ns: 'knowledgeSettings' }),+ reasoning: tModels(($) => $['settings.systemReasoningModelRequired'], {+ ns: 'knowledgeSettings',+ }),+ }return (<AlertDialog@@ -109,7 +152,7 @@ export function KnowledgeUpgradeDialog({})}/>)}- <ul className="mt-0 list-disc pl-5">+ <ul className="mt-0 list-disc ps-5"><li>{t(($) => $['upgrade.dialogDuration'], { ns: 'knowledgeUpgrade' })}</li><li>{t(($) => $['upgrade.dialogLinkedApps'], { ns: 'knowledgeUpgrade' })}</li><li>@@ -130,11 +173,38 @@ export function KnowledgeUpgradeDialog({</a>{(discoveryQuery.isError || startMutation.isError) && (<p role="alert" className="mt-3 system-sm-regular text-text-destructive">- {t(($) => $['upgrade.startFailed'], { ns: 'knowledgeUpgrade' })}+ {modelsRejected+ ? t(($) => $['upgrade.modelsUnavailable'], { ns: 'knowledgeUpgrade' })+ : t(($) => $['upgrade.startFailed'], { ns: 'knowledgeUpgrade' })}</p>)}</AlertDialogDescription></AlertDialogHeader>+ {canUpgrade && (+ <AlertDialogBody>+ <section+ aria-labelledby={modelSettingsLabelId}+ className="flex flex-col gap-3 border-t border-divider-subtle pt-4"+ >+ <h3 id={modelSettingsLabelId} className="system-sm-semibold text-text-primary">+ {tModels(($) => $.modelSettings, { ns: 'knowledgeCreate' })}+ </h3>+ {UPGRADE_MODEL_KEYS.map((key) => (+ <CreationModelField+ key={key}+ inline+ field={models.fields[key]}+ label={modelLabels[key]}+ requiredMessage={modelRequiredMessages[key]}+ disabled={startMutation.isPending}+ onChange={() => {+ if (modelsRejected) startMutation.reset()+ }}+ />+ ))}+ </section>+ </AlertDialogBody>+ )}<AlertDialogFooter><AlertDialogCancelButton ref={cancelRef} disabled={startMutation.isPending}>{tCommon(($) => $['operation.cancel'])}@@ -143,7 +213,7 @@ export function KnowledgeUpgradeDialog({tone="default"aria-describedby={modelCostNoticeId}loading={discoveryQuery.isFetching || startMutation.isPending}- disabled={discoveryQuery.data?.can_upgrade !== true}+ disabled={!canUpgrade || !models.payload}onClick={startUpgrade}>{t(($) => $['upgrade.start'], { ns: 'knowledgeUpgrade' })}diff --git a/web/features/new-rag/upgrade/use-upgrade-models.ts b/web/features/new-rag/upgrade/use-upgrade-models.tsnew file mode 100644index 00000000000..4a382895d3e--- /dev/null+++ b/web/features/new-rag/upgrade/use-upgrade-models.ts@@ -0,0 +1,182 @@+import type {+ KnowledgeFsUpgradeModelIssueResponse,+ KnowledgeFsUpgradeModelRecommendationResponse,+ KnowledgeFsUpgradeModelRecommendationsResponse,+ KnowledgeFsUpgradeModelsPayload,+} from '@dify/contracts/api/console/datasets/types.gen'+import type { ModelSelectorValue } from '@/app/components/header/account-setting/model-provider-page/model-selector/types'+import type {+ CreationModelFieldState,+ CreationModelIssue,+ CreationModelType,+} from '@/features/new-rag/create/use-creation-models'+import { skipToken, useQuery } from '@tanstack/react-query'+import { useState } from 'react'+import { modelIssueFromCatalog } from '@/features/new-rag/create/use-creation-models'+import { consoleQuery } from '@/service/console'++type UpgradeModelKey = keyof KnowledgeFsUpgradeModelsPayload++export const UPGRADE_MODEL_KEYS = ['embedding', 'rerank', 'reasoning'] as const++const MODEL_TYPES = {+ embedding: 'text-embedding',+ rerank: 'rerank',+ reasoning: 'llm',+} as const satisfies Record<UpgradeModelKey, CreationModelType>++type Selections = Partial<Record<UpgradeModelKey, ModelSelectorValue>>++type Rejection = {+ fingerprint: string+ issues: KnowledgeFsUpgradeModelIssueResponse[]+}++type UpgradeModelsState = {+ datasetId?: string+ rejection?: Rejection+ selections: Selections+}++export function upgradeModelsFingerprint(models: KnowledgeFsUpgradeModelsPayload) {+ return UPGRADE_MODEL_KEYS.map(+ (key) => `${key}:${models[key].provider}/${models[key].model}`,+ ).join('|')+}++function issueFromReason(+ reason: KnowledgeFsUpgradeModelIssueResponse['reason'],+): CreationModelIssue {+ if (reason === 'not_found' || reason === 'deprecated') return 'unavailable'+ return reason+}++function useUpgradeModel({+ enabled,+ modelType,+ rejectedIssue,+ setSelection,+ value,+}: {+ enabled: boolean+ modelType: CreationModelType+ rejectedIssue: KnowledgeFsUpgradeModelIssueResponse | undefined+ setSelection: (value: ModelSelectorValue | undefined) => void+ value: ModelSelectorValue | undefined+}): CreationModelFieldState {+ const catalog = useQuery(+ consoleQuery.workspaces.current.models.modelTypes.byModelType.get.queryOptions({+ input: enabled ? { params: { model_type: modelType } } : skipToken,+ select: ({ data }) => data,+ }),+ )+ const models = catalog.data ?? []+ const pending = enabled && catalog.isPending+ const issue: CreationModelIssue | undefined = !enabled+ ? undefined+ : catalog.isError+ ? 'load-error'+ : rejectedIssue+ ? issueFromReason(rejectedIssue.reason)+ : pending+ ? undefined+ : modelIssueFromCatalog(models, value)++ return {+ issue,+ models,+ pending,+ refreshing: catalog.isFetching,+ retry: () => catalog.refetch(),+ setSelection,+ value,+ }+}++export function useUpgradeModels({+ datasetId,+ recommendations,+}: {+ datasetId: string | undefined+ recommendations: KnowledgeFsUpgradeModelRecommendationsResponse | null | undefined+}) {+ // Choices are scoped to one dataset so reopening the dialog for another one starts fresh.+ const [state, setState] = useState<UpgradeModelsState>({ selections: {} })+ const forDataset = (current: UpgradeModelsState): UpgradeModelsState =>+ current.datasetId === datasetId ? current : { datasetId, selections: {} }+ const scoped = forDataset(state)+ const enabled = Boolean(datasetId && recommendations !== undefined)+ const setSelection = (key: UpgradeModelKey) => (value: ModelSelectorValue | undefined) =>+ setState((current) => {+ const own = forDataset(current)+ return { ...own, selections: { ...own.selections, [key]: value } }+ })+ // Recommendations the backend marks unavailable start empty so the user must choose.+ const values: Record<UpgradeModelKey, ModelSelectorValue | undefined> = {+ embedding: scoped.selections.embedding ?? recommendedValue(recommendations?.embedding),+ rerank: scoped.selections.rerank ?? recommendedValue(recommendations?.rerank),+ reasoning: scoped.selections.reasoning ?? recommendedValue(recommendations?.reasoning),+ }+ const draftPayload = toPayload(values)+ // A rejection only applies while the rejected combination is still selected.+ const activeRejection =+ scoped.rejection &&+ draftPayload &&+ scoped.rejection.fingerprint === upgradeModelsFingerprint(draftPayload)+ ? scoped.rejection+ : undefined+ const field = (key: UpgradeModelKey) => ({+ enabled,+ modelType: MODEL_TYPES[key],+ rejectedIssue: activeRejection?.issues.find((issue) => issue.field === key),+ setSelection: setSelection(key),+ value: values[key],+ })++ const embedding = useUpgradeModel(field('embedding'))+ const rerank = useUpgradeModel(field('rerank'))+ const reasoning = useUpgradeModel(field('reasoning'))+ const fields = { embedding, rerank, reasoning }+ const pending = Object.values(fields).some((entry) => entry.pending)+ const invalid = Object.values(fields).some((entry) => entry.issue)++ return {+ fields,+ payload: !pending && !invalid ? draftPayload : undefined,+ refresh: () => Promise.allSettled(Object.values(fields).map((entry) => entry.retry())),+ reject: (+ models: KnowledgeFsUpgradeModelsPayload,+ issues: KnowledgeFsUpgradeModelIssueResponse[],+ ) =>+ setState((current) => ({+ ...forDataset(current),+ rejection: { fingerprint: upgradeModelsFingerprint(models), issues },+ })),+ reset: () => setState({ selections: {} }),+ }+}++// Legacy datasets may store short provider names; expand them like the backend's ModelProviderID.+function fullProviderId(provider: string) {+ const parts = provider.split('/')+ if (parts.length === 1) return `langgenius/${provider}/${provider}`+ if (parts.length === 2) return `${provider}/${parts[1]}`+ return provider+}++function recommendedValue(+ recommendation: KnowledgeFsUpgradeModelRecommendationResponse | undefined,+): ModelSelectorValue | undefined {+ if (!recommendation?.available || !recommendation.value) return undefined+ const { model, provider } = recommendation.value+ return { model, provider: fullProviderId(provider) }+}++function toPayload(+ values: Record<UpgradeModelKey, ModelSelectorValue | undefined>,+): KnowledgeFsUpgradeModelsPayload | undefined {+ const { embedding, rerank, reasoning } = values+ if (!embedding || !rerank || !reasoning) return undefined+ const choice = ({ provider, model }: ModelSelectorValue) => ({ provider, model })+ return { embedding: choice(embedding), rerank: choice(rerank), reasoning: choice(reasoning) }+}diff --git a/web/i18n/locales/ar-TN/knowledge-upgrade.json b/web/i18n/locales/ar-TN/knowledge-upgrade.jsonindex 05479f54257..39cabb9bb0c 100644--- a/web/i18n/locales/ar-TN/knowledge-upgrade.json+++ b/web/i18n/locales/ar-TN/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "الترقية إلى قاعدة معرفة Agent","upgrade.migratingDocuments": "جارٍ نقل المستندات…","upgrade.modelCostDescription": "تستخدم الترقية النماذج لمعالجة مستندات قاعدة المعرفة هذه وتستهلك الرموز (tokens). كلما زاد محتوى المستندات زاد الاستهلاك عادةً وقد تنشأ تكاليف مرتفعة. تعتمد التكلفة الفعلية على طريقة احتساب رسوم النموذج المستخدم.",+ "upgrade.modelsUnavailable": "بعض النماذج المحددة غير متاحة. اختر نماذج أخرى وحاول مرة أخرى.","upgrade.start": "بدء الترقية","upgrade.startFailed": "تعذر بدء الترقية. حاول مرة أخرى.","upgrade.statusFailed": "فشلت الترقية",diff --git a/web/i18n/locales/az-AZ/knowledge-upgrade.json b/web/i18n/locales/az-AZ/knowledge-upgrade.jsonindex 1f1bd319ce4..ab6494ef1e1 100644--- a/web/i18n/locales/az-AZ/knowledge-upgrade.json+++ b/web/i18n/locales/az-AZ/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Agent bilik bazasına yenilə","upgrade.migratingDocuments": "Sənədlər köçürülür…","upgrade.modelCostDescription": "Yeniləmə bu bilik bazasındakı sənədləri emal etmək üçün modellərdən istifadə edir və token sərf edir. Sənədlərin məzmunu nə qədər çox olsa, istifadə adətən bir o qədər yüksək olur və böyük xərclər yarana bilər. Faktiki xərc istifadə olunan modelin ödəniş qaydasından asılıdır.",+ "upgrade.modelsUnavailable": "Seçilmiş bəzi modellər əlçatan deyil. Başqa modellər seçin və yenidən cəhd edin.","upgrade.start": "Yeniləməni başlat","upgrade.startFailed": "Yeniləməni başlatmaq mümkün olmadı. Yenidən cəhd edin.","upgrade.statusFailed": "Yeniləmə uğursuz oldu",diff --git a/web/i18n/locales/de-DE/knowledge-upgrade.json b/web/i18n/locales/de-DE/knowledge-upgrade.jsonindex 68b59223fc5..a22bb226bc2 100644--- a/web/i18n/locales/de-DE/knowledge-upgrade.json+++ b/web/i18n/locales/de-DE/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Upgrade auf Agent-Wissensdatenbank","upgrade.migratingDocuments": "Dokumente werden migriert…","upgrade.modelCostDescription": "Beim Upgrade verarbeiten Modelle die Dokumente dieser Wissensdatenbank und verbrauchen Tokens. Mehr Dokumentinhalt bedeutet in der Regel einen höheren Verbrauch und kann erhebliche Kosten verursachen. Die tatsächlichen Kosten hängen vom Abrechnungsmodell des verwendeten Modells ab.",+ "upgrade.modelsUnavailable": "Einige ausgewählte Modelle sind nicht verfügbar. Wählen Sie andere Modelle aus und versuchen Sie es erneut.","upgrade.start": "Upgrade starten","upgrade.startFailed": "Das Upgrade konnte nicht gestartet werden. Versuchen Sie es erneut.","upgrade.statusFailed": "Upgrade fehlgeschlagen",diff --git a/web/i18n/locales/en-US/knowledge-upgrade.json b/web/i18n/locales/en-US/knowledge-upgrade.jsonindex 4933d89fda5..ae7f8f96f3b 100644--- a/web/i18n/locales/en-US/knowledge-upgrade.json+++ b/web/i18n/locales/en-US/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Upgrade to Agent Knowledge Base","upgrade.migratingDocuments": "Migrating documents…","upgrade.modelCostDescription": "Upgrading uses models to process the documents in this knowledge base and consumes tokens. More document content usually means higher usage and may result in significant costs. Actual costs depend on how the model you use is billed.",+ "upgrade.modelsUnavailable": "Some selected models are unavailable. Select other models and try again.","upgrade.start": "Start upgrade","upgrade.startFailed": "The upgrade couldn't be started. Try again.","upgrade.statusFailed": "Upgrade failed",diff --git a/web/i18n/locales/es-ES/knowledge-upgrade.json b/web/i18n/locales/es-ES/knowledge-upgrade.jsonindex 79b7fc2fb7f..85633532014 100644--- a/web/i18n/locales/es-ES/knowledge-upgrade.json+++ b/web/i18n/locales/es-ES/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Actualizar a una base de conocimientos Agent","upgrade.migratingDocuments": "Migrando documentos…","upgrade.modelCostDescription": "La actualización usa modelos para procesar los documentos de esta base de conocimiento y consume tokens. Cuanto más contenido tengan los documentos, normalmente mayor es el consumo y puede generar costes elevados. El coste real depende de cómo se facture el modelo utilizado.",+ "upgrade.modelsUnavailable": "Algunos modelos seleccionados no están disponibles. Selecciona otros modelos e inténtalo de nuevo.","upgrade.start": "Iniciar actualización","upgrade.startFailed": "No se pudo iniciar la actualización. Inténtalo de nuevo.","upgrade.statusFailed": "Error en la actualización",diff --git a/web/i18n/locales/fa-IR/knowledge-upgrade.json b/web/i18n/locales/fa-IR/knowledge-upgrade.jsonindex 8926c71760c..f6e3d8faa78 100644--- a/web/i18n/locales/fa-IR/knowledge-upgrade.json+++ b/web/i18n/locales/fa-IR/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "ارتقا به پایگاه دانش Agent","upgrade.migratingDocuments": "در حال انتقال اسناد…","upgrade.modelCostDescription": "ارتقا از مدلها برای پردازش اسناد این پایگاه دانش استفاده کرده و توکن مصرف میکند. هرچه محتوای اسناد بیشتر باشد، معمولاً مصرف بیشتر است و ممکن است هزینه بالایی ایجاد شود. هزینه واقعی به روش صورتحساب مدل مورد استفاده بستگی دارد.",+ "upgrade.modelsUnavailable": "برخی از مدلهای انتخابشده در دسترس نیستند. مدلهای دیگری انتخاب کنید و دوباره تلاش کنید.","upgrade.start": "شروع ارتقا","upgrade.startFailed": "ارتقا شروع نشد. دوباره تلاش کنید.","upgrade.statusFailed": "ارتقا ناموفق بود",diff --git a/web/i18n/locales/fr-FR/knowledge-upgrade.json b/web/i18n/locales/fr-FR/knowledge-upgrade.jsonindex 393e97caa25..21baf0b6c9c 100644--- a/web/i18n/locales/fr-FR/knowledge-upgrade.json+++ b/web/i18n/locales/fr-FR/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Mettre à niveau vers une base de connaissances Agent","upgrade.migratingDocuments": "Migration des documents…","upgrade.modelCostDescription": "La mise à niveau utilise des modèles pour traiter les documents de cette base de connaissances et consomme des tokens. Plus les documents sont volumineux, plus la consommation est généralement élevée, ce qui peut entraîner des coûts importants. Le coût réel dépend du mode de facturation du modèle utilisé.",+ "upgrade.modelsUnavailable": "Certains modèles sélectionnés ne sont pas disponibles. Sélectionnez d’autres modèles et réessayez.","upgrade.start": "Démarrer la mise à niveau","upgrade.startFailed": "Impossible de démarrer la mise à niveau. Réessayez.","upgrade.statusFailed": "Échec de la mise à niveau",diff --git a/web/i18n/locales/hi-IN/knowledge-upgrade.json b/web/i18n/locales/hi-IN/knowledge-upgrade.jsonindex 8e6d96c14e4..52b6b2d9eba 100644--- a/web/i18n/locales/hi-IN/knowledge-upgrade.json+++ b/web/i18n/locales/hi-IN/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Agent ज्ञान आधार में अपग्रेड करें","upgrade.migratingDocuments": "दस्तावेज़ माइग्रेट हो रहे हैं…","upgrade.modelCostDescription": "अपग्रेड इस नॉलेज बेस के दस्तावेज़ों को प्रोसेस करने के लिए मॉडल का उपयोग करता है और टोकन खर्च करता है। दस्तावेज़ों में जितनी अधिक सामग्री होगी, आम तौर पर उपयोग उतना अधिक होगा और लागत काफ़ी हो सकती है। वास्तविक लागत उपयोग किए गए मॉडल की बिलिंग पद्धति पर निर्भर करती है।",+ "upgrade.modelsUnavailable": "कुछ चयनित मॉडल उपलब्ध नहीं हैं। अन्य मॉडल चुनें और फिर से प्रयास करें।","upgrade.start": "अपग्रेड शुरू करें","upgrade.startFailed": "अपग्रेड शुरू नहीं हो सका। फिर कोशिश करें।","upgrade.statusFailed": "अपग्रेड विफल",diff --git a/web/i18n/locales/id-ID/knowledge-upgrade.json b/web/i18n/locales/id-ID/knowledge-upgrade.jsonindex e132804fd03..1ff238221e7 100644--- a/web/i18n/locales/id-ID/knowledge-upgrade.json+++ b/web/i18n/locales/id-ID/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Tingkatkan ke basis pengetahuan Agent","upgrade.migratingDocuments": "Memigrasikan dokumen…","upgrade.modelCostDescription": "Peningkatan menggunakan model untuk memproses dokumen dalam basis pengetahuan ini dan menggunakan token. Semakin banyak isi dokumen, biasanya semakin besar penggunaannya dan dapat menimbulkan biaya tinggi. Biaya sebenarnya bergantung pada cara penagihan model yang digunakan.",+ "upgrade.modelsUnavailable": "Beberapa model yang dipilih tidak tersedia. Pilih model lain dan coba lagi.","upgrade.start": "Mulai peningkatan","upgrade.startFailed": "Peningkatan tidak dapat dimulai. Coba lagi.","upgrade.statusFailed": "Peningkatan gagal",diff --git a/web/i18n/locales/it-IT/knowledge-upgrade.json b/web/i18n/locales/it-IT/knowledge-upgrade.jsonindex 0cd5b0f9498..1c2e01b2ff8 100644--- a/web/i18n/locales/it-IT/knowledge-upgrade.json+++ b/web/i18n/locales/it-IT/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Aggiorna a una base di conoscenza Agent","upgrade.migratingDocuments": "Migrazione dei documenti…","upgrade.modelCostDescription": "L'aggiornamento usa modelli per elaborare i documenti di questa knowledge base e consuma token. Più contenuto hanno i documenti, maggiore è di solito il consumo, con possibili costi elevati. Il costo effettivo dipende dalla modalità di fatturazione del modello utilizzato.",+ "upgrade.modelsUnavailable": "Alcuni modelli selezionati non sono disponibili. Seleziona altri modelli e riprova.","upgrade.start": "Avvia aggiornamento","upgrade.startFailed": "Impossibile avviare l’aggiornamento. Riprova.","upgrade.statusFailed": "Aggiornamento non riuscito",diff --git a/web/i18n/locales/ja-JP/knowledge-upgrade.json b/web/i18n/locales/ja-JP/knowledge-upgrade.jsonindex 035496d1b8f..8dcad5b42c5 100644--- a/web/i18n/locales/ja-JP/knowledge-upgrade.json+++ b/web/i18n/locales/ja-JP/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Agent ナレッジベースにアップグレード","upgrade.migratingDocuments": "ドキュメントを移行中…","upgrade.modelCostDescription": "アップグレードではモデルがナレッジベース内のドキュメントを処理し、トークンを消費します。ドキュメントの内容が多いほど通常は消費量が増え、高額な費用が発生する可能性があります。実際の費用は使用するモデルの課金方式によって異なります。",+ "upgrade.modelsUnavailable": "選択した一部のモデルが利用できません。別のモデルを選択してもう一度お試しください。","upgrade.start": "アップグレードを開始","upgrade.startFailed": "アップグレードを開始できませんでした。もう一度お試しください。","upgrade.statusFailed": "アップグレード失敗",diff --git a/web/i18n/locales/ko-KR/knowledge-upgrade.json b/web/i18n/locales/ko-KR/knowledge-upgrade.jsonindex 2a12e8a52fe..9010950e96c 100644--- a/web/i18n/locales/ko-KR/knowledge-upgrade.json+++ b/web/i18n/locales/ko-KR/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Agent 지식 베이스로 업그레이드","upgrade.migratingDocuments": "문서 마이그레이션 중…","upgrade.modelCostDescription": "업그레이드 시 모델이 지식 베이스의 문서를 처리하며 토큰을 소비합니다. 문서 내용이 많을수록 일반적으로 사용량이 늘어나며 높은 비용이 발생할 수 있습니다. 실제 비용은 사용하는 모델의 과금 방식에 따라 달라집니다.",+ "upgrade.modelsUnavailable": "선택한 일부 모델을 사용할 수 없습니다. 다른 모델을 선택한 후 다시 시도하세요.","upgrade.start": "업그레이드 시작","upgrade.startFailed": "업그레이드를 시작할 수 없습니다. 다시 시도하세요.","upgrade.statusFailed": "업그레이드 실패",diff --git a/web/i18n/locales/lo-LA/knowledge-upgrade.json b/web/i18n/locales/lo-LA/knowledge-upgrade.jsonindex 1503ac6c4b1..bb3b65fb084 100644--- a/web/i18n/locales/lo-LA/knowledge-upgrade.json+++ b/web/i18n/locales/lo-LA/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "ອັບເກຣດເປັນຖານຄວາມຮູ້ Agent","upgrade.migratingDocuments": "ກຳລັງຍ້າຍເອກະສານ…","upgrade.modelCostDescription": "ການອັບເກຣດຈະໃຊ້ໂມເດວປະມວນຜົນເອກະສານໃນຖານຄວາມຮູ້ນີ້ ແລະ ໃຊ້ໂທເຄັນ. ເອກະສານຍິ່ງມີເນື້ອຫາຫຼາຍ ໂດຍທົ່ວໄປຍິ່ງໃຊ້ຫຼາຍຂຶ້ນ ແລະ ອາດມີຄ່າໃຊ້ຈ່າຍສູງ. ຄ່າໃຊ້ຈ່າຍຕົວຈິງຂຶ້ນກັບວິທີຄິດໄລ່ຄ່າບໍລິການຂອງໂມເດວທີ່ໃຊ້.",+ "upgrade.modelsUnavailable": "ບາງໂມເດລທີ່ເລືອກບໍ່ສາມາດໃຊ້ໄດ້. ເລືອກໂມເດລອື່ນແລ້ວລອງໃໝ່.","upgrade.start": "ເລີ່ມອັບເກຣດ","upgrade.startFailed": "ເລີ່ມອັບເກຣດບໍ່ໄດ້. ລອງອີກຄັ້ງ.","upgrade.statusFailed": "ອັບເກຣດບໍ່ສຳເລັດ",diff --git a/web/i18n/locales/nl-NL/knowledge-upgrade.json b/web/i18n/locales/nl-NL/knowledge-upgrade.jsonindex ebabef7cd42..3eb008f93d8 100644--- a/web/i18n/locales/nl-NL/knowledge-upgrade.json+++ b/web/i18n/locales/nl-NL/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Upgraden naar Agent-kennisbank","upgrade.migratingDocuments": "Documenten migreren…","upgrade.modelCostDescription": "Bij het upgraden verwerken modellen de documenten in deze kennisbank en verbruiken ze tokens. Meer documentinhoud betekent meestal meer verbruik en kan aanzienlijke kosten met zich meebrengen. De werkelijke kosten hangen af van de facturering van het gebruikte model.",+ "upgrade.modelsUnavailable": "Sommige geselecteerde modellen zijn niet beschikbaar. Selecteer andere modellen en probeer het opnieuw.","upgrade.start": "Upgrade starten","upgrade.startFailed": "De upgrade kon niet worden gestart. Probeer het opnieuw.","upgrade.statusFailed": "Upgrade mislukt",diff --git a/web/i18n/locales/pl-PL/knowledge-upgrade.json b/web/i18n/locales/pl-PL/knowledge-upgrade.jsonindex 18ad6ed8329..e30eb6f940e 100644--- a/web/i18n/locales/pl-PL/knowledge-upgrade.json+++ b/web/i18n/locales/pl-PL/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Zaktualizuj do bazy wiedzy Agent","upgrade.migratingDocuments": "Migracja dokumentów…","upgrade.modelCostDescription": "Uaktualnienie używa modeli do przetworzenia dokumentów tej bazy wiedzy i zużywa tokeny. Im więcej treści w dokumentach, tym zwykle większe zużycie i potencjalnie wysokie koszty. Rzeczywisty koszt zależy od sposobu rozliczania używanego modelu.",+ "upgrade.modelsUnavailable": "Niektóre wybrane modele są niedostępne. Wybierz inne modele i spróbuj ponownie.","upgrade.start": "Rozpocznij aktualizację","upgrade.startFailed": "Nie udało się rozpocząć aktualizacji. Spróbuj ponownie.","upgrade.statusFailed": "Aktualizacja nie powiodła się",diff --git a/web/i18n/locales/pt-BR/knowledge-upgrade.json b/web/i18n/locales/pt-BR/knowledge-upgrade.jsonindex 7641df86ee3..232f7954b13 100644--- a/web/i18n/locales/pt-BR/knowledge-upgrade.json+++ b/web/i18n/locales/pt-BR/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Atualizar para uma base de conhecimento Agent","upgrade.migratingDocuments": "Migrando documentos…","upgrade.modelCostDescription": "A atualização usa modelos para processar os documentos desta base de conhecimento e consome tokens. Quanto mais conteúdo os documentos tiverem, geralmente maior o consumo, o que pode gerar custos elevados. O custo real depende da forma de cobrança do modelo utilizado.",+ "upgrade.modelsUnavailable": "Alguns modelos selecionados não estão disponíveis. Selecione outros modelos e tente novamente.","upgrade.start": "Iniciar atualização","upgrade.startFailed": "Não foi possível iniciar a atualização. Tente novamente.","upgrade.statusFailed": "Falha na atualização",diff --git a/web/i18n/locales/ro-RO/knowledge-upgrade.json b/web/i18n/locales/ro-RO/knowledge-upgrade.jsonindex c633e8e3923..43ce73bea7d 100644--- a/web/i18n/locales/ro-RO/knowledge-upgrade.json+++ b/web/i18n/locales/ro-RO/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Actualizează la o bază de cunoștințe Agent","upgrade.migratingDocuments": "Se migrează documentele…","upgrade.modelCostDescription": "Actualizarea folosește modele pentru a procesa documentele din această bază de cunoștințe și consumă tokenuri. Cu cât documentele au mai mult conținut, cu atât consumul este de obicei mai mare și pot apărea costuri ridicate. Costul real depinde de modul de facturare al modelului folosit.",+ "upgrade.modelsUnavailable": "Unele modele selectate nu sunt disponibile. Selectați alte modele și încercați din nou.","upgrade.start": "Începe actualizarea","upgrade.startFailed": "Actualizarea nu a putut fi începută. Încearcă din nou.","upgrade.statusFailed": "Actualizarea a eșuat",diff --git a/web/i18n/locales/ru-RU/knowledge-upgrade.json b/web/i18n/locales/ru-RU/knowledge-upgrade.jsonindex 1c559c6110a..3c125d1f750 100644--- a/web/i18n/locales/ru-RU/knowledge-upgrade.json+++ b/web/i18n/locales/ru-RU/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Обновить до базы знаний Agent","upgrade.migratingDocuments": "Перенос документов…","upgrade.modelCostDescription": "При обновлении модели обрабатывают документы этой базы знаний и расходуют токены. Чем больше содержимого в документах, тем обычно выше расход и тем выше могут быть затраты. Фактическая стоимость зависит от тарификации используемой модели.",+ "upgrade.modelsUnavailable": "Некоторые выбранные модели недоступны. Выберите другие модели и повторите попытку.","upgrade.start": "Начать обновление","upgrade.startFailed": "Не удалось начать обновление. Повторите попытку.","upgrade.statusFailed": "Ошибка обновления",diff --git a/web/i18n/locales/sl-SI/knowledge-upgrade.json b/web/i18n/locales/sl-SI/knowledge-upgrade.jsonindex d24a5a0a6bf..b993100581d 100644--- a/web/i18n/locales/sl-SI/knowledge-upgrade.json+++ b/web/i18n/locales/sl-SI/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Nadgradi v zbirko znanja Agent","upgrade.migratingDocuments": "Selitev dokumentov…","upgrade.modelCostDescription": "Nadgradnja uporablja modele za obdelavo dokumentov v tej bazi znanja in porablja žetone. Več vsebine v dokumentih običajno pomeni večjo porabo in lahko povzroči visoke stroške. Dejanski stroški so odvisni od načina obračunavanja uporabljenega modela.",+ "upgrade.modelsUnavailable": "Nekateri izbrani modeli niso na voljo. Izberite druge modele in poskusite znova.","upgrade.start": "Začni nadgradnjo","upgrade.startFailed": "Nadgradnje ni bilo mogoče začeti. Poskusite znova.","upgrade.statusFailed": "Nadgradnja ni uspela",diff --git a/web/i18n/locales/th-TH/knowledge-upgrade.json b/web/i18n/locales/th-TH/knowledge-upgrade.jsonindex 5dcf8140562..1838ac25554 100644--- a/web/i18n/locales/th-TH/knowledge-upgrade.json+++ b/web/i18n/locales/th-TH/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "อัปเกรดเป็นฐานความรู้ Agent","upgrade.migratingDocuments": "กำลังย้ายเอกสาร…","upgrade.modelCostDescription": "การอัปเกรดจะใช้โมเดลประมวลผลเอกสารในฐานความรู้นี้และใช้โทเค็น ยิ่งเอกสารมีเนื้อหามาก โดยทั่วไปยิ่งใช้มากขึ้นและอาจมีค่าใช้จ่ายสูง ค่าใช้จ่ายจริงขึ้นอยู่กับวิธีคิดค่าบริการของโมเดลที่ใช้",+ "upgrade.modelsUnavailable": "โมเดลที่เลือกบางรายการใช้งานไม่ได้ เลือกโมเดลอื่นแล้วลองอีกครั้ง","upgrade.start": "เริ่มอัปเกรด","upgrade.startFailed": "เริ่มอัปเกรดไม่ได้ โปรดลองอีกครั้ง","upgrade.statusFailed": "อัปเกรดไม่สำเร็จ",diff --git a/web/i18n/locales/tr-TR/knowledge-upgrade.json b/web/i18n/locales/tr-TR/knowledge-upgrade.jsonindex 746523dec04..6c97c006d84 100644--- a/web/i18n/locales/tr-TR/knowledge-upgrade.json+++ b/web/i18n/locales/tr-TR/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Agent bilgi tabanına yükselt","upgrade.migratingDocuments": "Belgeler taşınıyor…","upgrade.modelCostDescription": "Yükseltme, bu bilgi tabanındaki belgeleri işlemek için modelleri kullanır ve token tüketir. Belge içeriği arttıkça tüketim genellikle artar ve yüksek maliyetler oluşabilir. Gerçek maliyet, kullanılan modelin faturalandırma yöntemine bağlıdır.",+ "upgrade.modelsUnavailable": "Seçilen bazı modeller kullanılamıyor. Başka modeller seçip tekrar deneyin.","upgrade.start": "Yükseltmeyi başlat","upgrade.startFailed": "Yükseltme başlatılamadı. Tekrar deneyin.","upgrade.statusFailed": "Yükseltme başarısız",diff --git a/web/i18n/locales/uk-UA/knowledge-upgrade.json b/web/i18n/locales/uk-UA/knowledge-upgrade.jsonindex 607f1109c37..a2d5b2b3726 100644--- a/web/i18n/locales/uk-UA/knowledge-upgrade.json+++ b/web/i18n/locales/uk-UA/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Оновити до бази знань Agent","upgrade.migratingDocuments": "Перенесення документів…","upgrade.modelCostDescription": "Під час оновлення моделі обробляють документи цієї бази знань і витрачають токени. Чим більше вмісту в документах, тим зазвичай вища витрата і можливі значні витрати. Фактична вартість залежить від тарифікації моделі, що використовується.",+ "upgrade.modelsUnavailable": "Деякі вибрані моделі недоступні. Виберіть інші моделі та спробуйте ще раз.","upgrade.start": "Почати оновлення","upgrade.startFailed": "Не вдалося почати оновлення. Спробуйте ще раз.","upgrade.statusFailed": "Помилка оновлення",diff --git a/web/i18n/locales/vi-VN/knowledge-upgrade.json b/web/i18n/locales/vi-VN/knowledge-upgrade.jsonindex 32cd9b2611a..20a8cd46ae5 100644--- a/web/i18n/locales/vi-VN/knowledge-upgrade.json+++ b/web/i18n/locales/vi-VN/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "Nâng cấp lên cơ sở tri thức Agent","upgrade.migratingDocuments": "Đang di chuyển tài liệu…","upgrade.modelCostDescription": "Nâng cấp sẽ dùng mô hình để xử lý các tài liệu trong cơ sở kiến thức này và tiêu thụ token. Tài liệu càng nhiều nội dung thì mức tiêu thụ thường càng cao và có thể phát sinh chi phí lớn. Chi phí thực tế phụ thuộc vào cách tính phí của mô hình được sử dụng.",+ "upgrade.modelsUnavailable": "Một số mô hình đã chọn không khả dụng. Hãy chọn mô hình khác và thử lại.","upgrade.start": "Bắt đầu nâng cấp","upgrade.startFailed": "Không thể bắt đầu nâng cấp. Hãy thử lại.","upgrade.statusFailed": "Nâng cấp thất bại",diff --git a/web/i18n/locales/zh-Hans/knowledge-upgrade.json b/web/i18n/locales/zh-Hans/knowledge-upgrade.jsonindex 549413623e4..a1a91f5a4c2 100644--- a/web/i18n/locales/zh-Hans/knowledge-upgrade.json+++ b/web/i18n/locales/zh-Hans/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "升级为 Agent 知识库","upgrade.migratingDocuments": "正在迁移文档…","upgrade.modelCostDescription": "升级会调用模型处理知识库中的文档并消耗 token。文档内容越多,通常消耗越高,并可能产生较高费用。实际费用取决于所用模型的计费方式。",+ "upgrade.modelsUnavailable": "部分所选模型不可用,请重新选择后再试。","upgrade.start": "开始升级","upgrade.startFailed": "无法开始升级,请重试。","upgrade.statusFailed": "升级失败",diff --git a/web/i18n/locales/zh-Hant/knowledge-upgrade.json b/web/i18n/locales/zh-Hant/knowledge-upgrade.jsonindex a30147c0652..e187c733fd0 100644--- a/web/i18n/locales/zh-Hant/knowledge-upgrade.json+++ b/web/i18n/locales/zh-Hant/knowledge-upgrade.json@@ -14,6 +14,7 @@"upgrade.menuLabel": "升級為 Agent 知識庫","upgrade.migratingDocuments": "正在移轉文件…","upgrade.modelCostDescription": "升級會呼叫模型處理知識庫中的文件並消耗 token。文件內容越多,通常消耗越高,並可能產生較高費用。實際費用取決於所用模型的計費方式。",+ "upgrade.modelsUnavailable": "部分所選模型無法使用,請重新選擇後再試。","upgrade.start": "開始升級","upgrade.startFailed": "無法開始升級,請重試。","upgrade.statusFailed": "升級失敗",diff --git a/web/i18n/resources.generated.d.ts b/web/i18n/resources.generated.d.tsindex ae1bfee670f..dab5eeed4ca 100644--- a/web/i18n/resources.generated.d.ts+++ b/web/i18n/resources.generated.d.ts@@ -4100,6 +4100,7 @@ export default interface Resources {'upgrade.menuLabel': 'Upgrade to Agent Knowledge Base''upgrade.migratingDocuments': 'Migrating documents…''upgrade.modelCostDescription': 'Upgrading uses models to process the documents in this knowledge base and consumes tokens. More document content usually means higher usage and may result in significant costs. Actual costs depend on how the model you use is billed.'+ 'upgrade.modelsUnavailable': 'Some selected models are unavailable. Select other models and try again.''upgrade.start': 'Start upgrade''upgrade.startFailed': "The upgrade couldn't be started. Try again."'upgrade.statusFailed': 'Upgrade failed'diff --git a/web/service/console/query-policies.ts b/web/service/console/query-policies.tsindex 0f00024c400..863c27199ae 100644--- a/web/service/console/query-policies.ts+++ b/web/service/console/query-policies.ts@@ -1815,6 +1815,10 @@ export function createConsoleQuery(consoleClient: ConsoleClient) {},},},+ // The upgrade dialog reports start failures, including model issues, inline.+ knowledgeFsUpgrades: {+ post: { mutationOptions: { context: { silent: true } } },+ },get: {queryOptions: {// A missing or inaccessible dataset sends the detail page back to the list.