toolslm 0.3.9__py3-none-any.whl → 0.3.11__py3-none-any.whl

toolslm/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.9"
+__version__ = "0.3.11"

toolslm/funccall.py

@@ -5,7 +5,7 @@ __all__ = ['empty', 'custom_types', 'get_schema', 'python', 'mk_ns', 'call_func'
            'mk_tool']
 
 # %% ../01_funccall.ipynb
-import inspect, json
+import inspect, json, ast
 from collections import abc
 from fastcore.utils import *
 from fastcore.docments import docments
@@ -37,12 +37,20 @@ def _types(t:type)->tuple[str,Optional[str]]:
     else: return tmap.get(t.__name__, "object"), None
 
 # %% ../01_funccall.ipynb
-def _param(name, info):
-    "json schema parameter given `name` and `info` from docments full dict."
+def _param(
+    name, # param name
+    info, # dict from docments
+    evalable=False): # stringify defaults that can't be literal_eval'd?
+    "json schema parameter given `name` and `info` from docments full dict"
     paramt,itemt = _types(info.anno)
     pschema = dict(type=paramt, description=info.docment or "")
     if itemt: pschema["items"] = {"type": itemt}
-    if info.default is not empty: pschema["default"] = info.default
+    if info.default is not empty:
+        if evalable:
+            try: ast.literal_eval(repr(info.default))
+            except: pschema["default"] = str(info.default)
+            else: pschema["default"] = info.default
+        else: pschema["default"] = info.default
     return pschema
 
 # %% ../01_funccall.ipynb
@@ -90,9 +98,9 @@ def _handle_container(origin, args, defs):
     return None
 
 # %% ../01_funccall.ipynb
-def _process_property(name, obj, props, req, defs):
+def _process_property(name, obj, props, req, defs, evalable=False):
     "Process a single property of the schema"
-    p = _param(name, obj)
+    p = _param(name, obj, evalable=evalable)
     props[name] = p
     if obj.default is empty: req[name] = True
 
@@ -103,14 +111,14 @@ def _process_property(name, obj, props, req, defs):
         p.update(_handle_type(obj.anno, defs))
 
 # %% ../01_funccall.ipynb
-def _get_nested_schema(obj):
+def _get_nested_schema(obj, evalable=False, skip_hidden=False):
     "Generate nested JSON schema for a class or function"
     d = docments(obj, full=True)
     props, req, defs = {}, {}, {}
 
     for n, o in d.items():
-        if n != 'return' and n != 'self':
-            _process_property(n, o, props, req, defs)
+        if n != 'return' and n != 'self' and not (skip_hidden and n.startswith('_')):
+            _process_property(n, o, props, req, defs, evalable=evalable)
 
     tkw = {}
     if isinstance(obj, type): tkw['title']=obj.__name__
@@ -120,10 +128,15 @@ def _get_nested_schema(obj):
     return schema
 
 # %% ../01_funccall.ipynb
-def get_schema(f:Union[callable,dict], pname='input_schema')->dict:
+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 '_'?
+)->dict: # {'name':..., 'description':..., pname:...}
     "Generate JSON schema for a class, function, or method"
     if isinstance(f, dict): return f
-    schema = _get_nested_schema(f)
+    schema = _get_nested_schema(f, evalable=evalable, skip_hidden=skip_hidden)
     desc = f.__doc__
     assert desc, "Docstring missing!"
     d = docments(f, full=True)

{toolslm-0.3.9.dist-info → toolslm-0.3.11.dist-info}/METADATA

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

toolslm-0.3.11.dist-info/RECORD

@@ -0,0 +1,13 @@
+toolslm/__init__.py,sha256=TESjMH0a_iUkwdfWT4nyzKizSFmmCY2omxnS2XyT97Y,23
+toolslm/_modidx.py,sha256=kpgsDpj-Tvn90wezrHaMttyzhNcyNVgw_dQgK10qotI,5308
+toolslm/download.py,sha256=g3BxUSxylC_575M7RFSJ1GI3Co3EwPDdEeWzxaf2Czk,4451
+toolslm/funccall.py,sha256=_5TyhTjWaWLi-eJ96-4P3_faFv6Ft07nO60UjCF-bPU,11160
+toolslm/md_hier.py,sha256=r_NPezhgfxjRmSYFlu_ND42hXt1qSbaPWHTcjbviOn4,11010
+toolslm/shell.py,sha256=dGInuRKvexu21VmtZkw_0S3BGiTsbAongUG-yG4YHpc,1566
+toolslm/xml.py,sha256=tAHoqXrTRiX8i3pR-9KpHoBb8QXJ_TKEVyTEOPviudE,8095
+toolslm-0.3.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+toolslm-0.3.11.dist-info/METADATA,sha256=LrsRNEumsWCi0JnHLTn73b8GoqjwQ3m6mDak4n2h47g,2404
+toolslm-0.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+toolslm-0.3.11.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
+toolslm-0.3.11.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
+toolslm-0.3.11.dist-info/RECORD,,

toolslm-0.3.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-toolslm/__init__.py,sha256=xmkmdvq15kb61xdtCoa1YARnvHBnUgI-0GWIJYvHNeA,22
-toolslm/_modidx.py,sha256=kpgsDpj-Tvn90wezrHaMttyzhNcyNVgw_dQgK10qotI,5308
-toolslm/download.py,sha256=g3BxUSxylC_575M7RFSJ1GI3Co3EwPDdEeWzxaf2Czk,4451
-toolslm/funccall.py,sha256=0OBrx6KzI0KK13L-5Hn69yah9oZhgTsKchmMenCoT0A,10421
-toolslm/md_hier.py,sha256=r_NPezhgfxjRmSYFlu_ND42hXt1qSbaPWHTcjbviOn4,11010
-toolslm/shell.py,sha256=dGInuRKvexu21VmtZkw_0S3BGiTsbAongUG-yG4YHpc,1566
-toolslm/xml.py,sha256=tAHoqXrTRiX8i3pR-9KpHoBb8QXJ_TKEVyTEOPviudE,8095
-toolslm-0.3.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-toolslm-0.3.9.dist-info/METADATA,sha256=djSwIqYu8Taj8g0yyXKw3IqFr_fbAKhbI3aQu14kv9U,2403
-toolslm-0.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-toolslm-0.3.9.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
-toolslm-0.3.9.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
-toolslm-0.3.9.dist-info/RECORD,,