P1 #1 + #2 + #6: extended the chat / diffusion / training identifier hardening to every export-side request model. ExportCommonOptions (parent of ExportMergedModelRequest / ExportBaseModelRequest / ExportLoRAAdapterRequest) now applies _no_control_chars and _reject_embedded_hf_token to repo_id and base_model_id; ExportGGUFRequest gets the same on its repo_id plus a control-char check on quantization_method; and LoadCheckpointRequest validates checkpoint_path. Previously "/api/export/*" accepted newline-smuggled identifiers and URL-form ``hf_xxxxx`` tokens that flowed into log lines. P1 #3 + #4: ``_run_with_helper`` and ``_run_multi_pass_advisor`` now use a shared ``_gpu_workload_busy_for_helper`` that gates on diffusion (round 22 already), training, AND export. The round 22 guard only checked diffusion, so the dataset helper / advisor could still load llama-server on top of an active training run or a resident export checkpoint. Each step fails closed (unverifiable status counts as busy) so the user's primary workload is preserved. P1 #5: PublishDatasetRequest in models/data_recipe.py also applies the identifier hardening to repo_id; the publish path previously accepted control characters and URL-form tokens. P1 #7-10: added _validate_logged_identifier helper to routes/models.py and applied it to the path / query parameter endpoints that flow into logger.info(...) calls -- ``/config/{model_name}``, ``/check-vision/{model_name}``, ``/check-embedding/{model_name}``, ``/gguf-variants``. Mapped the validator's ValueError to HTTP 422 so the client sees the same shape as a Pydantic validation failure. P2 #11 + #12: ``Loading diffusion model %s`` and ``Diffusion load failed for %s`` log lines route ``repo_id`` / ``effective_base`` through ``_display_repo_id`` (collapses absolute local paths to the leaf, still scrubs HF tokens) instead of plain ``_redact_hf_tokens``. The error path was already collapsed in the user-facing 400 / RuntimeError, but the structured-log lines kept the full path. All 97 diffusion + training-validation + related tests pass locally.
162 lines
5.3 KiB
Python
162 lines
5.3 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
|
|
"""
|
|
Pydantic schemas for Data Recipe (DataDesigner) API.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
from pydantic import BaseModel, Field, field_validator, model_validator
|
|
|
|
# Round 23 P1 #5: identifier hardening reused from the chat models
|
|
# so /api/data_recipe/publish rejects control characters and
|
|
# URL-form ``hf_xxxxx`` tokens in ``repo_id`` before they reach
|
|
# log lines or the HF API.
|
|
from models.inference import _no_control_chars, _reject_embedded_hf_token
|
|
|
|
|
|
class RecipePayload(BaseModel):
|
|
recipe: dict[str, Any] = Field(default_factory = dict)
|
|
run: dict[str, Any] | None = None
|
|
ui: dict[str, Any] | None = None
|
|
|
|
|
|
class PreviewResponse(BaseModel):
|
|
dataset: list[dict[str, Any]] = Field(default_factory = list)
|
|
processor_artifacts: dict[str, Any] | None = None
|
|
analysis: dict[str, Any] | None = None
|
|
|
|
|
|
class ValidateError(BaseModel):
|
|
message: str
|
|
path: str | None = None
|
|
code: str | None = None
|
|
|
|
|
|
class ValidateResponse(BaseModel):
|
|
valid: bool
|
|
errors: list[ValidateError] = Field(default_factory = list)
|
|
raw_detail: str | None = None
|
|
|
|
|
|
class JobCreateResponse(BaseModel):
|
|
job_id: str
|
|
|
|
|
|
class PublishDatasetRequest(BaseModel):
|
|
repo_id: str = Field(min_length = 3, description = "Hugging Face dataset repo ID")
|
|
description: str = Field(
|
|
min_length = 1,
|
|
max_length = 4000,
|
|
description = "Short dataset description for the dataset card",
|
|
)
|
|
hf_token: str | None = Field(
|
|
default = None,
|
|
description = "Optional Hugging Face token for private or write-protected repos",
|
|
)
|
|
private: bool = Field(
|
|
default = False,
|
|
description = "Create or update the dataset repo as private",
|
|
)
|
|
artifact_path: str | None = Field(
|
|
default = None,
|
|
description = "Execution artifact path captured by the UI for completed runs",
|
|
)
|
|
|
|
@field_validator("repo_id")
|
|
@classmethod
|
|
def _no_repo_id_control_chars(cls, v, info):
|
|
return _no_control_chars(v, info.field_name)
|
|
|
|
@field_validator("repo_id")
|
|
@classmethod
|
|
def _no_repo_id_embedded_hf_tokens(cls, v, info):
|
|
return _reject_embedded_hf_token(v, info.field_name)
|
|
|
|
|
|
class PublishDatasetResponse(BaseModel):
|
|
success: bool = True
|
|
url: str
|
|
message: str
|
|
|
|
|
|
class SeedInspectRequest(BaseModel):
|
|
dataset_name: str = Field(min_length = 1)
|
|
hf_token: str | None = None
|
|
subset: str | None = None
|
|
split: str | None = "train"
|
|
preview_size: int = Field(default = 10, ge = 1, le = 50)
|
|
|
|
|
|
class SeedInspectUploadRequest(BaseModel):
|
|
# Legacy single-file flow (mutually exclusive with file_ids)
|
|
filename: str | None = None
|
|
content_base64: str | None = None
|
|
# Multi-file flow (mutually exclusive with content_base64)
|
|
block_id: str | None = None
|
|
file_ids: list[str] | None = None
|
|
file_names: list[str] | None = None
|
|
# Shared fields
|
|
preview_size: int = Field(default = 10, ge = 1, le = 50)
|
|
seed_source_type: str | None = None
|
|
unstructured_chunk_size: int | None = Field(default = None, ge = 1, le = 20000)
|
|
unstructured_chunk_overlap: int | None = Field(default = None, ge = 0, le = 20000)
|
|
|
|
@model_validator(mode = "after")
|
|
def _check_mutual_exclusivity(self) -> "SeedInspectUploadRequest":
|
|
has_legacy = self.content_base64 is not None
|
|
has_multi = self.file_ids is not None
|
|
if has_legacy and has_multi:
|
|
raise ValueError("Provide either content_base64 or file_ids, not both")
|
|
if not has_legacy and not has_multi:
|
|
raise ValueError("Provide either content_base64 or file_ids")
|
|
if has_multi:
|
|
if len(self.file_ids) == 0:
|
|
raise ValueError("file_ids must not be empty")
|
|
if not self.block_id:
|
|
raise ValueError("block_id is required when using file_ids")
|
|
if self.file_names is None or len(self.file_ids) != len(self.file_names):
|
|
raise ValueError(
|
|
"file_names must be provided and same length as file_ids"
|
|
)
|
|
if has_legacy:
|
|
if not self.filename:
|
|
raise ValueError("filename is required when using content_base64")
|
|
return self
|
|
|
|
|
|
class SeedInspectResponse(BaseModel):
|
|
dataset_name: str
|
|
resolved_path: str
|
|
columns: list[str] = Field(default_factory = list)
|
|
preview_rows: list[dict[str, Any]] = Field(default_factory = list)
|
|
split: str | None = None
|
|
subset: str | None = None
|
|
resolved_paths: list[str] | None = None
|
|
|
|
|
|
class UnstructuredFileUploadResponse(BaseModel):
|
|
file_id: str
|
|
filename: str
|
|
size_bytes: int
|
|
status: str # "ok" or "error"
|
|
error: str | None = None
|
|
|
|
|
|
class McpToolsListRequest(BaseModel):
|
|
mcp_providers: list[dict[str, Any]] = Field(default_factory = list)
|
|
timeout_sec: float | None = Field(default = None, gt = 0)
|
|
|
|
|
|
class McpToolsProviderResult(BaseModel):
|
|
name: str
|
|
tools: list[str] = Field(default_factory = list)
|
|
error: str | None = None
|
|
|
|
|
|
class McpToolsListResponse(BaseModel):
|
|
providers: list[McpToolsProviderResult] = Field(default_factory = list)
|
|
duplicate_tools: dict[str, list[str]] = Field(default_factory = dict)
|