toolslm 0.3.2__tar.gz → 0.3.3__tar.gz

{toolslm-0.3.2/toolslm.egg-info → toolslm-0.3.3}/PKG-INFO

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

{toolslm-0.3.2 → toolslm-0.3.3}/settings.ini

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

toolslm-0.3.3/toolslm/__init__.py

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

{toolslm-0.3.2 → toolslm-0.3.3}/toolslm/_modidx.py

@@ -35,10 +35,15 @@ d = { 'settings': { 'branch': 'main',
                                                                                     'toolslm/shell.py'),
                                'toolslm.shell.get_shell': ('shell.html#get_shell', 'toolslm/shell.py')},
             '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.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.xml.folder2ctx_cli': ('xml.html#folder2ctx_cli', 'toolslm/xml.py'),
+                             'toolslm.xml.get_mime_text': ('xml.html#get_mime_text', 'toolslm/xml.py'),
                              'toolslm.xml.json_to_xml': ('xml.html#json_to_xml', 'toolslm/xml.py'),
                              'toolslm.xml.mk_doc': ('xml.html#mk_doc', 'toolslm/xml.py'),
-                             'toolslm.xml.mk_doctype': ('xml.html#mk_doctype', 'toolslm/xml.py')}}}
+                             'toolslm.xml.mk_doctype': ('xml.html#mk_doctype', 'toolslm/xml.py'),
+                             'toolslm.xml.nb2xml': ('xml.html#nb2xml', 'toolslm/xml.py'),
+                             'toolslm.xml.read_file': ('xml.html#read_file', 'toolslm/xml.py')}}}

{toolslm-0.3.2 → toolslm-0.3.3}/toolslm/funccall.py

@@ -107,7 +107,9 @@ def _get_nested_schema(obj):
         if n != 'return' and n != 'self':
             _process_property(n, o, props, req, defs)
 
-    schema = dict(type='object', properties=props, title=obj.__name__ if isinstance(obj, type) else None)
+    tkw = {}
+    if isinstance(obj, type): tkw['title']=obj.__name__
+    schema = dict(type='object', properties=props, **tkw)
     if req: schema['required'] = list(req)
     if defs: schema['$defs'] = defs
     return schema

{toolslm-0.3.2 → toolslm-0.3.3}/toolslm/xml.py

@@ -1,7 +1,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../00_xml.ipynb.
 
 # %% auto 0
-__all__ = ['doctype', 'json_to_xml', 'mk_doctype', 'mk_doc', 'docs_xml', 'files2ctx', 'folder2ctx', 'folder2ctx_cli']
+__all__ = ['doctype', 'json_to_xml', 'get_mime_text', 'cell2out', 'cell2xml', 'nb2xml', 'mk_doctype', 'mk_doc', 'docs_xml',
+           'read_file', 'files2ctx', 'folder2ctx', 'folder2ctx_cli']
 
 # %% ../00_xml.ipynb
 import hashlib,xml.etree.ElementTree as ET
@@ -10,7 +11,7 @@ from collections import namedtuple
 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
+from fastcore.xml import to_xml, Document, Documents, Document_content, Src, Source,Out,Outs,Cell
 from fastcore.script import call_parse
 try: from IPython import display
 except: display=None
@@ -31,6 +32,39 @@ def json_to_xml(d:dict, # JSON dictionary to convert
     ET.indent(root)
     return ET.tostring(root, encoding='unicode')
 
+# %% ../00_xml.ipynb
+def get_mime_text(data):
+    "Get text from MIME bundle, preferring markdown over plain"
+    if 'text/markdown' in data: return ''.join(list(data['text/markdown']))
+    if 'text/plain' in data: return ''.join(list(data['text/plain']))
+
+# %% ../00_xml.ipynb
+def cell2out(o):
+    "Convert single notebook output to XML format"
+    if hasattr(o, 'data'): 
+        txt = get_mime_text(o.data)
+        if txt: return Out(txt, mime='markdown' if 'text/markdown' in o.data else 'plain')
+    if hasattr(o, 'text'):
+        txt = o.text if isinstance(o.text, str) else ''.join(o.text)
+        return Out(txt, type='stream', name=o.get('name', 'stdout'))
+    if hasattr(o, 'ename'): return Out(f"{o.ename}: {o.evalue}", type='error')
+
+# %% ../00_xml.ipynb
+def cell2xml(cell):
+    "Convert notebook cell to concise XML format"
+    cts = Source(''.join(cell.source)) if hasattr(cell, 'source') and cell.source else None
+    out_items = L(getattr(cell,'outputs',[])).map(cell2out).filter()
+    outs = []
+    if out_items: outs = Outs(*out_items)
+    parts = [p for p in [cts, outs] if p]
+    return Cell(*parts, type=cell.cell_type)
+
+# %% ../00_xml.ipynb
+def nb2xml(fname):
+    nb = dict2obj(fname.read_json())
+    cells_xml = [to_xml(cell2xml(c), do_escape=False) for c in nb.cells if c.cell_type in ('code','markdown')]
+    return '\n'.join(cells_xml)
+
 # %% ../00_xml.ipynb
 doctype = namedtuple('doctype', ['src', 'content'])
 
@@ -73,15 +107,23 @@ def docs_xml(docs:list[str],  # The content of each document
     if srcs is None: srcs = [None]*len(docs)
     if details is None: details = [{}]*len(docs)
     docs = (mk_doc(i+1, d, s, **kw) for i,(d,s,kw) in enumerate(zip(docs,srcs,details)))
-    return pre + to_xml(Documents(docs))
+    return pre + to_xml(Documents(docs), do_escape=False)
+
+# %% ../00_xml.ipynb
+def read_file(fname):
+    "Read file content, converting notebooks to XML if needed"
+    fname = Path(fname)
+    if fname.suffix == '.ipynb': return nb2xml(fname)
+    return fname.read_text()
 
 # %% ../00_xml.ipynb
 def files2ctx(
     fnames:list[Union[str,Path]], # List of file names to add to context
     prefix:bool=True # Include Anthropic's suggested prose intro?
 )->str: # XML for LM context
+    "Convert files to XML context, handling notebooks"
     fnames = [Path(o) for o in fnames]
-    contents = [o.read_text() for o in fnames]
+    contents = [read_file(o) for o in fnames]
     return docs_xml(contents, fnames, prefix=prefix)
 
 # %% ../00_xml.ipynb

{toolslm-0.3.2 → toolslm-0.3.3/toolslm.egg-info}/PKG-INFO

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

toolslm-0.3.2/toolslm/__init__.py

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