Skip to content

feat: improve macOS support and local LLM (GPT4All) compatibility #3

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

Open
lmntrixace wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: improve macOS support and local LLM (GPT4All) compatibility #3

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions crates/ctxgraph-cli/src/commands/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ fn find_models_dir(db_path: &std::path::Path) -> Option<PathBuf> {
}
}

// 2. ~/.cache/ctxgraph/models
if let Ok(home) = env::var("HOME") {
let p = PathBuf::from(home).join(".cache/ctxgraph/models");
// 2. Default cache directory (XDG or macOS)
if let Ok(p) = ctxgraph_extract::model_manager::ModelManager::default_cache_dir() {
if p.is_dir() {
return Some(p);
}
Expand Down
25 changes: 18 additions & 7 deletions crates/ctxgraph-extract/src/llm_extract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,14 @@ pub struct LlmConfig {
pub auto_escalate: bool,
}

fn ensure_chat_path(url: String) -> String {
if url.contains("/chat/completions") {
url
} else {
format!("{}/chat/completions", url.trim_end_matches('/'))
}
}

fn default_true() -> bool {
true
}
Expand Down Expand Up @@ -195,7 +203,7 @@ impl LlmExtractor {
}

let url = if !config.base_url.is_empty() {
format!("{}/chat/completions", config.base_url.trim_end_matches('/'))
ensure_chat_path(config.base_url.clone())
} else {
match config.provider.as_str() {
"nvidia" => "http://localhost:4000/v1/chat/completions".to_string(),
Expand Down Expand Up @@ -256,7 +264,7 @@ impl LlmExtractor {
if let Ok(key) = std::env::var("CTXGRAPH_LLM_KEY")
&& !key.is_empty()
{
let url = std::env::var("CTXGRAPH_LLM_URL").unwrap_or_else(|_| DEFAULT_URL.to_string());
let url = ensure_chat_path(std::env::var("CTXGRAPH_LLM_URL").unwrap_or_else(|_| DEFAULT_URL.to_string()));
let model =
std::env::var("CTXGRAPH_LLM_MODEL").unwrap_or_else(|_| DEFAULT_MODEL.to_string());
let client = reqwest::blocking::Client::builder()
Expand Down Expand Up @@ -310,7 +318,7 @@ impl LlmExtractor {
return None;
};

let url = std::env::var("CTXGRAPH_LLM_URL").unwrap_or(default_url);
let url = ensure_chat_path(std::env::var("CTXGRAPH_LLM_URL").unwrap_or(default_url));
let model =
std::env::var("CTXGRAPH_LLM_MODEL").unwrap_or_else(|_| DEFAULT_MODEL.to_string());

Expand Down Expand Up @@ -568,11 +576,14 @@ RULES:
schema: &ExtractionSchema,
) -> Result<LlmExtractionResult, LlmError> {
// Try strict JSON schema first
if let Ok(result) = self.extract_strict(text, schema) {
return Ok(result);
match self.extract_strict(text, schema) {
Ok(result) => Ok(result),
Err(_e) => {
// If the model explicitly rejects response_format, immediately fall back.
// Otherwise, if it's a 4xx error that might be related to strict config, fall back.
self.extract_prompt_json(text, schema)
}
}
// Fall back to prompt-based JSON for small models
self.extract_prompt_json(text, schema)
}

fn extract_strict(
Expand Down