fixes #83

Author: jph00

00_core.ipynb

@@ -800,7 +800,8 @@
     "@patch\n",
     "async def _stream(self:AsyncChat, res):\n",
     "    async for o in res: yield o\n",
-    "    self.h += mk_toolres(self.c.result, ns=self.tools, obj=self)"
+    "    self.last = mk_toolres(self.c.result, ns=self.tools, obj=self)\n",
+    "    self.h += self.last"
    ]
   },
   {
@@ -840,7 +841,8 @@
     "    await self._append_pr(pr)\n",
     "    res = await self.c(self.h, stream=stream, prefill=prefill, sp=self.sp, temp=temp, maxtok=maxtok, maxthinktok=maxthinktok, tools=self.tools, tool_choice=tool_choice, **kw)\n",
     "    if stream: return self._stream(res)\n",
-    "    self.h += await mk_toolres_async(self.c.result, ns=self.ns)\n",
+    "    self.last = await mk_toolres_async(self.c.result, ns=self.ns)\n",
+    "    self.h += self.last\n",
     "    return res"
    ]
   },

01_toolloop.ipynb

@@ -1,4 +1,4 @@
-__version__ = "0.1.12"
+__version__ = "0.2.0"
 from .core import *
 from .toolloop import *
 from .asink import *

02_async.ipynb

@@ -45,6 +45,7 @@
                                 'claudette.core._convert': ('core.html#_convert', 'claudette/core.py'),
                                 'claudette.core._dgetattr': ('core.html#_dgetattr', 'claudette/core.py'),
                                 'claudette.core._is_builtin': ('core.html#_is_builtin', 'claudette/core.py'),
+                                'claudette.core._type': ('core.html#_type', 'claudette/core.py'),
                                 'claudette.core.blks2cited_txt': ('core.html#blks2cited_txt', 'claudette/core.py'),
                                 'claudette.core.can_set_system_prompt': ('core.html#can_set_system_prompt', 'claudette/core.py'),
                                 'claudette.core.can_set_temperature': ('core.html#can_set_temperature', 'claudette/core.py'),

claudette/__init__.py

@@ -114,7 +114,8 @@ def __init__(self,
 @patch
 async def _stream(self:AsyncChat, res):
     async for o in res: yield o
-    self.h += mk_toolres(self.c.result, ns=self.tools, obj=self)
+    self.last = mk_toolres(self.c.result, ns=self.tools, obj=self)
+    self.h += self.last
 
 # %% ../02_async.ipynb
 @patch
@@ -138,5 +139,6 @@ async def __call__(self:AsyncChat,
     await self._append_pr(pr)
     res = await self.c(self.h, stream=stream, prefill=prefill, sp=self.sp, temp=temp, maxtok=maxtok, maxthinktok=maxthinktok, tools=self.tools, tool_choice=tool_choice, **kw)
     if stream: return self._stream(res)
-    self.h += await mk_toolres_async(self.c.result, ns=self.ns)
+    self.last = await mk_toolres_async(self.c.result, ns=self.ns)
+    self.h += self.last
     return res

claudette/_modidx.py

@@ -92,11 +92,16 @@ def can_set_temperature(m): return m in has_temperature_models
 def can_use_extended_thinking(m): return m in has_extended_thinking_models
 
 # %% ../00_core.ipynb
+def _type(x):
+    try: return x.type
+    except AttributeError: return x.get('type')
+
 def find_block(r:abc.Mapping, # The message to look in
-               blk_type:type=TextBlock  # The type of block to find
+               blk_type:type|str=TextBlock  # The type of block to find
               ):
     "Find the first block of type `blk_type` in `r.content`."
-    return first(o for o in r.content if isinstance(o,blk_type))
+    f = (lambda x:_type(x)==blk_type) if isinstance(blk_type,str) else (lambda x:isinstance(x,blk_type))
+    return first(o for o in r.content if f(o))
 
 # %% ../00_core.ipynb
 @patch
@@ -410,7 +415,8 @@ def cost(self: Chat) -> float: return self.c.cost
 @patch
 def _stream(self:Chat, res):
     yield from res
-    self.h += mk_toolres(self.c.result, ns=self.ns) #, obj=self)
+    self.last = mk_toolres(self.c.result, ns=self.ns) #, obj=self)
+    self.h += self.last
 
 # %% ../00_core.ipynb
 @patch
@@ -445,7 +451,8 @@ def __call__(self:Chat,
     self._append_pr(pr)
     res = self.c(self.h, stream=stream, prefill=prefill, sp=self.sp, temp=temp, maxtok=maxtok, maxthinktok=maxthinktok, tools=self.tools, tool_choice=tool_choice,**kw)
     if stream: return self._stream(res)
-    self.h += mk_toolres(self.c.result, ns=self.ns)
+    self.last = mk_toolres(self.c.result, ns=self.ns)
+    self.h += self.last
     return res
 
 # %% ../00_core.ipynb

claudette/asink.py

@@ -7,6 +7,7 @@
 from .core import *
 from fastcore.utils import *
 from fastcore.meta import delegates
+from functools import wraps
 
 from anthropic.types import TextBlock, Message, ToolUseBlock
 
@@ -28,12 +29,14 @@ def __iter__(a):
             init_n = len(self.h)
             r = self(pr, **kwargs)
             yield r
+            if len(self.last)>1: yield self.last[1]
             for i in range(max_steps-1):
                 if self.c.stop_reason!='tool_use': break
                 r = self(final_prompt if i==max_steps-2 else None, **kwargs)
                 yield r
+                if len(self.last)>1: yield self.last[1]
                 if not cont_func(*self.h[-3:]): break
-            a.value = self.h[init_n:]
+            a.value = self.h[init_n+1:]
     return _Loop()
 
 # %% ../01_toolloop.ipynb
@@ -56,10 +59,12 @@ async def __aiter__(a):
             init_n = len(self.h)
             r = await self(pr, **kwargs)
             yield r
+            if len(self.last)>1: yield self.last[1]
             for i in range(max_steps-1):
                 if self.c.stop_reason != 'tool_use': break
                 r = await self(final_prompt if i==max_steps-2 else None, **kwargs)
                 yield r
+                if len(self.last)>1: yield self.last[1]
                 if not cont_func(*self.h[-3:]): break
-            a.value = self.h[init_n:]
+            a.value = self.h[init_n+1:]
     return _Loop()

claudette/core.py

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = claudette
 lib_name = claudette
-version = 0.1.12
+version = 0.2.0
 min_python = 3.9
 license = apache2
 black_formatting = False