mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-05-23 12:45:01 +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>
95 lines
3.4 KiB
TypeScript
95 lines
3.4 KiB
TypeScript
import { describe, it, expect } from 'vitest';
|
|
import { LEGACY_AGENTIC_REGEX } from '$lib/constants/agentic';
|
|
|
|
/**
|
|
* Tests for legacy marker stripping (used in migration).
|
|
* The new system does not embed markers in content - these tests verify
|
|
* the legacy regex patterns still work for the migration code.
|
|
*/
|
|
|
|
// Mirror the legacy stripping logic used during migration
|
|
function stripLegacyContextMarkers(content: string): string {
|
|
return content
|
|
.replace(new RegExp(LEGACY_AGENTIC_REGEX.REASONING_BLOCK.source, 'g'), '')
|
|
.replace(LEGACY_AGENTIC_REGEX.REASONING_OPEN, '')
|
|
.replace(new RegExp(LEGACY_AGENTIC_REGEX.AGENTIC_TOOL_CALL_BLOCK.source, 'g'), '')
|
|
.replace(LEGACY_AGENTIC_REGEX.AGENTIC_TOOL_CALL_OPEN, '');
|
|
}
|
|
|
|
// A realistic complete tool call block as stored in old message.content
|
|
const COMPLETE_BLOCK =
|
|
'\n\n<<<AGENTIC_TOOL_CALL_START>>>\n' +
|
|
'<<<TOOL_NAME:bash_tool>>>\n' +
|
|
'<<<TOOL_ARGS_START>>>\n' +
|
|
'{"command":"ls /tmp","description":"list tmp"}\n' +
|
|
'<<<TOOL_ARGS_END>>>\n' +
|
|
'file1.txt\nfile2.txt\n' +
|
|
'<<<AGENTIC_TOOL_CALL_END>>>\n';
|
|
|
|
// Partial block: streaming was cut before END arrived.
|
|
const OPEN_BLOCK =
|
|
'\n\n<<<AGENTIC_TOOL_CALL_START>>>\n' +
|
|
'<<<TOOL_NAME:bash_tool>>>\n' +
|
|
'<<<TOOL_ARGS_START>>>\n' +
|
|
'{"command":"ls /tmp","description":"list tmp"}\n' +
|
|
'<<<TOOL_ARGS_END>>>\n' +
|
|
'partial output...';
|
|
|
|
describe('legacy agentic marker stripping (for migration)', () => {
|
|
it('strips a complete tool call block, leaving surrounding text', () => {
|
|
const input = 'Before.' + COMPLETE_BLOCK + 'After.';
|
|
const result = stripLegacyContextMarkers(input);
|
|
expect(result).not.toContain('<<<');
|
|
expect(result).toContain('Before.');
|
|
expect(result).toContain('After.');
|
|
});
|
|
|
|
it('strips multiple complete tool call blocks', () => {
|
|
const input = 'A' + COMPLETE_BLOCK + 'B' + COMPLETE_BLOCK + 'C';
|
|
const result = stripLegacyContextMarkers(input);
|
|
expect(result).not.toContain('<<<');
|
|
expect(result).toContain('A');
|
|
expect(result).toContain('B');
|
|
expect(result).toContain('C');
|
|
});
|
|
|
|
it('strips an open/partial tool call block (no END marker)', () => {
|
|
const input = 'Lead text.' + OPEN_BLOCK;
|
|
const result = stripLegacyContextMarkers(input);
|
|
expect(result).toBe('Lead text.');
|
|
expect(result).not.toContain('<<<');
|
|
});
|
|
|
|
it('does not alter content with no markers', () => {
|
|
const input = 'Just a normal assistant response.';
|
|
expect(stripLegacyContextMarkers(input)).toBe(input);
|
|
});
|
|
|
|
it('strips reasoning block independently', () => {
|
|
const input = '<<<reasoning_content_start>>>think hard<<<reasoning_content_end>>>Answer.';
|
|
expect(stripLegacyContextMarkers(input)).toBe('Answer.');
|
|
});
|
|
|
|
it('strips both reasoning and agentic blocks together', () => {
|
|
const input =
|
|
'<<<reasoning_content_start>>>plan<<<reasoning_content_end>>>' +
|
|
'Some text.' +
|
|
COMPLETE_BLOCK;
|
|
expect(stripLegacyContextMarkers(input)).not.toContain('<<<');
|
|
expect(stripLegacyContextMarkers(input)).toContain('Some text.');
|
|
});
|
|
|
|
it('empty string survives', () => {
|
|
expect(stripLegacyContextMarkers('')).toBe('');
|
|
});
|
|
|
|
it('detects legacy markers', () => {
|
|
expect(LEGACY_AGENTIC_REGEX.HAS_LEGACY_MARKERS.test('normal text')).toBe(false);
|
|
expect(
|
|
LEGACY_AGENTIC_REGEX.HAS_LEGACY_MARKERS.test('text<<<AGENTIC_TOOL_CALL_START>>>more')
|
|
).toBe(true);
|
|
expect(LEGACY_AGENTIC_REGEX.HAS_LEGACY_MARKERS.test('<<<reasoning_content_start>>>think')).toBe(
|
|
true
|
|
);
|
|
});
|
|
});
|