Upload ARO Coder 4-bit (dpo)

.gitattributes

@@ -33,3 +33,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+tokenizer.json filter=lfs diff=lfs merge=lfs -text

.source_model

@@ -0,0 +1 @@
+/Users/kris/Projects/ARO/ARO-Train/Train/models/dpo/fused

README.md

@@ -0,0 +1,118 @@
+---
+language: en
+license: mit
+tags:
+  - aro
+  - code-generation
+  - dsl
+  - mlx
+  - 4-bit
+  - lora
+  - fine-tuned
+base_model: mlx-community/Qwen3-Coder-30B-A3B-Instruct-4bit
+pipeline_tag: text-generation
+library_name: mlx
+---
+
+# ARO Coder
+
+A fine-tuned code generation model specialised in the **ARO** (Action Result Object) programming language.
+
+ARO is a domain-specific language where every statement follows the pattern:
+`Verb the <Result> preposition [the] <Object>`.
+
+| | |
+|---|---|
+| **Base model** | [mlx-community/Qwen3-Coder-30B-A3B-Instruct-4bit](https://huggingface.co/mlx-community/Qwen3-Coder-30B-A3B-Instruct-4bit) |
+| **Quantization** | 4-bit (MLX) |
+| **Language** | ARO |
+| **Training samples** | 861 |
+| **Syntax pass rate** | 47% |
+| **Source label** | dpo |
+
+## Links
+
+- **Website**: [arolang.github.io/aro](https://arolang.github.io/aro/)
+- **GitHub**: [github.com/arolang/aro](https://github.com/arolang/aro)
+- **Documentation**: [Wiki](https://github.com/arolang/aro/wiki)
+- **Language Guide (PDF)**: [Download](https://github.com/arolang/aro/releases/latest/download/ARO-Language-Guide.pdf)
+- **Discussions**: [GitHub Discussions](https://github.com/arolang/aro/discussions)
+
+## Quick Start
+
+### MLX (Apple Silicon)
+
+```python
+from mlx_lm import load, generate
+
+model, tokenizer = load("ARO-Lang/aro-coder-4bit")
+
+messages = [
+    {"role": "system", "content": "You are an expert ARO programmer."},
+    {"role": "user", "content": "Write an ARO feature set that retrieves a user by ID and returns an OK response."},
+]
+prompt = tokenizer.apply_chat_template(messages, tokenize=False, add_generation_prompt=True)
+response = generate(model, tokenizer, prompt=prompt, max_tokens=500)
+print(response)
+```
+
+### MLX Server (OpenAI-compatible API)
+
+```bash
+python -m mlx_lm.server --model ARO-Lang/aro-coder-4bit --port 8080
+
+curl http://localhost:8080/v1/chat/completions \
+  -H 'Content-Type: application/json' \
+  -d '{"model": "aro-coder", "messages": [{"role": "user", "content": "Write hello world in ARO"}]}'
+```
+
+### Ollama
+
+```bash
+ollama run aro-coder
+```
+
+## Example Output
+
+**Prompt:** *Write an ARO Application-Start that starts an HTTP server.*
+
+```aro
+(Application-Start: My API) {
+    Log "Starting server..." to the <console>.
+    Start the <http-server> with <contract>.
+    Keepalive the <application> for the <events>.
+    Return an <OK: status> for the <startup>.
+}
+```
+
+## What is ARO?
+
+ARO is a DSL for expressing business features as Action-Result-Object statements.
+Every program is a directory of `.aro` files with event-driven feature sets:
+
+```aro
+(getUser: User API) {
+    Extract the <id> from the <pathParameters: id>.
+    Retrieve the <user> from the <user-repository> where id = <id>.
+    Return an <OK: status> with <user>.
+}
+```
+
+Key features:
+- **Contract-first HTTP** — routes defined in `openapi.yaml`, feature sets match `operationId`
+- **Event-driven** — feature sets triggered by events, not direct calls
+- **Immutable bindings** — every transformation produces a new name
+- **Happy-path only** — no error handling code; the runtime manages errors
+
+## Training
+
+This model was trained with the ARO training pipeline:
+
+1. **Corpus collection** — 861 samples from Examples, Book, Wiki, Proposals, and real-world ARO applications
+2. **Supervised fine-tuning** — LoRA on all code generation, debugging, Q&A, and explanation tasks
+3. **DPO preference training** — using `aro check` validation to build chosen/rejected pairs
+4. **Iterative self-improvement** — multiple rounds of generate-validate-retrain
+
+## License
+
+This model and the ARO language are open source under the [MIT License](https://github.com/arolang/aro/blob/main/LICENSE).

chat_template.jinja

@@ -0,0 +1,131 @@
+{% macro render_item_list(item_list, tag_name='required') %}
+    {%- if item_list is defined and item_list is iterable 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 %}{{- '</' ~ 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" }}
+    {{- "<tools>" }}
+    {%- for tool in tools %}
+        {%- if tool.function is defined %}
+            {%- set tool = tool.function %}
+        {%- endif %}
+        {{- "\n<function>\n<name>" ~ tool.name ~ "</name>" }}
+        {{- '\n<description>' ~ (tool.description | trim) ~ '</description>' }}
+        {{- '\n<parameters>' }}
+        {%- for param_name, param_fields in tool.parameters.properties|items %}
+            {{- '\n<parameter>' }}
+            {{- '\n<name>' ~ param_name ~ '</name>' }}
+            {%- if param_fields.type is defined %}
+                {{- '\n<type>' ~ (param_fields.type | string) ~ '</type>' }}
+            {%- endif %}
+            {%- if param_fields.description is defined %}
+                {{- '\n<description>' ~ (param_fields.description | trim) ~ '</description>' }}
+            {%- endif %}
+            {{- render_item_list(param_fields.enum, 'enum') }}
+            {%- set handled_keys = ['type', 'description', 'enum', 'required'] %}
+            {%- for json_key in param_fields.keys() | reject("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 | safe) ~ '</' ~ normed_json_key ~ '>' }}
+                {%- else %}
+                    {{-'\n<' ~ normed_json_key ~ '>' ~ (param_fields[json_key] | string) ~ '</' ~ normed_json_key ~ '>' }}
+                {%- endif %}
+            {%- endfor %}
+            {{- render_item_list(param_fields.required, 'required') }}
+            {{- '\n</parameter>' }}
+        {%- endfor %}
+        {{- render_item_list(tool.parameters.required, 'required') }}
+        {{- '\n</parameters>' }}
+        {%- if tool.return is defined %}
+            {%- if tool.return is mapping %}
+                {{- '\n<return>' ~ (tool.return | tojson | safe) ~ '</return>' }}
+            {%- else %}
+                {{- '\n<return>' ~ (tool.return | string) ~ '</return>' }}
+            {%- endif %}
+        {%- endif %}
+        {{- '\n</function>' }}
+    {%- endfor %}
+    {{- "\n</tools>" }}
+    {{- '\n\nIf you choose to call a function ONLY reply in the following format with NO suffix:\n\n<tool_call>\n<function=example_function_name>\n<parameter=example_parameter_1>\nvalue_1\n</parameter>\n<parameter=example_parameter_2>\nThis is the value for the second parameter\nthat can span\nmultiple lines\n</parameter>\n</function>\n</tool_call>\n\n<IMPORTANT>\nReminder:\n- Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> 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</IMPORTANT>' }}
+{%- 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<tool_call>\n<function=' + tool_call.name + '>\n' }}
+            {%- if tool_call.arguments is defined %}
+                {%- for args_name, args_value in tool_call.arguments|items %}
+                    {{- '<parameter=' + args_name + '>\n' }}
+                    {%- set args_value = args_value if args_value is string else args_value | string %}
+                    {{- args_value }}
+                    {{- '\n</parameter>\n' }}
+                {%- endfor %}
+            {%- endif %}
+            {{- '</function>\n</tool_call>' }}
+        {%- 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 %}
+        {{- '<tool_response>\n' }}
+        {{- message.content }}
+        {{- '\n</tool_response>\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 %}

config.json

@@ -0,0 +1,434 @@
+{
+    "architectures": [
+        "Qwen3MoeForCausalLM"
+    ],
+    "attention_dropout": 0.0,
+    "decoder_sparse_step": 1,
+    "eos_token_id": [
+        151645,
+        151643
+    ],
+    "head_dim": 128,
+    "hidden_act": "silu",
+    "hidden_size": 2048,
+    "initializer_range": 0.02,
+    "intermediate_size": 5472,
+    "max_position_embeddings": 262144,
+    "max_window_layers": 28,
+    "mlp_only_layers": [],
+    "model_type": "qwen3_moe",
+    "moe_intermediate_size": 768,
+    "norm_topk_prob": true,
+    "num_attention_heads": 32,
+    "num_experts": 128,
+    "num_experts_per_tok": 8,
+    "num_hidden_layers": 48,
+    "num_key_value_heads": 4,
+    "output_router_logits": false,
+    "qkv_bias": false,
+    "quantization": {
+        "group_size": 64,
+        "bits": 4,
+        "model.layers.0.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.1.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.2.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.3.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.4.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.5.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.6.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.7.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.8.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.9.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.10.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.11.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.12.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.13.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.14.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.15.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.16.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.17.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.18.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.19.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.20.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.21.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.22.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.23.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.24.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.25.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.26.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.27.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.28.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.29.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.30.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.31.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.32.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.33.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.34.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.35.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.36.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.37.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.38.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.39.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.40.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.41.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.42.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.43.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.44.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.45.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.46.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.47.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        }
+    },
+    "quantization_config": {
+        "group_size": 64,
+        "bits": 4,
+        "model.layers.0.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.1.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.2.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.3.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.4.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.5.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.6.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.7.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.8.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.9.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.10.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.11.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.12.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.13.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.14.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.15.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.16.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.17.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.18.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.19.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.20.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.21.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.22.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.23.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.24.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.25.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.26.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.27.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.28.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.29.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.30.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.31.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.32.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.33.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.34.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.35.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.36.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.37.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.38.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.39.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.40.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.41.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.42.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.43.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.44.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.45.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.46.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        },
+        "model.layers.47.mlp.gate": {
+            "group_size": 64,
+            "bits": 8
+        }
+    },
+    "rms_norm_eps": 1e-06,
+    "rope_scaling": null,
+    "rope_theta": 10000000,
+    "router_aux_loss_coef": 0.0,
+    "shared_expert_intermediate_size": 0,
+    "sliding_window": null,
+    "tie_word_embeddings": false,
+    "torch_dtype": "bfloat16",
+    "transformers_version": "4.52.3",
+    "use_cache": true,
+    "use_qk_norm": true,
+    "use_sliding_window": false,
+    "vocab_size": 151936
+}

generation_config.json

@@ -0,0 +1,12 @@
+{
+  "pad_token_id": 151643,
+  "do_sample": true,
+  "eos_token_id": [
+    151645,
+    151643
+  ],
+  "repetition_penalty": 1.05,
+  "temperature": 0.7,
+  "top_p": 0.8,
+  "top_k": 20
+}

model-00001-of-00004.safetensors

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25c6d0a62e02224605774ce2e9dc9a8c95910cde33557b938e55a368da1b5212
+size 5321473414

model-00002-of-00004.safetensors

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7007ce495b063155207c3e8b4038771d0d751655274cb6b76c42b8d9c0624412
+size 5366644780

model-00003-of-00004.safetensors

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aac9d433daaefb64706bfdc80f7632c300af2ff53a1ae6429fbf7804119b42d
+size 5276887419

model-00004-of-00004.safetensors

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:836ca454dbcc7675ebc97e1fe0ef3422a02858a899db5ac11813c5cc5d2c006e
+size 1216066381

qwen3coder_tool_parser.py

@@ -0,0 +1,675 @@
+# SPDX-License-Identifier: Apache-2.0
+
+import json
+import re
+import uuid
+from collections.abc import Sequence
+from typing import Union, Optional, Any, List, Dict
+from enum import Enum
+
+from vllm.entrypoints.openai.protocol import (
+    ChatCompletionRequest,
+    ChatCompletionToolsParam,
+    DeltaMessage,
+    DeltaToolCall,
+    DeltaFunctionCall,
+    ExtractedToolCallInformation,
+    FunctionCall,
+    ToolCall,
+)
+from vllm.entrypoints.openai.tool_parsers.abstract_tool_parser import (
+    ToolParser,
+    ToolParserManager,
+)
+from vllm.logger import init_logger
+from vllm.transformers_utils.tokenizer import AnyTokenizer
+
+logger = init_logger(__name__)
+
+
+@ToolParserManager.register_module("qwen3_xml")
+class Qwen3XMLToolParser(ToolParser):
+    def __init__(self, tokenizer: AnyTokenizer):
+        super().__init__(tokenizer)
+
+        self.current_tool_name_sent: bool = False
+        self.prev_tool_call_arr: list[dict] = []
+        self.current_tool_id: int = -1
+        self.streamed_args_for_tool: list[str] = []
+
+        # Sentinel tokens for streaming mode
+        self.tool_call_start_token: str = "<tool_call>"
+        self.tool_call_end_token: str = "</tool_call>"
+        self.tool_call_prefix: str = "<function="
+        self.function_end_token: str = "</function>"
+        self.parameter_prefix: str = "<parameter="
+        self.parameter_end_token: str = "</parameter>"
+        self.is_tool_call_started: bool = False
+        self.failed_count: int = 0
+
+        # Enhanced streaming state - reset for each new message
+        self._reset_streaming_state()
+
+        # Regex patterns
+        self.tool_call_complete_regex = re.compile(
+            r"<tool_call>(.*?)</tool_call>", re.DOTALL
+        )
+        self.tool_call_regex = re.compile(
+            r"<tool_call>(.*?)</tool_call>|<tool_call>(.*?)$", re.DOTALL
+        )
+        self.tool_call_function_regex = re.compile(
+            r"<function=(.*?)</function>|<function=(.*)$", re.DOTALL
+        )
+        self.tool_call_parameter_regex = re.compile(
+            r"<parameter=(.*?)</parameter>|<parameter=(.*?)$", re.DOTALL
+        )
+
+        if not self.model_tokenizer:
+            raise ValueError(
+                "The model tokenizer must be passed to the ToolParser "
+                "constructor during construction."
+            )
+
+        self.tool_call_start_token_id = self.vocab.get(self.tool_call_start_token)
+        self.tool_call_end_token_id = self.vocab.get(self.tool_call_end_token)
+
+        if self.tool_call_start_token_id is None or self.tool_call_end_token_id is None:
+            raise RuntimeError(
+                "Qwen3 XML Tool parser could not locate tool call start/end "
+                "tokens in the tokenizer!"
+            )
+
+        logger.info(f"vLLM Successfully import tool parser {self.__class__.__name__} !")
+
+    def _generate_tool_call_id(self) -> str:
+        """Generate a unique tool call ID."""
+        return f"call_{uuid.uuid4().hex[:24]}"
+
+    def _reset_streaming_state(self):
+        """Reset all streaming state."""
+        self.current_tool_index = 0
+        self.is_tool_call_started = False
+        self.header_sent = False
+        self.current_tool_id = None
+        self.current_function_name = None
+        self.current_param_name = None
+        self.current_param_value = ""
+        self.param_count = 0
+        self.in_param = False
+        self.in_function = False
+        self.accumulated_text = ""
+        self.json_started = False
+        self.json_closed = False
+
+    def _parse_xml_function_call(
+        self, function_call_str: str, tools: Optional[list[ChatCompletionToolsParam]]
+    ) -> Optional[ToolCall]:
+        def get_arguments_config(func_name: str) -> dict:
+            if tools is None:
+                return {}
+            for config in tools:
+                if not hasattr(config, "type") or not (
+                    hasattr(config, "function") and hasattr(config.function, "name")
+                ):
+                    continue
+                if config.type == "function" and config.function.name == func_name:
+                    if not hasattr(config.function, "parameters"):
+                        return {}
+                    params = config.function.parameters
+                    if isinstance(params, dict) and "properties" in params:
+                        return params["properties"]
+                    elif isinstance(params, dict):
+                        return params
+                    else:
+                        return {}
+            logger.warning(f"Tool '{func_name}' is not defined in the tools list.")
+            return {}
+
+        def convert_param_value(
+            param_value: str, param_name: str, param_config: dict, func_name: str
+        ) -> Any:
+            # Handle null value for any type
+            if param_value.lower() == "null":
+                return None
+
+            if param_name not in param_config:
+                if param_config != {}:
+                    logger.warning(
+                        f"Parsed parameter '{param_name}' is not defined in the tool "
+                        f"parameters for tool '{func_name}', directly returning the string value."
+                    )
+                return param_value
+
+            if (
+                isinstance(param_config[param_name], dict)
+                and "type" in param_config[param_name]
+            ):
+                param_type = str(param_config[param_name]["type"]).strip().lower()
+            else:
+                param_type = "string"
+            if param_type in ["string", "str", "text", "varchar", "char", "enum"]:
+                return param_value
+            elif (
+                param_type.startswith("int")
+                or param_type.startswith("uint")
+                or param_type.startswith("long")
+                or param_type.startswith("short")
+                or param_type.startswith("unsigned")
+            ):
+                try:
+                    param_value = int(param_value)
+                except:
+                    logger.warning(
+                        f"Parsed value '{param_value}' of parameter '{param_name}' is not an integer in tool "
+                        f"'{func_name}', degenerating to string."
+                    )
+                return param_value
+            elif param_type.startswith("num") or param_type.startswith("float"):
+                try:
+                    float_param_value = float(param_value)
+                    param_value = float_param_value if float_param_value - int(float_param_value) != 0 else int(float_param_value)
+                except:
+                    logger.warning(
+                        f"Parsed value '{param_value}' of parameter '{param_name}' is not a float in tool "
+                        f"'{func_name}', degenerating to string."
+                    )
+                return param_value
+            elif param_type in ["boolean", "bool", "binary"]:
+                param_value = param_value.lower()
+                if param_value not in ["true", "false"]:
+                    logger.warning(
+                        f"Parsed value '{param_value}' of parameter '{param_name}' is not a boolean (`true` of `false`) in tool '{func_name}', degenerating to false."
+                    )
+                return param_value == "true"
+            else:
+                if param_type == "object" or param_type.startswith("dict"):
+                    try:
+                        param_value = json.loads(param_value)
+                        return param_value
+                    except:
+                        logger.warning(
+                            f"Parsed value '{param_value}' of parameter '{param_name}' is not a valid JSON object in tool "
+                            f"'{func_name}', will try other methods to parse it."
+                        )
+                try:
+                    param_value = eval(param_value)
+                except:
+                    logger.warning(
+                        f"Parsed value '{param_value}' of parameter '{param_name}' cannot be converted via Python `eval()` in tool '{func_name}', degenerating to string."
+                    )
+                return param_value
+
+        # Extract function name
+        end_index = function_call_str.index(">")
+        function_name = function_call_str[:end_index]
+        param_config = get_arguments_config(function_name)
+        parameters = function_call_str[end_index + 1 :]
+        param_dict = {}
+        for match in self.tool_call_parameter_regex.findall(parameters):
+            match_text = match[0] if match[0] else match[1]
+            idx = match_text.index(">")
+            param_name = match_text[:idx]
+            param_value = str(match_text[idx + 1 :])
+            # Remove prefix and trailing \n
+            if param_value.startswith("\n"):
+                param_value = param_value[1:]
+            if param_value.endswith("\n"):
+                param_value = param_value[:-1]
+
+            param_dict[param_name] = convert_param_value(
+                param_value, param_name, param_config, function_name
+            )
+        return ToolCall(
+            type="function",
+            function=FunctionCall(
+                name=function_name, arguments=json.dumps(param_dict, ensure_ascii=False)
+            ),
+        )
+
+    def _get_function_calls(self, model_output: str) -> List[str]:
+        # Find all tool calls
+        matched_ranges = self.tool_call_regex.findall(model_output)
+        raw_tool_calls = [
+            match[0] if match[0] else match[1] for match in matched_ranges
+        ]
+
+        # Back-off strategy if no tool_call tags found
+        if len(raw_tool_calls) == 0:
+            raw_tool_calls = [model_output]
+
+        raw_function_calls = []
+        for tool_call in raw_tool_calls:
+            raw_function_calls.extend(self.tool_call_function_regex.findall(tool_call))
+
+        function_calls = [
+            match[0] if match[0] else match[1] for match in raw_function_calls
+        ]
+        return function_calls
+
+    def extract_tool_calls(
+        self,
+        model_output: str,
+        request: ChatCompletionRequest,
+    ) -> ExtractedToolCallInformation:
+        # Quick check to avoid unnecessary processing
+        if self.tool_call_prefix not in model_output:
+            return ExtractedToolCallInformation(
+                tools_called=False, tool_calls=[], content=model_output
+            )
+
+        try:
+            function_calls = self._get_function_calls(model_output)
+            if len(function_calls) == 0:
+                return ExtractedToolCallInformation(
+                    tools_called=False, tool_calls=[], content=model_output
+                )
+
+            tool_calls = [
+                self._parse_xml_function_call(function_call_str, request.tools)
+                for function_call_str in function_calls
+            ]
+
+            # Populate prev_tool_call_arr for serving layer to set finish_reason
+            self.prev_tool_call_arr.clear()  # Clear previous calls
+            for tool_call in tool_calls:
+                if tool_call:
+                    self.prev_tool_call_arr.append(
+                        {
+                            "name": tool_call.function.name,
+                            "arguments": tool_call.function.arguments,
+                        }
+                    )
+
+            # Extract content before tool calls
+            content_index = model_output.find(self.tool_call_start_token)
+            content_index = (
+                content_index
+                if content_index >= 0
+                else model_output.find(self.tool_call_prefix)
+            )
+            content = model_output[:content_index]  # .rstrip()
+
+            return ExtractedToolCallInformation(
+                tools_called=(len(tool_calls) > 0),
+                tool_calls=tool_calls,
+                content=content if content else None,
+            )
+
+        except Exception:
+            logger.exception("Error in extracting tool call from response.")
+            return ExtractedToolCallInformation(
+                tools_called=False, tool_calls=[], content=model_output
+            )
+
+    def extract_tool_calls_streaming(
+        self,
+        previous_text: str,
+        current_text: str,
+        delta_text: str,
+        previous_token_ids: Sequence[int],
+        current_token_ids: Sequence[int],
+        delta_token_ids: Sequence[int],
+        request: ChatCompletionRequest,
+    ) -> Union[DeltaMessage, None]:
+        # If no delta text, return None unless it's an EOS token after tool calls
+        if not delta_text:
+            # Check if this is an EOS token after all tool calls are complete
+            # We check for tool calls in the text even if is_tool_call_started is False
+            # because it might have been reset after processing all tools
+            if delta_token_ids and self.tool_call_end_token_id not in delta_token_ids:
+                # Count complete tool calls
+                complete_calls = len(
+                    self.tool_call_complete_regex.findall(current_text)
+                )
+
+                # If we have completed tool calls and populated prev_tool_call_arr
+                if complete_calls > 0 and len(self.prev_tool_call_arr) > 0:
+                    # Check if all tool calls are closed
+                    open_calls = current_text.count(
+                        self.tool_call_start_token
+                    ) - current_text.count(self.tool_call_end_token)
+                    if open_calls == 0:
+                        # Return empty delta message to allow finish_reason processing
+                        return DeltaMessage(content="")
+                elif not self.is_tool_call_started and current_text:
+                    # This is a regular content response that's now complete
+                    return DeltaMessage(content="")
+            return None
+
+        # Check if this is the first call (reset state if needed)
+        if not previous_text:
+            self._reset_streaming_state()
+
+        # Update accumulated text
+        self.accumulated_text = current_text
+
+        # Check if we need to advance to next tool
+        if self.json_closed and not self.in_function:
+            # Check if this tool call has ended
+            tool_ends = current_text.count(self.tool_call_end_token)
+            if tool_ends > self.current_tool_index:
+                # This tool has ended, advance to next
+                self.current_tool_index += 1
+                self.header_sent = False
+                self.param_count = 0
+                self.json_started = False
+                self.json_closed = False
+
+                # Check if there are more tool calls
+                tool_starts = current_text.count(self.tool_call_start_token)
+                if self.current_tool_index >= tool_starts:
+                    # No more tool calls
+                    self.is_tool_call_started = False
+                # Continue processing next tool
+                return None
+
+        # Handle normal content before tool calls
+        if not self.is_tool_call_started:
+            # Check if tool call is starting
+            if (
+                self.tool_call_start_token_id in delta_token_ids
+                or self.tool_call_start_token in delta_text
+            ):
+                self.is_tool_call_started = True
+                # Return any content before the tool call
+                if self.tool_call_start_token in delta_text:
+                    content_before = delta_text[
+                        : delta_text.index(self.tool_call_start_token)
+                    ]
+                    if content_before:
+                        return DeltaMessage(content=content_before)
+                return None
+            else:
+                # Check if we're between tool calls - skip whitespace
+                if current_text.rstrip().endswith(self.tool_call_end_token):
+                    # We just ended a tool call, skip whitespace
+                    if delta_text.strip() == "":
+                        return None
+                # Normal content, no tool call
+                return DeltaMessage(content=delta_text)
+
+        # Check if we're between tool calls (waiting for next one)
+        # Count tool calls we've seen vs processed
+        tool_starts_count = current_text.count(self.tool_call_start_token)
+        if self.current_tool_index >= tool_starts_count:
+            # We're past all tool calls, shouldn't be here
+            return None
+
+        # We're in a tool call, find the current tool call portion
+        # Need to find the correct tool call based on current_tool_index
+        tool_starts = []
+        idx = 0
+        while True:
+            idx = current_text.find(self.tool_call_start_token, idx)
+            if idx == -1:
+                break
+            tool_starts.append(idx)
+            idx += len(self.tool_call_start_token)
+
+        if self.current_tool_index >= len(tool_starts):
+            # No more tool calls to process yet
+            return None
+
+        tool_start_idx = tool_starts[self.current_tool_index]
+        # Find where this tool call ends (or current position if not ended yet)
+        tool_end_idx = current_text.find(self.tool_call_end_token, tool_start_idx)
+        if tool_end_idx == -1:
+            tool_text = current_text[tool_start_idx:]
+        else:
+            tool_text = current_text[
+                tool_start_idx : tool_end_idx + len(self.tool_call_end_token)
+            ]
+
+        # Looking for function header
+        if not self.header_sent:
+            if self.tool_call_prefix in tool_text:
+                func_start = tool_text.find(self.tool_call_prefix) + len(
+                    self.tool_call_prefix
+                )
+                func_end = tool_text.find(">", func_start)
+
+                if func_end != -1:
+                    # Found complete function name
+                    self.current_function_name = tool_text[func_start:func_end]
+                    self.current_tool_id = self._generate_tool_call_id()
+                    self.header_sent = True
+                    self.in_function = True
+
+                    # IMPORTANT: Add to prev_tool_call_arr immediately when we detect a tool call
+                    # This ensures finish_reason="tool_calls" even if parsing isn't complete
+                    already_added = any(
+                        tool.get("name") == self.current_function_name
+                        for tool in self.prev_tool_call_arr
+                    )
+                    if not already_added:
+                        self.prev_tool_call_arr.append(
+                            {
+                                "name": self.current_function_name,
+                                "arguments": "{}",  # Placeholder, will be updated later
+                            }
+                        )
+
+                    # Send header with function info
+                    return DeltaMessage(
+                        tool_calls=[
+                            DeltaToolCall(
+                                index=self.current_tool_index,
+                                id=self.current_tool_id,
+                                function=DeltaFunctionCall(
+                                    name=self.current_function_name, arguments=""
+                                ),
+                                type="function",
+                            )
+                        ]
+                    )
+            return None
+
+        # We've sent header, now handle function body
+        if self.in_function:
+            # Send opening brace if not sent yet
+            if not self.json_started and not self.parameter_prefix in delta_text:
+                self.json_started = True
+                return DeltaMessage(
+                    tool_calls=[
+                        DeltaToolCall(
+                            index=self.current_tool_index,
+                            function=DeltaFunctionCall(arguments="{"),
+                        )
+                    ]
+                )
+
+            # Make sure json_started is set if we're processing parameters
+            if not self.json_started:
+                self.json_started = True
+
+            # Check for function end in accumulated text
+            if not self.json_closed and self.function_end_token in tool_text:
+                # Close JSON
+                self.json_closed = True
+
+                # Extract the complete tool call to update prev_tool_call_arr with final arguments
+                # Find the function content
+                func_start = tool_text.find(self.tool_call_prefix) + len(
+                    self.tool_call_prefix
+                )
+                func_content_end = tool_text.find(self.function_end_token, func_start)
+                if func_content_end != -1:
+                    func_content = tool_text[func_start:func_content_end]
+                    # Parse to get the complete arguments
+                    try:
+                        parsed_tool = self._parse_xml_function_call(
+                            func_content, request.tools if request else None
+                        )
+                        if parsed_tool:
+                            # Update existing entry in prev_tool_call_arr with complete arguments
+                            for i, tool in enumerate(self.prev_tool_call_arr):
+                                if tool.get("name") == parsed_tool.function.name:
+                                    self.prev_tool_call_arr[i]["arguments"] = (
+                                        parsed_tool.function.arguments
+                                    )
+                                    break
+                    except Exception:
+                        pass  # Ignore parsing errors during streaming
+
+                result = DeltaMessage(
+                    tool_calls=[
+                        DeltaToolCall(
+                            index=self.current_tool_index,
+                            function=DeltaFunctionCall(arguments="}"),
+                        )
+                    ]
+                )
+
+                # Reset state for next tool
+                self.in_function = False
+                self.json_closed = True
+
+                return result
+
+            # Look for parameters
+            # Count how many complete parameters we have processed
+            complete_params = tool_text.count(self.parameter_end_token)
+
+            # Check if we should start a new parameter
+            if not self.in_param and self.param_count < complete_params:
+                # Find the unprocessed parameter
+                # Count parameter starts
+                param_starts = []
+                idx = 0
+                while True:
+                    idx = tool_text.find(self.parameter_prefix, idx)
+                    if idx == -1:
+                        break
+                    param_starts.append(idx)
+                    idx += len(self.parameter_prefix)
+
+                if len(param_starts) > self.param_count:
+                    # Process the next parameter
+                    param_idx = param_starts[self.param_count]
+                    param_start = param_idx + len(self.parameter_prefix)
+                    remaining = tool_text[param_start:]
+
+                    if ">" in remaining:
+                        # We have the complete parameter name
+                        name_end = remaining.find(">")
+                        self.current_param_name = remaining[:name_end]
+
+                        # Find the parameter value
+                        value_start = param_start + name_end + 1
+                        value_text = tool_text[value_start:]
+                        if value_text.startswith("\n"):
+                            value_text = value_text[1:]
+
+                        # Find where this parameter ends
+                        param_end_idx = value_text.find(self.parameter_end_token)
+                        if param_end_idx != -1:
+                            # Complete parameter found
+                            param_value = value_text[:param_end_idx]
+                            if param_value.endswith("\n"):
+                                param_value = param_value[:-1]
+
+                            # Build complete JSON fragment for this parameter
+                            if self.param_count == 0:
+                                json_fragment = (
+                                    '"'
+                                    + self.current_param_name
+                                    + '": "'
+                                    + json.dumps(param_value)[1:-1]
+                                    + '"'
+                                )
+                            else:
+                                json_fragment = (
+                                    ', "'
+                                    + self.current_param_name
+                                    + '": "'
+                                    + json.dumps(param_value)[1:-1]
+                                    + '"'
+                                )
+
+                            self.param_count += 1
+
+                            return DeltaMessage(
+                                tool_calls=[
+                                    DeltaToolCall(
+                                        index=self.current_tool_index,
+                                        function=DeltaFunctionCall(
+                                            arguments=json_fragment
+                                        ),
+                                    )
+                                ]
+                            )
+
+            # Continue parameter value
+            if self.in_param:
+                if self.parameter_end_token in delta_text:
+                    # End of parameter
+                    end_idx = delta_text.find(self.parameter_end_token)
+                    value_chunk = delta_text[:end_idx]
+
+                    # Skip past > if at start
+                    if not self.current_param_value and ">" in value_chunk:
+                        gt_idx = value_chunk.find(">")
+                        value_chunk = value_chunk[gt_idx + 1 :]
+
+                    if not self.current_param_value and value_chunk.startswith("\n"):
+                        value_chunk = value_chunk[1:]
+
+                    # Calculate incremental JSON
+                    full_value = self.current_param_value + value_chunk
+                    prev_escaped = (
+                        json.dumps(self.current_param_value)[1:-1]
+                        if self.current_param_value
+                        else ""
+                    )
+                    full_escaped = json.dumps(full_value)[1:-1]
+                    delta_escaped = full_escaped[len(prev_escaped) :]
+
+                    self.in_param = False
+                    self.current_param_value = ""
+
+                    return DeltaMessage(
+                        tool_calls=[
+                            DeltaToolCall(
+                                index=self.current_tool_index,
+                                function=DeltaFunctionCall(
+                                    arguments=delta_escaped + '"'
+                                ),
+                            )
+                        ]
+                    )
+                else:
+                    # Continue accumulating value
+                    value_chunk = delta_text
+
+                    # Handle first chunk after param name
+                    if not self.current_param_value and ">" in value_chunk:
+                        gt_idx = value_chunk.find(">")
+                        value_chunk = value_chunk[gt_idx + 1 :]
+
+                    if not self.current_param_value and value_chunk.startswith("\n"):
+                        value_chunk = value_chunk[1:]
+
+                    if value_chunk:
+                        # Stream the escaped delta
+                        prev_escaped = (
+                            json.dumps(self.current_param_value)[1:-1]
+                            if self.current_param_value
+                            else ""
+                        )
+                        self.current_param_value += value_chunk
+                        full_escaped = json.dumps(self.current_param_value)[1:-1]
+                        delta_escaped = full_escaped[len(prev_escaped) :]
+
+                        if delta_escaped:
+                            return DeltaMessage(
+                                tool_calls=[
+                                    DeltaToolCall(
+                                        index=self.current_tool_index,
+                                        function=DeltaFunctionCall(
+                                            arguments=delta_escaped
+                                        ),
+                                    )
+                                ]
+                            )
+
+        return None

tokenizer.json

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be75606093db2094d7cd20f3c2f385c212750648bd6ea4fb2bf507a6a4c55506
+size 11422650

tokenizer_config.json

@@ -0,0 +1,15 @@
+{
+  "add_prefix_space": false,
+  "backend": "tokenizers",
+  "bos_token": null,
+  "clean_up_tokenization_spaces": false,
+  "eos_token": "<|im_end|>",
+  "errors": "replace",
+  "is_local": true,
+  "model_max_length": 1048576,
+  "pad_token": "<|endoftext|>",
+  "split_special_tokens": false,
+  "tokenizer_class": "Qwen2Tokenizer",
+  "tool_parser_type": "qwen3_coder",
+  "unk_token": null
+}