Merge pull request #30 from AnswerDotAI/feat/29-reconstruct-tool-call-message-history

reconstruct tool calls

Author: jph00

cachy.jsonl

@@ -330,3 +330,8 @@
 {"key": "5c8485a6", "response": "event: message_start\ndata: {\"type\":\"message_start\",\"message\":{\"model\":\"claude-sonnet-4-5-20250929\",\"id\":\"msg_01FAdRVTQeQTovybY7EVW2Fr\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[],\"stop_reason\":null,\"stop_sequence\":null,\"usage\":{\"input_tokens\":4,\"cache_creation_input_tokens\":14,\"cache_read_input_tokens\":1622,\"cache_creation\":{\"ephemeral_5m_input_tokens\":14,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":9,\"service_tier\":\"standard\"}}               }\n\nevent: content_block_start\ndata: {\"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"text\",\"text\":\"\"}  }\n\nevent: content_block_delta\ndata: {\"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\"Goodbye! Feel free to come back if\"}           }\n\nevent: content_block_delta\ndata: {\"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\" you have any questions.\"}      }\n\nevent: content_block_stop\ndata: {\"type\":\"content_block_stop\",\"index\":0        }\n\nevent: message_delta\ndata: {\"type\":\"message_delta\",\"delta\":{\"stop_reason\":\"end_turn\",\"stop_sequence\":null},\"usage\":{\"input_tokens\":4,\"cache_creation_input_tokens\":14,\"cache_read_input_tokens\":1622,\"output_tokens\":17}}\n\nevent: message_stop\ndata: {\"type\":\"message_stop\"}\n\n"}
 {"key": "fc5ede02", "response": "{\"model\":\"claude-sonnet-4-20250514\",\"id\":\"msg_01M2HV41ZonZ1AAJg5FUy6zr\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"\\n\\nThe result of 47 + 23 is 70.\"}],\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":573,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":18,\"service_tier\":\"standard\"}}"}
 {"key": "df4ef045", "response": "{\"model\":\"claude-sonnet-4-20250514\",\"id\":\"msg_0139iCPpDfH1itSAtoBGNV4V\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"\\n\\nThe answer is **129**.\\n\\nI calculated this by first adding 47 + 23 = 70, then adding 70 + 59 = 129.\"}],\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":702,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":41,\"service_tier\":\"standard\"}}"}
+{"key": "d4589fc2", "response": "{\"model\":\"claude-sonnet-4-5-20250929\",\"id\":\"msg_019GSku9pTraoyhUZZxkDbws\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01MCSt43tUWZKqaoFXbn7krH\",\"name\":\"simple_add\",\"input\":{\"a\":5,\"b\":3}}],\"stop_reason\":\"tool_use\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":618,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":70,\"service_tier\":\"standard\"}}"}
+{"key": "20a4c712", "response": "{\"model\":\"claude-sonnet-4-5-20250929\",\"id\":\"msg_01ErxCc3aGgypa4ndgTwMuMf\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"\\n\\nThe result of 5 + 3 is **8**.\"}],\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":742,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":18,\"service_tier\":\"standard\"}}"}
+{"key": "71b7f751", "response": "{\"model\":\"claude-sonnet-4-5-20250929\",\"id\":\"msg_01YPXAnNErrUzxUZpLxqP7rT\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"Here's a joke based on the number 8:\\n\\nWhy was 6 afraid of 7?\\n\\nBecause 7 8 (ate) 9!\\n\\nBut since we got 8 as our answer, here's another one:\\n\\nWhat did the number 8 say when it looked in the mirror?\\n\\n\\\"Nice belt!\\\"\\n\\n(Because 8 looks like it's wearing a belt around its middle! \ud83d\ude04)\"}],\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":774,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":97,\"service_tier\":\"standard\"}}"}
+{"key": "8ff05b20", "response": "{\"model\":\"claude-sonnet-4-5-20250929\",\"id\":\"msg_01UkSZXczvtptdBLJemBkwnv\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"# Image Description\\n\\nThis adorable image shows a **Cavalier King Charles Spaniel puppy** with the classic Blenheim coloring (chestnut brown and white markings). \\n\\n## Key features visible:\\n- **Expressive brown eyes** looking directly at the camera\\n- **Soft, fluffy ears** with rich brown fur\\n- **White blaze** down the center of the face\\n- **White chest and paws**\\n- The puppy is lying on **green grass**\\n- **Purple flowers** (appear to be asters or similar) in the background\\n- Warm, soft lighting creating a charming portrait effect\\n\\nThe puppy has that irresistibly sweet, gentle expression that Cavalier King Charles Spaniels are famous for. This looks like a professional or carefully composed photograph, possibly for a breeder, pet portrait, or greeting card.\"}],\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":105,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":195,\"service_tier\":\"standard\"}}"}
+{"key": "130a52f1", "response": "{\"model\":\"claude-sonnet-4-5-20250929\",\"id\":\"msg_01NsVrovfY7JrTr5dPygRJhb\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\" D A C T E D\\n\\nI don't actually know your name - you haven't told me what it is yet! If you'd like me to spell your name, please let me know what it is first.\"}],\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":16,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":47,\"service_tier\":\"standard\"}}"}

lisette/_modidx.py

@@ -16,8 +16,10 @@
                               'lisette.core.Chat.print_hist': ('core.html#chat.print_hist', 'lisette/core.py'),
                               'lisette.core._add_cache_control': ('core.html#_add_cache_control', 'lisette/core.py'),
                               'lisette.core._alite_call_func': ('core.html#_alite_call_func', 'lisette/core.py'),
+                              'lisette.core._build_tool_hist': ('core.html#_build_tool_hist', 'lisette/core.py'),
                               'lisette.core._bytes2content': ('core.html#_bytes2content', 'lisette/core.py'),
                               'lisette.core._clean_str': ('core.html#_clean_str', 'lisette/core.py'),
+                              'lisette.core._details_extract': ('core.html#_details_extract', 'lisette/core.py'),
                               'lisette.core._has_cache': ('core.html#_has_cache', 'lisette/core.py'),
                               'lisette.core._has_search': ('core.html#_has_search', 'lisette/core.py'),
                               'lisette.core._lite_call_func': ('core.html#_lite_call_func', 'lisette/core.py'),

lisette/core.py

@@ -3,8 +3,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['sonn45', 'effort', 'patch_litellm', 'mk_msg', 'mk_msgs', 'stream_with_complete', 'lite_mk_func', 'cite_footnote',
-           'cite_footnotes', 'Chat', 'random_tool_id', 'mk_tc', 'mk_tc_req', 'mk_tc_result', 'mk_tc_results',
+__all__ = ['sonn45', 'effort', 'patch_litellm', 'mk_msg', 'stream_with_complete', 'lite_mk_func', 'cite_footnote',
+           'cite_footnotes', 'Chat', 'random_tool_id', 'mk_tc', 'mk_tc_req', 'mk_tc_result', 'mk_tc_results', 'mk_msgs',
            'astream_with_complete', 'AsyncChat', 'aformat_stream', 'adisplay_stream']
 
 # %% ../nbs/00_core.ipynb
@@ -117,23 +117,6 @@ def mk_msg(content,      # Content: str, bytes (image), list of mixed content, o
     msg = {"role": role, "content": c}
     return _add_cache_control(msg, ttl=ttl) if cache else msg
 
-# %% ../nbs/00_core.ipynb
-def mk_msgs(msgs,                      # List of messages (each: str, bytes, list, or dict w 'role' and 'content' fields)
-            cache=False,               # Enable Anthropic caching
-            ttl=None,                  # Cache TTL: '5m' (default) or '1h'
-           ):
-    "Create a list of LiteLLM compatible messages."
-    if not msgs: return []
-    if not isinstance(msgs, list): msgs = [msgs]
-    res,role = [],'user'
-    for m in msgs:
-        res.append(msg:=mk_msg(m, role=role))
-        role = 'assistant' if msg['role'] in ('user','function', 'tool') else 'user'
-    if cache:
-        res[-1] = _add_cache_control(res[-1], ttl)
-        res[-2] = _add_cache_control(res[-2], ttl)
-    return res
-
 # %% ../nbs/00_core.ipynb
 def stream_with_complete(gen, postproc=noop):
     "Extend streaming response chunks with the complete response"
@@ -269,11 +252,9 @@ def random_tool_id():
     return f'toolu_{random_part}'
 
 # %% ../nbs/00_core.ipynb
-def mk_tc(func, idx=1, **kwargs):
-    args = json.dumps(kwargs)
-    if callable(func): func = func.__name__
-    id = random_tool_id()
-    return {'index': idx, 'function': {'arguments': args, 'name': func}, 'id': id, 'type': 'function'}
+def mk_tc(func, args, tcid=None, idx=1):
+    if not tcid: tcid = random_tool_id()
+    return {'index': idx, 'function': {'arguments': args, 'name': func}, 'id': tcid, 'type': 'function'}
 
 # %% ../nbs/00_core.ipynb
 def mk_tc_req(content, tcs):
@@ -287,6 +268,48 @@ def mk_tc_result(tc, result): return {'tool_call_id': tc['id'], 'role': 'tool',
 # %% ../nbs/00_core.ipynb
 def mk_tc_results(tcq, results): return [mk_tc_result(a,b) for a,b in zip(tcq.tool_calls, results)]
 
+# %% ../nbs/00_core.ipynb
+def _details_extract(x):
+    "Extract fn, args, tool_call_id, result from <details>"
+    m = re.search(r'<details.*?>(.*?)</details>', x, re.DOTALL)
+    tc, tcid, res = re.findall(r'-\s*`([^`]+)`', m.group(1))
+    fn, args = re.search(r'(\w+)\((.*?)\)', tc).groups()
+    return fn, args, res, tcid
+
+# %% ../nbs/00_core.ipynb
+def _build_tool_hist(msg):
+    "Build original tool call messages from the tool call summary."
+    hist = []
+    parts = re.split(r'(<details.*?>.*?</details>)', msg, flags=re.DOTALL)
+    for islast, (i,o) in loop_last(enumerate(parts)):
+        if "<details class='tool-usage-details'>" not in o:
+            if islast: hist.append(o.strip())
+            continue
+        fn, args, res, tcid = _details_extract(o)
+        tc = mk_tc(fn, args, tcid)
+        tcq = mk_tc_req(parts[i-1].strip() if i>0 else "", [tc])
+        tcr = first(mk_tc_results(tcq, [res]))
+        hist.extend([tcq, tcr])
+    return hist
+
+# %% ../nbs/00_core.ipynb
+def mk_msgs(msgs,                   # List of messages (each: str, bytes, list, or dict w 'role' and 'content' fields)
+            cache=False,            # Enable Anthropic caching
+            ttl=None,               # Cache TTL: '5m' (default) or '1h'
+           ):
+    "Create a list of LiteLLM compatible messages."
+    if not msgs: return []
+    if not isinstance(msgs, list): msgs = [msgs]
+    res,role = [],'user'
+    msgs = L(msgs).map(lambda m: _build_tool_hist(m) if "<details class='tool-usage-details'>" in m else [m]).concat()
+    for m in msgs:
+        res.append(msg:=mk_msg(m, role=role))
+        role = 'assistant' if msg['role'] in ('user','function', 'tool') else 'user'
+    if cache:
+        res[-1] = _add_cache_control(res[-1], ttl)
+        res[-2] = _add_cache_control(res[-2], ttl)
+    return res
+
 # %% ../nbs/00_core.ipynb
 async def _alite_call_func(tc, ns, raise_on_err=True):
     try: fargs = json.loads(tc.function.arguments)
@@ -385,9 +408,9 @@ async def aformat_stream(rs, include_usage=False):
             if include_usage: yield f"\nUsage: {o.usage}"
             if (c := getattr(o.choices[0].message, 'tool_calls', None)):
                 fn = first(c).function
-                yield f"\n<details class='tool-usage-details'>\n\n `{fn.name}({_trunc_str(fn.arguments)})`\n"
+                yield f"\n<details class='tool-usage-details'>\n\n - `{fn.name}({_trunc_str(fn.arguments, replace='<TRUNCATED>')})`\n"
         elif isinstance(o, dict) and 'tool_call_id' in o: 
-            yield f"  - `{_trunc_str(_clean_str(o.get('content')))}`\n\n</details>\n\n"
+            yield f"  - `{o['tool_call_id']}`\n\n - `{_trunc_str(_clean_str(o.get('content')),replace='<TRUNCATED>')}`\n\n</details>\n\n"
 
 # %% ../nbs/00_core.ipynb
 async def adisplay_stream(rs):