toolslm 0.1.2__py3-none-any.whl → 0.2.0__py3-none-any.whl

toolslm/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.2"
+__version__ = "0.2.0"

toolslm/download.py

@@ -7,10 +7,6 @@ __all__ = ['clean_md', 'read_md', 'html2md', 'read_html', 'get_llmstxt', 'split_
 from fastcore.utils import *
 from httpx import get
 from fastcore.meta import delegates
-from llms_txt import *
-
-from html2text import HTML2Text
-from bs4 import BeautifulSoup
 from urllib.parse import urlparse, urljoin
 
 # %% ../03_download.ipynb 4
@@ -29,7 +25,8 @@ def read_md(url, rm_comments=True, rm_details=True, **kwargs):
 # %% ../03_download.ipynb 7
 def html2md(s:str, ignore_links=True):
     "Convert `s` from HTML to markdown"
-    o = HTML2Text(bodywidth=5000)
+    import html2text
+    o = html2text.HTML2Text(bodywidth=5000)
     o.ignore_links = ignore_links
     o.mark_code = True
     o.ignore_images = True
@@ -47,6 +44,7 @@ def read_html(url, # URL to read
     "Get `url`, optionally selecting CSS selector `sel`, and convert to clean markdown"
     page = get(url).text
     if sel:
+        from bs4 import BeautifulSoup
         soup = BeautifulSoup(page, 'html.parser')
         if multi:
             page = [str(el) for el in soup.select(sel)]
@@ -56,14 +54,14 @@ def read_html(url, # URL to read
     if wrap_tag: return '\n'.join([f"\n<{wrap_tag}>\n{o}</{wrap_tag}>\n" for o in mds])
     else: return'\n'.join(mds)
 
-
 # %% ../03_download.ipynb 13
 def get_llmstxt(url, optional=False, n_workers=None):
     "Get llms.txt file from and expand it with `llms_txt.create_ctx()`"
     if not url.endswith('llms.txt'): return None
+    import llms_txt
     resp = get(url)
     if resp.status_code!=200: return None
-    return create_ctx(resp.text, optional=optional, n_workers=n_workers)
+    return llms_txt.create_ctx(resp.text, optional=optional, n_workers=n_workers)
 
 # %% ../03_download.ipynb 15
 def split_url(url):

toolslm/funccall.py

@@ -141,7 +141,7 @@ def _copy_loc(new, orig):
     return new
 
 # %% ../01_funccall.ipynb 69
-def _run(code:str ):
+def _run(code:str, glb:dict=None, loc:dict=None):
     "Run `code`, returning final expression (similar to IPython)"
     tree = ast.parse(code)
     last_node = tree.body[-1] if tree.body else None
@@ -153,30 +153,34 @@ def _run(code:str ):
         tree.body[-1] = _copy_loc(assign_node, last_node)
 
     compiled_code = compile(tree, filename='<ast>', mode='exec')
-    namespace = {}
+    glb = glb or {}
     stdout_buffer = io.StringIO()
     saved_stdout = sys.stdout
     sys.stdout = stdout_buffer
-    try: exec(compiled_code, namespace)
+    try: exec(compiled_code, glb, loc)
     finally: sys.stdout = saved_stdout
-    _result = namespace.get('_result', None)
+    _result = glb.get('_result', None)
     if _result is not None: return _result
     return stdout_buffer.getvalue().strip()
 
 # %% ../01_funccall.ipynb 74
-def python(code, # Code to execute
-           timeout=5 # Maximum run time in seconds before a `TimeoutError` is raised
+def python(code:str, # Code to execute
+           glb:Optional[dict]=None, # Globals namespace
+           loc:Optional[dict]=None, # Locals namespace
+           timeout:int=3600 # Maximum run time in seconds before a `TimeoutError` is raised
           ): # Result of last node, if it's an expression, or `None` otherwise
     """Executes python `code` with `timeout` and returning final expression (similar to IPython).
     Raised exceptions are returned as a string, with a stack trace."""
     def handler(*args): raise TimeoutError()
+    if glb is None: glb = inspect.currentframe().f_back.f_globals
+    if loc is None: loc=glb
     signal.signal(signal.SIGALRM, handler)
     signal.alarm(timeout)
-    try: return _run(code)
+    try: return _run(code, glb, loc)
     except Exception as e: return traceback.format_exc()
     finally: signal.alarm(0)
 
-# %% ../01_funccall.ipynb 81
+# %% ../01_funccall.ipynb 85
 def mk_ns(*funcs_or_objs):
     merged = {}
     for o in funcs_or_objs:
@@ -185,14 +189,14 @@ def mk_ns(*funcs_or_objs):
         if callable(o) and hasattr(o, '__name__'): merged |= {o.__name__: o}
     return merged
 
-# %% ../01_funccall.ipynb 90
+# %% ../01_funccall.ipynb 94
 def call_func(fc_name, fc_inputs, ns):
     "Call the function `fc_name` with the given `fc_inputs` using namespace `ns`."
     if not isinstance(ns, abc.Mapping): ns = mk_ns(*ns)
     func = ns[fc_name]
     return func(**fc_inputs)
 
-# %% ../01_funccall.ipynb 97
+# %% ../01_funccall.ipynb 101
 async def call_func_async(fc_name, fc_inputs, ns):
     "Awaits the function `fc_name` with the given `fc_inputs` using namespace `ns`."
     if not isinstance(ns, abc.Mapping): ns = mk_ns(*ns)

{toolslm-0.1.2.dist-info → toolslm-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolslm
-Version: 0.1.2
+Version: 0.2.0
 Summary: Tools to make language models a bit easier to use
 Home-page: https://github.com/AnswerDotAI/toolslm
 Author: Jeremy Howard
@@ -17,10 +17,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastcore>=1.5.47
-Requires-Dist: beautifulsoup4
-Requires-Dist: html2text
 Requires-Dist: httpx
-Requires-Dist: llms_txt
 Provides-Extra: dev
 Dynamic: author
 Dynamic: author-email

toolslm-0.2.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+toolslm/__init__.py,sha256=Zn1KFblwuFHiDRdRAiRnDBRkbPttWh44jKa5zG2ov0E,22
+toolslm/_modidx.py,sha256=-D-B5o30VGs11gBKf96lpADVXnZhdiVEshJpLzmUnDs,4378
+toolslm/download.py,sha256=Ak7xzzCplU4RFW2cvUiuvhnL0agQqwF4lVH2hQhNNmc,4476
+toolslm/funccall.py,sha256=bzVlcTpgQuuBIG-I1HRidnXV5mp0FfGV10_Mk1DSQuc,8460
+toolslm/md_hier.py,sha256=4uC12443tPBduYJgIZZIcEat2VG0x7JYC8-SwDdS2JY,6360
+toolslm/shell.py,sha256=GVqfL74NHw66zzZ7jvGVLjE55ZNJGBPvEb8kLz4aoYc,1576
+toolslm/xml.py,sha256=QNwUavoMkFK84D7dMwnBjqlYJwN-pJ7u3BxOeDuNAmk,4088
+toolslm-0.2.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+toolslm-0.2.0.dist-info/METADATA,sha256=L2bwDiXXiMvKYeR8SSApCVBF7YrwwOE4Nbry4DJfMOk,2404
+toolslm-0.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+toolslm-0.2.0.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
+toolslm-0.2.0.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
+toolslm-0.2.0.dist-info/RECORD,,

toolslm-0.1.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-toolslm/__init__.py,sha256=YvuYzWnKtqBb-IqG8HAu-nhIYAsgj9Vmc_b9o7vO-js,22
-toolslm/_modidx.py,sha256=-D-B5o30VGs11gBKf96lpADVXnZhdiVEshJpLzmUnDs,4378
-toolslm/download.py,sha256=d84O8PCX7uAbLg0HTbNNfCdANPcnhXFu4qzOtcfJfHU,4465
-toolslm/funccall.py,sha256=yAZmu2gIRtND-5pOuLCp7P4dor0FV_xntcacnZ81j0M,8210
-toolslm/md_hier.py,sha256=4uC12443tPBduYJgIZZIcEat2VG0x7JYC8-SwDdS2JY,6360
-toolslm/shell.py,sha256=GVqfL74NHw66zzZ7jvGVLjE55ZNJGBPvEb8kLz4aoYc,1576
-toolslm/xml.py,sha256=QNwUavoMkFK84D7dMwnBjqlYJwN-pJ7u3BxOeDuNAmk,4088
-toolslm-0.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-toolslm-0.1.2.dist-info/METADATA,sha256=gGurWuj5SWNPQvCPKbd8oc5Iz9x4NPxv8bx_C8w3Kps,2483
-toolslm-0.1.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-toolslm-0.1.2.dist-info/entry_points.txt,sha256=xFz0Eymlo5X7BGpaO6DI9gMxvN5A7faebzrlr8ctp5I,95
-toolslm-0.1.2.dist-info/top_level.txt,sha256=4hRTrFWayz_Kz5221XjvlpCwVFrW3WPi1P0fllkTq9s,8
-toolslm-0.1.2.dist-info/RECORD,,