From 00fc41d91759788d5f6410b2dc498bd9639538b3 Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Tue, 21 Jan 2025 17:07:38 -0500 Subject: [PATCH 1/2] jinja2cpp: update submodule for 'not X is defined' fix Signed-off-by: Jared Van Bortel --- gpt4all-chat/deps/Jinja2Cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpt4all-chat/deps/Jinja2Cpp b/gpt4all-chat/deps/Jinja2Cpp index 5960ccf98a37..f5095aadfb22 160000 --- a/gpt4all-chat/deps/Jinja2Cpp +++ b/gpt4all-chat/deps/Jinja2Cpp @@ -1 +1 @@ -Subproject commit 5960ccf98a37bb9b53fc1b23438c0c509e62ee29 +Subproject commit f5095aadfb22ce61c0f6f4e9a95d33a35bf6e0ff From eecce913bf44589f71853e6486814e6a9d85c69f Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Tue, 21 Jan 2025 17:15:36 -0500 Subject: [PATCH 2/2] add changelog entry Signed-off-by: Jared Van Bortel --- gpt4all-chat/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gpt4all-chat/CHANGELOG.md b/gpt4all-chat/CHANGELOG.md index 46936f21b448..6ea703487cb2 100644 --- a/gpt4all-chat/CHANGELOG.md +++ b/gpt4all-chat/CHANGELOG.md @@ -12,12 +12,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Fixed - Fix the timeout error in code interpreter ([#3369](https://github.com/nomic-ai/gpt4all/pull/3369)) - Fix code interpreter console.log not accepting multiple arguments ([#3371](https://github.com/nomic-ai/gpt4all/pull/3371)) -- Remove 'X is defined' checks from templates as they work incorrectly with Jinja2Cpp ([#3372](https://github.com/nomic-ai/gpt4all/pull/3372)) +- Remove 'X is defined' checks from templates for better compatibility ([#3372](https://github.com/nomic-ai/gpt4all/pull/3372)) - Jinja2Cpp: Add 'if' requirement for 'else' parsing to fix crash ([#3373](https://github.com/nomic-ai/gpt4all/pull/3373)) - Save chats on quit, even if the window isn't closed first ([#3387](https://github.com/nomic-ai/gpt4all/pull/3387)) - Add chat template replacements for five new models and fix EM German Mistral ([#3393](https://github.com/nomic-ai/gpt4all/pull/3393)) - Fix crash when entering `{{ a["foo"(` as chat template ([#3394](https://github.com/nomic-ai/gpt4all/pull/3394)) - Sign the maintenance tool on macOS to prevent crash on Sonoma ([#3391](https://github.com/nomic-ai/gpt4all/pull/3391)) +- Jinja2Cpp: Fix operator precedence in 'not X is defined' ([#3402](https://github.com/nomic-ai/gpt4all/pull/3402)) ## [3.6.1] - 2024-12-20