Skip to content

Commit 5910711

Browse files
committed
Merge branch 'master' into xsn/webui_pako
2 parents 9383d11 + d486dd3 commit 5910711

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

docs/multimodal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ llama-server -hf ggml-org/gemma-3-4b-it-GGUF --no-mmproj-offload
3131

3232
## Pre-quantized models
3333

34-
These are ready-to-use models, most of them come with `Q4_K_M` quantization by default.
34+
These are ready-to-use models, most of them come with `Q4_K_M` quantization by default. They can be found at the Hugging Face page of the ggml-org: https://huggingface.co/ggml-org
3535

3636
Replaces the `(tool_name)` with the name of binary you want to use. For example, `llama-mtmd-cli` or `llama-server`
3737

scripts/compare-llama-bench.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
help_s = (
114114
"Columns to add to the table. "
115115
"Accepts a comma-separated list of values. "
116-
f"Legal values: {', '.join(KEY_PROPERTIES[:-2])}. "
116+
f"Legal values: {', '.join(KEY_PROPERTIES[:-3])}. "
117117
"Defaults to model name (model_type) and CPU and/or GPU name (cpu_info, gpu_info) "
118118
"plus any column where not all data points are the same. "
119119
"If the columns are manually specified, then the results for each unique combination of the "
@@ -505,7 +505,7 @@ def valid_format(data_files: list[str]) -> bool:
505505
show = known_args.show.split(",")
506506
unknown_cols = []
507507
for prop in show:
508-
if prop not in KEY_PROPERTIES[:-2]: # Last two values are n_prompt, n_gen.
508+
if prop not in KEY_PROPERTIES[:-3]: # Last three values are n_prompt, n_gen, n_depth.
509509
unknown_cols.append(prop)
510510
if unknown_cols:
511511
logger.error(f"Unknown values for --show: {', '.join(unknown_cols)}")

tools/server/public/index.html.gz

67 Bytes
Binary file not shown.

tools/server/webui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc -b && vite build",
8+
"build": "npm run format && tsc -b && vite build",
99
"format": "eslint . && prettier --write .",
1010
"lint": "eslint .",
1111
"preview": "vite preview"

tools/server/webui/src/components/ChatScreen.tsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useEffect, useMemo, useRef, useState } from 'react';
1+
import { ClipboardEvent, useEffect, useMemo, useRef, useState } from 'react';
22
import { CallbackGeneratedChunk, useAppContext } from '../utils/app.context';
33
import ChatMessage from './ChatMessage';
44
import { CanvasType, Message, PendingMessage } from '../utils/types';
@@ -328,6 +328,17 @@ function ChatInput({
328328
{({ getRootProps, getInputProps }) => (
329329
<div
330330
className="flex flex-col rounded-xl border-1 border-base-content/30 p-3 w-full"
331+
onPasteCapture={(e: ClipboardEvent<HTMLInputElement>) => {
332+
const files = Array.from(e.clipboardData.items)
333+
.filter((item) => item.kind === 'file')
334+
.map((item) => item.getAsFile())
335+
.filter((file) => file !== null);
336+
337+
if (files.length > 0) {
338+
e.preventDefault();
339+
extraContext.onFileAdded(files);
340+
}
341+
}}
331342
{...getRootProps()}
332343
>
333344
{!isGenerating && (

0 commit comments

Comments
 (0)