Replace env vars and conf file with config.json#1464
Draft
jeremyfowers wants to merge 14 commits intomainfrom
Draft
Replace env vars and conf file with config.json#1464jeremyfowers wants to merge 14 commits intomainfrom
jeremyfowers wants to merge 14 commits intomainfrom
Conversation
Replace the mix of environment variables, lemonade.conf, and CLI arguments that configured lemond with a single config.json file in the lemonade home directory. This makes configuration manageable by GUI apps at runtime via the /internal/set endpoint, and gives users a single source of truth. Key changes: - lemond now takes 3 CLI args: [home_dir] [--port] [--host] - config.json is auto-created with defaults on first run - Backend settings nested under their backend name (llamacpp, sdcpp, etc.) - Meaningful defaults: "auto" for backends, "builtin" for binary paths - /internal/set persists changes to config.json on disk - Auto-migration from env vars and /etc/lemonade/lemonade.conf on first run - Legacy shim (lemonade-server) stays backwards-compatible by translating old CLI args into /internal/set calls after spawning lemond - LEMONADE_API_KEY, LEMONADE_CI_MODE, HF_TOKEN stay as env vars Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Merge origin/main (super-resolution, issue templates, system-info fix, recipes fix) and resolve the recipe_options.cpp conflict by keeping the branch's OPTION_TO_CLI_FLAG structure. Add value validation to RuntimeConfig that was lost when replacing CLI args with config.json: - Backend selection (llamacpp, whispercpp, sdcpp) validated dynamically against SystemInfo::get_supported_backends() at both set time and use time via a single validate_backend_choice() helper - Binary path overrides (*_bin) validated via validate_bin_path(): must be "builtin" or an existing filesystem path - Numeric options (steps, width, height, cfg_scale) validated for positive values - Centralize config-section/recipe name mapping (config_section_to_recipe / recipe_to_config_section) to eliminate duplicate hand-rolled conversions in backend_utils.cpp Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…versioning - Fix ::tolower UB by using unsigned char lambda instead of bare ::tolower - Replace std::mutex with std::shared_mutex for concurrent load/save safety - Use RAII scoped lock blocks instead of manual unlock in error paths - Back up corrupt config.json as .corrupted before falling back to defaults - Clean up stale .tmp files from interrupted saves - Add config_version field for future schema migration - Add bounds validation for config_version (>= 1) - Quote PowerShell argument for paths with spaces in MSI installer action - Remove low-value section dividers and obvious comments Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Add a `config` command with `view` and `set` subcommands to the lemonade CLI for reading and modifying server configuration via /internal/config and /internal/set endpoints. - `config view` displays a formatted table with key=value syntax that maps directly to `config set` arguments - `config set` accepts key=value positional args (e.g., `port=8123 llamacpp-backend=rocm`) and dynamically determines top-level vs nested keys by querying the server's config structure - Update legacy shim (lemonade-server) to delegate config changes through `lemonade config set` instead of direct HTTP calls to /internal/set Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…ault - Remove ConfigFile::migrate() and all supporting code (env_to_config_key, read_conf_file, parse_env_value) — users migrate manually via `lemonade config set` - Remove migrate() calls from lemond and tray startup - Make `lemonade config` default to displaying config (previously required `lemonade config view` subcommand); `lemonade config set` unchanged Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Merge main which includes PR #1453 (direct-run log streaming fix) and PR #1466 (openSUSE Tumbleweed support). Resolve conflicts by adapting the dual-sink logging (console + file when not under systemd) to use config.json-based RuntimeConfig instead of the old CLI config struct. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- LEMONADE_CACHE_DIR env var sets the lemonade home dir (checked after explicit CLI arg, before platform defaults) - Default models_dir in config.json is now "auto", which resolves HF_HUB_CACHE → HF_HOME/hub → platform default per the HF spec - Explicit models_dir paths in config.json still override env vars Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Fix Windows build: use runtime_config->host()/port() instead of removed
config struct in tray/main.cpp shutdown block
- Fix Linux distro builds: remove --log-level CLI arg (no longer supported);
instead have LEMONADE_CI_MODE auto-set log level to debug in RuntimeConfig
- Fix test /internal/set format: send nested backend objects (e.g.
{"llamacpp": {"backend": "metal"}}) instead of flat keys (llamacpp_backend)
- Remove redundant "Set debug logging" CI steps now that LEMONADE_CI_MODE
handles it automatically
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
On main, lemonade-router resolved its home dir via get_cache_dir() ($HOME/.cache/lemonade). The positional arg was overriding that to a different path. Remove it so lemond uses the same default resolution. Also document valid env vars for the conf.d drop-in and note that server settings now live in config.json. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Use std::atomic for global RuntimeConfig pointer for thread safety - Document set-once-at-startup invariant for g_home_dir/g_models_dir - Move stale .tmp cleanup from shared_lock to unique_lock in ConfigFile - Fix docs: models_dir default is "auto", not a hardcoded path - Fix docs: migration is manual via `lemonade config set`, not automatic - Log when --port/--host CLI overrides are persisted to config.json - Quote Windows cmd_line args in legacy shim to handle paths with spaces Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace ambiguous hyphen-based key syntax (llamacpp-backend=rocm) with unambiguous dot notation (llamacpp.backend=rocm) for `lemonade config set`. Hyphens were doing double duty as both word separators and section separators, causing parsing bugs for keys like cfg-scale. - config set/view now uses section.field for nested keys (e.g., sdcpp.steps) - Top-level keys shown as JSON names (e.g., log_level, no_broadcast) - Removed server round-trip from config set (no longer needs to fetch config to determine key nesting) - lemonade-web-app discovers port from running server via lemonade status Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
lemonade.conf, and CLI arguments with a singleconfig.jsonfile in the lemonade home directorylemondnow takes exactly 3 CLI args:[home_dir] [--port PORT] [--host HOST]config.jsonis auto-created with defaults on first run; there is no auto-migration — users migrate manually vialemonade config setlemonade configdisplays the current configuration;lemonade config set key=valueupdates it (e.g.lemonade config set llamacpp-backend=rocm port=8123)/internal/set(nested JSON) and/internal/config(GET), which persist changes toconfig.jsonllamacpp,sdcpp, etc.) with meaningful defaults ("auto"for backends,"builtin"for binary paths)config.jsonis hardened with thread-safe read/write, atomic saves (write-to-temp + rename), corruption recovery (auto-recreate from defaults), and schema versioninglemonade-servershim stays backwards-compatible by translating old CLI args into/internal/setcallsLEMONADE_API_KEY,LEMONADE_CI_MODE, andHF_TOKENremain as environment variablesTest plan
cmake --build --preset defaultcompiles cleanlylemond /tmp/testcreates config.json with correct nested structure and defaultslemond --port 9000persists port override to config.jsonlemonade configdisplays current configurationlemonade config set llamacpp-backend=vulkanupdates config via/internal/setcurl localhost:8000/internal/configreturns full nested configlemonade-server serve --log-level debug --llamacpp vulkanstill works via legacy shimpython test/server_cli.pypassespython test/server_endpoints.pypasses