Run frontier MoE models on hardware you already own — pure C, zero deps, experts streamed from disk. Tiny engine, immense model. 🐦
C
serve stage 2: per-request grammars end-to-end — response_format -> SUBMIT -> grammar-forced drafts in the multiplexed server
FABIOTESSd7b855f43fbf
diff --git a/c/colibri.c b/c/colibri.cindex a24d5400..9a231642 100644--- a/c/colibri.c+++ b/c/colibri.c@@ -3962,10 +3962,36 @@ static void repin_pass(Model *m){ repin_pass_limit(m,16); }* grammar_draft propone lo span FORZATO successivo (un solo byte legale per posizione)* gia' tokenizzato. Il confine di tokenizzazione non e' garantito coincidere con quello* del modello: la verifica assorbe la differenza (al peggio l'ultimo draft e' rifiutato). */+/* Compile grammar TEXT into g: raw GBNF, or — if the first non-space byte is '{'+ * — a JSON-Schema compiled via schema_gbnf.h. Takes ownership of txt (always+ * freed). Fail-soft: returns -1 with g->on=0, engine runs without a grammar. */+static int grammar_setup_text(GrDraft *g, Tok *T, char *txt, const char *label){+ const char *p=txt; while(*p==' '||*p=='\t'||*p=='\n'||*p=='\r') p++;+ if(*p=='{'){+ char serr[160];+ char *gbnf=schema_to_gbnf(txt,serr,sizeof serr);+ free(txt);+ if(!gbnf){ fprintf(stderr,"[SCHEMA] %s: %s (running without grammar)\n",label,serr); return -1; }+ txt=gbnf;+ }+ if(gr_parse(&g->gram,txt)){ fprintf(stderr,"[GRAMMAR] %s: %s\n",label,g->gram.err); free(txt); return -1; }+ free(txt);+ gr_state_init(&g->st,&g->gram);+ if(!g->st.alive){ fprintf(stderr,"[GRAMMAR] %s: grammar cannot be evaluated (left recursion?)\n",label); return -1; }+ if(g->max<1) g->max=24;+ if(g->max>48) g->max=48;+ g->T=T; g->on=1; g->armed=0;+ fprintf(stderr,"[GRAMMAR] %s: %d rules, forced span capped at %d tokens/forward\n",label,g->gram.n,g->max);+ return 0;+}+/* Release a per-request grammar so the slot can host the next request (keeps max). */+static void grammar_teardown(GrDraft *g){+ if(g->gram.n) gr_free(&g->gram);+ int max=g->max; memset(g,0,sizeof(*g)); g->max=max;+}static void grammar_setup(GrDraft *g, Tok *T){/* GRAMMAR=<file.gbnf> takes precedence; SCHEMA=<file.json> compiles a JSON-Schema- * to GBNF (schema_gbnf.h) for the same draft source. Both fail soft: the engine- * runs without a grammar and output is unchanged. */+ * to GBNF. Both fail soft: the engine runs without a grammar, output unchanged. */const char *gf=getenv("GRAMMAR");const char *sf=(gf&&*gf)?NULL:getenv("SCHEMA");if((!gf||!*gf)&&(!sf||!*sf)) return;@@ -3977,22 +4003,8 @@ static void grammar_setup(GrDraft *g, Tok *T){if(!txt || fread(txt,1,(size_t)n,f)!=(size_t)n){fprintf(stderr,"[GRAMMAR] failed to read %s\n",path); fclose(f); free(txt); return; }fclose(f); txt[n]=0;- if(sf){ /* schema -> GBNF, then the same gr_parse as the GRAMMAR path */- char serr[160];- char *gbnf=schema_to_gbnf(txt,serr,sizeof serr);- free(txt);- if(!gbnf){ fprintf(stderr,"[SCHEMA] %s: %s (running without grammar)\n",sf,serr); return; }- txt=gbnf;- }- if(gr_parse(&g->gram,txt)){ fprintf(stderr,"[GRAMMAR] %s: %s\n",path,g->gram.err); free(txt); return; }- free(txt);- gr_state_init(&g->st,&g->gram);- if(!g->st.alive){ fprintf(stderr,"[GRAMMAR] %s: grammar cannot be evaluated (left recursion?)\n",path); return; }if(getenv("GRAMMAR_DRAFT")) g->max=atoi(getenv("GRAMMAR_DRAFT"));- if(g->max<1) g->max=1;- if(g->max>48) g->max=48;- g->T=T; g->on=1;- fprintf(stderr,"[GRAMMAR] %s: %d rules, forced span capped at %d tokens/forward\n",path,g->gram.n,g->max);+ grammar_setup_text(g,T,txt,path);}/* stato pulito all'inizio di ogni RISPOSTA (non tra i \x02MORE, che continuano) */static void grammar_reset(GrDraft *g){@@ -4811,8 +4823,8 @@ static void mux_done(Model *m, ServeCtx *sc, ServeReq *r){/* Read and prefill one request. Returns -1 on EOF, 0 for a rejected frame and* 1 for an accepted request. Prefill deliberately remains serial: continuous* batching starts at decode, where every active slot contributes one row. */-static int mux_submit(Model *m, Tok *T, ServeCtx *ctx, ServeReq *req, int nctx,- int maxctx, int eos){+static int mux_submit(Model *m, Tok *T, ServeCtx *ctx, ServeReq *req, GrDraft *grd,+ int nctx, int maxctx, int eos){char *line=NULL; size_t cap=0; ssize_t nr=getline(&line,&cap,stdin);if(nr<0){ free(line); return -1; }if(nr && line[nr-1]=='\n') line[--nr]=0;@@ -4833,21 +4845,31 @@ static int mux_submit(Model *m, Tok *T, ServeCtx *ctx, ServeReq *req, int nctx,char *raw=malloc((size_t)sub.bytes+1);if(!raw){ fprintf(stderr,"OOM multiplex payload\n"); exit(1); }if(fread(raw,1,(size_t)sub.bytes,stdin)!=(size_t)sub.bytes){ free(raw); free(line); return -1; }+ char *gtxt=NULL; /* optional per-request grammar/schema text */+ if(sub.gbytes){+ gtxt=malloc((size_t)sub.gbytes+1);+ if(!gtxt){ fprintf(stderr,"OOM multiplex payload\n"); exit(1); }+ if(fread(gtxt,1,(size_t)sub.gbytes,stdin)!=(size_t)sub.gbytes){+ free(gtxt); free(raw); free(line); return -1; }+ gtxt[sub.gbytes]=0;+ }int delim=fgetc(stdin);if(delim!='\n'){printf("ERROR %llu BAD_FRAME\n",sub.id); fflush(stdout);- free(raw); free(line); return -1;+ free(gtxt); free(raw); free(line); return -1;}raw[sub.bytes]=0;if(sub.slot>=nctx || memchr(raw,0,(size_t)sub.bytes)){- printf("ERROR %llu BAD_REQUEST\n",sub.id); fflush(stdout); free(raw); free(line); return 0;+ printf("ERROR %llu BAD_REQUEST\n",sub.id); fflush(stdout); free(gtxt); free(raw); free(line); return 0;}if(req[sub.slot].active){- printf("ERROR %llu SLOT_BUSY\n",sub.id); fflush(stdout); free(raw); free(line); return 0;+ printf("ERROR %llu SLOT_BUSY\n",sub.id); fflush(stdout); free(gtxt); free(raw); free(line); return 0;}for(int i=0;i<nctx;i++) if(req[i].active && req[i].id==sub.id){- printf("ERROR %llu DUPLICATE_ID\n",sub.id); fflush(stdout); free(raw); free(line); return 0;+ printf("ERROR %llu DUPLICATE_ID\n",sub.id); fflush(stdout); free(gtxt); free(raw); free(line); return 0;}+ grammar_teardown(&grd[sub.slot]); /* new request owns the slot's grammar state */+ if(gtxt) grammar_setup_text(&grd[sub.slot],T,gtxt,"request"); /* fail-soft; owns gtxt */ServeCtx *sc=&ctx[sub.slot]; kv_bind(m,&sc->kv);int *tmp=malloc(maxctx*sizeof(int));if(!tmp){ fprintf(stderr,"OOM mux_submit tmp\n"); free(raw); free(line); exit(1); }@@ -4873,6 +4895,7 @@ static int mux_submit(Model *m, Tok *T, ServeCtx *ctx, ServeReq *req, int nctx,int next=pick_tok(logit,m->c.vocab,-1); free(logit);if(r->maximum<=0 || next==eos || is_stop(next)){ mux_done(m,sc,r); return 1; }r->pending=next; r->emitted=1; r->active=1; sc->hist[sc->len]=next; m->n_emit++;+ if(grd[sub.slot].on){ grammar_reset(&grd[sub.slot]); gr_feed(&grd[sub.slot],next); }mux_data(T,r->id,next);if(r->emitted>=r->maximum) mux_done(m,sc,r);return 1;@@ -4881,14 +4904,18 @@ static int mux_submit(Model *m, Tok *T, ServeCtx *ctx, ServeReq *req, int nctx,static void run_serve_mux(Model *m, const char *snap){char tkp[2048]; snprintf(tkp,sizeof(tkp),"%s/tokenizer.json",snap);Tok T; tok_load(&T,tkp); int eos=tok_id_of(&T,"<|endoftext|>"); stops_arm_tok(&m->c,eos,&T);- g_draft=0; /* one scheduler owns every forward; MTP/speculation is not ragged-safe */+ g_draft=0; /* one scheduler owns every forward; MTP/n-gram speculation is not ragged-safe.+ * Grammar-forced drafts ARE mux-safe (below): a drafting slot leaves the shared+ * batch for one forward and runs the proven single-sequence verify path+ * (kv_bind + step_all), exactly like prefill already does per submission. */int maxctx=getenv("CTX")?atoi(getenv("CTX")):4096;int nctx=getenv("KV_SLOTS")?atoi(getenv("KV_SLOTS")):1;if(nctx<1||nctx>512){fprintf(stderr,"KV_SLOTS must be between 1 and 512\n");exit(2);}g_kvsave=getenv("KVSAVE")?atoi(getenv("KVSAVE")):1;KVState *initial=m->kv; free(initial->kv_start); free(initial);ServeCtx *ctx=calloc(nctx,sizeof(*ctx)); ServeReq *req=calloc(nctx,sizeof(*req));- for(int i=0;i<nctx;i++) serve_ctx_init(m,&ctx[i],snap,i,maxctx);+ GrDraft *grd=calloc(nctx,sizeof(*grd)); /* per-slot request grammars (SUBMIT 7th field) */+ for(int i=0;i<nctx;i++){ serve_ctx_init(m,&ctx[i],snap,i,maxctx); grd[i].max=24; }#ifdef _WIN32/* Same byte-exact protocol as run_serve: in TEXT mode the CRT collapses CRLF in* fread() payloads (waits forever for the missing bytes) and expands LF on the@@ -4936,14 +4963,47 @@ static void run_serve_mux(Model *m, const char *snap){else ready=(PeekNamedPipe(ih,NULL,0,NULL,&avail,NULL) && avail>0)?1:0;if(ready)#endif- if(mux_submit(m,&T,ctx,req,nctx,maxctx,eos)<0) eof=1;+ if(mux_submit(m,&T,ctx,req,grd,nctx,maxctx,eos)<0) eof=1;}active=0; for(int i=0;i<nctx;i++) active+=req[i].active;if(!active){ if(eof) break; continue; }DecodeRow rows[512]; int slots[512], S=0;for(int i=0;i<nctx;i++) if(req[i].active){- rows[S]=(DecodeRow){&ctx[i].kv,req[i].pending,ctx[i].len}; slots[S++]=i;+ ServeCtx *sc=&ctx[i]; ServeReq *r=&req[i]; GrDraft *gd=&grd[i];+ /* grammar-forced drafts (greedy requests only: verification under sampling+ * needs rejection resampling, out of scope here). The slot leaves the shared+ * batch for one forward and runs the single-sequence verify path. */+ int draft[49], k=0;+ if(gd->on && r->temp==0) k=grammar_draft(gd,draft,gd->max);+ if(k>0 && sc->len+1+k<maxctx-1){+ if(sc->len+1+k>=(int)sc->kv.max_t) k=(int)sc->kv.max_t-sc->len-2;+ if(k<1){ rows[S]=(DecodeRow){&sc->kv,r->pending,sc->len}; slots[S++]=i; continue; }+ kv_bind(m,&sc->kv);+ int seq[50]; seq[0]=r->pending;+ memcpy(seq+1,draft,(size_t)k*sizeof(int));+ float *lo=step_all(m,seq,1+k,sc->len); m->n_fw++;+ gd->prop+=(uint64_t)k;+ int done=0;+ for(int j=0;j<=k && !done;j++){+ g_temp=r->temp; g_nuc=r->top_p;+ int next=pick_tok(lo+(int64_t)j*m->c.vocab,m->c.vocab,-1);+ sc->len++; /* seq[j] joins the committed history */+ if(next==eos || is_stop(next)){ mux_done(m,sc,r); done=1; break; }+ r->pending=next; sc->hist[sc->len]=next; r->emitted++; m->n_emit++;+ if(gd->on) gr_feed(gd,next);+ mux_data(&T,r->id,next);+ if(r->emitted>=r->maximum){ mux_done(m,sc,r); done=1; break; }+ if(j<k){+ if(next!=draft[j]) break; /* rejected: seq[j+1..] stale, overwritten next forward */+ gd->acc++;+ }+ }+ free(lo);+ continue; /* handled outside the shared batch */+ }+ rows[S]=(DecodeRow){&sc->kv,r->pending,sc->len}; slots[S++]=i;}+ if(S==0) continue; /* every active slot drafted this round */double tf0=g_prof?now_s():0;float *lo=step_decode_batch(m,rows,S); if(!lo){fprintf(stderr,"decode batch failed\n");break;}m->n_fw++;@@ -4954,13 +5014,15 @@ static void run_serve_mux(Model *m, const char *snap){int next=pick_tok(lo+(int64_t)s*m->c.vocab,m->c.vocab,-1);if(next==eos || is_stop(next)){mux_done(m,sc,r);continue;}r->pending=next; sc->hist[sc->len]=next; r->emitted++; m->n_emit++;+ if(grd[i].on) gr_feed(&grd[i],next); /* walker stays in sync when not drafting */mux_data(&T,r->id,next);if(r->emitted>=r->maximum) mux_done(m,sc,r);}free(lo);}usage_save(m);- for(int i=0;i<nctx;i++) serve_ctx_free(m,&ctx[i]); free(ctx); free(req);+ for(int i=0;i<nctx;i++){ serve_ctx_free(m,&ctx[i]); grammar_teardown(&grd[i]); }+ free(ctx); free(req); free(grd);m->kv=NULL; m->Lc=m->Rc=m->Ic=NULL; m->kv_start=NULL; m->max_t=0;}diff --git a/c/decode_batch.h b/c/decode_batch.hindex ad3d2eda..9f4dd343 100644--- a/c/decode_batch.h+++ b/c/decode_batch.h@@ -13,22 +13,32 @@ static inline float *coli_kv_row(float *base, int position, int width)}typedef struct {- unsigned long long id, bytes;+ unsigned long long id, bytes, gbytes;int slot, max_tokens;float temperature, top_p;} ColiSubmit;/* Parse the textual header. The payload is read separately using `bytes`, so- * it may contain newlines. Reject trailing fields to keep framing unambiguous. */+ * it may contain newlines. Reject trailing fields to keep framing unambiguous.+ * Optional 7th field `gbytes`: length of a per-request grammar (raw GBNF, or a+ * JSON-Schema compiled engine-side) appended to the payload AFTER the prompt+ * bytes. 6-field headers remain valid (gbytes = 0). */static inline int coli_submit_parse(const char *line, ColiSubmit *s){char tail;- if (!line || !s ||- sscanf(line, "SUBMIT %llu %d %llu %d %f %f %c", &s->id, &s->slot,+ if (!line || !s) return 0;+ s->gbytes = 0;+ if (sscanf(line, "SUBMIT %llu %d %llu %d %f %f %llu %c", &s->id, &s->slot,&s->bytes, &s->max_tokens, &s->temperature, &s->top_p,- &tail) != 6)- return 0;- return s->id > 0 && s->bytes <= (16u << 20) && s->slot >= 0 && s->max_tokens >= 1 &&+ &s->gbytes, &tail) != 7) {+ s->gbytes = 0;+ if (sscanf(line, "SUBMIT %llu %d %llu %d %f %f %c", &s->id, &s->slot,+ &s->bytes, &s->max_tokens, &s->temperature, &s->top_p,+ &tail) != 6)+ return 0;+ }+ return s->id > 0 && s->bytes <= (16u << 20) && s->gbytes <= (1u << 20) &&+ s->slot >= 0 && s->max_tokens >= 1 &&isfinite(s->temperature) && isfinite(s->top_p) &&s->temperature >= 0 && s->temperature <= 2 &&s->top_p > 0 && s->top_p <= 1;diff --git a/c/openai_server.py b/c/openai_server.pyindex be21d91f..1dd987ba 100644--- a/c/openai_server.py+++ b/c/openai_server.py@@ -370,6 +370,21 @@ def render_chat(messages, enable_thinking=False, reasoning_effort=None, tools=Noreturn "".join(prompt)+# Generic whitespace-tolerant JSON grammar for response_format {"type": "json_object"}.+# Draft-source semantics: positions with one legal byte draft; jws points just keep+# the walker alive through the model's own spacing (see docs/grammar-draft.md).+GENERIC_JSON_GBNF = (+ 'root ::= jws jval jws\n'+ 'jval ::= jobj | jarr | jstr | jnum | "true" | "false" | "null"\n'+ 'jobj ::= "{" jws ( jstr jws ":" jws jval jws ( "," jws jstr jws ":" jws jval jws )* )? "}"\n'+ 'jarr ::= "[" jws ( jval jws ( "," jws jval jws )* )? "]"\n'+ 'jstr ::= "\\"" jchar* "\\""\n'+ 'jchar ::= [^"\\\\\\x00-\\x1f] | "\\\\" ( ["\\\\/bfnrt] | "u" jhex jhex jhex jhex )\n'+ 'jhex ::= [0-9a-fA-F]\n'+ 'jnum ::= "-"? ( "0" | [1-9] [0-9]* ) ( "." [0-9]+ )? ( ( "e" | "E" ) ( "+" | "-" )? [0-9]+ )?\n'+ 'jws ::= ( " " | "\\t" | "\\n" | "\\r" )*\n'+)+def generation_options(body, limit):if body.get("n", 1) != 1:raise APIError(400, "Colibri currently supports `n=1` only.", "n", "unsupported_value")@@ -424,10 +439,35 @@ def generation_options(body, limit):raise APIError(400, "Token penalties are not supported yet.", None, "unsupported_parameter")if body.get("seed") is not None:raise APIError(400, "Per-request seeds are not supported yet.", "seed", "unsupported_parameter")+ # response_format -> optional per-request grammar for the engine's grammar-forced+ # draft source (#70/#148). NEVER a sampling constraint: drafts are verified, so a+ # schema the engine cannot compile degrades to "no speedup", not to an error and+ # not to changed output. json_schema payloads are forwarded as-is (the engine+ # compiles them via schema_gbnf.h); {"type": "gbnf"} is a raw-GBNF extension.+ grammar = Noneresponse_format = body.get("response_format")- if response_format not in (None, {"type": "text"}):- raise APIError(400, "Only the default text response format is supported.",- "response_format", "unsupported_parameter")+ if response_format is not None and response_format != {"type": "text"}:+ if not isinstance(response_format, dict) or "type" not in response_format:+ raise APIError(400, "`response_format` must be an object with a `type`.",+ "response_format", "invalid_value")+ ftype = response_format["type"]+ if ftype == "json_object":+ grammar = GENERIC_JSON_GBNF+ elif ftype == "json_schema":+ schema = (response_format.get("json_schema") or {}).get("schema")+ if not isinstance(schema, dict):+ raise APIError(400, "`response_format.json_schema.schema` must be an object.",+ "response_format", "invalid_value")+ grammar = json.dumps(schema)+ elif ftype == "gbnf":+ grammar = response_format.get("grammar")+ if not isinstance(grammar, str) or not grammar.strip():+ raise APIError(400, "`response_format.grammar` must be a non-empty GBNF string.",+ "response_format", "invalid_value")+ else:+ raise APIError(400, "`response_format.type` must be \"text\", \"json_object\", "+ "\"json_schema\" or \"gbnf\".",+ "response_format", "unsupported_value")maximum = body.get("max_completion_tokens")maximum_param = "max_completion_tokens"@@ -454,7 +494,7 @@ def generation_options(body, limit):if (isinstance(top_p, bool) or not isinstance(top_p, (int, float)) ornot math.isfinite(top_p) or not 0 < top_p <= 1):raise APIError(400, "`top_p` must be greater than 0 and at most 1.", "top_p")- return maximum, float(temperature), float(top_p)+ return maximum, float(temperature), float(top_p), grammardef read_engine_turn(stream, sentinel, on_bytes):@@ -618,12 +658,15 @@ class Engine:self._fail_pending(error)def generate(self, prompt, max_tokens, temperature, top_p, on_text, cache_slot=0,- cancelled=None):+ cancelled=None, grammar=None):if isinstance(cache_slot, bool) or not isinstance(cache_slot, int) or not 0 <= cache_slot < self.kv_slots:raise APIError(400, "Invalid cache slot.", "cache_slot")payload = prompt.encode("utf-8")if b"\0" in payload:raise APIError(400, "NUL bytes are not supported in prompts.", "messages")+ gpayload = grammar.encode("utf-8") if grammar else b""+ if b"\0" in gpayload:+ raise APIError(400, "NUL bytes are not supported in grammars.", "response_format")decoder = codecs.getincrementaldecoder("utf-8")("replace")def decode(data):@@ -643,12 +686,13 @@ class Engine:self.next_request_id += 1self.pending[request_id] = eventsheader = (f"SUBMIT {request_id} {cache_slot} {len(payload)} {max_tokens} "- f"{temperature:.8g} {top_p:.8g}\n").encode()+ f"{temperature:.8g} {top_p:.8g}"+ + (f" {len(gpayload)}" if gpayload else "") + "\n").encode()try:with self.write_lock:if self.process.poll() is not None:raise RuntimeError("colibri engine is not running")- self.process.stdin.write(header + payload + b"\n")+ self.process.stdin.write(header + payload + gpayload + b"\n")self.process.stdin.flush()except Exception:with self.pending_lock:@@ -895,7 +939,7 @@ class APIHandler(BaseHTTPRequestHandler):if dbg >= 2:sys.stderr.write(f"\n===== PROMPT [{request_id}] =====\n{prompt}\n===== OUTPUT [{request_id}] =====\n")sys.stderr.flush()- maximum, temperature, top_p = generation_options(body, self.server.max_tokens)+ maximum, temperature, top_p, grammar = generation_options(body, self.server.max_tokens)# tools and tool_choice come from chat_completion() already processed/filteredif chat and tool_choice == "none":tools = None # client forbade tools: never surface tool_calls@@ -924,7 +968,7 @@ class APIHandler(BaseHTTPRequestHandler):output = []stats = self.server.engine.generate(prompt, maximum, temperature, top_p, output.append, cache_slot,- self.client_disconnected)+ self.client_disconnected, grammar=grammar)text = "".join(output)length_finish = "length" if stats["length_limited"] else "stop"if chat and tools:@@ -1031,7 +1075,7 @@ class APIHandler(BaseHTTPRequestHandler):sp["buf"] = sp["buf"][flush:]stats = self.server.engine.generate(prompt, maximum, temperature, top_p, emit_tools, cache_slot,- lambda: not connected)+ lambda: not connected, grammar=grammar)if not sp["tool"] and sp["buf"]:emit(sp["buf"]) # no tool call happened: flush held tail_content, calls = parse_tool_calls("".join(raw), tools)@@ -1048,7 +1092,7 @@ class APIHandler(BaseHTTPRequestHandler):emit(chunk)stats = self.server.engine.generate(prompt, maximum, temperature, top_p, emit_plain, cache_slot,- lambda: not connected)+ lambda: not connected, grammar=grammar)finish = "length" if stats["length_limited"] else "stop"ka_stop.set() # generation done: stop the keepalive pumpka_thread.join(timeout=2)diff --git a/c/tests/test_decode_batch.c b/c/tests/test_decode_batch.cindex d370d2dc..f5b216e2 100644--- a/c/tests/test_decode_batch.c+++ b/c/tests/test_decode_batch.c@@ -44,6 +44,12 @@ static void test_submit_header(void)assert(coli_submit_parse("SUBMIT 1 0 16777216 3 1 1", &sub));assert(!coli_submit_parse("SUBMIT 1 0 16777217 3 1 1", &sub));assert(!coli_submit_parse("SUBMIT 1 0 2 3 1 1 trailing", &sub));+ /* optional 7th field: per-request grammar length (0 when absent) */+ assert(coli_submit_parse("SUBMIT 42 3 17 64 0.7 0.95", &sub) && sub.gbytes == 0);+ assert(coli_submit_parse("SUBMIT 42 3 17 64 0.7 0.95 512", &sub) && sub.gbytes == 512);+ assert(coli_submit_parse("SUBMIT 42 3 17 64 0.7 0.95 1048576", &sub));+ assert(!coli_submit_parse("SUBMIT 42 3 17 64 0.7 0.95 1048577", &sub));+ assert(!coli_submit_parse("SUBMIT 42 3 17 64 0.7 0.95 512 extra", &sub));}int main(void)diff --git a/c/tests/test_openai_server.py b/c/tests/test_openai_server.pyindex 4cda9ef3..7cbbc045 100644--- a/c/tests/test_openai_server.py+++ b/c/tests/test_openai_server.py@@ -20,8 +20,8 @@ class FakeEngine:self.calls = []def generate(self, prompt, maximum, temperature, top_p, on_text, cache_slot=0,- cancelled=None):- self.calls.append((prompt, maximum, temperature, top_p, cache_slot))+ cancelled=None, grammar=None):+ self.calls.append((prompt, maximum, temperature, top_p, cache_slot, grammar))on_text("Hé")on_text("llo")return {"prompt_tokens": 7, "completion_tokens": 2, "length_limited": False}@@ -34,7 +34,7 @@ class BlockingEngine(FakeEngine):self.release = threading.Event()def generate(self, prompt, maximum, temperature, top_p, on_text, cache_slot=0,- cancelled=None):+ cancelled=None, grammar=None):self.entered.set()self.release.wait(2)return super().generate(prompt, maximum, temperature, top_p, on_text, cache_slot,@@ -71,11 +71,11 @@ class TemplateTest(unittest.TestCase):def test_validates_generation_limits(self):self.assertEqual(generation_options({"max_tokens": 4, "temperature": 0, "top_p": 1}, 8),- (4, 0.0, 1.0))+ (4, 0.0, 1.0, None))# max_tokens above the server cap is clamped, not rejected (#260): OpenAI# clients default to large values; erroring breaks them.self.assertEqual(generation_options({"max_tokens": 9, "temperature": 0, "top_p": 1}, 8),- (8, 0.0, 1.0))+ (8, 0.0, 1.0, None))# non-positive / non-int max_tokens is still a hard errorwith self.assertRaises(APIError):generation_options({"max_tokens": 0}, 8)@@ -84,7 +84,21 @@ class TemplateTest(unittest.TestCase):with self.assertRaises(APIError):generation_options({"top_p": math.inf}, 8)self.assertEqual(generation_options({"temperature": None, "top_p": None}, 8),- (8, 0.7, 0.9))+ (8, 0.7, 0.9, None))+ # response_format -> grammar plumbing (draft source, never a constraint)+ opts = generation_options({"max_tokens": 4, "response_format": {"type": "json_object"}}, 8)+ self.assertIn("root ::=", opts[3])+ schema = {"type": "object", "properties": {"a": {"type": "string"}}, "required": ["a"]}+ opts = generation_options({"max_tokens": 4, "response_format":+ {"type": "json_schema", "json_schema": {"schema": schema}}}, 8)+ self.assertEqual(json.loads(opts[3]), schema)+ opts = generation_options({"max_tokens": 4, "response_format":+ {"type": "gbnf", "grammar": 'root ::= "x"'}}, 8)+ self.assertEqual(opts[3], 'root ::= "x"')+ with self.assertRaises(APIError):+ generation_options({"response_format": {"type": "yaml"}}, 8)+ with self.assertRaises(APIError):+ generation_options({"response_format": {"type": "json_schema", "json_schema": {}}}, 8)class ProtocolTest(unittest.TestCase):