131 Commits

Include renames

Author	SHA1	Message	Date
Aldehir RojasandGitHub	6ba5ef2470	common/chat: add specialized minimax m3 parser (#26210)	2026-07-28 04:27:20 -05:00
Aldehir RojasandGitHub	910196f6b3	common : add support for multiple end sequences in the reasoning budget sampler (#25544) ... * common : extract trie/ac to a separate file * common : support multiple token sequences in the reasoning budget sampler * common/trie : return matched word index * common/trie : rename "word" to "pattern" * common/reasoning-budget : expose matched end sequence * common/sampling : replay end sequence when reasoning budget is done * cont : update to use multiple end sequences * cont : clean up	2026-07-25 11:58:09 +02:00
Matt ThompsonandGitHub	8f5ab832ca	cohere2 moe template parser: enforce JSON schema for text responses if a response schema is provided (#26018)	2026-07-24 12:54:47 +02:00
Piotr Wilkin (ilintar)andGitHub	f534da26e4	Fix DeepSeek4 crafted template (#25414) ... * chat: fix DS4 template to explicitly follow reference behavior * Support DeepSeekv4 flag (`drop_reasoning`). * fix: hook DS3.2 parser for DS4 as well * fix: add tool result reordering * fix: post-merge	2026-07-22 12:54:40 +02:00
4 people	2d973636e2	chat: trim messages sent to StepFun parser (fixes long reasoning loops) (#25238) ... * chat: trim messages sent to StepFun parser (fixes long reasoning loops) * add regression test; remove duplicate template * chat: trim StepFun content parts before rendering The StepFun trim workaround ran on the already-rendered messages, where typed content parts have been concatenated into a single string, so the per-part whitespace could no longer be reached. Move the trim ahead of rendering and apply it to content_parts text as well as the string content and reasoning_content. Adds a content-parts regression test. Co-Authored-By: Piotr Wilkin <ilintar@gmail.com> Assisted-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: tarruda <tpadilha84@gmail.com>	2026-07-03 23:12:11 +02:00
Xuan-Son NguyenandGitHub	b3fed31b99	jinja, chat: add --reasoning-preserve flag (#25105) ... * jinja, chat: add --reasoning-preserve flag * correct help message	2026-06-28 23:33:51 +02:00
4 people	c818263f2a	chat : implement minicpm5 parser (#24889) ... * Add minicpm5 tool call parser * Refactor MiniCPM5 PEG parser per review feedback * Fix jinja min/max API to match Jinja2 * modify by review * MiniCPM5: use autoparser for XML tool calls and fix grammar preserved-token triggers * MiniCPM5: fix streaming tool-arg placeholder and remove alt XML markers * skip min/max attribute tests in -py mode * test-jinja: use real expected output for min/max attribute tests * MiniCPM5: revert shared mapper and history fallbacks per review Drop streaming tool-arg placeholder workarounds from the generic PEG mapper and restore strict tool-call argument JSON parsing so MiniCPM5 support stays limited to autoparser/diff-analyzer changes. * chat : refactor minicpm5 back to dedicated parser * cont : simplify grammar * cont : refactor * cont : fixes * cont : rename template to openbmb-MiniCPM5-1B.jinja * cont : add message delimiters * cont : fix tests --------- Co-authored-by: zhangtao <zhangtao2@modelbest.cn> Co-authored-by: 张涛 <>	2026-06-28 16:53:32 +02:00
Piotr Wilkin (ilintar)andGitHub	09cedfd699	chat: harden caps check (#24973)	2026-06-25 02:49:22 +02:00
Aldehir RojasandGitHub	73618f27a8	server: improve user message detection and create checkpoints at every user message (#24176) ... * server : improve message span logic * cont : cast size_t to int32_t in comparisons * server : create checkpoints before every user msg * chat : remove \n in gemma4 delimiters * chat : merge msg delimiter structs into one * cont : reword comment * cont : initialize tokens in delimiter * cont : add server_tokens::get_raw_tokens() for mtmd * cont : move message finding to server_tokens and skip mtmd tokens * cont : update cohere2moe parser * cont : increase min-step to 8192 and always produce a chkpt for last user message	2026-06-23 08:27:28 +03:00
Piotr Wilkin (ilintar)andGitHub	38d546330a	chat: include full unparsed prompt in debug (#24650) ... message on parse error	2026-06-15 17:33:54 +02:00
PascalandGitHub	581e8eca8b	chat: harden peg-native tool call parsing (#24329) ... * chat: harden peg-native tool call parsing accept an optional leading type: function field in build_json_tools_flat_keys so openai style tool calls parse on templates whose serialization opens on the name field. return a clean error and log the unparsed fragment on a final peg parse failure instead of throwing the raw parser position and input. keep the raw arguments string in func_args_not_string when it is not valid json instead of aborting the prompt render. * chat: surface peg-native parse failures a final peg parse failure threw the raw parser position and input. log the unparsed fragment and raise a clearer error instead, so a model output that does not match the expected format no longer fails silently with an empty assistant turn. minimal change, no behavior change on successful parses. * chat: handle openai style tool calls in peg-native * nits * common: scope OpenAI wrapper grammar trigger via autoparser flag * chat: gate type:function parsing leniency on the analysis flag Thread accept_openai_wrapper from the generator to build_json_tools_flat_keys so the leading "type": "function" field is accepted only when openai_wrapper_trigger is set.	2026-06-15 15:37:04 +02:00
Piotr Wilkin (ilintar)andGitHub	aedb2a5e9c	chat: add dedicated Cohere2MoE (North Code) parser (#24615) ... * chat: add dedicated Cohere2MoE (North Code) parser * Some renames to make @CISC happy :>	2026-06-14 20:17:40 +02:00
Tarek DakhranandGitHub	d2462f8f7a	chat: fix LFM2/LFM2.5 ignoring json_schema (#24377) ... The LFM2 specialized template handler only built a grammar for tool-calling, silently ignoring json_schema from response_format.	2026-06-10 14:41:41 +02:00
Tarek DakhranandGitHub	98d5e8ba8a	common/chat : fix LFM2/LFM2.5 reasoning round-trip and <think> leak (#24234) ... * common/chat : fix LFM2 reasoning round-trip and stray <think> leak * Gate by reasoning format and whether the template supports <think>	2026-06-06 22:39:21 +02:00
Tarek DakhranandGitHub	da87e9b612	common/chat : unify and fix LFM2/LFM2.5 tool parser (#24178)	2026-06-05 14:31:56 -05:00
5 people	e2ef8fe42c	server: fix checkpoints creation (#22929) ... * common : add common_chat_split_by_role * cont : fix spans to reach end of message * server: fix checkpoints creation - extract message_spans from chat templates - find the prompt token position before the latest user message - split prompt batching at that position - create a context checkpoint before the latest user input - avoid periodic mid-prompt checkpoints when that position is known - handle multimodal prompts when mapping text/template positions to server prompt tokens - add --checkpoint-min-step to control minimum spacing between checkpoints * cont : clean-up * Support autoparser detection for message barriers * server: fix message span delimiter and update docs --------- Co-authored-by: Alde Rojas <hello@alde.dev> Co-authored-by: Georgi Gerganov <ggerganov@gmail.com> Co-authored-by: Piotr Wilkin <piotr.wilkin@syndatis.com>	2026-05-25 08:56:18 +03:00
Aldehir RojasandGitHub	39cf5d6191	common : delegate assistant continuation to underlying template handlers (#23089) ... * common : delegate assistant continuation to template handler * server : implement echo parameter to exclude assistant prefill in the response * server : fix tests for prefill * server : use existing llama template * cont : clean up	2026-05-17 13:36:05 +02:00
Aldehir RojasandGitHub	093be624cc	common/chat : preserve media markers for typed-content templates (#22634)	2026-05-07 12:50:56 -05:00
Piotr Wilkin (ilintar)andGitHub	a4701c98f7	common/autoparser: fixes for newline handling / forced tool calls (#22654) ... * chat/autoparser: the fixes * Move optspace() to chat-peg-parser, comment out server tests invalidated due to content now allowed with forced tool calls. * Trim whitespace on apply instead	2026-05-04 13:18:11 +02:00
Aldehir RojasandGitHub	e48034dfc9	common : determine generation prompt using longest common prefix (#22657)	2026-05-04 00:18:23 +02:00
Tarek DakhranandGitHub	550d684bd1	server: Enable transcriptions API for LFM2-Audio (#22000)	2026-04-23 10:47:26 +02:00
Piotr Wilkin (ilintar)andGitHub	134d6e54d4	common/chat, server: refactor, move all conversion functions to common, add tests (#20690) ... * Refactor conversion functions	2026-04-22 10:28:45 +02:00
3 people	455d8e4be8	server : speculative checkpointing (#19493) ... * server : speculative decoding using checkpoints * server : fix draft check with checkpoints * server : rename spec vars * server : log levels * server : refactored spec logic to speculative.cpp * server : renamed spec checkpoints option * server : fix spec checkpoints, logging * speculative : checkpoints with draft model, logging * server : n_tokens_cur and create_checkpoint in draft * server : fix server_speculative_callback (slot.id) * spec : fix ngram-map/begin idx_last_check * spec : init ckpt (begin() wasn't called) * chore: update webui build output * server : restore sampler in spec checkpoint and clear mem * cont : avoid --spec-use-checkpoints argument * cont : remove server_prompt_checkpoint_with_size * spec : rename (leave_draft_state) * cont : clean-up * cont : do not ignore partial drafts even if the are short * cont : spec callback owned by session * cont : simplify * cont : avoid empty speculative session * cont : simplify * cont : simplify * cont : enable mtmd speculative decoding * cont : keep the spec sampler alive * cont : simplify * cont : fix nullptr deref + draft checkpoints * cont : remove common_speculative_accept_response * cont : remove callback * cont : simplify * cont : minor * cont : simplify * cont : fix accepted number --------- Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>	2026-04-19 10:24:06 +03:00
Aldehir RojasandGitHub	e21cdc11a0	common/gemma4 : handle parsing edge cases (#21760)	2026-04-13 18:18:18 -05:00
Piotr Wilkin (ilintar)andGitHub	1c0d9081fd	chat: dedicated DeepSeek v3.2 parser + "official" template (#21785)	2026-04-13 22:23:53 +02:00
GalunidandGitHub	b136b62cf9	fix: Fix broken structured output when using $refs in json_schema (#21699)	2026-04-10 18:26:36 -05:00
Aldehir RojasandGitHub	3fc65063d9	common : better align to the updated official gemma4 template (#21704)	2026-04-10 16:12:53 -05:00
Berk IdemandGitHub	d7ff074c87	common : enable reasoning budget sampler for gemma4 (#21697) ... * fix: enable reasoning budget sampler for gemma4 Add thinking_start_tag and thinking_end_tag to common_chat_params_init_gemma4(). Without these, the reasoning budget sampler never activates for gemma4. Make the newline after "thought" optional in the PEG parser to handle budget=0 (sampler forces end tag before the newline). Add test case for empty thinking block. Fixes #21487 * use p.space() instead of p.optional(p.literal("\n")) in gemma4 thought parser	2026-04-10 11:49:14 +02:00
Aldehir RojasandGitHub	ddf03c6d9a	common : fix ambiguous grammar rule in gemma4 (#21661) ... * common : fix ambiguous grammar rule in gemma4 * cont : fix missing comma...	2026-04-09 12:25:07 +02:00
Piotr Wilkin (ilintar)andGitHub	85d482e6b6	parser: fix MiniMax handling (#21573)	2026-04-08 12:47:25 +02:00
Aldehir RojasandGitHub	b8635075ff	common : add gemma 4 specialized parser (#21418) ... * common : add gemma4 dedicated parser * cont : add '<|tool_response>' as eog * cont : emit JSON from Gemma4 tool call AST * cont : more fixes * cont : refactor convert function * cont : refine rules and mapping * cont : add more tests * cont : clean up * cont : remove autoparser gemma4 implementation * cont : more cleanup * cont : rename gemma4.jinja to match the others * cont : add custom template to support interleaved thinking * cont : preserve reasoning in model turns * cont : fix initializer error * cont : fix unused vars * cont : fix accidental static * cont : fix specialized_template signature * fix extra semicolon * remove debug line and extra space [no ci]	2026-04-04 20:39:00 +02:00
3 people	f1f793ad06	common/parser: fix call ID detection (Mistral parser mostly) + atomicity for tag-json parsers (#21230) ... * Fix call ID detection (Mistral parser mostly) + atomicity for tag-json parsers * Rename * Update common/chat-auto-parser-generator.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>	2026-04-03 17:51:52 +02:00
Georgi GerganovandGitHub	57ace0d612	chat : avoid including json in chat.h (#21306)	2026-04-03 09:07:59 +03:00
Piotr Wilkin (ilintar)andGitHub	5208e2d5ba	fix: gemma 4 template (#21326)	2026-04-02 23:31:02 +02:00
Xuan-Son NguyenandGitHub	63f8fe0ef4	model, mtmd: fix gguf conversion for audio/vision mmproj (#21309) ... * fix gguf conversion for audio/vision mmproj * fix test	2026-04-02 17:10:32 +02:00
Aldehir RojasandGitHub	223373742b	common : add commentary rules for gpt-oss-20b (#21286)	2026-04-02 08:59:59 -05:00
Piotr Wilkin (ilintar)andGitHub	e15efe007d	Relax prefill parser to allow space. (#21240) ... * Relax prefill parser to allow space. * Move changes from prefix() to parser generation * Only allow spaces if we're not having a pure content parser next	2026-04-02 11:29:11 +02:00
JonathanandGitHub	1d6d4cf7a5	fix: tool call parsing for LFM2 and LFM2.5 models (#21242) ... * fix: tool call parsing for LFM2 and LFM2.5 models' * refactor: add test / break out lfm2 and lfm2.5 parsing logic	2026-04-01 16:22:44 +02:00
Aldehir RojasandGitHub	624733d631	common : gpt-oss handle builtin and unsolicited tool calls (#21213)	2026-03-31 13:52:42 +02:00
lainon1andGitHub	0b6ff47996	fix: correct misspellings in code comments (#21217) ... - emdeddings → embeddings (gemma3.cpp, gemma3n-iswa.cpp, gemma-embedding.cpp) - imlpemented → implemented (llama-adapter.cpp) - interere → interfere (llama-graph.cpp) - overridde → overridden (chat.cpp) - stastistics → statistics (ngram-map.h) - layed → laid (llama-kv-cache.h) - worster → worst (llama-context.cpp) - sequantial → sequential (llama-batch.h)	2026-03-31 13:50:51 +02:00
Aldehir RojasandGitHub	e6f2ec01ff	common : add reasoning_format = none support to gpt-oss (#21094)	2026-03-28 09:33:39 -05:00
Aldehir RojasandGitHub	312d870a89	common : replace wrap_for_generation with a prefix convenience function and fix gpt-oss (#20912)	2026-03-23 22:21:47 -05:00
3 people	c46583b86b	common/parser : fix out_of_range crash in throw path (#20424 regression) (#20777) ... * chat : fix out_of_range crash in throw path (#20424 regression) #20424 introduced effective_input = generation_prompt + input, but the throw path uses input.substr(result.end) where result.end is a position within effective_input. Every thinking model with a non-empty generation_prompt crashes with std::out_of_range instead of the intended error message. Test crashes on unpatched master, passes with fix: cmake -B build -DLLAMA_BUILD_TESTS=ON -DLLAMA_BUILD_TOOLS=OFF cmake --build build --target test-chat ./build/bin/test-chat * Update test-chat.cpp * Update test-chat.cpp * Update test-chat.cpp --------- Co-authored-by: Piotr Wilkin (ilintar) <piotr.wilkin@syndatis.com>	2026-03-20 02:37:22 +01:00
3 people	5e54d51b19	common/parser: add proper reasoning tag prefill reading (#20424) ... * Implement proper prefill extraction * Refactor cli parameters, update docs, move reasoning budget sampler part to common/reasoning-budget.cpp * Update tools/server/server-task.cpp * refactor: move grammars to variant, remove grammar_external, handle exception internally * Make code less C++y Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>	2026-03-19 16:58:21 +01:00
Aldehir RojasandGitHub	1b9bbaa357	common : fix gpt-oss content removal (#20745)	2026-03-19 11:40:39 +01:00
Aldehir RojasandGitHub	5e8910a0db	common : rework gpt-oss parser (#20393) ... * common : rework gpt-oss parser * cont : fix gpt-oss tests * cont : add structured output test * cont : rename final to final_msg	2026-03-18 10:41:25 +01:00
3 people	d2ecd2d1cf	common/parser: add --skip-chat-parsing to force a pure content parser. (#20289) ... * Add `--force-pure-content` to force a pure content parser. * Update common/arg.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * Change parameter name [no ci] --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>	2026-03-17 16:16:43 +01:00
Aldehir RojasandGitHub	1bbec6a75d	jinja : add capability check for object args (#20612)	2026-03-16 17:43:14 +01:00
3 people	a8304b4d27	common/parser: add GigaChatV3/3.1 models support (#19931) ... Co-authored-by: Mishusha <pmv26021975@gmail.com>	2026-03-12 01:22:25 +01:00
4 people	acb7c79069	common/parser: handle reasoning budget (#20297) ... * v1 * Finished! * Handlie cli * Reasoning sampler * Apply suggestions from code review Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * Less explosive terminology :) * Add utf-8 case and tests * common : migrate reasoning budget sampler to common * cont : clean up * cont : expose state and allow passing as initial state * cont : remove unused imports * cont : update state machine doc string --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> Co-authored-by: Alde Rojas <hello@alde.dev>	2026-03-11 10:26:12 +01:00