toolslm 0.0.3__tar.gz → 0.0.4__tar.gz

{toolslm-0.0.3/toolslm.egg-info → toolslm-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolslm
-Version: 0.0.3
+Version: 0.0.4
 Summary: Tools to make language models a bit easier to use
 Home-page: https://github.com/AnswerDotAI/toolslm
 Author: Jeremy Howard
@@ -16,7 +16,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore
+Requires-Dist: fastcore>=1.5.47
 Provides-Extra: dev
 
 # toolslm

{toolslm-0.0.3 → toolslm-0.0.4}/settings.ini

@@ -1,11 +1,11 @@
 [DEFAULT]
 repo = toolslm
 lib_name = toolslm
-version = 0.0.3
+version = 0.0.4
 min_python = 3.9
 license = apache2
 black_formatting = False
-requirements = fastcore
+requirements = fastcore>=1.5.47
 doc_path = _docs
 lib_path = toolslm
 nbs_path = .
@@ -34,4 +34,4 @@ jupyter_hooks = True
 clean_ids = True
 clear_all = False
 conda_user = fastai
-
+console_scripts = folder2ctx=toolslm.xml:folder2ctx_cli

toolslm-0.0.4/toolslm/__init__.py

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

{toolslm-0.0.3 → toolslm-0.0.4}/toolslm/_modidx.py

@@ -11,9 +11,6 @@ d = { 'settings': { 'branch': 'main',
                                   'toolslm.funccall._types': ('funccall.html#_types', 'toolslm/funccall.py'),
                                   'toolslm.funccall.get_schema': ('funccall.html#get_schema', 'toolslm/funccall.py'),
                                   'toolslm.funccall.python': ('funccall.html#python', 'toolslm/funccall.py')},
-            'toolslm.lmcode': { 'toolslm.lmcode._copy_loc': ('lmcode.html#_copy_loc', 'toolslm/lmcode.py'),
-                                'toolslm.lmcode._run': ('lmcode.html#_run', 'toolslm/lmcode.py'),
-                                'toolslm.lmcode.python': ('lmcode.html#python', 'toolslm/lmcode.py')},
             'toolslm.shell': { 'toolslm.shell.TerminalInteractiveShell.run_cell': ( 'shell.html#terminalinteractiveshell.run_cell',
                                                                                     'toolslm/shell.py'),
                                'toolslm.shell.get_shell': ('shell.html#get_shell', 'toolslm/shell.py')},
@@ -21,9 +18,7 @@ d = { 'settings': { 'branch': 'main',
                              '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.hl_md': ('xml.html#hl_md', 'toolslm/xml.py'),
+                             'toolslm.xml.folder2ctx_cli': ('xml.html#folder2ctx_cli', '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.to_xml': ('xml.html#to_xml', 'toolslm/xml.py'),
-                             'toolslm.xml.xt': ('xml.html#xt', 'toolslm/xml.py')}}}
+                             'toolslm.xml.mk_doctype': ('xml.html#mk_doctype', 'toolslm/xml.py')}}}

{toolslm-0.0.3 → toolslm-0.0.4}/toolslm/funccall.py

@@ -29,7 +29,7 @@ def _param(name, info):
     return pschema
 
 # %% ../01_funccall.ipynb 17
-def get_schema(f:callable)->dict:
+def get_schema(f:callable, pname='input_schema')->dict:
     "Convert function `f` into a JSON schema `dict` for tool use."
     d = docments(f, full=True)
     ret = d.pop('return')
@@ -40,9 +40,10 @@ def get_schema(f:callable)->dict:
         'required': [n for n,o in d.items() if o.default is empty and n[0]!='_']
     }
     desc = f.__doc__
+    assert desc, "Docstring missing!"
     if ret.anno is not empty: desc += f'\n\nReturns:\n- type: {_types(ret.anno)[0]}'
     if ret.docment: desc += f'\n- description: {ret.docment}'
-    return dict(name=f.__name__, description=desc or "", input_schema=paramd)
+    return {'name':f.__name__, 'description':desc, pname:paramd}
 
 # %% ../01_funccall.ipynb 22
 import ast, time, signal, traceback

{toolslm-0.0.3 → toolslm-0.0.4}/toolslm/xml.py

@@ -1,8 +1,7 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../00_xml.ipynb.
 
 # %% auto 0
-__all__ = ['g', 'tags', 'doctype', 'xt', 'hl_md', 'to_xml', 'json_to_xml', 'mk_doctype', 'mk_doc', 'docs_xml', 'files2ctx',
-           'folder2ctx']
+__all__ = ['doctype', 'json_to_xml', 'mk_doctype', 'mk_doc', 'docs_xml', 'files2ctx', 'folder2ctx', 'folder2ctx_cli']
 
 # %% ../00_xml.ipynb 3
 import hashlib,xml.etree.ElementTree as ET
@@ -10,45 +9,13 @@ 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, Source
+from fastcore.script import call_parse
 try: from IPython import display
 except: display=None
 
-# %% ../00_xml.ipynb 6
-def xt(tag:str, # XML tag name
-       c:Optional[list]=None, # Children
-       **kw):
-    "Helper to create appropriate data structure for `to_xml`."
-    kw = {k.lstrip('_'):str(v) for k,v in kw.items()}
-    return tag,c,kw
-
-# %% ../00_xml.ipynb 9
-g = globals()
-tags = 'div img h1 h2 h3 h4 h5 p hr span html'.split()
-for o in tags: g[o] = partial(xt, o)
-
-# %% ../00_xml.ipynb 12
-def hl_md(s, lang='xml'):
-    "Syntax highlight `s` using `lang`."
-    if display: return display.Markdown(f'```{lang}\n{s}\n```')
-    print(s)
-
-# %% ../00_xml.ipynb 15
-def to_xml(node:tuple, # XML structure in `xt` format
-           hl=False # Syntax highlight response?
-          ):
-    "Convert `node` to an XML string."
-    def mk_el(tag, cs, attrs):
-        el = ET.Element(tag, attrib=attrs)
-        if isinstance(cs, list): el.extend([mk_el(*o) for o in cs])
-        elif cs is not None: el.text = str(cs)
-        return el
-
-    root = mk_el(*node)
-    ET.indent(root, space='  ' if hl else '')
-    res = ET.tostring(root, encoding='unicode')
-    return hl_md(res) if hl else res
-
-# %% ../00_xml.ipynb 18
+# %% ../00_xml.ipynb 4
 def json_to_xml(d:dict, # JSON dictionary to convert
                 rnm:str # Root name
                )->str:
@@ -64,17 +31,17 @@ def json_to_xml(d:dict, # JSON dictionary to convert
     ET.indent(root)
     return ET.tostring(root, encoding='unicode')
 
-# %% ../00_xml.ipynb 23
+# %% ../00_xml.ipynb 9
 doctype = namedtuple('doctype', ['source', 'content'])
 
-# %% ../00_xml.ipynb 25
+# %% ../00_xml.ipynb 11
 def _add_nls(s):
     "Add newlines to start and end of `s` if missing"
     if s[ 0]!='\n': s = '\n'+s
     if s[-1]!='\n': s = s+'\n'
     return s
 
-# %% ../00_xml.ipynb 27
+# %% ../00_xml.ipynb 13
 def mk_doctype(content:str,  # The document content
            source:Optional[str]=None # URL, filename, etc; defaults to `md5(content)` if not provided
           ) -> namedtuple:
@@ -82,18 +49,29 @@ def mk_doctype(content:str,  # The document content
     if source is None: source = hashlib.md5(content.encode()).hexdigest()[:8]
     return doctype(_add_nls(str(source).strip()), _add_nls(content.strip()))
 
-# %% ../00_xml.ipynb 30
+# %% ../00_xml.ipynb 17
 def mk_doc(index:int,  # The document index
            content:str,  # The document content
            source:Optional[str]=None # URL, filename, etc; defaults to `md5(content)` if not provided
           ) -> tuple:
-    "Create an `xt` format tuple for a single doc in Anthropic's recommended format"
+    "Create an `ft` format tuple for a single doc in Anthropic's recommended format"
     dt = mk_doctype(content, source)
-    content = xt('document_content', dt.content)
-    source =  xt('source', dt.source)
-    return xt('document', [source, content], index=index)
+    content = ft('document_content', dt.content)
+    source =  ft('source', dt.source)
+    return ft('document', source, content, index=index)
 
-# %% ../00_xml.ipynb 33
+# %% ../00_xml.ipynb 18
+def mk_doc(index:int,  # The document index
+           content:str,  # The document content
+           source:Optional[str]=None # URL, filename, etc; defaults to `md5(content)` if not provided
+          ) -> tuple:
+    "Create an `ft` format tuple for a single doc in Anthropic's recommended format"
+    dt = mk_doctype(content, source)
+    content = Document_content(dt.content)
+    source = Source(dt.source)
+    return Document(source, content, index=index)
+
+# %% ../00_xml.ipynb 22
 def docs_xml(docs:list[str],  # The content of each document
              sources:Optional[list]=None,  # URLs, filenames, etc; each one defaults to `md5(content)` if not provided
              prefix:bool=True # Include Anthropic's suggested prose intro?
@@ -101,10 +79,10 @@ def docs_xml(docs:list[str],  # The content of each document
     "Create an XML string containing `docs` in Anthropic's recommended format"
     pre = 'Here are some documents for you to reference for your task:\n\n' if prefix else ''
     if sources is None: sources = [None]*len(docs)
-    docs = [mk_doc(i+1, *o) for i,o in enumerate(zip(docs,sources))]
-    return pre + to_xml(xt('documents', docs))
+    docs = (mk_doc(i+1, *o) for i,o in enumerate(zip(docs,sources)))
+    return pre + to_xml(Documents(docs))
 
-# %% ../00_xml.ipynb 40
+# %% ../00_xml.ipynb 29
 def files2ctx(
     fnames:list[Union[str,Path]], # List of file names to add to context
     prefix:bool=True # Include Anthropic's suggested prose intro?
@@ -113,7 +91,7 @@ def files2ctx(
     contents = [o.read_text() for o in fnames]
     return docs_xml(contents, fnames, prefix=prefix)
 
-# %% ../00_xml.ipynb 43
+# %% ../00_xml.ipynb 32
 @delegates(globtastic)
 def folder2ctx(
     folder:Union[str,Path], # Folder name containing files to add to context
@@ -122,3 +100,12 @@ def folder2ctx(
 )->str: # XML for Claude context
     fnames = globtastic(folder, **kwargs)
     return files2ctx(fnames, prefix=prefix)
+
+# %% ../00_xml.ipynb 34
+@call_parse
+@delegates(folder2ctx)
+def folder2ctx_cli(
+    folder:str, # Folder name containing files to add to context
+    **kwargs # Passed to `folder2ctx`
+)->str: # XML for Claude context
+    return folder2ctx(folder, **kwargs)

{toolslm-0.0.3 → toolslm-0.0.4/toolslm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolslm
-Version: 0.0.3
+Version: 0.0.4
 Summary: Tools to make language models a bit easier to use
 Home-page: https://github.com/AnswerDotAI/toolslm
 Author: Jeremy Howard
@@ -16,7 +16,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore
+Requires-Dist: fastcore>=1.5.47
 Provides-Extra: dev
 
 # toolslm

toolslm-0.0.4/toolslm.egg-info/entry_points.txt

@@ -0,0 +1,5 @@
+[console_scripts]
+folder2ctx = toolslm.xml:folder2ctx_cli
+
+[nbdev]
+toolslm = toolslm._modidx:d

toolslm-0.0.4/toolslm.egg-info/requires.txt

@@ -0,0 +1,3 @@
+fastcore>=1.5.47
+
+[dev]

toolslm-0.0.3/toolslm/__init__.py

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

toolslm-0.0.3/toolslm.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[nbdev]
-toolslm = toolslm._modidx:d

toolslm-0.0.3/toolslm.egg-info/requires.txt

@@ -1,3 +0,0 @@
-fastcore
-
-[dev]