ed/manual_slop
Private
Public Access
0
0
Fork 0
Code Activity

refactor(ai_client): _send_llama_result() returns Result[str]

Browse Source
This commit is contained in:
ed
2026-06-12 18:46:29 -04:00
parent 64d6ba2db5
commit 6665152950
1 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ai_client.py
+8 -5
View File
@@ -2471,17 +2471,18 @@ def _ensure_llama_client() -> Any:
_llama_client = openai.OpenAI(api_key=_llama_api_key, base_url=_llama_base_url) _llama_client = openai.OpenAI(api_key=_llama_api_key, base_url=_llama_base_url)
return _llama_client return _llama_client
def _send_llama(md_content: str, user_message: str, base_dir: str, def _send_llama_result(md_content: str, user_message: str, base_dir: str,
file_items: list[dict[str, Any]] | None = None, file_items: list[dict[str, Any]] | None = None,
discussion_history: str = "", discussion_history: str = "",
stream: bool = False, stream: bool = False,
pre_tool_callback: Optional[Callable[[str, str, Optional[Callable[[str], str]]], Optional[str]]] = None, pre_tool_callback: Optional[Callable[[str, str, Optional[Callable[[str], str]]], Optional[str]]] = None,
qa_callback: Optional[Callable[[str], str]] = None, qa_callback: Optional[Callable[[str], str]] = None,
stream_callback: Optional[Callable[[str], None]] = None, stream_callback: Optional[Callable[[str], None]] = None,
patch_callback: Optional[Callable[[str, str], Optional[str]]] = None) -> str: patch_callback: Optional[Callable[[str, str], Optional[str]]] = None) -> Result[str]:
from src.openai_compatible import OpenAICompatibleRequest, _classify_openai_compatible_error
try:
if "localhost" in _llama_base_url or "127.0.0.1" in _llama_base_url: if "localhost" in _llama_base_url or "127.0.0.1" in _llama_base_url:
return _send_llama_native(md_content, user_message, base_dir, file_items, discussion_history, stream, pre_tool_callback, qa_callback, stream_callback, patch_callback) return _send_llama_native(md_content, user_message, base_dir, file_items, discussion_history, stream, pre_tool_callback, qa_callback, stream_callback, patch_callback)
from src.openai_compatible import OpenAICompatibleRequest
client = _ensure_llama_client() client = _ensure_llama_client()
tools: list[dict[str, Any]] | None = _get_deepseek_tools() or None tools: list[dict[str, Any]] | None = _get_deepseek_tools() or None
with _llama_history_lock: with _llama_history_lock:
@@ -2504,12 +2505,14 @@ def _send_llama(md_content: str, user_message: str, base_dir: str,
tools=tools, tool_choice="auto" if tools else "auto", tools=tools, tool_choice="auto" if tools else "auto",
) )
caps = get_capabilities("llama", _model) caps = get_capabilities("llama", _model)
return run_with_tool_loop( return Result(data=run_with_tool_loop(
client, _build_llama_request, capabilities=caps, client, _build_llama_request, capabilities=caps,
pre_tool_callback=pre_tool_callback, qa_callback=qa_callback, stream_callback=stream_callback, pre_tool_callback=pre_tool_callback, qa_callback=qa_callback, stream_callback=stream_callback,
patch_callback=patch_callback, base_dir=base_dir, vendor_name="llama", patch_callback=patch_callback, base_dir=base_dir, vendor_name="llama",
history_lock=_llama_history_lock, history=_llama_history, history_lock=_llama_history_lock, history=_llama_history,
) ))
except Exception as exc:
return Result(data="", errors=[_classify_openai_compatible_error(exc, source="ai_client.llama")])
OLLAMA_DEFAULT_BASE_URL: str = "http://localhost:11434" OLLAMA_DEFAULT_BASE_URL: str = "http://localhost:11434"