Skip to content

armgit / strix

Public Imported from GitHub
0

Open-source AI penetration testing tool to find and fix your app’s vulnerabilities.

resolve: merge conflict resolution, llm api base resolution

octovimmerd2c99ea4df0a
diff --cc strix/config/config.py
index 387834be,53a3726b..f8836b2f
--- a/strix/config/config.py
+++ b/strix/config/config.py
@@@ -177,3 -180,30 +180,31 @@@ def apply_saved_config(force: bool = Fa
def save_current_config() -> bool:
return Config.save_current()
+
+
+ def resolve_llm_config() -> tuple[str | None, str | None, str | None]:
+ """Resolve LLM model, api_key, and api_base based on STRIX_LLM prefix.
+
+ Returns:
+ tuple: (model_name, api_key, api_base)
++ - model_name: Original model name (strix/ prefix preserved for display)
++ - api_key: LLM API key
++ - api_base: API base URL (auto-set to STRIX_API_BASE for strix/ models)
+ """
+ model = Config.get("strix_llm")
+ if not model:
+ return None, None, None
+
+ api_key = Config.get("llm_api_key")
+
+ if model.startswith("strix/"):
- model_name = "openai/" + model[6:]
+ api_base: str | None = STRIX_API_BASE
+ else:
- model_name = model
+ api_base = (
+ Config.get("llm_api_base")
+ or Config.get("openai_api_base")
+ or Config.get("litellm_base_url")
+ or Config.get("ollama_api_base")
+ )
+
- return model_name, api_key, api_base
++ return model, api_key, api_base
diff --cc strix/interface/main.py
index 58d52a08,e7ab6c01..5df4ac5b
--- a/strix/interface/main.py
+++ b/strix/interface/main.py
@@@ -18,7 -18,6 +18,8 @@@ from rich.panel import Pane
from rich.text import Text
from strix.config import Config, apply_saved_config, save_current_config
- from strix.llm.utils import get_litellm_model_name, get_strix_api_base
++from strix.config.config import resolve_llm_config
++from strix.llm.utils import get_litellm_model_name
apply_saved_config()
diff --cc strix/llm/dedupe.py
index f8cdb08c,ec151921..33b3bc90
--- a/strix/llm/dedupe.py
+++ b/strix/llm/dedupe.py
@@@ -5,8 -5,7 +5,8 @@@ from typing import An
import litellm
- from strix.config import Config
- from strix.llm.utils import get_litellm_model_name, get_strix_api_base
+ from strix.config.config import resolve_llm_config
++from strix.llm.utils import get_litellm_model_name
logger = logging.getLogger(__name__)
diff --cc strix/llm/llm.py
index d1b6370d,8133fe37..d6373ec2
--- a/strix/llm/llm.py
+++ b/strix/llm/llm.py
@@@ -14,8 -14,6 +14,7 @@@ from strix.llm.memory_compressor impor
from strix.llm.utils import (
_truncate_to_first_function,
fix_incomplete_tool_call,
+ get_litellm_model_name,
- get_strix_api_base,
parse_tool_invocations,
)
from strix.skills import load_skills
diff --cc strix/llm/memory_compressor.py
index e46b3319,f5981f6e..45909726
--- a/strix/llm/memory_compressor.py
+++ b/strix/llm/memory_compressor.py
@@@ -3,8 -3,7 +3,8 @@@ from typing import An
import litellm
- from strix.config import Config
- from strix.llm.utils import get_litellm_model_name, get_strix_api_base
+ from strix.config.config import Config, resolve_llm_config
++from strix.llm.utils import get_litellm_model_name
logger = logging.getLogger(__name__)
@@@ -106,19 -104,11 +106,12 @@@ def _summarize_messages
conversation = "\n".join(formatted)
prompt = SUMMARY_PROMPT_TEMPLATE.format(conversation=conversation)
- api_key = Config.get("llm_api_key")
- api_base = (
- Config.get("llm_api_base")
- or Config.get("openai_api_base")
- or Config.get("litellm_base_url")
- or Config.get("ollama_api_base")
- or get_strix_api_base(model)
- )
+ _, api_key, api_base = resolve_llm_config()
try:
+ litellm_model = get_litellm_model_name(model) or model
completion_args: dict[str, Any] = {
- "model": model,
+ "model": litellm_model,
"messages": [{"role": "user", "content": prompt}],
"timeout": timeout,
}
diff --cc strix/llm/utils.py
index 8abe6ba9,81431f01..c7d83a94
--- a/strix/llm/utils.py
+++ b/strix/llm/utils.py
@@@ -3,50 -3,6 +3,36 @@@ import r
from typing import Any
- STRIX_API_BASE = "https://models.strix.ai/api/v1"
-
+STRIX_PROVIDER_PREFIXES: dict[str, str] = {
+ "claude-": "anthropic",
+ "gpt-": "openai",
+ "gemini-": "gemini",
+}
+
+
- def is_strix_model(model_name: str | None) -> bool:
- """Check if model uses strix/ prefix."""
- return bool(model_name and model_name.startswith("strix/"))
-
-
- def get_strix_api_base(model_name: str | None) -> str | None:
- """Return Strix API base URL if using strix/ model, None otherwise."""
- if is_strix_model(model_name):
- return STRIX_API_BASE
- return None
-
-
+def get_litellm_model_name(model_name: str | None) -> str | None:
+ """Convert strix/ prefixed model to litellm-compatible provider/model format.
+
+ Maps strix/ models to their corresponding litellm provider:
+ - strix/claude-* -> anthropic/claude-*
+ - strix/gpt-* -> openai/gpt-*
+ - strix/gemini-* -> gemini/gemini-*
+ - Other models -> openai/<model> (routed via Strix API)
+ """
+ if not model_name:
+ return model_name
+ if not model_name.startswith("strix/"):
+ return model_name
+
+ base_model = model_name[6:]
+
+ for prefix, provider in STRIX_PROVIDER_PREFIXES.items():
+ if base_model.startswith(prefix):
+ return f"{provider}/{base_model}"
+
+ return f"openai/{base_model}"
+
+
def _truncate_to_first_function(content: str) -> str:
if not content:
return content