* ui: bring @ggml-org/llama-ui into ui/lib/ui The design system package (tokens, fonts, surfaces, components and Model UI), so far in the temporary ggml-org/llama-ui repository at edaf518, moves to its home in ui/lib/ui, built with @sveltejs/package and published as @ggml-org/llama-ui from here. ui/lib holds the packages, one folder each. Its references to tools/ui now name ui/apps/chat, its package.json points at this repository, and the UI workflow type-checks and packs it. ui/README.md describes the layout. Assisted-by: Claude (Opus 5.5 Medium) * ui: Llama UI design system: tokens, surfaces and brand The design system from allozaur/docs/storybook-overhaul: three tiers of tokens, matte glass surfaces, Llama Sans and Llama Mono, and the base components on the new tokens (Tabs and GlassKey among them). It also restyles the stack's features with it, replacing the plain stand-ins they used until now. DESIGN.md is generated from the tokens. The Storybook that documents it is the next PR. Assisted-by: Claude (Opus 5.5 Medium) * ui: have Llama Chat use @ggml-org/llama-ui for its base components, tokens and fonts Llama Chat kept its own copy of the design system: 29 base components, the three tiers of tokens, the surfaces, the theme and the fonts, next to the 12 components ui/lib/ui held. The copy goes, and the library gets what it lacked. ui/lib/ui - the 17 base components the app had and the library did not (alert, alert-dialog, button-group, checkbox, collapsible, context-menu, dialog, drawer, dropdown-menu, empty, hover-card, radio-group, scroll-area, skeleton, table, tabs, textarea), with vaul-svelte for the drawer - the inset-group and selected-row tokens and surfaces - sources import each other by relative path instead of $lib, which in an app points at the app's own src/lib - theme.css no longer imports tw-animate-css: it is a peer dependency that the consumer imports before the theme, as it does Tailwind - 0.3.0 ui/apps/chat - imports the base components as @ggml-org/llama-ui/ui/<name> and cn/tv as @ggml-org/llama-ui/utils; app.css imports the library's theme.css - compiles the library from source, with no install or build of it: scripts/vite-plugin-llama-ui.ts resolves its entry points and what it imports, and svelte.config.js gives TypeScript the same paths - src/lib/components/ui, styles/tokens, styles/surfaces.css and assets/fonts are removed; components.json moves to the library Builds - CMake stages ui/lib/ui next to the app, keeping the layout of ui/, and rebuilds when a library source changes - the Dockerfiles copy the library's sources; the Nix derivation takes ui/ as its source The built CSS has the same rules in the same order, apart from one zero-specificity rule and the @font-face rules moving, plus ten utilities and two tokens that only the library's own components use. Assisted-by: Claude (Opus 5.5 Medium) * ui: AGENTS.md places Llama UI in ui/lib/ui Llama Chat's AGENTS.md says where each part lives: Llama UI is ui/lib/ui, and Chat imports its tokens, fonts and base components from there. Assisted-by: Claude (Opus 5.5 Medium) * ui: Llama Sans and Llama Mono from llama-brand's latest, and shell commands marked in bash code The fonts in ui/lib/ui come from llama-brand's latest, with optical sizes from 10 to 36. Bash code blocks mark shell commands and flags. Assisted-by: Claude (Opus 5.5 Medium) * ui: open submenus outside the menu they come from A submenu was rendered inside its parent menu, so the menu's scroll box clipped it: the glass menus' backdrop filter, and the filter and transform of the open animation, make the menu the containing block even for the fixed-position submenu. Dropdown and context submenus now render in a portal, like the menus themselves. Assisted-by: Claude (Opus 5.5 Medium) * ui: draw submenus like the menu they open from Submenus had smaller corners than their menus, and context menus had none of the dropdown's glass. Context-menu parts now match the dropdown's, and both submenus take the menu's corners and height cap, with their first row level with the row that opens them, 4px past the menu's edge. Sub-triggers take the items' radius and pointer. The submenus' height cap and zoom origin named the dropdown's CSS variables, which bits-ui does not set on submenus; they now use its --bits-menu-* ones. The chat group submenu takes the actions menu's z-[999999] layer, as it no longer renders inside that menu. Assisted-by: Claude (Opus 5.5 Medium) * ui: keep a late current-node write off a closed or switched conversation updateCurrentNode checked the active conversation, awaited the database write, then wrote currNode to whatever was active after it. When the conversation closed during the write it threw, and the reply ended in a streaming error dialog. When another conversation opened, that one got the wrong node. Assisted-by: Claude (Fable 5.2) * ui: have Llama Chat use the library's Model UI and app components Llama Chat still kept its own copies of what the library holds above the base components. It now takes them from @ggml-org/llama-ui too, and its copies go. ui/lib/ui - ModelId gains what Chat's had: the model's own draft kind, draft sidecars with their quant (ModelDraftSidecars, new), aliases, hideName and a tooltip, in the same badge order - entry points for them, like ui/<name>: @ggml-org/llama-ui/app/<group> (actions, content, forms, misc) and @ggml-org/llama-ui/models ui/apps/chat - ActionIcon, SearchInput, SyntaxHighlightedCode, Logo, ModelCapabilityIcons, ModelDownloadProgressBar and ModelDraftSidecars come from the library; Chat's copies and the two constants only they used are removed - ModelId and ModelOrgAvatar stay as thin wrappers: ModelId parses the raw id and applies the user's display settings, ModelOrgAvatar hides the avatar while Hub metadata is off - the svelte/* TypeScript path falls back to Svelte's types/index.d.ts: svelte/reactivity has no file of its own, so a library source importing it got its types from ui/lib/ui's own install when there was one Assisted-by: Claude (Opus 5.5 Medium) * ui: Llama UI takes the brand's colours and logo from llama-brand @ggml-org/llama-brand is now a dependency of the library, by the same GitHub tarball Llama Chat already installs, which now names it @ggml-org/llama-brand too. - primitives.css drops the 25 tokens it held copies of (the neutral greys, sand, the skies and cinder) and builds on llama-brand's css/colors.css instead; the skies' gradients point at llama-brand's. Apps import that file before theme.css, as they do Tailwind and tw-animate-css: the library's stylesheets import no package, so an app that compiles them from source resolves it from its own node_modules - Logo draws llama-brand's icon, in currentColor, and assets/logo.svg goes - Llama Chat's TypeScript paths resolve llama-brand from its own node_modules, like the library's other dependencies The fonts stay as the library's WOFF2 copies until llama-brand ships WOFF2 builds of them. Assisted-by: Claude (Opus 5.5 Medium) * ui: have Llama Chat take the library's constants, enums and helpers Llama Chat redefined most of what the library exports next to its components. Where the two were the same, Chat now re-exports the library's from the files that held them, so its own imports stay as they are. - the library gets entry points for them: @ggml-org/llama-ui/constants, @ggml-org/llama-ui/enums and @ggml-org/llama-ui/code, and @ggml-org/llama-ui/models carries the model data with the Model UI - from the library now: the shared CSS classes and code-block constants, the byte units, the memory-fit constants and minMemoryTierGb, the bit depth labels, the capability and modality icons, labels and order, ColorMode, TooltipSide, BooleanString, the model enums, ModelModalities, formatParameters, highlightCode and trimCodePadding - the library's modality order follows Chat's: vision, video, audio - Chat keeps its own where they differ: UI_DATA_ATTRS and ModelDownloadProgress are supersets of the library's (the latter extends it now), and formatFileSize counts in 1024s Assisted-by: Claude (Opus 5.5 Medium) * ui: give the chat form's add key and model selector a tighter shadow In light, the two keys inside the chat form, white on its white glass, took the control elevation, whose soft spread blended into the form. They take a new elevation-key instead: a 0.5px hairline all round and a 1px drop. In dark they keep the control elevation. Chosen from the options in Scrapbook › UI › Composer keys. - semantic tokens: --elevation-key (light: the hairline and the drop; dark: the control elevation) - component token: --chat-form-key-shadow, for the add key and every model selector trigger - DESIGN.md names it next to the other elevations Assisted-by: Claude (Opus 5.5 Medium)
619 lines
21 KiB
CMake
619 lines
21 KiB
CMake
# Provision UI assets and generate ui.cpp/ui.h.
|
|
#
|
|
# Asset provisioning priority:
|
|
# 1. Pre-built assets in SRC_DIST_DIR (manually built by user)
|
|
# 2. If BUILD_UI=ON: npm build
|
|
# 3. If above did not produce assets and HF_ENABLED=ON: HF Bucket download
|
|
# of dist.tar.gz (verified against dist.tar.gz.sha256)
|
|
|
|
cmake_minimum_required(VERSION 3.18)
|
|
|
|
set(UI_SOURCE_DIR "" CACHE STRING "UI source directory (to run npm build)")
|
|
set(UI_BINARY_DIR "" CACHE STRING "UI binary directory (to store generated files)")
|
|
set(LLAMA_SOURCE_DIR "" CACHE STRING "Project source root (to resolve version from git)")
|
|
set(HF_BUCKET "" CACHE STRING "Hugging Face bucket name")
|
|
set(HF_VERSION "" CACHE STRING "Version to download (empty = resolve from git)")
|
|
set(HF_ENABLED "" CACHE STRING "Whether to allow HF Bucket download (ON/OFF)")
|
|
set(BUILD_UI "" CACHE STRING "Build UI via npm (ON/OFF)")
|
|
set(LLAMA_UI_GZIP "" CACHE STRING "Apply gzip compress to assets to save bandwidth")
|
|
|
|
set(DIST_DIR "${UI_BINARY_DIR}/dist")
|
|
set(SRC_DIST_DIR "${UI_SOURCE_DIR}/dist")
|
|
# The stage keeps the layout of ui/: the app in apps/chat, with the sources of
|
|
# Llama UI that it compiles next to it in lib/ui (see ui/apps/chat/scripts/llama-ui.js).
|
|
set(STAGE_DIR "${UI_BINARY_DIR}/ui-src")
|
|
set(WORK_DIR "${STAGE_DIR}/apps/chat")
|
|
set(UI_LIB_DIR "${UI_SOURCE_DIR}/../../lib/ui")
|
|
set(STAMP_FILE "${UI_BINARY_DIR}/.ui-stamp")
|
|
set(EMBED_STAMP "${UI_BINARY_DIR}/.ui-embed.sha256")
|
|
set(UI_CPP "${UI_BINARY_DIR}/ui.cpp")
|
|
set(UI_H "${UI_BINARY_DIR}/ui.h")
|
|
|
|
function(mime_from_ext name out_var)
|
|
string(FIND "${name}" "." ext REVERSE)
|
|
if(ext GREATER -1)
|
|
string(SUBSTRING "${name}" ${ext} -1 ext_full)
|
|
string(SUBSTRING "${ext_full}" 1 -1 ext_str)
|
|
else()
|
|
set(ext_str "")
|
|
endif()
|
|
if(ext_str STREQUAL "html")
|
|
set(m "text/html; charset=utf-8")
|
|
elseif(ext_str STREQUAL "css")
|
|
set(m "text/css")
|
|
elseif(ext_str STREQUAL "js")
|
|
set(m "application/javascript")
|
|
elseif(ext_str STREQUAL "json")
|
|
set(m "application/json")
|
|
elseif(ext_str STREQUAL "webmanifest")
|
|
set(m "application/manifest+json")
|
|
elseif(ext_str STREQUAL "svg")
|
|
set(m "image/svg+xml")
|
|
elseif(ext_str STREQUAL "png")
|
|
set(m "image/png")
|
|
elseif(ext_str STREQUAL "jpg" OR ext_str STREQUAL "jpeg")
|
|
set(m "image/jpeg")
|
|
elseif(ext_str STREQUAL "ico")
|
|
set(m "image/x-icon")
|
|
elseif(ext_str STREQUAL "woff")
|
|
set(m "font/woff")
|
|
elseif(ext_str STREQUAL "woff2")
|
|
set(m "font/woff2")
|
|
else()
|
|
set(m "application/octet-stream")
|
|
endif()
|
|
set(${out_var} "${m}" PARENT_SCOPE)
|
|
endfunction()
|
|
|
|
# Fail when a dist tree is present but is missing files the UI needs at
|
|
# runtime; catches truncated/stale asset trees early with a useful message.
|
|
function(ui_validate_assets files in_dir)
|
|
list(LENGTH files n_assets)
|
|
if(n_assets EQUAL 0)
|
|
return()
|
|
endif()
|
|
|
|
set(found_index FALSE)
|
|
set(found_manifest FALSE)
|
|
set(found_sw FALSE)
|
|
# the service worker: SvelteKit's service-worker.js, or Workbox's workbox-*.js in the
|
|
# prebuilt archives of builds before SvelteKit 3
|
|
set(found_service_worker FALSE)
|
|
set(found_build_json FALSE)
|
|
set(found_version_json FALSE)
|
|
set(found_bundle_js FALSE)
|
|
set(found_bundle_css FALSE)
|
|
|
|
foreach(f ${files})
|
|
get_filename_component(base "${f}" NAME)
|
|
if(base STREQUAL "index.html")
|
|
set(found_index TRUE)
|
|
elseif(base STREQUAL "manifest.webmanifest")
|
|
set(found_manifest TRUE)
|
|
elseif(base STREQUAL "sw.js")
|
|
set(found_sw TRUE)
|
|
elseif(base STREQUAL "service-worker.js" OR base MATCHES "^workbox.*\\.js$")
|
|
set(found_service_worker TRUE)
|
|
elseif(base STREQUAL "build.json")
|
|
set(found_build_json TRUE)
|
|
elseif(base STREQUAL "version.json")
|
|
set(found_version_json TRUE)
|
|
elseif(base MATCHES "^bundle.*\\.js$")
|
|
set(found_bundle_js TRUE)
|
|
elseif(base MATCHES "^bundle.*\\.css$")
|
|
set(found_bundle_css TRUE)
|
|
endif()
|
|
endforeach()
|
|
|
|
set(missing "")
|
|
if(NOT found_index)
|
|
list(APPEND missing "index.html")
|
|
endif()
|
|
if(NOT found_manifest)
|
|
list(APPEND missing "manifest.webmanifest")
|
|
endif()
|
|
if(NOT found_sw)
|
|
list(APPEND missing "sw.js")
|
|
endif()
|
|
if(NOT found_service_worker)
|
|
list(APPEND missing "service-worker.js (or workbox[hash].js in an older build)")
|
|
endif()
|
|
if(NOT found_build_json)
|
|
list(APPEND missing "build.json")
|
|
endif()
|
|
if(NOT found_version_json)
|
|
list(APPEND missing "version.json")
|
|
endif()
|
|
if(NOT found_bundle_js)
|
|
list(APPEND missing "bundle[hash].js")
|
|
endif()
|
|
if(NOT found_bundle_css)
|
|
list(APPEND missing "bundle[hash].css")
|
|
endif()
|
|
|
|
if(missing)
|
|
set(listing "")
|
|
foreach(f ${files})
|
|
string(APPEND listing " ${f}\n")
|
|
endforeach()
|
|
set(missing_list "")
|
|
foreach(m ${missing})
|
|
string(APPEND missing_list " ${m}\n")
|
|
endforeach()
|
|
message(FATAL_ERROR
|
|
"UI: current asset files:\n${listing}"
|
|
"UI: missing required asset(s):\n${missing_list}"
|
|
"UI: hint: try cleaning your build directory: ${in_dir}")
|
|
endif()
|
|
endfunction()
|
|
|
|
# Generate ui.cpp/ui.h embedding every file of ${dist_dir} (empty table when
|
|
# it has no index.html), gzip-compressed when LLAMA_UI_GZIP is enabled.
|
|
function(emit_files dist_dir)
|
|
set(UI_TEMPLATE_DIR "${LLAMA_SOURCE_DIR}/ui/apps/chat")
|
|
|
|
# Collect the asset list once and reuse it for the fingerprint,
|
|
# validation, compression and embedding.
|
|
set(assets "")
|
|
if(EXISTS "${dist_dir}/index.html")
|
|
file(GLOB_RECURSE assets
|
|
LIST_DIRECTORIES false
|
|
RELATIVE "${dist_dir}"
|
|
"${dist_dir}/*")
|
|
list(FILTER assets EXCLUDE REGEX "^_gzip/")
|
|
list(SORT assets)
|
|
endif()
|
|
|
|
if(LLAMA_UI_GZIP AND NOT DEFINED ENV{SOURCE_DATE_EPOCH})
|
|
# Zero the gzip header timestamp so identical inputs give identical
|
|
# bytes (and therefore stable ETags) on every machine.
|
|
set(ENV{SOURCE_DATE_EPOCH} 0)
|
|
endif()
|
|
|
|
# Fingerprint of every input that determines ui.cpp/ui.h: compression
|
|
# settings, the asset tree (names + SHA-256) and this script + templates.
|
|
set(fp "${LLAMA_UI_GZIP}|$ENV{SOURCE_DATE_EPOCH}|${CMAKE_VERSION}\n")
|
|
foreach(f ${assets})
|
|
file(SHA256 "${dist_dir}/${f}" h)
|
|
string(APPEND fp "${f} ${h}\n")
|
|
endforeach()
|
|
foreach(g
|
|
"${CMAKE_CURRENT_FUNCTION_LIST_FILE}"
|
|
"${UI_TEMPLATE_DIR}/ui.h.in"
|
|
"${UI_TEMPLATE_DIR}/ui.cpp.in")
|
|
file(SHA256 "${g}" h)
|
|
string(APPEND fp "gen ${h}\n")
|
|
endforeach()
|
|
string(SHA256 fingerprint "${fp}")
|
|
|
|
if(EXISTS "${EMBED_STAMP}" AND EXISTS "${UI_CPP}" AND EXISTS "${UI_H}")
|
|
file(READ "${EMBED_STAMP}" fp_saved)
|
|
string(STRIP "${fp_saved}" fp_saved)
|
|
if(fp_saved STREQUAL "${fingerprint}")
|
|
message(STATUS "UI: assets unchanged, skipping embedding")
|
|
return()
|
|
endif()
|
|
endif()
|
|
|
|
# Drop the old stamp up front so a crash mid-generation cannot leave
|
|
# outputs and stamp out of sync.
|
|
file(REMOVE "${EMBED_STAMP}")
|
|
|
|
ui_validate_assets("${assets}" "${dist_dir}")
|
|
|
|
set(embed_dir "${dist_dir}")
|
|
set(use_gzip FALSE)
|
|
|
|
if(EXISTS "${dist_dir}/index.html")
|
|
if(EXISTS "${dist_dir}/_gzip")
|
|
# a _gzip tree inside dist_dir can only be a leftover from an
|
|
# older version of this script that staged it there
|
|
file(REMOVE_RECURSE "${dist_dir}/_gzip")
|
|
message(STATUS "UI: removed stale gzip tree ${dist_dir}/_gzip")
|
|
endif()
|
|
if(LLAMA_UI_GZIP)
|
|
# Compress every asset into a parallel _gzip/ tree under the build
|
|
# directory, served with Content-Encoding: gzip.
|
|
set(gzip_root "${UI_BINARY_DIR}/ui-gzip")
|
|
set(gzip_dir "${gzip_root}/_gzip")
|
|
file(REMOVE_RECURSE "${gzip_root}")
|
|
foreach(f IN LISTS assets)
|
|
get_filename_component(asset_path "${dist_dir}/${f}" REALPATH)
|
|
get_filename_component(dst_dir "${gzip_dir}/${f}" DIRECTORY)
|
|
file(MAKE_DIRECTORY "${dst_dir}")
|
|
file(ARCHIVE_CREATE
|
|
OUTPUT "${gzip_dir}/${f}"
|
|
PATHS "${asset_path}"
|
|
FORMAT raw
|
|
COMPRESSION GZip
|
|
)
|
|
endforeach()
|
|
message(STATUS "UI: gzip compression applied (${gzip_dir})")
|
|
set(embed_dir "${gzip_dir}")
|
|
set(use_gzip TRUE)
|
|
endif()
|
|
endif()
|
|
|
|
list(LENGTH assets n_assets)
|
|
|
|
# Per-asset arrays and table rows go into the ui.h.in / ui.cpp.in templates;
|
|
# configure_file only rewrites on content change, avoiding needless recompiles.
|
|
set(ASSET_ARRAYS "")
|
|
set(ASSET_TABLE "")
|
|
set(idx 0)
|
|
|
|
foreach(f IN LISTS assets)
|
|
file(READ "${embed_dir}/${f}" hex HEX)
|
|
if(hex STREQUAL "")
|
|
message(FATAL_ERROR "UI: empty file: ${embed_dir}/${f}")
|
|
endif()
|
|
|
|
string(REGEX REPLACE "(..)" "0x\\1," bytes "${hex}")
|
|
file(SHA256 "${embed_dir}/${f}" etag)
|
|
mime_from_ext("${f}" mime)
|
|
|
|
string(APPEND ASSET_ARRAYS
|
|
"static const unsigned char asset_${idx}[] = {${bytes}};\n")
|
|
|
|
string(APPEND ASSET_TABLE
|
|
" { \"${f}\", asset_${idx}, sizeof(asset_${idx}), \"\\\"${etag}\\\"\", \"${mime}\" },\n")
|
|
|
|
math(EXPR idx "${idx} + 1")
|
|
endforeach()
|
|
|
|
set(LLAMA_UI_HAS_ASSETS 0)
|
|
if(n_assets GREATER 0)
|
|
set(LLAMA_UI_HAS_ASSETS 1)
|
|
endif()
|
|
set(N_ASSETS "${n_assets}")
|
|
set(USE_GZIP false)
|
|
if(use_gzip)
|
|
set(USE_GZIP true)
|
|
endif()
|
|
|
|
configure_file("${UI_TEMPLATE_DIR}/ui.h.in" "${UI_H}" @ONLY)
|
|
configure_file("${UI_TEMPLATE_DIR}/ui.cpp.in" "${UI_CPP}" @ONLY)
|
|
|
|
# Write the embed stamp last, after both generated files succeeded.
|
|
file(WRITE "${EMBED_STAMP}" "${fingerprint}")
|
|
message(STATUS "UI: embedded ${n_assets} assets")
|
|
endfunction()
|
|
|
|
function(npm_build_should_skip out_var)
|
|
set(${out_var} FALSE PARENT_SCOPE)
|
|
|
|
if(NOT EXISTS "${DIST_DIR}/index.html")
|
|
return()
|
|
endif()
|
|
|
|
if(EXISTS "${STAMP_FILE}")
|
|
return()
|
|
endif()
|
|
|
|
if(NOT EXISTS "${UI_SOURCE_DIR}/sources.cmake")
|
|
return()
|
|
endif()
|
|
include("${UI_SOURCE_DIR}/sources.cmake")
|
|
|
|
set(globs "")
|
|
foreach(g ${UI_SOURCE_GLOBS})
|
|
list(APPEND globs "${UI_SOURCE_DIR}/${g}")
|
|
endforeach()
|
|
file(GLOB_RECURSE sources ${globs})
|
|
foreach(f ${UI_SOURCE_FILES})
|
|
list(APPEND sources "${UI_SOURCE_DIR}/${f}")
|
|
endforeach()
|
|
|
|
file(TIMESTAMP "${DIST_DIR}/index.html" out_ts)
|
|
|
|
foreach(s ${sources})
|
|
if(NOT EXISTS "${s}")
|
|
continue()
|
|
endif()
|
|
file(TIMESTAMP "${s}" s_ts)
|
|
if(s_ts STRGREATER out_ts)
|
|
return()
|
|
endif()
|
|
endforeach()
|
|
|
|
set(${out_var} TRUE PARENT_SCOPE)
|
|
endfunction()
|
|
|
|
function(stage_sources)
|
|
# everything but the app goes: the library, restaged below, and what a stage
|
|
# from before this layout left at the top, its node_modules included
|
|
if(EXISTS "${STAGE_DIR}")
|
|
file(GLOB staged RELATIVE "${STAGE_DIR}" "${STAGE_DIR}/*")
|
|
list(REMOVE_ITEM staged "apps")
|
|
foreach(entry ${staged})
|
|
file(REMOVE_RECURSE "${STAGE_DIR}/${entry}")
|
|
endforeach()
|
|
endif()
|
|
|
|
if(EXISTS "${WORK_DIR}")
|
|
file(GLOB staged RELATIVE "${WORK_DIR}" "${WORK_DIR}/*")
|
|
list(REMOVE_ITEM staged "node_modules")
|
|
foreach(entry ${staged})
|
|
file(REMOVE_RECURSE "${WORK_DIR}/${entry}")
|
|
endforeach()
|
|
endif()
|
|
|
|
file(COPY "${UI_SOURCE_DIR}/"
|
|
DESTINATION "${WORK_DIR}"
|
|
NO_SOURCE_PERMISSIONS
|
|
PATTERN "node_modules" EXCLUDE
|
|
)
|
|
|
|
# what the app reads of the library: its sources and the dependency list
|
|
file(COPY "${UI_LIB_DIR}/package.json"
|
|
DESTINATION "${STAGE_DIR}/lib/ui"
|
|
NO_SOURCE_PERMISSIONS
|
|
)
|
|
file(COPY "${UI_LIB_DIR}/src/lib"
|
|
DESTINATION "${STAGE_DIR}/lib/ui/src"
|
|
NO_SOURCE_PERMISSIONS
|
|
)
|
|
endfunction()
|
|
|
|
function(npm_build out_var)
|
|
set(${out_var} FALSE PARENT_SCOPE)
|
|
|
|
if(NOT EXISTS "${UI_SOURCE_DIR}/package.json")
|
|
message(STATUS "UI: ${UI_SOURCE_DIR}/package.json not found, skipping npm")
|
|
return()
|
|
endif()
|
|
|
|
npm_build_should_skip(skip)
|
|
if(skip)
|
|
message(STATUS "UI: npm output up-to-date, skipping build")
|
|
set(${out_var} TRUE PARENT_SCOPE)
|
|
return()
|
|
endif()
|
|
|
|
if(CMAKE_HOST_WIN32)
|
|
find_program(NPM_EXECUTABLE NAMES npm.cmd npm.bat npm)
|
|
else()
|
|
find_program(NPM_EXECUTABLE npm)
|
|
endif()
|
|
if(NOT NPM_EXECUTABLE)
|
|
message(STATUS "UI: npm not found, skipping npm build")
|
|
return()
|
|
endif()
|
|
|
|
stage_sources()
|
|
|
|
# npm writes node_modules/.package-lock.json on every successful install,
|
|
# so a package-lock.json newer than this marker means node_modules is stale
|
|
set(NPM_MARKER "${WORK_DIR}/node_modules/.package-lock.json")
|
|
set(need_install FALSE)
|
|
if(NOT EXISTS "${NPM_MARKER}")
|
|
set(need_install TRUE)
|
|
else()
|
|
file(TIMESTAMP "${WORK_DIR}/package-lock.json" lock_ts)
|
|
file(TIMESTAMP "${NPM_MARKER}" marker_ts)
|
|
if(lock_ts STRGREATER marker_ts)
|
|
set(need_install TRUE)
|
|
endif()
|
|
endif()
|
|
|
|
if(need_install)
|
|
message(STATUS "UI: running npm ci")
|
|
execute_process(
|
|
COMMAND ${NPM_EXECUTABLE} ci
|
|
WORKING_DIRECTORY "${WORK_DIR}"
|
|
RESULT_VARIABLE rc
|
|
ERROR_VARIABLE err
|
|
)
|
|
if(NOT rc EQUAL 0)
|
|
message(STATUS "UI: npm ci failed (${rc})")
|
|
message(STATUS " stderr: ${err}")
|
|
return()
|
|
endif()
|
|
endif()
|
|
|
|
file(MAKE_DIRECTORY "${DIST_DIR}")
|
|
|
|
message(STATUS "UI: running npm run build, output -> ${DIST_DIR}")
|
|
execute_process(
|
|
COMMAND ${CMAKE_COMMAND} -E env "LLAMA_UI_OUT_DIR=${DIST_DIR}" "LLAMA_UI_VERSION=${HF_VERSION}" "LLAMA_BUILD_NUMBER=${LLAMA_BUILD_NUMBER}"
|
|
${NPM_EXECUTABLE} run build
|
|
WORKING_DIRECTORY "${WORK_DIR}"
|
|
RESULT_VARIABLE rc
|
|
ERROR_VARIABLE err
|
|
)
|
|
if(NOT rc EQUAL 0)
|
|
message(STATUS "UI: npm run build failed (${rc})")
|
|
message(STATUS " stderr: ${err}")
|
|
return()
|
|
endif()
|
|
|
|
if(NOT EXISTS "${DIST_DIR}/index.html")
|
|
message(STATUS "UI: npm build finished but assets missing in ${DIST_DIR}")
|
|
return()
|
|
endif()
|
|
|
|
message(STATUS "UI: npm build succeeded")
|
|
file(REMOVE "${STAMP_FILE}")
|
|
set(${out_var} TRUE PARENT_SCOPE)
|
|
endfunction()
|
|
|
|
function(resolve_version out_var)
|
|
if(NOT "${HF_VERSION}" STREQUAL "")
|
|
set(${out_var} "${HF_VERSION}" PARENT_SCOPE)
|
|
return()
|
|
endif()
|
|
|
|
if(EXISTS "${LLAMA_SOURCE_DIR}/cmake/build-info.cmake")
|
|
include("${LLAMA_SOURCE_DIR}/cmake/build-info.cmake")
|
|
if(NOT "${BUILD_NUMBER}" STREQUAL "" AND NOT BUILD_NUMBER EQUAL 0)
|
|
set(${out_var} "b${BUILD_NUMBER}" PARENT_SCOPE)
|
|
return()
|
|
endif()
|
|
endif()
|
|
|
|
set(${out_var} "" PARENT_SCOPE)
|
|
endfunction()
|
|
|
|
function(hf_download version out_var out_resolved)
|
|
set(${out_var} FALSE PARENT_SCOPE)
|
|
set(${out_resolved} "" PARENT_SCOPE)
|
|
|
|
set(archive "${UI_BINARY_DIR}/dist.tar.gz")
|
|
|
|
# Use HF_TOKEN to benefit from higher rate limits
|
|
set(auth_headers "")
|
|
if(DEFINED ENV{HF_TOKEN} AND NOT "$ENV{HF_TOKEN}" STREQUAL "")
|
|
list(APPEND auth_headers "HTTPHEADER" "Authorization: Bearer $ENV{HF_TOKEN}")
|
|
endif()
|
|
|
|
set(candidates "")
|
|
if(NOT "${version}" STREQUAL "")
|
|
list(APPEND candidates "${version}")
|
|
endif()
|
|
list(APPEND candidates "latest")
|
|
|
|
foreach(resolved ${candidates})
|
|
set(base "https://huggingface.co/buckets/${HF_BUCKET}/resolve/${resolved}")
|
|
|
|
message(STATUS "UI: downloading from ${resolved}: ${base}/dist.tar.gz")
|
|
|
|
# Fetch the checksum first: when the archive we already have matches
|
|
# it, the expensive download is skipped and only extraction repeats.
|
|
file(DOWNLOAD "${base}/dist.tar.gz.sha256?download=true" "${archive}.sha256"
|
|
STATUS status TIMEOUT 30 ${auth_headers}
|
|
)
|
|
list(GET status 0 rc)
|
|
if(NOT rc EQUAL 0)
|
|
list(GET status 1 errmsg)
|
|
message(STATUS "UI: download dist.tar.gz.sha256 from ${resolved} failed: ${errmsg}")
|
|
continue()
|
|
endif()
|
|
|
|
# Validate the sha256 checksum: reject anything that is not a full
|
|
# 64-hex-digit digest before touching the archive.
|
|
file(READ "${archive}.sha256" expected)
|
|
string(REGEX MATCH "^[0-9a-fA-F]+" expected "${expected}")
|
|
string(TOLOWER "${expected}" expected)
|
|
string(LENGTH "${expected}" expected_len)
|
|
if(NOT expected_len EQUAL 64)
|
|
message(STATUS "UI: invalid checksum from ${resolved}")
|
|
continue()
|
|
endif()
|
|
|
|
set(actual "")
|
|
if(EXISTS "${archive}")
|
|
file(SHA256 "${archive}" actual)
|
|
endif()
|
|
|
|
if("${actual}" STREQUAL "${expected}")
|
|
message(STATUS "UI: local dist.tar.gz matches checksum from ${resolved}, skipping download")
|
|
else()
|
|
file(DOWNLOAD "${base}/dist.tar.gz?download=true" "${archive}"
|
|
STATUS status TIMEOUT 300 ${auth_headers}
|
|
)
|
|
list(GET status 0 rc)
|
|
if(NOT rc EQUAL 0)
|
|
list(GET status 1 errmsg)
|
|
message(STATUS "UI: download dist.tar.gz from ${resolved} failed: ${errmsg}")
|
|
continue()
|
|
endif()
|
|
|
|
file(SHA256 "${archive}" actual)
|
|
if(NOT "${actual}" STREQUAL "${expected}")
|
|
message(STATUS "UI: checksum mismatch for dist.tar.gz from ${resolved}")
|
|
continue()
|
|
endif()
|
|
endif()
|
|
|
|
# Remove the stamp with the dist tree it describes, together.
|
|
file(REMOVE "${STAMP_FILE}")
|
|
file(REMOVE_RECURSE "${DIST_DIR}")
|
|
|
|
file(ARCHIVE_EXTRACT INPUT "${archive}" DESTINATION "${DIST_DIR}")
|
|
|
|
if(NOT EXISTS "${DIST_DIR}/index.html")
|
|
message(STATUS "UI: archive from ${resolved} is missing required assets")
|
|
continue()
|
|
endif()
|
|
|
|
message(STATUS "UI: archive verified and extracted")
|
|
set(${out_var} TRUE PARENT_SCOPE)
|
|
set(${out_resolved} "${resolved}" PARENT_SCOPE)
|
|
return()
|
|
endforeach()
|
|
endfunction()
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 1. Priority 1: pre-built assets supplied in ui/apps/chat/dist
|
|
# ---------------------------------------------------------------------------
|
|
if(EXISTS "${SRC_DIST_DIR}/index.html")
|
|
message(STATUS "UI: using pre-built assets from ${SRC_DIST_DIR}")
|
|
emit_files("${SRC_DIST_DIR}")
|
|
return()
|
|
endif()
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 2. Priority 2: npm build (if BUILD_UI=ON)
|
|
# ---------------------------------------------------------------------------
|
|
set(provisioned FALSE)
|
|
|
|
if(BUILD_UI)
|
|
# Resolve version from git build-info if not explicitly set
|
|
resolve_version(HF_VERSION)
|
|
npm_build(NPM_OK)
|
|
if(NPM_OK)
|
|
set(provisioned TRUE)
|
|
endif()
|
|
endif()
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 3. Priority 3: HF Bucket download (if npm did not produce assets and HF_ENABLED=ON)
|
|
# ---------------------------------------------------------------------------
|
|
if(NOT provisioned AND HF_ENABLED)
|
|
resolve_version(VERSION)
|
|
|
|
# Stamp a successful HF download: records bucket + requested version and
|
|
# lets later steps distinguish downloaded assets from locally built ones.
|
|
set(stamp_key "${HF_BUCKET}|${VERSION}")
|
|
|
|
set(stamp_ok FALSE)
|
|
if(EXISTS "${STAMP_FILE}" AND EXISTS "${DIST_DIR}/index.html" AND NOT "${VERSION}" STREQUAL "")
|
|
file(READ "${STAMP_FILE}" stamped)
|
|
string(STRIP "${stamped}" stamped)
|
|
if(stamped STREQUAL "${stamp_key}")
|
|
set(stamp_ok TRUE)
|
|
endif()
|
|
endif()
|
|
|
|
if(stamp_ok)
|
|
message(STATUS "UI: HF stamp matches '${stamp_key}', skipping HF fetch")
|
|
set(provisioned TRUE)
|
|
else()
|
|
hf_download("${VERSION}" HF_OK HF_RESOLVED)
|
|
if(HF_OK)
|
|
file(WRITE "${STAMP_FILE}" "${stamp_key}")
|
|
message(STATUS "UI: HF download succeeded, stamp updated (${stamp_key}, resolved: ${HF_RESOLVED})")
|
|
set(provisioned TRUE)
|
|
else()
|
|
message(STATUS "UI: HF download failed")
|
|
endif()
|
|
endif()
|
|
endif()
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# 4. Fallback: warn about stale or missing assets, then emit whatever we have
|
|
# ---------------------------------------------------------------------------
|
|
if(NOT provisioned)
|
|
if(EXISTS "${DIST_DIR}/index.html")
|
|
message(WARNING "UI: provisioning failed; embedding stale assets from ${DIST_DIR}")
|
|
else()
|
|
message(WARNING "UI: no assets available - building without an embedded UI. "
|
|
"In a disconnected environment, download the pre-built UI "
|
|
"from a llama.cpp release at "
|
|
"https://github.com/ggml-org/llama.cpp/releases and "
|
|
"extract to ui/apps/chat/dist.")
|
|
endif()
|
|
endif()
|
|
|
|
emit_files("${DIST_DIR}")
|