mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-05-18 23:49:46 +00:00
* 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>
157 lines
6.3 KiB
CMake
157 lines
6.3 KiB
CMake
set(TARGET llama-ui)
|
|
|
|
# Deprecated: use LLAMA_UI_HF_BUCKET instead
|
|
set(LLAMA_WEBUI_HF_BUCKET "llama-ui" CACHE STRING "Hugging Face bucket name for prebuilt webui assets (deprecated: use LLAMA_UI_HF_BUCKET)")
|
|
set(LLAMA_UI_HF_BUCKET "llama-ui" CACHE STRING "Hugging Face bucket name for prebuilt UI assets")
|
|
|
|
# Backward compat: forward old var to new one
|
|
if(DEFINED LLAMA_WEBUI_HF_BUCKET AND NOT DEFINED LLAMA_UI_HF_BUCKET)
|
|
set(LLAMA_UI_HF_BUCKET ${LLAMA_WEBUI_HF_BUCKET})
|
|
elseif(DEFINED LLAMA_WEBUI_HF_BUCKET AND NOT "${LLAMA_WEBUI_HF_BUCKET}" STREQUAL "${LLAMA_UI_HF_BUCKET}")
|
|
message(DEPRECATION "LLAMA_WEBUI_HF_BUCKET is deprecated, use LLAMA_UI_HF_BUCKET instead")
|
|
endif()
|
|
|
|
set(TARGET_SRCS "")
|
|
set(UI_COMPILE_DEFS "")
|
|
|
|
# Support both old (LLAMA_BUILD_WEBUI) and new (LLAMA_BUILD_UI) option names
|
|
if(LLAMA_BUILD_WEBUI OR LLAMA_BUILD_UI)
|
|
if(LLAMA_BUILD_WEBUI AND NOT LLAMA_BUILD_UI)
|
|
message(DEPRECATION "LLAMA_BUILD_WEBUI is deprecated, use LLAMA_BUILD_UI instead")
|
|
endif()
|
|
|
|
set(PUBLIC_ASSETS
|
|
index.html
|
|
bundle.js
|
|
bundle.css
|
|
loading.html
|
|
)
|
|
|
|
# Determine source of UI assets (priority: local > HF Bucket)
|
|
set(UI_SOURCE "")
|
|
set(UI_SOURCE_DIR "")
|
|
|
|
# Priority 1: Check for local build output
|
|
set(LOCAL_UI_DIR "${PROJECT_SOURCE_DIR}/build/tools/ui/dist")
|
|
|
|
# Verify all required assets exist before declaring local source valid
|
|
set(ALL_ASSETS_PRESENT TRUE)
|
|
foreach(asset ${PUBLIC_ASSETS})
|
|
if(NOT EXISTS "${LOCAL_UI_DIR}/${asset}")
|
|
set(ALL_ASSETS_PRESENT FALSE)
|
|
break()
|
|
endif()
|
|
endforeach()
|
|
|
|
if(ALL_ASSETS_PRESENT)
|
|
set(UI_SOURCE "local")
|
|
set(UI_SOURCE_DIR "${LOCAL_UI_DIR}")
|
|
message(STATUS "UI: using local build from ${UI_SOURCE_DIR}")
|
|
endif()
|
|
|
|
# Priority 2: Build-time asset provisioning (npm build → HF Bucket fallback)
|
|
if(NOT UI_SOURCE_DIR)
|
|
# Environment variable takes precedence (e.g., from CI workflows)
|
|
# Deprecated: use HF_UI_VERSION instead
|
|
if(DEFINED ENV{HF_WEBUI_VERSION})
|
|
set(HF_UI_VERSION "$ENV{HF_WEBUI_VERSION}")
|
|
message(DEPRECATION "HF_WEBUI_VERSION env var is deprecated, use HF_UI_VERSION instead")
|
|
if(NOT HF_UI_VERSION MATCHES "^[A-Za-z0-9._-]+$")
|
|
message(FATAL_ERROR "UI: invalid HF_WEBUI_VERSION='${HF_UI_VERSION}' - must match ^[A-Za-z0-9._-]+$")
|
|
endif()
|
|
elseif(DEFINED ENV{HF_UI_VERSION})
|
|
set(HF_UI_VERSION "$ENV{HF_UI_VERSION}")
|
|
if(NOT HF_UI_VERSION MATCHES "^[A-Za-z0-9._-]+$")
|
|
message(FATAL_ERROR "UI: invalid HF_UI_VERSION='${HF_UI_VERSION}' - must match ^[A-Za-z0-9._-]+$")
|
|
endif()
|
|
elseif(DEFINED LLAMA_BUILD_NUMBER)
|
|
set(HF_UI_VERSION "b${LLAMA_BUILD_NUMBER}")
|
|
message(STATUS "UI: derived HF_UI_VERSION=b${LLAMA_BUILD_NUMBER}")
|
|
else()
|
|
set(HF_UI_VERSION "")
|
|
message(STATUS "UI: version not specified (will use HF 'latest')")
|
|
endif()
|
|
|
|
if("${HF_UI_VERSION}" STREQUAL "")
|
|
set(UI_VERSION_TAG "provisioned")
|
|
else()
|
|
set(UI_VERSION_TAG "${HF_UI_VERSION}")
|
|
endif()
|
|
set(UI_STAMP "${CMAKE_CURRENT_BINARY_DIR}/.ui-${UI_VERSION_TAG}.stamp")
|
|
|
|
string(REPLACE ";" "+" PUBLIC_ASSETS_JOINED "${PUBLIC_ASSETS}")
|
|
|
|
add_custom_command(
|
|
OUTPUT ${UI_STAMP}
|
|
COMMAND ${CMAKE_COMMAND}
|
|
"-DSOURCE_DIR=${PROJECT_SOURCE_DIR}"
|
|
"-DPUBLIC_DIR=${PROJECT_SOURCE_DIR}/build/tools/ui/dist"
|
|
"-DHF_BUCKET=${LLAMA_UI_HF_BUCKET}"
|
|
"-DHF_VERSION=${HF_UI_VERSION}"
|
|
"-DHF_ENABLED=${LLAMA_USE_PREBUILT_UI}"
|
|
"-DASSETS=${PUBLIC_ASSETS_JOINED}"
|
|
"-DSTAMP_FILE=${UI_STAMP}"
|
|
"-DNPM_DIR=${PROJECT_SOURCE_DIR}/tools/ui"
|
|
-P ${PROJECT_SOURCE_DIR}/scripts/ui-download.cmake
|
|
COMMENT "Building/provisioning UI assets (npm build -> HF Bucket fallback)"
|
|
)
|
|
|
|
set(UI_SOURCE "provisioned")
|
|
set(UI_SOURCE_DIR "${PROJECT_SOURCE_DIR}/build/tools/ui/dist")
|
|
endif()
|
|
|
|
# Process assets from the determined source
|
|
if(UI_SOURCE_DIR)
|
|
foreach(asset ${PUBLIC_ASSETS})
|
|
set(input "${UI_SOURCE_DIR}/${asset}")
|
|
set(output "${CMAKE_CURRENT_BINARY_DIR}/${asset}.hpp")
|
|
list(APPEND TARGET_SRCS ${output})
|
|
|
|
if(UI_SOURCE STREQUAL "local")
|
|
if(NOT EXISTS "${input}")
|
|
message(FATAL_ERROR "UI asset not found: ${input}")
|
|
endif()
|
|
set(dependency "${input}")
|
|
else()
|
|
set(dependency "${UI_STAMP}")
|
|
endif()
|
|
|
|
add_custom_command(
|
|
DEPENDS ${dependency}
|
|
OUTPUT "${output}"
|
|
COMMAND "${CMAKE_COMMAND}" "-DINPUT=${input}" "-DOUTPUT=${output}" -P "${PROJECT_SOURCE_DIR}/scripts/xxd.cmake"
|
|
)
|
|
set_source_files_properties(${output} PROPERTIES GENERATED TRUE)
|
|
endforeach()
|
|
|
|
list(APPEND UI_COMPILE_DEFS
|
|
LLAMA_BUILD_WEBUI # Deprecated: use LLAMA_BUILD_UI
|
|
LLAMA_BUILD_UI
|
|
LLAMA_WEBUI_DEFAULT_ENABLED=1 # Deprecated: use LLAMA_UI_DEFAULT_ENABLED
|
|
LLAMA_UI_DEFAULT_ENABLED=1
|
|
)
|
|
message(STATUS "UI: embedded with source: ${UI_SOURCE}")
|
|
else()
|
|
message(WARNING "UI: no source available. Neither local build (build/tools/ui/dist/) nor HF Bucket download succeeded.")
|
|
message(WARNING "UI: building server without embedded UI. Set LLAMA_BUILD_UI=OFF to suppress this warning.")
|
|
list(APPEND UI_COMPILE_DEFS LLAMA_WEBUI_DEFAULT_ENABLED=0 LLAMA_UI_DEFAULT_ENABLED=0)
|
|
endif()
|
|
else()
|
|
list(APPEND UI_COMPILE_DEFS LLAMA_WEBUI_DEFAULT_ENABLED=0 LLAMA_UI_DEFAULT_ENABLED=0)
|
|
endif()
|
|
|
|
# Build the static library
|
|
add_library(${TARGET} STATIC ui.cpp)
|
|
|
|
target_include_directories(${TARGET} PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}
|
|
${CMAKE_CURRENT_BINARY_DIR}
|
|
)
|
|
|
|
target_compile_definitions(${TARGET} PUBLIC ${UI_COMPILE_DEFS})
|
|
|
|
if(TARGET_SRCS)
|
|
# List generated .hpp files as sources so CMake tracks them as build dependencies
|
|
target_sources(${TARGET} PRIVATE ${TARGET_SRCS})
|
|
set_source_files_properties(${TARGET_SRCS} PROPERTIES HEADER_FILE_ONLY TRUE)
|
|
endif()
|