59778f0196
* webui: Move static build output from `tools/server/public` to `build/ui` directory * refactor: Move to `tools/ui` * refactor: rename CMake variables and preprocessor defines - Rename LLAMA_BUILD_WEBUI -> LLAMA_BUILD_UI (old kept as deprecated) - Rename LLAMA_USE_PREBUILT_WEBUI -> LLAMA_USE_PREBUILT_UI (old kept as deprecated) - Backward compat: old vars auto-forward to new ones with DEPRECATION warning - Rename internal vars: WEBUI_SOURCE -> UI_SOURCE, WEBUI_SOURCE_DIR -> UI_SOURCE_DIR, etc. - Rename HF bucket: LLAMA_WEBUI_HF_BUCKET -> LLAMA_UI_HF_BUCKET - Emit both LLAMA_BUILD_WEBUI and LLAMA_BUILD_UI preprocessor defines - Emit both LLAMA_WEBUI_DEFAULT_ENABLED and LLAMA_UI_DEFAULT_ENABLED * refactor: rename CLI flags (--webui -> --ui) with backward compat - Add --ui/--no-ui (old --webui/--no-webui kept as deprecated aliases) - Add --ui-config (old --webui-config kept as deprecated alias) - Add --ui-config-file (old --webui-config-file kept as deprecated alias) - Add --ui-mcp-proxy/--no-ui-mcp-proxy (old --webui-mcp-proxy kept as deprecated) - Add new env vars: LLAMA_ARG_UI, LLAMA_ARG_UI_CONFIG, LLAMA_ARG_UI_CONFIG_FILE, LLAMA_ARG_UI_MCP_PROXY - C++ struct fields: params.ui, params.ui_config_json, params.ui_mcp_proxy added alongside old fields - Backward compat: old fields synced to new ones in g_params_to_internals * refactor: update C++ server internals with backward compat - Rename json_webui_settings -> json_ui_settings (both kept in server_context_meta) - Rename params.webui usage -> params.ui (both synced, old still works) - JSON API emits both "ui"/"ui_settings" and "webui"/"webui_settings" keys - Server routes use params.ui_mcp_proxy || params.webui_mcp_proxy - Preprocessor guards use #if defined(LLAMA_BUILD_UI) || defined(LLAMA_BUILD_WEBUI) * refactor: rename CI/CD workflows, artifacts, and build script - Rename webui-build.yml -> ui-build.yml; artifact webui-build -> ui-build - Rename webui-publish.yml -> ui-publish.yml; var HF_BUCKET_WEBUI_STATIC_OUTPUT -> HF_BUCKET_UI_STATIC_OUTPUT - Rename server-webui.yml -> server-ui.yml; job webui-build/checks -> ui-build/checks - Update server.yml: job/artifact refs webui-build -> ui-build - Update release.yml: all webui-build/publish refs -> ui-build/publish; HF_TOKEN_WEBUI_STATIC_OUTPUT -> HF_TOKEN_UI_STATIC_OUTPUT - Update server-self-hosted.yml: webui-build -> ui-build - Update build-self-hosted.yml: HF_WEBUI_VERSION -> HF_UI_VERSION - Rename webui-download.cmake -> ui-download.cmake (internal refs updated) - Update labeler.yml: server/webui -> server/ui path label * docs: update CODEOWNERS and server README docs - Update CODEOWNERS: team ggml-org/llama-webui -> ggml-org/llama-ui, path /tools/server/webui/ -> /tools/ui/ - Update server README.md: CLI tables show --ui flags with deprecated --webui aliases - Update server README-dev.md: "WebUI" -> "UI", paths updated to tools/ui/ * fix: Small fixes for UI build * fix: CMake.txt syntax * chore: Formatting * fix: `.editorconfig` for llama-ui * chore: Formatting * refactor: Use `APP_NAME` in Error route * refactor: Cleanup * refactor: Single migration service * make llama-ui a linkable target * fix: UI Build output * fix: Missing change * fix: separate llama-ui npm build output into build/tools/ui/dist subfolder + use cmake npm build instead of downloading ui-build.yml artifacts in CI * refactor: UI workflows cleanup --------- Co-authored-by: Xuan Son Nguyen <son@huggingface.co>
57 lines
2.0 KiB
TypeScript
57 lines
2.0 KiB
TypeScript
/**
|
|
* Normalizes a model name by extracting the filename from a path, but preserves Hugging Face repository format.
|
|
*
|
|
* Handles both forward slashes (/) and backslashes (\) as path separators.
|
|
* - If the model name has exactly one slash (org/model format), preserves the full "org/model" name
|
|
* - If the model name has no slash or multiple slashes, extracts just the filename
|
|
* - If the model name is just a filename (no path), returns it as-is.
|
|
*
|
|
* @param modelName - The model name or path to normalize
|
|
* @returns The normalized model name
|
|
*
|
|
* @example
|
|
* normalizeModelName('models/llama-3.1-8b') // Returns: 'llama-3.1-8b' (multiple slashes -> filename)
|
|
* normalizeModelName('C:\\Models\\gpt-4') // Returns: 'gpt-4' (multiple slashes -> filename)
|
|
* normalizeModelName('meta-llama/Llama-3.1-8B') // Returns: 'meta-llama/Llama-3.1-8B' (Hugging Face format)
|
|
* normalizeModelName('simple-model') // Returns: 'simple-model' (no slash)
|
|
* normalizeModelName(' spaced ') // Returns: 'spaced'
|
|
* normalizeModelName('') // Returns: ''
|
|
*/
|
|
export function normalizeModelName(modelName: string): string {
|
|
const trimmed = modelName.trim();
|
|
|
|
if (!trimmed) {
|
|
return '';
|
|
}
|
|
|
|
const segments = trimmed.split(/[\\/]/);
|
|
|
|
// If we have exactly 2 segments (one slash), treat it as Hugging Face repo format
|
|
// and preserve the full "org/model" format
|
|
if (segments.length === 2) {
|
|
const [org, model] = segments;
|
|
const trimmedOrg = org?.trim();
|
|
const trimmedModel = model?.trim();
|
|
|
|
if (trimmedOrg && trimmedModel) {
|
|
return `${trimmedOrg}/${trimmedModel}`;
|
|
}
|
|
}
|
|
|
|
// For other cases (no slash, or multiple slashes), extract just the filename
|
|
const candidate = segments.pop();
|
|
const normalized = candidate?.trim();
|
|
|
|
return normalized && normalized.length > 0 ? normalized : trimmed;
|
|
}
|
|
|
|
/**
|
|
* Validates if a model name is valid (non-empty after normalization).
|
|
*
|
|
* @param modelName - The model name to validate
|
|
* @returns true if valid, false otherwise
|
|
*/
|
|
export function isValidModelName(modelName: string): boolean {
|
|
return normalizeModelName(modelName).length > 0;
|
|
}
|