toolslm 0.3.19__tar.gz → 0.3.22__tar.gz

{toolslm-0.3.19/toolslm.egg-info → toolslm-0.3.22}/PKG-INFO

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

{toolslm-0.3.19 → toolslm-0.3.22}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = toolslm
 lib_name = toolslm
-version = 0.3.19
+version = 0.3.22
 min_python = 3.9
 license = apache2
 black_formatting = False
@@ -35,6 +35,7 @@ clean_ids = 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

toolslm-0.3.22/toolslm/__init__.py

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

{toolslm-0.3.19 → toolslm-0.3.22}/toolslm/_modidx.py

@@ -55,6 +55,7 @@ d = { 'settings': { 'branch': 'main',
                              'toolslm.xml.py2sigs': ('xml.html#py2sigs', 'toolslm/xml.py'),
                              'toolslm.xml.read_file': ('xml.html#read_file', 'toolslm/xml.py'),
                              'toolslm.xml.repo2ctx': ('xml.html#repo2ctx', 'toolslm/xml.py'),
+                             'toolslm.xml.repo2ctx_cli': ('xml.html#repo2ctx_cli', 'toolslm/xml.py'),
                              'toolslm.xml.sym2file': ('xml.html#sym2file', 'toolslm/xml.py'),
                              'toolslm.xml.sym2folderctx': ('xml.html#sym2folderctx', 'toolslm/xml.py'),
                              'toolslm.xml.sym2pkgctx': ('xml.html#sym2pkgctx', 'toolslm/xml.py'),

{toolslm-0.3.19 → toolslm-0.3.22}/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.19 → toolslm-0.3.22}/toolslm/xml.py

@@ -3,7 +3,7 @@
 # %% auto 0
 __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']
+           'sym2pkgpath', 'sym2pkgctx', 'folder2ctx_cli', 'parse_gh_url', 'repo2ctx', 'repo2ctx_cli']
 
 # %% ../00_xml.ipynb
 import hashlib, inspect, xml.etree.ElementTree as ET, ast
@@ -175,9 +175,9 @@ def files2ctx(
     return docs_xml(contents, srcs or fnames, **kwargs)
 
 # %% ../00_xml.ipynb
-@delegates(globtastic)
+@delegates(globtastic, but='func')
 def folder2ctx(
-    folder:Union[str,Path], # Folder to read
+    path:Union[str,Path], # Folder to read
     prefix:bool=False, # Include Anthropic's suggested prose intro?
     out:bool=True, # Include notebook cell outputs?
     include_base:bool=True, # Include full path in src?
@@ -191,7 +191,7 @@ def folder2ctx(
     **kwargs
 )->Union[str,dict]:
     "Convert folder contents to XML context, handling notebooks"
-    folder = Path(folder).expanduser()
+    folder = Path(path).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))
@@ -233,12 +233,12 @@ def sym2pkgctx(sym, types:str|list='py', skip_file_re=r'^_mod', **kwargs):
 @call_parse
 @delegates(folder2ctx)
 def folder2ctx_cli(
-    folder:str, # Folder name containing files to add to context
+    path:str='.', # Folder name containing files to add to context
     out:bool=True, # Include notebook cell outputs?
     **kwargs # Passed to `folder2ctx`
 )->str: # XML for Claude context
     "CLI to convert folder contents to XML context, handling notebooks"
-    print(folder2ctx(folder, out=out, **kwargs))
+    print(folder2ctx(path, out=out, **kwargs))
 
 # %% ../00_xml.ipynb
 def parse_gh_url(url):
@@ -280,3 +280,17 @@ def repo2ctx(
         subdir = Path(tmp) / tf.getmembers()[0].name.split('/')[0]
         if folder: subdir = subdir/folder
         return folder2ctx(subdir, include_base=False, title=title, readme_first=True, **kwargs)
+
+# %% ../00_xml.ipynb
+@call_parse
+@delegates(repo2ctx, but='include_base,title,readme_first')
+def repo2ctx_cli(
+    owner:str,  # GitHub repo owner or "owner/repo" or a full github URL
+    repo:str=None,   # GitHub repo name (leave empty if using "owner/repo" or URL format)
+    ref:str=None,  # Git ref (branch/tag/sha)
+    folder:str=None,  # Only include files under this path
+    out:bool=True, # Include notebook cell outputs?
+    **kwargs # Passed to `repo2ctx`
+)->str: # XML for Claude context
+    "CLI to convert GitHub repo contents to XML context"
+    print(repo2ctx(owner, repo, ref=ref, folder=folder, out=out, **kwargs))

{toolslm-0.3.19 → toolslm-0.3.22/toolslm.egg-info}/PKG-INFO

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

{toolslm-0.3.19 → toolslm-0.3.22}/toolslm.egg-info/entry_points.txt

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

toolslm-0.3.19/toolslm/__init__.py

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