Private
Public Access
refactor(ai_client): _send_grok_result() returns Result[str]
This commit is contained in:
+8
-5
@@ -2247,15 +2247,16 @@ def _ensure_grok_client() -> Any:
|
|||||||
_grok_client = openai.OpenAI(api_key=api_key, base_url="https://api.x.ai/v1")
|
_grok_client = openai.OpenAI(api_key=api_key, base_url="https://api.x.ai/v1")
|
||||||
return _grok_client
|
return _grok_client
|
||||||
|
|
||||||
def _send_grok(md_content: str, user_message: str, base_dir: str,
|
def _send_grok_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
|
from src.openai_compatible import OpenAICompatibleRequest, _classify_openai_compatible_error
|
||||||
|
try:
|
||||||
client = _ensure_grok_client()
|
client = _ensure_grok_client()
|
||||||
tools: list[dict[str, Any]] | None = _get_deepseek_tools() or None
|
tools: list[dict[str, Any]] | None = _get_deepseek_tools() or None
|
||||||
caps = get_capabilities("grok", _model)
|
caps = get_capabilities("grok", _model)
|
||||||
@@ -2285,12 +2286,14 @@ def _send_grok(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",
|
||||||
extra_body=extra_body or None,
|
extra_body=extra_body or None,
|
||||||
)
|
)
|
||||||
return run_with_tool_loop(
|
return Result(data=run_with_tool_loop(
|
||||||
client, _build_grok_request, capabilities=caps,
|
client, _build_grok_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="grok",
|
patch_callback=patch_callback, base_dir=base_dir, vendor_name="grok",
|
||||||
history_lock=_grok_history_lock, history=_grok_history,
|
history_lock=_grok_history_lock, history=_grok_history,
|
||||||
)
|
))
|
||||||
|
except Exception as exc:
|
||||||
|
return Result(data="", errors=[_classify_openai_compatible_error(exc, source="ai_client.grok")])
|
||||||
|
|
||||||
def _list_grok_models() -> list[str]:
|
def _list_grok_models() -> list[str]:
|
||||||
from src.vendor_capabilities import list_models_for_vendor
|
from src.vendor_capabilities import list_models_for_vendor
|
||||||
|
|||||||
Reference in New Issue
Block a user