toolslm 0.3.4__py3-none-any.whl → 0.3.5__py3-none-any.whl

toolslm/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.4"
+__version__ = "0.3.5"

toolslm/_modidx.py

@@ -14,11 +14,10 @@ d = { 'settings': { 'branch': 'main',
                                   'toolslm.download.read_html': ('download.html#read_html', 'toolslm/download.py'),
                                   'toolslm.download.read_md': ('download.html#read_md', 'toolslm/download.py'),
                                   'toolslm.download.split_url': ('download.html#split_url', 'toolslm/download.py')},
-            'toolslm.funccall': { 'toolslm.funccall.PathArg': ('funccall.html#patharg', 'toolslm/funccall.py'),
+            'toolslm.funccall': { 'toolslm.funccall._coerce_inputs': ('funccall.html#_coerce_inputs', 'toolslm/funccall.py'),
                                   'toolslm.funccall._copy_loc': ('funccall.html#_copy_loc', 'toolslm/funccall.py'),
                                   'toolslm.funccall._get_nested_schema': ('funccall.html#_get_nested_schema', 'toolslm/funccall.py'),
                                   'toolslm.funccall._handle_container': ('funccall.html#_handle_container', 'toolslm/funccall.py'),
-                                  'toolslm.funccall._handle_type': ('funccall.html#_handle_type', 'toolslm/funccall.py'),
                                   'toolslm.funccall._is_container': ('funccall.html#_is_container', 'toolslm/funccall.py'),
                                   'toolslm.funccall._is_parameterized': ('funccall.html#_is_parameterized', 'toolslm/funccall.py'),
                                   'toolslm.funccall._param': ('funccall.html#_param', 'toolslm/funccall.py'),
@@ -29,7 +28,10 @@ d = { 'settings': { 'branch': 'main',
                                   'toolslm.funccall.call_func_async': ('funccall.html#call_func_async', 'toolslm/funccall.py'),
                                   'toolslm.funccall.get_schema': ('funccall.html#get_schema', 'toolslm/funccall.py'),
                                   'toolslm.funccall.mk_ns': ('funccall.html#mk_ns', 'toolslm/funccall.py'),
-                                  'toolslm.funccall.python': ('funccall.html#python', 'toolslm/funccall.py')},
+                                  'toolslm.funccall.mk_param': ('funccall.html#mk_param', 'toolslm/funccall.py'),
+                                  'toolslm.funccall.mk_tool': ('funccall.html#mk_tool', 'toolslm/funccall.py'),
+                                  'toolslm.funccall.python': ('funccall.html#python', 'toolslm/funccall.py'),
+                                  'toolslm.funccall.schema2sig': ('funccall.html#schema2sig', 'toolslm/funccall.py')},
             'toolslm.md_hier': {},
             'toolslm.shell': { 'toolslm.shell.TerminalInteractiveShell.run_cell': ( 'shell.html#terminalinteractiveshell.run_cell',
                                                                                     'toolslm/shell.py'),

toolslm/funccall.py

@@ -1,15 +1,19 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../01_funccall.ipynb.
 
 # %% auto 0
-__all__ = ['empty', 'custom_types', 'get_schema', 'PathArg', 'python', 'mk_ns', 'call_func', 'call_func_async']
+__all__ = ['empty', 'get_schema', 'python', 'mk_ns', 'call_func', 'call_func_async', 'mk_param', 'schema2sig', 'mk_tool']
 
 # %% ../01_funccall.ipynb
-import inspect
+import inspect, json
 from collections import abc
 from fastcore.utils import *
 from fastcore.docments import docments
-from typing import get_origin, get_args, Dict, List, Optional, Tuple, Union
+from typing import get_origin, get_args, Dict, List, Optional, Tuple, Union, Any
 from types import UnionType
+from typing import get_type_hints
+from inspect import Parameter, Signature
+from decimal import Decimal
+from uuid import UUID
 
 # %% ../01_funccall.ipynb
 empty = inspect.Parameter.empty
@@ -40,19 +44,6 @@ def _param(name, info):
     if info.default is not empty: pschema["default"] = info.default
     return pschema
 
-# %% ../01_funccall.ipynb
-custom_types = {Path}
-
-def _handle_type(t, defs):
-    "Handle a single type, creating nested schemas if necessary"
-    if t is NoneType: return {'type': 'null'}
-    if t in custom_types: return {'type':'string', 'format':t.__name__}
-    if t in (dict, list, tuple, set): return {'type': _types(t)[0]}
-    if isinstance(t, type) and not issubclass(t, (int, float, str, bool)) or inspect.isfunction(t):
-        defs[t.__name__] = _get_nested_schema(t)
-        return {'$ref': f'#/$defs/{t.__name__}'}
-    return {'type': _types(t)[0]}
-
 # %% ../01_funccall.ipynb
 def _is_container(t):
     "Check if type is a container (list, dict, tuple, set, Union)"
@@ -123,14 +114,9 @@ def get_schema(f:Union[callable,dict], pname='input_schema')->dict:
     assert desc, "Docstring missing!"
     d = docments(f, full=True)
     ret = d.pop('return')
-    if ret.anno is not empty: desc += f'\n\nReturns:\n- type: {_types(ret.anno)[0]}'
+    if (ret.anno is not empty) and (ret.anno is not None): desc += f'\n\nReturns:\n- type: {_types(ret.anno)[0]}'
     return {"name": f.__name__, "description": desc, pname: schema}
 
-# %% ../01_funccall.ipynb
-def PathArg(
-    path: str  # A filesystem path
-): return Path(path)
-
 # %% ../01_funccall.ipynb
 import ast, time, signal, traceback
 from fastcore.utils import *
@@ -193,14 +179,26 @@ def mk_ns(fs):
         elif callable(o) and hasattr(o, '__name__'): merged |= {o.__name__: o}
     return merged
 
+# %% ../01_funccall.ipynb
+def _coerce_inputs(func, inputs):
+    "Coerce inputs based on function type annotations"
+    hints = get_type_hints(func) if hasattr(func, '__annotations__') else {}
+    res = {}
+    for k,v in inputs.items():
+        ann = hints.get(k)
+        if ann in custom_types: res[k] = ann(v)
+        elif isinstance(v, dict) and callable(ann): res[k] = ann(**v)
+        else: res[k] = v
+    return res
+
 # %% ../01_funccall.ipynb
 def call_func(fc_name, fc_inputs, ns, raise_on_err=True):
     "Call the function `fc_name` with the given `fc_inputs` using namespace `ns`."
     if not isinstance(ns, abc.Mapping): ns = mk_ns(ns)
     func = ns[fc_name]
-    # Clean up bad param names
     inps = {re.sub(r'\W', '', k):v for k,v in fc_inputs.items()}
-    try: return func(**fc_inputs)
+    inps = _coerce_inputs(func, inps)
+    try: return func(**inps)
     except Exception as e:
         if raise_on_err: raise e from None
         else: return traceback.format_exc()
@@ -215,3 +213,35 @@ async def call_func_async(fc_name, fc_inputs, ns, raise_on_err=True):
             if raise_on_err: raise e from None
             else: return traceback.format_exc()
     return res
+
+# %% ../01_funccall.ipynb
+def mk_param(nm, props, req):
+    "Create a `Parameter` for `nm` with schema `props`"
+    kind = Parameter.POSITIONAL_OR_KEYWORD if nm in req else Parameter.KEYWORD_ONLY
+    default = Parameter.empty if nm in req else props.get('default')    
+    if props.get('type') == 'array' and 'items' in props:
+        item_type = type_map.get(props['items'].get('type'), Any)
+        anno = list[item_type]
+    else: anno = type_map.get(props.get('type'), Any)
+    return Parameter(nm, kind, default=default, annotation=anno)
+
+# %% ../01_funccall.ipynb
+def schema2sig(tool):
+    "Convert json schema `tool` to a `Signature`"
+    props, req = tool.inputSchema['properties'], tool.inputSchema.get('required', [])
+    params = sorted([mk_param(k, v, req) for k, v in props.items()], key=lambda p: p.kind)
+    return Signature(params)
+
+# %% ../01_funccall.ipynb
+def mk_tool(dispfn, tool):
+    "Create a callable function from a JSON schema tool definition"
+    sig = schema2sig(tool)
+    props = tool.inputSchema['properties']
+    def fn(*args, **kwargs):
+        bound = sig.bind(*args, **kwargs)
+        return dispfn(tool.name, **bound.arguments)
+    fn.__doc__ = tool.description
+    fn.__signature__ = sig
+    fn.__name__ = fn.__qualname__ = tool.name
+    fn.__annotations__ = {k: p.annotation for k, p in sig.parameters.items()}
+    return fn

toolslm/md_hier.py

@@ -14,20 +14,32 @@ def create_heading_dict(text, rm_fenced=True):
     original_text = text
     original_lines = text.splitlines()
     
-    # Use fenced-removed text only for finding headings
-    text_for_headings = text
-    if rm_fenced: text_for_headings = re.sub(r'```[\s\S]*?```', '', text)
+    # Build line mapping when removing fenced blocks
+    if rm_fenced:
+        filtered_lines,original_line_map,in_fenced = [],{},False
+        for i, line in enumerate(original_lines):
+            if line.strip().startswith('```'):
+                in_fenced = not in_fenced
+                continue
+            if not in_fenced:
+                original_line_map[len(filtered_lines)] = i
+                filtered_lines.append(line)
+
+        lines_for_headings = filtered_lines
+    else:
+        lines_for_headings = original_lines
+        original_line_map = {i: i for i in range(len(original_lines))}
 
-    lines_for_headings = text_for_headings.splitlines()
     headings = []
 
-    # Parse headings with their levels and line numbers
+    # Parse headings with their levels and original line numbers
     for idx, line in enumerate(lines_for_headings):
         match = re.match(r'^(#{1,6})\s+\S.*', line)
         if match:
             level = len(match.group(1))
             title = line.strip('#').strip()
-            headings.append({'level': level, 'title': title, 'line': idx})
+            original_line_idx = original_line_map[idx]
+            headings.append({'level': level, 'title': title, 'line': original_line_idx})
 
     # Assign text content to each heading using original lines
     for i, h in enumerate(headings):
@@ -270,9 +282,26 @@ More content after code."""
         assert '💻 Computer' in result['🚀 Rocket Heading']
         assert result.text == md_content
 
+    def test_fenced_blocks_between_headings():
+        md_content = """# First Header
+Content here.
+
+```python
+# A comment that should be ignored for structure
+def example():
+    pass
+```
+
+# Second Header
+This content belongs to Second Header."""
+        result = create_heading_dict(md_content)
+        assert "def example():" not in result['Second Header'].text
+        assert result['Second Header'].text == "# Second Header\nThis content belongs to Second Header."
+
     test_empty_input()
     test_whitespace_only()
     test_malformed_headings()
     test_unicode_and_emojis()
+    test_fenced_blocks_between_headings()
     print('tests passed')
 

{toolslm-0.3.4.dist-info → toolslm-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolslm
-Version: 0.3.4
+Version: 0.3.5
 Summary: Tools to make language models a bit easier to use
 Home-page: https://github.com/AnswerDotAI/toolslm
 Author: Jeremy Howard

toolslm-0.3.5.dist-info/RECORD

@@ -0,0 +1,13 @@
+toolslm/__init__.py,sha256=ThnCuF3X7rsQSd5PAea_jfYA70ZmhLvkFcLBxBPwZnY,22
+toolslm/_modidx.py,sha256=DWmzODG1IzXmJBQmOC89s6m0evOg4NeXgS_6KPVWYSA,5092
+toolslm/download.py,sha256=g3BxUSxylC_575M7RFSJ1GI3Co3EwPDdEeWzxaf2Czk,4451
+toolslm/funccall.py,sha256=z35-r1uzmI83zD5f6zapaHTlidA64KFvdwiSShcNkdM,9812
+toolslm/md_hier.py,sha256=r_NPezhgfxjRmSYFlu_ND42hXt1qSbaPWHTcjbviOn4,11010
+toolslm/shell.py,sha256=dGInuRKvexu21VmtZkw_0S3BGiTsbAongUG-yG4YHpc,1566
+toolslm/xml.py,sha256=2QGVGrTWfyyf0duBDn_Of5kFzYFoBjvl8PrZKgNxbUU,5806
+toolslm-0.3.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+toolslm-0.3.5.dist-info/METADATA,sha256=yh3pgKcJ98EFN3CY7bRFx4AJsrEWzJ2f55gHuQNVuDs,2404
+toolslm-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+toolslm-0.3.5.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
+toolslm-0.3.5.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
+toolslm-0.3.5.dist-info/RECORD,,

toolslm-0.3.4.dist-info/RECORD

@@ -1,13 +0,0 @@
-toolslm/__init__.py,sha256=oYLGMpySamd16KLiaBTfRyrAS7_oyp-TOEHmzmeumwg,22
-toolslm/_modidx.py,sha256=KeI16uj9ZfA5ZWlmov5ATQwf3291dayJ42Bp1dh69gU,4856
-toolslm/download.py,sha256=g3BxUSxylC_575M7RFSJ1GI3Co3EwPDdEeWzxaf2Czk,4451
-toolslm/funccall.py,sha256=PSmQ9kZsJvYh3egH7k1vQPYFn-XBm5E_CCKDVdX9tfg,8506
-toolslm/md_hier.py,sha256=Havk9Hf0t2Xt67n_r7ZxCsS0pciR85iLcE5quShvkTg,10032
-toolslm/shell.py,sha256=dGInuRKvexu21VmtZkw_0S3BGiTsbAongUG-yG4YHpc,1566
-toolslm/xml.py,sha256=2QGVGrTWfyyf0duBDn_Of5kFzYFoBjvl8PrZKgNxbUU,5806
-toolslm-0.3.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-toolslm-0.3.4.dist-info/METADATA,sha256=y9ERYYAn6SAv_ozBqAeoiMgGjorCUGHQA1eLPWDSdlA,2404
-toolslm-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-toolslm-0.3.4.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
-toolslm-0.3.4.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
-toolslm-0.3.4.dist-info/RECORD,,