fixes #85

Author: jph00

00_core.ipynb

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

01_toolloop.ipynb

@@ -70,14 +70,12 @@ async def mk_funcres_async(fc, ns):
 # %% ../02_async.ipynb
 async def mk_toolres_async(
     r:abc.Mapping, # Tool use request response from Claude
-    ns:Optional[abc.Mapping]=None, # Namespace to search for tools
-    obj:Optional=None # Class to search for tools
+    ns:Optional[abc.Mapping]=None # Namespace to search for tools
     ):
     "Create a `tool_result` message from response `r`."
     cts = getattr(r, 'content', [])
     res = [mk_msg(r.model_dump(), role='assistant')]
     if ns is None: ns=globals()
-    if obj is not None: ns = mk_ns(obj)
     tcs = [await mk_funcres_async(o, ns) for o in cts if isinstance(o,ToolUseBlock)]
     if tcs: res.append(mk_msg(tcs))
     return res
@@ -88,13 +86,11 @@ async def mk_toolres_async(
 async def structured(self:AsyncClient,
                msgs:list, # List of messages in the dialog
                tools:Optional[list]=None, # List of tools to make available to Claude
-               obj:Optional=None, # Class to search for tools  
                ns:Optional[abc.Mapping]=None, # Namespace to search for tools
                **kwargs):
     "Return the value of all tool calls (generally used for structured outputs)"
     tools = listify(tools)
     if ns is None: ns=mk_ns(*tools)
-    if obj is not None: ns = mk_ns(obj)
     res = await self(msgs, tools=tools, tool_choice=tools,**kwargs)
     cts = getattr(res, 'content', [])
     tcs = [await call_func_async(o.name, o.input, ns=ns) for o in cts if isinstance(o,ToolUseBlock)]

02_async.ipynb

@@ -341,14 +341,12 @@ def mk_funcres(fc, ns):
 # %% ../00_core.ipynb
 def mk_toolres(
     r:abc.Mapping, # Tool use request response from Claude
-    ns:Optional[abc.Mapping]=None, # Namespace to search for tools
-    obj:Optional=None # Class to search for tools
+    ns:Optional[abc.Mapping]=None # Namespace to search for tools
     ):
     "Create a `tool_result` message from response `r`."
     cts = getattr(r, 'content', [])
     res = [mk_msg(r.model_dump(), role='assistant')]
     if ns is None: ns=globals()
-    if obj is not None: ns = mk_ns(obj)
     tcs = [mk_funcres(o, ns) for o in cts if isinstance(o,ToolUseBlock)]
     if tcs: res.append(mk_msg(tcs))
     return res
@@ -359,14 +357,12 @@ def mk_toolres(
 def structured(self:Client,
                msgs:list, # List of messages in the dialog
                tools:Optional[list]=None, # List of tools to make available to Claude
-               obj:Optional=None, # Class to search for tools
                ns:Optional[abc.Mapping]=None, # Namespace to search for tools
                **kwargs):
     "Return the value of all tool calls (generally used for structured outputs)"
     tools = listify(tools)
     res = self(msgs, tools=tools, tool_choice=tools, **kwargs)
     if ns is None: ns=mk_ns(*tools)
-    if obj is not None: ns = mk_ns(obj)
     cts = getattr(res, 'content', [])
     tcs = [call_func(o.name, o.input, ns=ns) for o in cts if isinstance(o,ToolUseBlock)]
     return tcs

claudette/__init__.py

@@ -1,11 +1,11 @@
 [DEFAULT]
 repo = claudette
 lib_name = claudette
-version = 0.2.3
+version = 0.3.0
 min_python = 3.9
 license = apache2
 black_formatting = False
-requirements = fastcore>=1.8.4 msglm>=0.0.8 anthropic>=0.52 toolslm>=0.2.3
+requirements = fastcore>=1.8.4 msglm>=0.0.8 anthropic>=0.52 toolslm>=0.3.0
 dev_requirements = google-auth
 doc_path = _docs
 lib_path = claudette