From 58594d582bad925756b805d26c20e1852adaf8e6 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 26 Nov 2025 15:34:10 +0530 Subject: [PATCH] feat(chat): implement qwen3-coder-30b model with custom chat template and tool support The commit message reflects the main changes: 1. Updated model name from "gpt-oss-20b" to "qwen3-coder-30b" in aichat.nix 2. Changed the default model to ryu:qwen3-coder-30b in aichat.nix 3. Added a new chat template file (chat.hbs) with tool/function calling support 4. Configured llama.cpp to use the new chat template file 5. Enabled HDR display settings in hyprland 6. Modified gamemode to unload lmstudio on start and added custom script for gamemode startup All changes are focused on implementing Qwen3-Coder-30B model with enhanced tool calling capabilities and system configuration improvements. --- assets/chat.hbs | 133 ++++++++++++++++++++++++++++++++ home/programs/aichat.nix | 4 +- home/services/hyprland.nix | 2 +- nixos/ryu/programs/gamemode.nix | 7 +- nixos/ryu/services/llama.nix | 3 +- 5 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 assets/chat.hbs diff --git a/assets/chat.hbs b/assets/chat.hbs new file mode 100644 index 00000000..9cc1e87c --- /dev/null +++ b/assets/chat.hbs @@ -0,0 +1,133 @@ +{% macro render_item_list(item_list, tag_name='required') %} +{%- if item_list is defined and item_list is iterable and item_list is not string and item_list | length > 0 %} +{%- if tag_name %}{{- '\n<' ~ tag_name ~ '>' -}}{% endif %} +{{- '[' }} +{%- for item in item_list -%} +{%- if loop.index > 1 %}{{- ", "}}{% endif -%} +{%- if item is string -%} +{{ "" ~ item ~ "" }} +{%- else -%} +{{ item }} +{%- endif -%} +{%- endfor -%} +{{- ']' }} +{%- if tag_name %}{{- '' -}}{% endif %} +{%- endif %} +{% endmacro %} + +{%- if messages[0]["role"] == "system" %} +{%- set system_message = messages[0]["content"] %} +{%- set loop_messages = messages[1:] %} +{%- else %} +{%- set loop_messages = messages %} +{%- endif %} + +{%- if not tools is defined %} +{%- set tools = [] %} +{%- endif %} + +{%- if system_message is defined %} +{{- "<|im_start|>system\n" + system_message }} +{%- else %} +{%- if tools is iterable and tools | length > 0 %} +{{- "<|im_start|>system\nYou are Qwen, a helpful AI assistant that can interact with a computer to solve tasks." }} +{%- endif %} +{%- endif %} +{%- if tools is iterable and tools | length > 0 %} +{{- "\n\nYou have access to the following functions:\n\n" }} +{{- "" }} +{%- for tool in tools %} +{%- if tool.function is defined %} +{%- set tool = tool.function %} +{%- endif %} +{{- "\n\n" ~ tool.name ~ "" }} +{{- '\n' ~ (tool.description | trim) ~ '' }} +{{- '\n' }} +{%- for param_name, param_fields in tool.parameters.properties|items %} +{{- '\n' }} +{{- '\n' ~ param_name ~ '' }} +{%- if param_fields.type is defined and param_fields.type is not none %} +{{- '\n' ~ (param_fields.type | string) ~ '' }} +{%- endif %} +{%- if param_fields.description is defined and param_fields.description is not none %} +{{- '\n' ~ (param_fields.description | trim) ~ '' }} +{%- endif %} +{{- render_item_list(param_fields.enum, 'enum') }} +{%- set handled_keys = ['type', 'description', 'enum', 'required'] %} +{%- for json_key in param_fields.keys() if json_key not in handled_keys %} +{%- set normed_json_key = json_key | replace("-", "") | replace(" ", "") | replace("$", "") %} +{%- if param_fields[json_key] is mapping %} +{{- '\n<' ~ normed_json_key ~ '>' ~ (param_fields[json_key] | tojson) ~ '' }} +{%- else %} +{%- if param_fields[json_key] is not none %} +{{- '\n<' ~ normed_json_key ~ '>' ~ (param_fields[json_key] | string) ~ '' }} +{%- endif %} +{%- endif %} +{%- endfor %} +{{- render_item_list(param_fields.required, 'required') }} +{{- '\n' }} +{%- endfor %} +{{- render_item_list(tool.parameters.required, 'required') }} +{{- '\n' }} +{%- if tool.return is defined and tool.return is not none %} +{%- if tool.return is mapping %} +{{- '\n' ~ (tool.return | tojson) ~ '' }} +{%- else %} +{{- '\n' ~ (tool.return | string) ~ '' }} +{%- endif %} +{%- endif %} +{{- '\n' }} +{%- endfor %} +{{- "\n" }} +{{- '\n\nIf you choose to call a function ONLY reply in the following format with NO suffix:\n\n\n\n\nvalue_1\n\n\nThis is the value for the second parameter\nthat can span\nmultiple lines\n\n\n\n\n\nReminder:\n- Function calls MUST follow the specified format: an inner block must be nested within XML tags\n- Required parameters MUST be specified\n- You may provide optional reasoning for your function call in natural language BEFORE the function call, but NOT after\n- If there is no function call available, answer the question like normal with your current knowledge and do not tell the user about function calls\n' }} +{%- endif %} +{%- if system_message is defined %} +{{- '<|im_end|>\n' }} +{%- else %} +{%- if tools is iterable and tools | length > 0 %} +{{- '<|im_end|>\n' }} +{%- endif %} +{%- endif %} +{%- for message in loop_messages %} +{%- if message.role == "assistant" and message.tool_calls is defined and message.tool_calls is iterable and message.tool_calls | length > 0 %} +{{- '<|im_start|>' + message.role }} +{%- if message.content is defined and message.content is string and message.content | trim | length > 0 %} +{{- '\n' + message.content | trim + '\n' }} +{%- endif %} +{%- for tool_call in message.tool_calls %} +{%- if tool_call.function is defined %} +{%- set tool_call = tool_call.function %} +{%- endif %} +{{- '\n\n\n' }} +{%- if tool_call.arguments is defined %} +{%- for args_name, args_value in tool_call.arguments|items %} +{{- '\n' }} +{%- set args_value = args_value if args_value is string else args_value | string %} +{{- args_value }} +{{- '\n\n' }} +{%- endfor %} +{%- endif %} +{{- '\n' }} +{%- endfor %} +{{- '<|im_end|>\n' }} +{%- elif message.role == "user" or message.role == "system" or message.role == "assistant" %} +{{- '<|im_start|>' + message.role + '\n' + message.content + '<|im_end|>' + '\n' }} +{%- elif message.role == "tool" %} +{%- if loop.previtem and loop.previtem.role != "tool" %} +{{- '<|im_start|>user\n' }} +{%- endif %} +{{- '\n' }} +{{- message.content }} +{{- '\n\n' }} +{%- if not loop.last and loop.nextitem.role != "tool" %} +{{- '<|im_end|>\n' }} +{%- elif loop.last %} +{{- '<|im_end|>\n' }} +{%- endif %} +{%- else %} +{{- '<|im_start|>' + message.role + '\n' + message.content + '<|im_end|>\n' }} +{%- endif %} +{%- endfor %} +{%- if add_generation_prompt %} +{{- '<|im_start|>assistant\n' }} +{%- endif %} diff --git a/home/programs/aichat.nix b/home/programs/aichat.nix index d541c82a..df7b2a9d 100644 --- a/home/programs/aichat.nix +++ b/home/programs/aichat.nix @@ -50,7 +50,7 @@ api_base = "https://llama.ryu.darksailor.dev/v1"; models = [ { - name = "gpt-oss-20b"; + name = "qwen3-coder-30b"; type = "chat"; } # { @@ -173,7 +173,7 @@ */ '' --- - model: openai:gpt-4o + model: ryu:qwen3-coder-30b --- Your task is to generate a concise and informative commit message based on the provided diff. Use the conventional commit format, which includes a type (feat, fix, chore, docs, style, refactor, perf, test) and an optional scope. The message should be in the imperative mood and should not exceed 72 characters in the subject line. Don't include any additional text or explanations, just the commit message. ''; diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix index 80ab90e3..6eeafbad 100644 --- a/home/services/hyprland.nix +++ b/home/services/hyprland.nix @@ -52,7 +52,7 @@ supports_wide_color = 1; supports_hdr = 1; bitdepth = 10; - # cm = "hdr"; + cm = "hdr"; # sdrbrightness = 0.005; # sdrsaturation = 200; } diff --git a/nixos/ryu/programs/gamemode.nix b/nixos/ryu/programs/gamemode.nix index 6731c913..976173e8 100644 --- a/nixos/ryu/programs/gamemode.nix +++ b/nixos/ryu/programs/gamemode.nix @@ -6,7 +6,12 @@ renice = 10; }; custom = { - start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; + start = let + out = pkgs.writeScriptBin "gamemode-start" '' + ${pkgs.lmstudio}/bin/lms unload + ${pkgs.libnotify}/bin/notify-send 'GameMode started' + ''; + in "${out}/bin/gamemode-start"; end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; }; }; diff --git a/nixos/ryu/services/llama.nix b/nixos/ryu/services/llama.nix index 7b8853a0..01b78721 100644 --- a/nixos/ryu/services/llama.nix +++ b/nixos/ryu/services/llama.nix @@ -19,7 +19,8 @@ "-c" "98304" "--jinja" - # "--chat-template-file" + "--chat-template-file" + "${../../../assets/chat.hbs}" # "/nix/store/4zk1p50hrzghp3jzzysz96pa64i2kmjl-promp.hbs" ]; # package = inputs.llama-cpp.packages.${pkgs.system}.cuda;