toolslm 0.3.26__py3-none-any.whl → 0.3.28__py3-none-any.whl

toolslm/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.26"
+__version__ = "0.3.28"

toolslm/_modidx.py

@@ -28,10 +28,12 @@ d = { 'settings': { 'branch': 'main',
                                   'toolslm.funccall.call_func': ('funccall.html#call_func', 'toolslm/funccall.py'),
                                   '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.get_schema_nm': ('funccall.html#get_schema_nm', 'toolslm/funccall.py'),
                                   'toolslm.funccall.mk_ns': ('funccall.html#mk_ns', '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.resolve_nm': ('funccall.html#resolve_nm', 'toolslm/funccall.py'),
                                   'toolslm.funccall.schema2sig': ('funccall.html#schema2sig', 'toolslm/funccall.py')},
             'toolslm.inspecttools': { 'toolslm.inspecttools.SymbolNotFound': ( 'inspecttools.html#symbolnotfound',
                                                                                'toolslm/inspecttools.py'),

toolslm/funccall.py

@@ -1,8 +1,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../01_funccall.ipynb.
 
 # %% auto #0
-__all__ = ['empty', 'custom_types', 'get_schema', 'python', 'mk_ns', 'call_func', 'call_func_async', 'mk_param', 'schema2sig',
-           'mk_tool']
+__all__ = ['empty', 'custom_types', 'get_schema', 'python', 'mk_ns', 'resolve_nm', 'get_schema_nm', 'call_func',
+           'call_func_async', 'mk_param', 'schema2sig', 'mk_tool']
 
 # %% ../01_funccall.ipynb #e5ad6b86
 import inspect, json, ast
@@ -15,6 +15,7 @@ from typing import get_type_hints
 from inspect import Parameter, Signature
 from decimal import Decimal
 from uuid import UUID
+from functools import reduce
 
 # %% ../01_funccall.ipynb #a9f43047
 empty = inspect.Parameter.empty
@@ -25,7 +26,7 @@ def _types(t:type)->tuple[str,Optional[str]]:
     if t is empty: raise TypeError('Missing type')
     tmap = {int:"integer", float:"number", str:"string", bool:"boolean", list:"array", dict:"object"}
     tmap.update({k.__name__: v for k, v in tmap.items()})
-    if getattr(t, '__origin__', None) in (list,tuple):
+    if getattr(t, '__origin__', None) in (list,tuple,set):
         args = getattr(t, '__args__', None)
         item_type = "object" if not args else tmap.get(t.__args__[0].__name__, "object")
         return "array", item_type
@@ -58,9 +59,11 @@ custom_types = {Path, bytes, Decimal, UUID}
 
 def _handle_type(t, defs):
     "Handle a single type, creating nested schemas if necessary"
+    ot = ifnone(get_origin(t), t)
     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 ot is dict: return {'type': _types(t)[0]} 
+    if ot in (list, tuple, set): return {'type': _types(t)[0], 'items':{}}
     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__}'}
@@ -132,12 +135,17 @@ def get_schema(
     f:Union[callable,dict], # Function to get schema for
     pname='input_schema',   # Key name for parameters
     evalable=False,  # stringify defaults that can't be literal_eval'd?
-    skip_hidden=False # skip parameters starting with '_'?
+    skip_hidden=False, # skip parameters starting with '_'?
+    name=None # Override function name (useful for dotted paths like 'obj.method')
 )->dict: # {'name':..., 'description':..., pname:...}
     "Generate JSON schema for a class, function, or method"
     if isinstance(f, dict): return f
+    if hasattr(f, '__call__') and not isinstance(f, type) and not inspect.isfunction(f) and not inspect.ismethod(f):
+        orig_doc = f.__doc__
+        f = f.__call__
+    else: orig_doc = None
     schema = _get_nested_schema(f, evalable=evalable, skip_hidden=skip_hidden)
-    desc = f.__doc__
+    desc = f.__doc__ or orig_doc
     assert desc, "Docstring missing!"
     d = docments(f, full=True)
     ret = d.pop('return')
@@ -147,7 +155,7 @@ def get_schema(
         type_str = f'type: {_types(ret.anno)[0]}' if has_type else None
         ret_str = f'{ret.docment} ({type_str})' if has_type and has_doc else (type_str if has_type else ret.docment)
         desc += f'\n\nReturns:\n- {ret_str}'
-    return {"name": f.__name__, "description": desc, pname: schema}
+    return {"name": name or f.__name__, "description": desc, pname: schema}
 
 # %% ../01_funccall.ipynb #873000d7
 import ast, time, signal, traceback
@@ -223,11 +231,22 @@ def _coerce_inputs(func, inputs):
         else: res[k] = v
     return res
 
-# %% ../01_funccall.ipynb #d817ab01
+# %% ../01_funccall.ipynb #925f462b
+def resolve_nm(nm, ns):
+    st,*rest = nm.split('.')
+    return reduce(getattr, rest, ns[st])
+
+# %% ../01_funccall.ipynb #6f6b5bfa
+def get_schema_nm(nm:str, ns, dot2dash=False, **kwargs):
+    "Get schema for symbol `nm` in namespace `ns`, preserving the full dotted name"
+    name = nm.replace('.', '-') if dot2dash else nm
+    return get_schema(resolve_nm(nm, ns), name=name, **kwargs)
+
+# %% ../01_funccall.ipynb #47b49644
 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]
+    func = resolve_nm(fc_name, ns)
     inps = {re.sub(r'\W', '', k):v for k,v in fc_inputs.items()}
     inps = _coerce_inputs(func, inps)
     try: return func(**inps)
@@ -235,7 +254,7 @@ def call_func(fc_name, fc_inputs, ns, raise_on_err=True):
         if raise_on_err: raise e from None
         else: return traceback.format_exc()
 
-# %% ../01_funccall.ipynb #7ac04e80-7bb9-4b52-8285-454684605d47
+# %% ../01_funccall.ipynb #73bca085
 async def call_func_async(fc_name, fc_inputs, ns, raise_on_err=True):
     "Awaits the function `fc_name` with the given `fc_inputs` using namespace `ns`."
     res = call_func(fc_name, fc_inputs, ns, raise_on_err=raise_on_err)

{toolslm-0.3.26.dist-info → toolslm-0.3.28.dist-info}/METADATA

@@ -1,18 +1,17 @@
 Metadata-Version: 2.4
 Name: toolslm
-Version: 0.3.26
+Version: 0.3.28
 Summary: Tools to make language models a bit easier to use
-Home-page: https://github.com/AnswerDotAI/toolslm
-Author: Jeremy Howard
-Author-email: j@fast.ai
-License: Apache Software License 2.0
-Keywords: nbdev jupyter notebook python
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
+Author-email: Jeremy Howard <j@fast.ai>
+License: Apache-2.0
+Project-URL: Repository, https://github.com/AnswerDotAI/toolslm
+Project-URL: Documentation, https://AnswerDotAI.github.io/toolslm
+Keywords: nbdev,jupyter,notebook,python
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Intended Audience :: Developers
+Classifier: Development Status :: 3 - Alpha
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -22,19 +21,7 @@ Requires-Dist: ghapi
 Requires-Dist: codesigs
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # toolslm
 

toolslm-0.3.28.dist-info/RECORD

@@ -0,0 +1,14 @@
+toolslm/__init__.py,sha256=eHgKaEsTNXyaLskZLw_tmKgMJo4Bmsn8JX-mwr5QLLo,23
+toolslm/_modidx.py,sha256=16eJzowUt9cpwnpt83goPyn_3Q3doH73X61s0YFmyuI,9172
+toolslm/download.py,sha256=tBDG5QFnbDdRigiSBjA_GUAC4lAE1LOEs-cjpW5C-kw,4582
+toolslm/funccall.py,sha256=Kzx_OjhQe_yuNKydYuHVExyvpSrP20hr05wEbSrQGgU,12512
+toolslm/inspecttools.py,sha256=wkHlbOgbps7hTmYQbG7mg4gDkFL_prvk3pfgSQz27L4,9810
+toolslm/md_hier.py,sha256=r_NPezhgfxjRmSYFlu_ND42hXt1qSbaPWHTcjbviOn4,11010
+toolslm/shell.py,sha256=VhXav3MSwK7P8e63-HKawFmrCkOdZSi8t4QgsIu8oFU,1617
+toolslm/xml.py,sha256=buCRuFluYQ2EvQR0nIGoeQoxrIln-o5QCRNyLFO_RcY,13226
+toolslm-0.3.28.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+toolslm-0.3.28.dist-info/METADATA,sha256=PxhYugzJJCV3Km13RdZ56xXjz3L-kecRX_F_sdgyYKA,2231
+toolslm-0.3.28.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+toolslm-0.3.28.dist-info/entry_points.txt,sha256=L77QoeUC_BjrE3BVY-Wpi4RMq_iwfX_1eAWchc6Zsmw,131
+toolslm-0.3.28.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
+toolslm-0.3.28.dist-info/RECORD,,

{toolslm-0.3.26.dist-info → toolslm-0.3.28.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

toolslm-0.3.26.dist-info/RECORD

@@ -1,14 +0,0 @@
-toolslm/__init__.py,sha256=PEJ4dz-V-DCK0OeabDYIWRrLQrxB_F8MVeCQiGql0Y0,23
-toolslm/_modidx.py,sha256=uRIQ7S4CNtTE4v6um6VE0HTOLvCbnLzKjWVpYQSytRk,8930
-toolslm/download.py,sha256=tBDG5QFnbDdRigiSBjA_GUAC4lAE1LOEs-cjpW5C-kw,4582
-toolslm/funccall.py,sha256=S68mlYOn-OW0j52PR7pHzAKk_D3omWv0q1W5pt-GIUc,11650
-toolslm/inspecttools.py,sha256=wkHlbOgbps7hTmYQbG7mg4gDkFL_prvk3pfgSQz27L4,9810
-toolslm/md_hier.py,sha256=r_NPezhgfxjRmSYFlu_ND42hXt1qSbaPWHTcjbviOn4,11010
-toolslm/shell.py,sha256=VhXav3MSwK7P8e63-HKawFmrCkOdZSi8t4QgsIu8oFU,1617
-toolslm/xml.py,sha256=buCRuFluYQ2EvQR0nIGoeQoxrIln-o5QCRNyLFO_RcY,13226
-toolslm-0.3.26.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-toolslm-0.3.26.dist-info/METADATA,sha256=8f85HepLX7oU4Upxw0UWkCMZzty10mkV2fg4NAqFeBQ,2489
-toolslm-0.3.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-toolslm-0.3.26.dist-info/entry_points.txt,sha256=L77QoeUC_BjrE3BVY-Wpi4RMq_iwfX_1eAWchc6Zsmw,131
-toolslm-0.3.26.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
-toolslm-0.3.26.dist-info/RECORD,,