Skip to content

Fix /ctx error handling in interactive REPL #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
superbling wants to merge 1 commit into from
+24 −13
Closed

Fix /ctx error handling in interactive REPL #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions ds4_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,17 @@ static int parse_int(const char *s, const char *opt) {
return (int)v;
}

static bool parse_int_repl(const char *s, const char *opt, int *out) {
char *end = NULL;
long v = strtol(s, &end, 10);
if (s[0] == '\0' || *end != '\0' || v <= 0 || v > INT32_MAX) {
fprintf(stderr, "ds4: invalid value for %s: %s\n", opt, s);
return false;
}
*out = (int)v;
return true;
}

static uint64_t parse_u64(const char *s, const char *opt) {
char *end = NULL;
unsigned long long v = strtoull(s, &end, 10);
Expand Down Expand Up @@ -861,9 +872,6 @@ static void repl_chat_free(repl_chat *chat) {
}

static int repl_chat_set_ctx(ds4_engine *engine, repl_chat *chat, int ctx_size) {
ds4_session_free(chat->session);
chat->session = NULL;
chat->ctx_size = 0;
return repl_chat_create_session(engine, chat, ctx_size);
}

Expand Down Expand Up @@ -1057,17 +1065,20 @@ static int run_repl(ds4_engine *engine, cli_config *cfg) {
if (!arg[0]) {
fprintf(stderr, "ds4: /ctx needs a positive integer\n");
} else {
cfg->gen.ctx_size = parse_int(arg, "/ctx");
log_context_memory(cfg->engine.backend, cfg->gen.ctx_size);
rc = repl_chat_set_ctx(engine, &chat, cfg->gen.ctx_size);
if (rc != 0) {
linenoiseFree(line);
break;
int new_ctx;
if (parse_int_repl(arg, "/ctx", &new_ctx)) {
log_context_memory(cfg->engine.backend, new_ctx);
if (repl_chat_set_ctx(engine, &chat, new_ctx) == 0) {
cfg->gen.ctx_size = new_ctx;
bool active = ds4_think_mode_for_context(cfg->gen.think_mode,
chat.ctx_size) == DS4_THINK_MAX;
repl_chat_apply_max_prefix(engine, &chat, active);
cli_warn_think_max_downgraded(&cfg->gen, "/ctx");
} else {
fprintf(stderr, "ds4: /ctx %d failed; keeping current ctx %d\n",
new_ctx, chat.ctx_size);
}
}
bool active = ds4_think_mode_for_context(cfg->gen.think_mode,
chat.ctx_size) == DS4_THINK_MAX;
repl_chat_apply_max_prefix(engine, &chat, active);
cli_warn_think_max_downgraded(&cfg->gen, "/ctx");
}
} else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit")) {
linenoiseFree(line);
Expand Down