toolslm 0.3.26__tar.gz → 0.3.28__tar.gz

{toolslm-0.3.26/toolslm.egg-info → toolslm-0.3.28}/PKG-INFO

@@ -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/pyproject.toml

@@ -0,0 +1,41 @@
+[build-system]
+requires = ["setuptools>=64"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "toolslm"
+dynamic = ["version"]
+description = "Tools to make language models a bit easier to use"
+readme = "README.md"
+requires-python = ">=3.9"
+license = {text = "Apache-2.0"}
+authors = [{name = "Jeremy Howard", email = "j@fast.ai"}]
+keywords = ['nbdev', 'jupyter', 'notebook', 'python']
+classifiers = ["Natural Language :: English", "Intended Audience :: Developers", "Development Status :: 3 - Alpha", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only"]
+dependencies = ['fastcore>=1.12.4', 'httpx', 'ghapi', 'codesigs']
+
+[project.urls]
+Repository = "https://github.com/AnswerDotAI/toolslm"
+Documentation = "https://AnswerDotAI.github.io/toolslm"
+
+[project.entry-points.nbdev]
+toolslm = "toolslm._modidx:d"
+
+[project.optional-dependencies]
+dev = ['ipython']
+
+
+[project.scripts]
+folder2ctx = "toolslm.xml:folder2ctx_cli"
+repo2ctx = "toolslm.xml:repo2ctx_cli"
+
+[tool.setuptools.dynamic]
+version = {attr = "toolslm.__version__"}
+
+[tool.setuptools.packages.find]
+include = ["toolslm"]
+
+[tool.nbdev]
+nbs_path = '.'
+jupyter_hooks = true
+custom_sidebar = false

toolslm-0.3.28/toolslm/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.28"

{toolslm-0.3.26 → toolslm-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-0.3.26 → toolslm-0.3.28}/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 → toolslm-0.3.28/toolslm.egg-info}/PKG-INFO

@@ -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.26 → toolslm-0.3.28}/toolslm.egg-info/SOURCES.txt

@@ -2,8 +2,6 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-settings.ini
-setup.py
 toolslm/__init__.py
 toolslm/_modidx.py
 toolslm/download.py
@@ -16,6 +14,5 @@ toolslm.egg-info/PKG-INFO
 toolslm.egg-info/SOURCES.txt
 toolslm.egg-info/dependency_links.txt
 toolslm.egg-info/entry_points.txt
-toolslm.egg-info/not-zip-safe
 toolslm.egg-info/requires.txt
 toolslm.egg-info/top_level.txt

toolslm-0.3.26/pyproject.toml

@@ -1,11 +0,0 @@
-[build-system]
-requires = ["setuptools>=64.0"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name="toolslm"
-requires-python=">=3.9"
-dynamic = [ "keywords", "description", "version", "dependencies", "optional-dependencies", "readme", "license", "authors", "classifiers", "entry-points", "scripts", "urls"]
-
-[tool.uv]
-cache-keys = [{ file = "pyproject.toml" }, { file = "settings.ini" }, { file = "setup.py" }]

toolslm-0.3.26/settings.ini

@@ -1,43 +0,0 @@
-[DEFAULT]
-repo = toolslm
-lib_name = toolslm
-version = 0.3.26
-min_python = 3.9
-license = apache2
-black_formatting = False
-requirements = fastcore>=1.12.4 httpx ghapi codesigs
-dev_requirements = ipython
-doc_path = _docs
-lib_path = toolslm
-nbs_path = .
-recursive = True
-tst_flags = notest
-put_version_in_init = True
-branch = main
-custom_sidebar = False
-doc_host = https://AnswerDotAI.github.io
-doc_baseurl = /toolslm
-git_url = https://github.com/AnswerDotAI/toolslm
-title = toolslm
-audience = Developers
-author = Jeremy Howard
-author_email = j@fast.ai
-copyright = 2024 onwards, Jeremy Howard
-description = Tools to make language models a bit easier to use
-keywords = nbdev jupyter notebook python
-language = English
-status = 3
-user = AnswerDotAI
-readme_nb = index.ipynb
-allowed_metadata_keys = 
-allowed_cell_metadata_keys = 
-jupyter_hooks = True
-clear_all = False
-conda_user = fastai
-console_scripts = folder2ctx=toolslm.xml:folder2ctx_cli
-	repo2ctx=toolslm.xml:repo2ctx_cli
-cell_number = False
-skip_procs = 
-update_pyproject = True
-clean_ids = True
-

toolslm-0.3.26/setup.py

@@ -1,57 +0,0 @@
-from pkg_resources import parse_version
-from configparser import ConfigParser
-import setuptools, shlex
-assert parse_version(setuptools.__version__)>=parse_version('36.2')
-
-# note: all settings are in settings.ini; edit there, not here
-config = ConfigParser(delimiters=['='])
-config.read('settings.ini', encoding='utf-8')
-cfg = config['DEFAULT']
-
-cfg_keys = 'version description keywords author author_email'.split()
-expected = cfg_keys + "lib_name user branch license status min_python audience language".split()
-for o in expected: assert o in cfg, "missing expected setting: {}".format(o)
-setup_cfg = {o:cfg[o] for o in cfg_keys}
-
-licenses = {
-    'apache2': ('Apache Software License 2.0','OSI Approved :: Apache Software License'),
-    'mit': ('MIT License', 'OSI Approved :: MIT License'),
-    'gpl2': ('GNU General Public License v2', 'OSI Approved :: GNU General Public License v2 (GPLv2)'),
-    'gpl3': ('GNU General Public License v3', 'OSI Approved :: GNU General Public License v3 (GPLv3)'),
-    'bsd3': ('BSD License', 'OSI Approved :: BSD License'),
-}
-statuses = [ '1 - Planning', '2 - Pre-Alpha', '3 - Alpha',
-    '4 - Beta', '5 - Production/Stable', '6 - Mature', '7 - Inactive' ]
-py_versions = '3.6 3.7 3.8 3.9 3.10'.split()
-
-requirements = shlex.split(cfg.get('requirements', ''))
-if cfg.get('pip_requirements'): requirements += shlex.split(cfg.get('pip_requirements', ''))
-min_python = cfg['min_python']
-lic = licenses.get(cfg['license'].lower(), (cfg['license'], None))
-dev_requirements = (cfg.get('dev_requirements') or '').split()
-
-setuptools.setup(
-    name = cfg['lib_name'],
-    license = lic[0],
-    classifiers = [
-        'Development Status :: ' + statuses[int(cfg['status'])],
-        'Intended Audience :: ' + cfg['audience'].title(),
-        'Natural Language :: ' + cfg['language'].title(),
-    ] + ['Programming Language :: Python :: '+o for o in py_versions[py_versions.index(min_python):]] + (['License :: ' + lic[1] ] if lic[1] else []),
-    url = cfg['git_url'],
-    packages = setuptools.find_packages(),
-    include_package_data = True,
-    install_requires = requirements,
-    extras_require={ 'dev': dev_requirements },
-    dependency_links = cfg.get('dep_links','').split(),
-    python_requires  = '>=' + cfg['min_python'],
-    long_description = open('README.md', encoding='utf-8').read(),
-    long_description_content_type = 'text/markdown',
-    zip_safe = False,
-    entry_points = {
-        'console_scripts': cfg.get('console_scripts','').split(),
-        'nbdev': [f'{cfg.get("lib_path")}={cfg.get("lib_path")}._modidx:d']
-    },
-    **setup_cfg)
-
-

toolslm-0.3.26/toolslm/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.26"

toolslm-0.3.26/toolslm.egg-info/not-zip-safe

@@ -1 +0,0 @@
-