toolslm 0.3.18__tar.gz → 0.3.20__tar.gz

{toolslm-0.3.18/toolslm.egg-info → toolslm-0.3.20}/PKG-INFO

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

{toolslm-0.3.18 → toolslm-0.3.20}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = toolslm
 lib_name = toolslm
-version = 0.3.18
+version = 0.3.20
 min_python = 3.9
 license = apache2
 black_formatting = False

toolslm-0.3.20/toolslm/__init__.py

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

{toolslm-0.3.18 → toolslm-0.3.20}/toolslm/_modidx.py

@@ -40,6 +40,7 @@ d = { 'settings': { 'branch': 'main',
             'toolslm.xml': { 'toolslm.xml._add_nls': ('xml.html#_add_nls', 'toolslm/xml.py'),
                              'toolslm.xml.cell2out': ('xml.html#cell2out', 'toolslm/xml.py'),
                              'toolslm.xml.cell2xml': ('xml.html#cell2xml', 'toolslm/xml.py'),
+                             'toolslm.xml.cells2xml': ('xml.html#cells2xml', 'toolslm/xml.py'),
                              'toolslm.xml.docs_xml': ('xml.html#docs_xml', 'toolslm/xml.py'),
                              'toolslm.xml.files2ctx': ('xml.html#files2ctx', 'toolslm/xml.py'),
                              'toolslm.xml.folder2ctx': ('xml.html#folder2ctx', 'toolslm/xml.py'),

{toolslm-0.3.18 → toolslm-0.3.20}/toolslm/funccall.py

@@ -141,7 +141,12 @@ def get_schema(
     assert desc, "Docstring missing!"
     d = docments(f, full=True)
     ret = d.pop('return')
-    if (ret.anno is not empty) and (ret.anno is not None): desc += f'\n\nReturns:\n- type: {_types(ret.anno)[0]}'
+    has_type = (ret.anno is not empty) and (ret.anno is not None)
+    has_doc = ret.docment
+    if has_type or has_doc:
+        type_str = f'type: {_types(ret.anno)[0]}'
+        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}
 
 # %% ../01_funccall.ipynb

{toolslm-0.3.18 → toolslm-0.3.20}/toolslm/xml.py

@@ -1,9 +1,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../00_xml.ipynb.
 
 # %% auto 0
-__all__ = ['doctype', 'json_to_xml', 'get_mime_text', 'cell2out', 'cell2xml', 'nb2xml', 'get_docstring', 'py2sigs', 'mk_doctype',
-           'mk_doc', 'docs_xml', 'read_file', 'files2ctx', 'folder2ctx', 'sym2file', 'sym2folderctx', 'sym2pkgpath',
-           'sym2pkgctx', 'folder2ctx_cli', 'parse_gh_url', 'repo2ctx']
+__all__ = ['doctype', 'json_to_xml', 'get_mime_text', 'cell2out', 'cell2xml', 'cells2xml', 'nb2xml', 'get_docstring', 'py2sigs',
+           'mk_doctype', 'mk_doc', 'docs_xml', 'read_file', 'files2ctx', 'folder2ctx', 'sym2file', 'sym2folderctx',
+           'sym2pkgpath', 'sym2pkgctx', 'folder2ctx_cli', 'parse_gh_url', 'repo2ctx']
 
 # %% ../00_xml.ipynb
 import hashlib, inspect, xml.etree.ElementTree as ET, ast
@@ -13,7 +13,7 @@ from ghapi.all import GhApi
 from fastcore.utils import *
 from fastcore.meta import delegates
 from fastcore.xtras import hl_md
-from fastcore.xml import to_xml, Document, Documents, Document_content, Src, Source,Out,Outs,Cell,Notebook,Md,Code
+from fastcore.xml import to_xml, Document, Documents, Document_content, Src, Source,Out,Outs,Cell,Notebook,Md,Code,Raw
 from fastcore.script import call_parse
 
 # %% ../00_xml.ipynb
@@ -50,10 +50,13 @@ def cell2out(o):
     if hasattr(o, 'ename'): return Out(f"{o.ename}: {o.evalue}", type='error')
 
 # %% ../00_xml.ipynb
-def cell2xml(cell, out=True, ids=True):
+_ctfuns = {'code': Code, 'markdown': Md, 'raw': Raw}
+
+def cell2xml(cell, out=True, ids=True, nums=False):
     "Convert notebook cell to concise XML format"
     src = ''.join(getattr(cell, 'source', ''))
-    f = Code if cell.cell_type=='code' else Md
+    if nums: src = '\n'.join(f'{i+1:6d} │ {l}' for i,l in enumerate(src.splitlines()))
+    f = _ctfuns[cell.cell_type]
     kw = dict(id=cell.id) if ids and hasattr(cell, 'id') else {}
     if not out: return f(src, **kw)
     parts = [Source(src)]
@@ -62,12 +65,18 @@ def cell2xml(cell, out=True, ids=True):
     return f(*parts, **kw)
 
 # %% ../00_xml.ipynb
-def nb2xml(fname=None, nb=None, out=True, ids=True):
+@delegates(cell2xml)
+def cells2xml(cells, wrap=Notebook, **kwargs):
+    "Convert notebook to XML format"
+    res = [cell2xml(c, **kwargs) for c in cells]
+    return to_xml(wrap(*res), do_escape=False)
+
+@delegates(cell2xml)
+def nb2xml(fname=None, nb=None, **kwargs):
     "Convert notebook to XML format"
     assert bool(fname)^bool(nb), "Pass either `fname` or `nb`"
     if not nb: nb = dict2obj(fname.read_json())
-    cells_xml = [to_xml(cell2xml(c, out=out, ids=ids), do_escape=False) for c in nb.cells if c.cell_type in ('code','markdown')]
-    return to_xml(Notebook(*cells_xml), do_escape=False)
+    return cells2xml(nb.cells, **kwargs)
 
 # %% ../00_xml.ipynb
 def get_docstring(node, lines):
@@ -78,7 +87,7 @@ def get_docstring(node, lines):
 
 def py2sigs(fname=None, src=None):
     "Return signature+docstring text for all functions and class methods in source"
-    if fname: src = Path(fname).read_text()
+    if fname: src = Path(fname).expanduser().read_text()
     tree = ast.parse(src)
     lines = src.splitlines()
     res = []
@@ -138,10 +147,11 @@ def docs_xml(docs:list[str],  # The content of each document
     return pre + to_xml(Documents(*docs, **kw), do_escape=False)
 
 # %% ../00_xml.ipynb
-def read_file(fname, out=True, max_size=None, ids=True, sigs_only=False):
+@delegates(nb2xml)
+def read_file(fname, max_size=None, sigs_only=False, **kwargs):
     "Read file content, converting notebooks to XML if needed"
-    fname = Path(fname)
-    if fname.suffix == '.ipynb': res = nb2xml(fname, out=out, ids=ids)
+    fname = Path(fname).expanduser()
+    if fname.suffix == '.ipynb': res = nb2xml(fname, **kwargs)
     elif fname.suffix == '.py' and sigs_only: res = py2sigs(fname)
     else: res = fname.read_text()
     if max_size and len(res)>max_size: return f"[Skipped: {fname.name} exceeds {max_size} bytes]"
@@ -151,16 +161,17 @@ def read_file(fname, out=True, max_size=None, ids=True, sigs_only=False):
 @delegates(docs_xml)
 def files2ctx(
     fnames:list[Union[str,Path]], # List of file names to add to context
-    out:bool=True, # Include notebook cell outputs?
     srcs:Optional[list]=None, # Use the labels instead of `fnames`
     max_size:int=None, # Skip files larger than this (bytes)
+    out:bool=True, # Include notebook cell outputs?
     ids:bool=True,  # Include cell ids in notebooks?
+    nums:bool=False, # Include line numbers in notebook cell source?
     sigs_only:bool=False, # For .py files, only include signatures and docstrings
     **kwargs
 )->str: # XML for LM context
     "Convert files to XML context, handling notebooks"
-    fnames = [Path(o) for o in fnames]
-    contents = [read_file(o, out=out, max_size=max_size, ids=ids, sigs_only=sigs_only) for o in fnames]
+    fnames = [Path(o).expanduser() for o in listify(fnames)]
+    contents = [read_file(o, max_size=max_size, out=out, ids=ids, sigs_only=sigs_only, nums=nums) for o in fnames]
     return docs_xml(contents, srcs or fnames, **kwargs)
 
 # %% ../00_xml.ipynb
@@ -180,7 +191,7 @@ def folder2ctx(
     **kwargs
 )->Union[str,dict]:
     "Convert folder contents to XML context, handling notebooks"
-    folder = Path(folder)
+    folder = Path(folder).expanduser()
     fnames = pglob(folder, **kwargs)
     if files_only: return {str(f.relative_to(folder)): f.stat().st_size for f in fnames}
     if readme_first: fnames = sorted(fnames, key=lambda f: (0 if 'readme' in f.name.lower() else 1, f))

{toolslm-0.3.18 → toolslm-0.3.20/toolslm.egg-info}/PKG-INFO

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

toolslm-0.3.18/toolslm/__init__.py

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