jinja : attribute support for join, map and sort#18883
Conversation
| throw not_implemented_exception("array attribute join not implemented"); | ||
| } | ||
| value val_delim = args.get_kwarg_or_pos("d", 1); | ||
| value attribute = args.get_kwarg_or_pos("attribute", 2); |
There was a problem hiding this comment.
both map, sort, join can have attribute, probably we can find a way to abstract out the attribute handling?
There was a problem hiding this comment.
Maybe, but didn't immediately see how since they are applied differently.
| value val_case = args.get_kwarg_or_pos("case_sensitive", 2); | ||
| value attribute = args.get_kwarg_or_pos("attribute", 3); | ||
| // FIXME: sorting is case sensitive | ||
| //const bool case_sensitive = val_case->as_bool(); // undefined == false |
There was a problem hiding this comment.
maybe throw not_implemented_exception if case_sensitive is set?
There was a problem hiding this comment.
It's the other way around, case_sensitive=False is default, but we are always case sensitive ATM.
| } | ||
| return val_arr[index]; | ||
| } | ||
| virtual value & at(int64_t index) { |
There was a problem hiding this comment.
I'm not quite sure why I placed the at(...) inside value_t in the first place, probably better to place them inside value_array_t and value_object_t respectively - let's have a look in a follow-up PR
| val_a = a->at(attr_name); | ||
| val_b = b->at(attr_name); | ||
| } else { | ||
| throw raised_exception("sort: unsupported object attribute comparison"); |
There was a problem hiding this comment.
maybe also log the type of a and b in the message, so that it's easier to debug in the future
There was a problem hiding this comment.
I didn't want to add std::format here since it's not used anywhere else.
There was a problem hiding this comment.
I mean you can just use string concat +, we already doing that in multiple places. Not the best, but it makes debugging much easier.
There was a problem hiding this comment.
I think I spaced out a little, thinking I needed to format values or something. :)
I'll fix it in the next PR which will touch this code anyway.
|
Merging now, let's address open suggestions if applicable in follow-ups. |
* support negative array index and default value * attribute support (int and str) for join, map and sort * add tests * update CODEOWNERS * improve fixme sorting comment
… and new jinja template engine (ggml-org#1369) --------- Co-authored-by: Piotr Wilkin <[email protected]> common : add nemotron 3 parsing (ggml-org#18077) common : add parser for ministral/mistral large 3/devstral 2 (ggml-org#17713) common : default content to an empty string (ggml-org#18485) chat: make tool description and parameters optional per OpenAI spec (ggml-org#18478) Per the OpenAI API specification, both 'description' and 'parameters' fields in tool function definitions are optional. Previously, the parser would throw an exception if these fields were missing. Attempts to fix ggml-org#17667 common : implement new jinja template engine (ggml-org#18462) --------- Co-authored-by: Alde Rojas <[email protected]> Co-authored-by: Sigbjørn Skjæret <[email protected]> Co-authored-by: Georgi Gerganov <[email protected]> jinja: correct member access rule (ggml-org#18905) jinja : fix lexing of float literals with sign (ggml-org#18901) jinja : add missing tojson filter for bool (ggml-org#18900) jinja : attribute support for join, map and sort (ggml-org#18883) jinja : fix object item order (and properly implement dictsort) (ggml-org#18904) tests : add test-jinja -py option for cross-checking (ggml-org#18906) Co-authored-by: Sigbjørn Skjæret <[email protected]> --------- Co-authored-by: Sigbjørn Skjæret <[email protected]> ci : run test-jinja -py on high perf [no ci] (ggml-org#18916) jinja : fix undefined keys and attributes and int/float as bool (ggml-org#18924) jinja: support none|string (ggml-org#18995) Co-authored-by: Sigbjørn Skjæret <[email protected]> Co-authored-by: Sigbjørn Skjæret <[email protected]> --------- Co-authored-by: Sigbjørn Skjæret <[email protected]> jinja : implement mixed type object keys (ggml-org#18955) --------- Co-authored-by: Xuan Son Nguyen <[email protected]> jinja : undefined should be treated as sequence/iterable (return string/array) by filters/tests (ggml-org#19147) `tojson` is not a supported `undefined` filter keep it DRY and fix some types jinja : do not pass empty tools and add some none filters (ggml-org#19176) jinja : add unordered_map include to value.h [no ci] (ggml-org#19205) jinja : add missing 'in' test to template engine (ggml-org#19004) (ggml-org#19239) The jinja template parser was missing the 'in' test from global_builtins(), causing templates using reject("in", ...), select("in", ...), or 'x is in(y)' to fail with "selectattr: unknown test 'in'". This broke tool-calling for Qwen3-Coder and any other model whose chat template uses the 'in' test. Added test_is_in supporting array, string, and object containment checks, mirroring the existing 'in' operator logic in runtime.cpp. Includes test cases for all three containment types plus reject/select filter usage. Co-Authored-By: Claude Opus 4.5 <[email protected]> --------- Co-authored-by: Sid Mohan <[email protected]> Co-authored-by: Claude Opus 4.5 <[email protected]> Co-authored-by: Xuan Son Nguyen <[email protected]> Add Jinja support for "indent" string filter (ggml-org#19529) Co-authored-by: Sigbjørn Skjæret <[email protected]> Co-authored-by: Sigbjørn Skjæret <[email protected]> --------- Co-authored-by: Sigbjørn Skjæret <[email protected]> add vendor refactor chat server : support preserving reasoning_content in assistant message (ggml-org#18994) chat : fix translategemma crash on common_chat_format_example (ggml-org#19019) chat: fix language input for translategemma (ggml-org#19052) Co-authored-by: Aldehir Rojas <[email protected]> --------- Co-authored-by: Aldehir Rojas <[email protected]> chat: fix case where template accepts type content only (ggml-org#19419) mtmd : chat : Fix extra \n between text and media marker (ggml-org#19595) Thanks to @tugot17 for detecting and reporting the issue. For vision models (e.g. LFM2.5-VL-1.6B and Qwen/Qwen3-VL-4B-Instruct) `llama-mtmd-cli` produces identical output to HF implementation. However `llama-server` doesn't. I traced it down to extra newline inserted after `<__media__>`. This happens in `to_json_oaicompat`, that treats media markers as text and joins all parts with `\n` separator. PR introduces new type `media_marker` and uses it for media markers. Extra logic is added to prevent insertion of newlines before and after media markers. With this change number of input tokens is identical to HF implementation and as a result the output is also identical. I explored other ways to address the issue * remove completely `\n` between text parts in `to_json_oaicompat` * merge text messages in server-common.cpp before sending them to `to_json_oaicompat` Please propose alternative ways of fixing this issue. Co-authored-by: Piotr Wilkin (ilintar) <[email protected]> --------- Co-authored-by: Piotr Wilkin (ilintar) <[email protected]> common : merge qwen3-coder and nemotron nano 3 parsers (ggml-org#19765) common : fix improper trimming in XML parser on complete message (ggml-org#19805) Co-authored-by: Jules LEIDELINGER <[email protected]> jinja: correct stats for tojson and string filters (ggml-org#19785) jinja : correct default size for string slices (ggml-org#19913) common : handle unicode during partial json parsing (ggml-org#16526) common : fix json schema with '\' in literals (ggml-org#17307) add back qwen_coder_xml and mirothinker Co-authored-by: Aldehir Rojas <[email protected]>
* support negative array index and default value * attribute support (int and str) for join, map and sort * add tests * update CODEOWNERS * improve fixme sorting comment
Adds attribute support (
intfor arrays andstrfor objects), forjoin,mapandsortfilters.Adds support for negative array index and default in
value->at().