toolslm 0.3.11__py3-none-any.whl → 0.3.13__py3-none-any.whl

toolslm/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.11"
+__version__ = "0.3.13"

toolslm/_modidx.py

@@ -49,5 +49,6 @@ d = { 'settings': { 'branch': 'main',
                              'toolslm.xml.mk_doc': ('xml.html#mk_doc', '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.parse_gh_url': ('xml.html#parse_gh_url', 'toolslm/xml.py'),
                              'toolslm.xml.read_file': ('xml.html#read_file', 'toolslm/xml.py'),
                              'toolslm.xml.repo2ctx': ('xml.html#repo2ctx', 'toolslm/xml.py')}}}

toolslm/download.py

@@ -8,6 +8,7 @@ from fastcore.utils import *
 from httpx import get
 from fastcore.meta import delegates
 from urllib.parse import urlparse, urljoin
+from .xml import parse_gh_url
 
 # %% ../03_download.ipynb
 def clean_md(text, rm_comments=True, rm_details=True):

toolslm/xml.py

@@ -2,7 +2,7 @@
 
 # %% auto 0
 __all__ = ['doctype', 'json_to_xml', 'get_mime_text', 'cell2out', 'cell2xml', 'nb2xml', 'mk_doctype', 'mk_doc', 'docs_xml',
-           'read_file', 'files2ctx', 'folder2ctx', 'repo2ctx', 'folder2ctx_cli']
+           'read_file', 'files2ctx', 'folder2ctx', 'folder2ctx_cli', 'parse_gh_url', 'repo2ctx']
 
 # %% ../00_xml.ipynb
 import hashlib,xml.etree.ElementTree as ET
@@ -101,7 +101,7 @@ def mk_doc(index:int,  # The document index
 # %% ../00_xml.ipynb
 def docs_xml(docs:list[str],  # The content of each document
              srcs:Optional[list]=None,  # URLs, filenames, etc; each one defaults to `md5(content)` if not provided
-             prefix:bool=True, # Include Anthropic's suggested prose intro?
+             prefix:bool=False, # Include Anthropic's suggested prose intro?
              details:Optional[list]=None, # Optional list of dicts with additional attrs for each doc
              title:str=None # Optional title attr for Documents element
             )->str:
@@ -123,66 +123,92 @@ def read_file(fname, out=True, max_size=None):
     return res
 
 # %% ../00_xml.ipynb
+@delegates(docs_xml)
 def files2ctx(
     fnames:list[Union[str,Path]], # List of file names to add to context
-    prefix:bool=True, # Include Anthropic's suggested prose intro?
     out:bool=True, # Include notebook cell outputs?
     srcs:Optional[list]=None, # Use the labels instead of `fnames`
-    title:str=None, # Optional title attr for Documents element
-    max_size:int=None # Skip files larger than this (bytes)
+    max_size:int=None, # Skip files larger than this (bytes)
+    **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) for o in fnames]
-    return docs_xml(contents, srcs or fnames, prefix=prefix, title=title)
+    return docs_xml(contents, srcs or fnames, **kwargs)
 
 # %% ../00_xml.ipynb
 @delegates(globtastic)
 def folder2ctx(
-    folder:Union[str,Path],
-    prefix:bool=True, # Include Anthropic's suggested prose intro?
+    folder: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?
     title:str=None, # Optional title attr for Documents element
     max_size:int=100_000, # Skip files larger than this (bytes)
+    max_total:int=10_000_000,  # Max total output size in bytes
+    readme_first:bool=False,  # Prioritize README files at start of context?
+    files_only:bool=False,  # Return dict of {filename: size} instead of context?
     **kwargs
-)->str:
+)->Union[str,dict]:
     "Convert folder contents to XML context, handling notebooks"
     folder = Path(folder)
     fnames = globtastic(folder, **kwargs)
+    if files_only: return {str(Path(f).relative_to(folder)): Path(f).stat().st_size for f in fnames}
+    if readme_first: fnames = sorted(fnames, key=lambda f: (0 if 'readme' in Path(f).name.lower() else 1, f))
     srcs = fnames if include_base else [Path(f).relative_to(folder) for f in fnames]
-    return files2ctx(fnames, prefix=prefix, out=out, srcs=srcs, title=title, max_size=max_size)
+    res = files2ctx(fnames, prefix=prefix, out=out, srcs=srcs, title=title, max_size=max_size)
+    suf = f"\n\n[TRUNCATED: output size {{_outsz_}} exceeded max size {max_total} bytes]"
+    if max_total and len(res) > max_total: res = truncstr(res, max_total, suf=suf, sizevar='_outsz_')
+    return res
+
+# %% ../00_xml.ipynb
+@call_parse
+@delegates(folder2ctx)
+def folder2ctx_cli(
+    folder: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))
+
+# %% ../00_xml.ipynb
+def parse_gh_url(url):
+    "Parse GitHub URL into (owner, repo, type, ref, path) or None"
+    m = re.match(r'https?://(?:www\.)?github\.com/([^/]+)/([^/]+)(?:/([^/]+)(?:/([^/]+)(?:/(.+))?)?)?', url)
+    return dict(zip('owner repo typ ref path'.split(), m.groups())) if m else None
 
 # %% ../00_xml.ipynb
 @delegates(folder2ctx)
 def repo2ctx(
-    owner:str,  # GitHub repo owner
-    repo:str,   # GitHub repo name
-    ref:str=None,  # Git ref (branch/tag/sha); defaults to repo's default branch
+    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 for owner param)
+    ref:str=None,  # Git ref (branch/tag/sha) (get from URL not provided); defaults to repo's default branch
+    folder:str=None,  # Only include files under this path (get from URL not provided)
+    show_filters:bool=True,  # Include filter info in title?
+    token:str=None,  # GitHub token (uses GITHUB_TOKEN env var if None)
     **kwargs  # Passed to `folder2ctx`
-)->str:  # XML for LM context
+)->Union[str,dict]:  # XML for LM context, or dict of file sizes
     "Convert GitHub repo to XML context without cloning"
     import tempfile, tarfile, io
-    api = GhApi()
+    if owner.startswith('http'):
+        parsed = parse_gh_url(owner)
+        if not parsed: raise ValueError(f"Invalid GitHub URL: {owner}")
+        owner,repo = parsed['owner'], parsed['repo']
+        ref = ref or parsed.get('ref')
+        folder = folder or parsed.get('path')
+    if repo is None: owner, repo = owner.split('/')
+    api = GhApi(token=token)
     if ref is None: ref = api.repos.get(owner, repo).default_branch
     data = api.repos.download_tarball_archive(owner, repo, ref)
-    parts = ' | '.join(f"{k}: {', '.join(v) if isinstance(v, (list,tuple)) else v}"
-        for k,v in kwargs.items() if v)
-    title = f"GitHub repository contents from {owner}/{repo} at ref '{ref}'"
-    if parts: title += f" (filters applied: {parts})"
+    title = f"GitHub repository contents from {owner}/{repo}/{ref}"
+    if folder: title += f'/{folder}'
+    if show_filters:
+        parts = [f"{k}: {', '.join(v) if isinstance(v, (list,tuple)) else v}" for k,v in kwargs.items() if v]
+        if parts: title += f" (filters applied -- {' | '.join(parts)})"
     tf = tarfile.open(fileobj=io.BytesIO(data))
     with tempfile.TemporaryDirectory() as tmp:
         tf.extractall(tmp, filter='data')
         subdir = Path(tmp) / tf.getmembers()[0].name.split('/')[0]
-        return folder2ctx(subdir, include_base=False, title=title, **kwargs)
-
-# %% ../00_xml.ipynb
-@call_parse
-@delegates(folder2ctx)
-def folder2ctx_cli(
-    folder: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))
+        if folder: subdir = subdir/folder
+        return folder2ctx(subdir, include_base=False, title=title, readme_first=True, **kwargs)

{toolslm-0.3.11.dist-info → toolslm-0.3.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolslm
-Version: 0.3.11
+Version: 0.3.13
 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>=1.9.6
+Requires-Dist: fastcore>=1.9.7
 Requires-Dist: httpx
 Provides-Extra: dev
 Dynamic: author

toolslm-0.3.13.dist-info/RECORD

@@ -0,0 +1,13 @@
+toolslm/__init__.py,sha256=jXmhGysidmiPOxLAzcyzQjjT98GxaQk2jHMECTsHr04,23
+toolslm/_modidx.py,sha256=DMBoEHx7c0EvxmSiLYbi0Grd8hjSQKiuK4xJdfa1rFo,5410
+toolslm/download.py,sha256=yMhyY3u26XRr6a4eZuCCmkprS7LQhHASl01Zn2B4q_o,4481
+toolslm/funccall.py,sha256=_5TyhTjWaWLi-eJ96-4P3_faFv6Ft07nO60UjCF-bPU,11160
+toolslm/md_hier.py,sha256=r_NPezhgfxjRmSYFlu_ND42hXt1qSbaPWHTcjbviOn4,11010
+toolslm/shell.py,sha256=dGInuRKvexu21VmtZkw_0S3BGiTsbAongUG-yG4YHpc,1566
+toolslm/xml.py,sha256=5sT-rRwpYTNpxNnZPr0QqIS2uZAAjsR3aE3c90nXzWA,9820
+toolslm-0.3.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+toolslm-0.3.13.dist-info/METADATA,sha256=uWzDigLPr9FoLJUdC3oXk8KfioKRfm4wTJi8k9K52iM,2404
+toolslm-0.3.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+toolslm-0.3.13.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
+toolslm-0.3.13.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
+toolslm-0.3.13.dist-info/RECORD,,

toolslm-0.3.11.dist-info/RECORD

@@ -1,13 +0,0 @@
-toolslm/__init__.py,sha256=TESjMH0a_iUkwdfWT4nyzKizSFmmCY2omxnS2XyT97Y,23
-toolslm/_modidx.py,sha256=kpgsDpj-Tvn90wezrHaMttyzhNcyNVgw_dQgK10qotI,5308
-toolslm/download.py,sha256=g3BxUSxylC_575M7RFSJ1GI3Co3EwPDdEeWzxaf2Czk,4451
-toolslm/funccall.py,sha256=_5TyhTjWaWLi-eJ96-4P3_faFv6Ft07nO60UjCF-bPU,11160
-toolslm/md_hier.py,sha256=r_NPezhgfxjRmSYFlu_ND42hXt1qSbaPWHTcjbviOn4,11010
-toolslm/shell.py,sha256=dGInuRKvexu21VmtZkw_0S3BGiTsbAongUG-yG4YHpc,1566
-toolslm/xml.py,sha256=tAHoqXrTRiX8i3pR-9KpHoBb8QXJ_TKEVyTEOPviudE,8095
-toolslm-0.3.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-toolslm-0.3.11.dist-info/METADATA,sha256=LrsRNEumsWCi0JnHLTn73b8GoqjwQ3m6mDak4n2h47g,2404
-toolslm-0.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-toolslm-0.3.11.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
-toolslm-0.3.11.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
-toolslm-0.3.11.dist-info/RECORD,,