refactor

Author: jph00

lisette/core.py

@@ -126,15 +126,17 @@ def mk_msg(content,      # Content: str, bytes (image), list of mixed content, o
 def _extract_tool(text:str)->tuple[dict,dict]:
     "Extract tool call and results from <details> block"
     d = json.loads(text.strip())
-    tc = ChatCompletionMessageToolCall(Function(dumps(d['call']['arguments']),d['call']['function']), d['id'],type='function')
-    tr = {'role': 'tool','tool_call_id': d['id'],'name': d['call']['function'], 'content': d['result']}
+    call = d['call']
+    func = call['function']
+    tc = ChatCompletionMessageToolCall(Function(dumps(call['arguments']),func), d['id'])
+    tr = {'role': 'tool','tool_call_id': d['id'],'name': func, 'content': d['result']}
     return tc,tr
 
 def fmt2hist(outp:str)->list:
     "Transform a formatted output into a LiteLLM compatible history"
     lm,hist = Message(),[]
     spt = re_tools.split(outp)
-    for txt,_,tooljson in list(chunked(spt, 3, pad=True)):
+    for txt,_,tooljson in chunked(spt, 3, pad=True):
         if txt.strip(): hist.append(lm:=Message(txt.strip()))
         if tooljson:
             tcr = _extract_tool(tooljson)

nbs/00_core.ipynb

@@ -781,15 +781,17 @@
     "def _extract_tool(text:str)->tuple[dict,dict]:\n",
     "    \"Extract tool call and results from <details> block\"\n",
     "    d = json.loads(text.strip())\n",
-    "    tc = ChatCompletionMessageToolCall(Function(dumps(d['call']['arguments']),d['call']['function']), d['id'],type='function')\n",
-    "    tr = {'role': 'tool','tool_call_id': d['id'],'name': d['call']['function'], 'content': d['result']}\n",
+    "    call = d['call']\n",
+    "    func = call['function']\n",
+    "    tc = ChatCompletionMessageToolCall(Function(dumps(call['arguments']),func), d['id'])\n",
+    "    tr = {'role': 'tool','tool_call_id': d['id'],'name': func, 'content': d['result']}\n",
     "    return tc,tr\n",
     "\n",
     "def fmt2hist(outp:str)->list:\n",
     "    \"Transform a formatted output into a LiteLLM compatible history\"\n",
     "    lm,hist = Message(),[]\n",
     "    spt = re_tools.split(outp)\n",
-    "    for txt,_,tooljson in list(chunked(spt, 3, pad=True)):\n",
+    "    for txt,_,tooljson in chunked(spt, 3, pad=True):\n",
     "        if txt.strip(): hist.append(lm:=Message(txt.strip()))\n",
     "        if tooljson:\n",
     "            tcr = _extract_tool(tooljson)\n",