dialoghelper 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

dialoghelper/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.0.11"
+__version__ = "0.0.13"
 from .core import *

dialoghelper/_modidx.py

@@ -5,10 +5,11 @@ d = { 'settings': { 'branch': 'main',
                 'doc_host': 'https://AnswerDotAI.github.io',
                 'git_url': 'https://github.com/AnswerDotAI/dialoghelper',
                 'lib_path': 'dialoghelper'},
-  'syms': { 'dialoghelper.core': { 'dialoghelper.core._msg': ('core.html#_msg', 'dialoghelper/core.py'),
+  'syms': { 'dialoghelper.core': { 'dialoghelper.core._add_msg_unsafe': ('core.html#_add_msg_unsafe', 'dialoghelper/core.py'),
+                                   'dialoghelper.core._msg': ('core.html#_msg', 'dialoghelper/core.py'),
                                    'dialoghelper.core._umsg': ('core.html#_umsg', 'dialoghelper/core.py'),
-                                   'dialoghelper.core.add_html': ('core.html#add_html', 'dialoghelper/core.py'),
                                    'dialoghelper.core.add_msg': ('core.html#add_msg', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.del_msg': ('core.html#del_msg', 'dialoghelper/core.py'),
                                    'dialoghelper.core.export_dialog': ('core.html#export_dialog', 'dialoghelper/core.py'),
                                    'dialoghelper.core.find_dialog_id': ('core.html#find_dialog_id', 'dialoghelper/core.py'),
                                    'dialoghelper.core.find_msg_id': ('core.html#find_msg_id', 'dialoghelper/core.py'),
@@ -19,9 +20,12 @@ d = { 'settings': { 'branch': 'main',
                                    'dialoghelper.core.import_dialog': ('core.html#import_dialog', 'dialoghelper/core.py'),
                                    'dialoghelper.core.import_gist': ('core.html#import_gist', 'dialoghelper/core.py'),
                                    'dialoghelper.core.import_string': ('core.html#import_string', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.is_usable_tool': ('core.html#is_usable_tool', 'dialoghelper/core.py'),
                                    'dialoghelper.core.load_gist': ('core.html#load_gist', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.mk_toollist': ('core.html#mk_toollist', 'dialoghelper/core.py'),
                                    'dialoghelper.core.msg_idx': ('core.html#msg_idx', 'dialoghelper/core.py'),
                                    'dialoghelper.core.read_msg': ('core.html#read_msg', 'dialoghelper/core.py'),
                                    'dialoghelper.core.read_msg_ids': ('core.html#read_msg_ids', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.tool_info': ('core.html#tool_info', 'dialoghelper/core.py'),
                                    'dialoghelper.core.update_msg': ('core.html#update_msg', 'dialoghelper/core.py')},
             'dialoghelper.db_dc': {}}}

dialoghelper/core.py

@@ -1,12 +1,12 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['Placements', 'get_db', 'find_var', 'find_dialog_id', 'find_msgs', 'find_msg_id', 'read_msg_ids', 'msg_idx',
-           'read_msg', 'add_msg', 'update_msg', 'add_html', 'load_gist', 'gist_file', 'import_string', 'import_gist',
-           'export_dialog', 'import_dialog', 'asdict']
+__all__ = ['Placements', 'empty', 'get_db', 'find_var', 'find_dialog_id', 'find_msgs', 'find_msg_id', 'read_msg_ids', 'msg_idx',
+           'read_msg', 'del_msg', 'add_msg', 'update_msg', 'load_gist', 'gist_file', 'import_string', 'is_usable_tool',
+           'mk_toollist', 'import_gist', 'export_dialog', 'import_dialog', 'tool_info', 'asdict']
 
 # %% ../nbs/00_core.ipynb
-import inspect, json, importlib, linecache
+import json, importlib, linecache
 from typing import Dict
 from tempfile import TemporaryDirectory
 from ipykernel_helper import *
@@ -17,6 +17,10 @@ from fastcore.meta import delegates
 from ghapi.all import *
 from fastlite import *
 from fastcore.xtras import asdict
+from inspect import currentframe,Parameter,signature
+from httpx import get as xget, post as xpost
+from .core import __all__ as _all
+from IPython.display import display,Markdown
 
 # %% ../nbs/00_core.ipynb
 _all_ = ["asdict"]
@@ -35,7 +39,7 @@ def get_db(ns:dict=None):
 # %% ../nbs/00_core.ipynb
 def find_var(var:str):
     "Search for var in all frames of the call stack"
-    frame = inspect.currentframe()
+    frame = currentframe()
     while frame:
         dv = frame.f_globals.get(var, frame.f_locals.get(var, None))
         if dv: return dv
@@ -92,7 +96,14 @@ def read_msg(n:int=-1,     # Message index (if relative, +ve is downwards)
         if not 0<=idx<len(ids): return None
     else: idx = n
     db = get_db()
-    return db.t.message.fetchone('sid=?', [ids[idx]])
+    return db.t.message.selectone('sid=?', [ids[idx]])
+
+# %% ../nbs/00_core.ipynb
+def del_msg(
+    sid:str=None, # sid (stable id -- pk) of message that placement is relative to (if None, uses current message)
+):
+    "Delete a message from the dialog. Be sure to pass a `sid`, not a `mid`."
+    xpost('http://localhost:5001/rm_msg_', data=dict(msid=sid)).raise_for_status()
 
 # %% ../nbs/00_core.ipynb
 def _msg(
@@ -118,13 +129,25 @@ def add_msg(
     **kwargs
 ):
     "Add/update a message to the queue to show after code execution completes. Be sure to pass a `sid` (stable id) not a `mid` (which is used only for sorting, and can change)."
-    assert msg_type in ('note', 'code', 'prompt'), "msg_type must be 'code', 'note', or 'prompt'."
-    assert msg_type not in ('note') or not output, "'note' messages cannot have an output."
-    run_cmd('add_msg', content=content, msg_type=msg_type, output=output, placement=placement, sid=sid, **kwargs)
+    if msg_type not in ('note', 'code', 'prompt'): return "msg_type must be 'code', 'note', or 'prompt'."
+    if msg_type=='note' and output: return "note messages cannot have an output."
+    if not sid: sid = find_msg_id()
+    data = dict(content=content, msg_type=msg_type, output=output, placement=placement, sid=sid, **kwargs)
+    return xpost('http://localhost:5001/add_relative_', data=data).text
+
+# %% ../nbs/00_core.ipynb
+@delegates(add_msg)
+def _add_msg_unsafe(
+    content:str, # Content of the message (i.e the message prompt, code, or note text)
+    run:bool=False, # For prompts, send it to the AI; for code, execute it (*DANGEROUS -- be careful of what you run!)
+    **kwargs
+):
+    """Add/update a message to the queue to show after code execution completes, and optionally run it. Be sure to pass a `sid` (stable id) not a `mid` (which is used only for sorting, and can change).
+    *WARNING*--This can execute arbitrary code, so check carefully what you run!--*WARNING"""
+    add_msg(content=content, run=run, **kwargs)
 
 # %% ../nbs/00_core.ipynb
 def _umsg(
-    content:str|None = None, # Content of the message (i.e the message prompt, code, or note text)
     msg_type: str|None = None, # Message type, can be 'code', 'note', or 'prompt'
     output:str|None = None, # For prompts/code, the output
     time_run: str | None = None, # When was message executed
@@ -139,8 +162,9 @@ def _umsg(
 # %% ../nbs/00_core.ipynb
 @delegates(_umsg)
 def update_msg(
-    msg:Optional[Dict]=None, # Dictionary of field keys/values to update
     sid:str=None, # sid (stable id -- pk) of message to update (if None, uses current message)
+    content:str|None = None, # Content of the message (i.e the message prompt, code, or note text)
+    msg:Optional[Dict]=None, # Dictionary of field keys/values to update
     **kwargs):
     """Update an existing message. Provide either `msg` OR field key/values to update.
     Use `content` param to update contents. Be sure to pass a `sid` (stable id -- the pk) not a `mid`
@@ -150,14 +174,7 @@ def update_msg(
     sid = kw.pop('sid', sid)
     if not sid: raise TypeError("update_msg needs either a dict message or `sid=...`")
     kw.pop('did', None)
-    run_cmd('add_msg', placement='update', sid=sid, **kw)
-
-# %% ../nbs/00_core.ipynb
-def add_html(
-    html:str, # HTML to add to the DOM
-):
-    "Dynamically add HTML to the current web page. Supports HTMX attrs too."
-    run_cmd('add_ft', html=html)
+    add_msg(content, placement='update', sid=sid, **kw)
 
 # %% ../nbs/00_core.ipynb
 def load_gist(gist_id:str):
@@ -189,17 +206,40 @@ def import_string(
         spec.loader.exec_module(module)
         return module
 
+# %% ../nbs/00_core.ipynb
+empty = Parameter.empty
+
+def is_usable_tool(func:callable):
+    "True if the function has a docstring and all parameters have types, meaning that it can be used as an LLM tool."    
+    if not func.__doc__ or not callable(func): return False
+    return all(p.annotation != empty for p in signature(func).parameters.values())
+
+# %% ../nbs/00_core.ipynb
+def mk_toollist(syms):
+    return "\n".join(f"- &`{sym.__name__}`: {sym.__doc__}" for sym in syms if is_usable_tool(sym))
+
 # %% ../nbs/00_core.ipynb
 def import_gist(
     gist_id:str, # user/id or just id of gist to import as a module
     mod_name:str=None, # module name to create (taken from gist filename if not passed)
-    add_global:bool=True # add module to caller's globals?
+    add_global:bool=True, # add module to caller's globals?
+    import_wildcard:bool=False, # import all exported symbols to caller's globals
+    create_msg:bool=False # Add a message that lists usable tools
 ):
     "Import gist directly from string without saving to disk"
     fil = gist_file(gist_id)
     mod_name = mod_name or Path(fil['filename']).stem
     module = import_string(fil['content'], mod_name)
-    if add_global: inspect.currentframe().f_back.f_globals[mod_name] = module
+    glbs = currentframe().f_back.f_globals
+    if add_global: glbs[mod_name] = module
+    syms = getattr(module, '__all__', None)
+    if syms is None: syms = [o for o in dir(module) if not o.startswith('_')]
+    syms = [getattr(module, nm) for nm in syms]
+    if import_wildcard:
+        for sym in syms: glbs[sym.__name__] = sym
+    if create_msg:
+        pref = getattr(module, '__doc__', "Tools added to dialog:")
+        add_msg(f"{pref}\n\n{mk_toollist(syms)}")
     return module
 
 # %% ../nbs/00_core.ipynb
@@ -227,3 +267,16 @@ def import_dialog(fname, add_header=True):
         add_msg(msg.get('content',''), msg.get('msg_type','note'), msg.get('output',''), 'at_end', **opts)
     if add_header: add_msg(f"# Imported Dialog `{fname}`", 'note', placement='at_end')
     return f"Imported {len(data['messages'])} messages"
+
+# %% ../nbs/00_core.ipynb
+def tool_info():
+    cts='''Tools available from `dialoghelper`:
+
+- &`find_dialog_id`: Get the current dialog id.
+- &`find_msg_id`: Get the current message id.
+- &`find_msgs`: Find messages in current specific dialog that contain the given information.
+- &`read_msg`: Get the message indexed in the current dialog.
+- &`del_msg`: Delete a message from the dialog.
+- &`add_msg`: Add/update a message to the queue to show after code execution completes.
+- &`update_msg`: Update an existing message.'''
+    add_msg(cts)

{dialoghelper-0.0.11.dist-info → dialoghelper-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dialoghelper
-Version: 0.0.11
+Version: 0.0.13
 Summary: Helper functions for solveit dialogs
 Home-page: https://github.com/AnswerDotAI/dialoghelper
 Author: Jeremy Howard

dialoghelper-0.0.13.dist-info/RECORD

@@ -0,0 +1,10 @@
+dialoghelper/__init__.py,sha256=7byX0N8qjtMnanYWGgpBm__8aWTi6sy6Thzt4kYvjaQ,43
+dialoghelper/_modidx.py,sha256=BmhVoIv53snN6JQm_EzJp-bu793QuY7EZg2hKaq5_7E,3013
+dialoghelper/core.py,sha256=IOnjRTU8oaJPpzt9sOBSmYGumZuZT0j1QOmBhql9kJY,12205
+dialoghelper/db_dc.py,sha256=ieSie_K1HHXACEJVZ0rMkD_uo42GgmMqqKDYrodjhtM,2297
+dialoghelper-0.0.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dialoghelper-0.0.13.dist-info/METADATA,sha256=GwWpTw4e3hkbKus7m_Ks-5P4YfrwGLvo-t1vo_rmjjo,2558
+dialoghelper-0.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dialoghelper-0.0.13.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
+dialoghelper-0.0.13.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
+dialoghelper-0.0.13.dist-info/RECORD,,

{dialoghelper-0.0.11.dist-info → dialoghelper-0.0.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dialoghelper-0.0.11.dist-info/RECORD

@@ -1,10 +0,0 @@
-dialoghelper/__init__.py,sha256=pot8RlG0U4OhR3W-uFE3FF_SkXBM1i-NXq4JI4v6zdU,43
-dialoghelper/_modidx.py,sha256=fZ9-eTMaLdG-nvxxTe9_qjLwKIGS9_FU7KpFyCiF7DU,2529
-dialoghelper/core.py,sha256=515ndWh4b2vNEm1H6l5DBt4GWcqk3ILVo9zk8cEr3ig,9552
-dialoghelper/db_dc.py,sha256=ieSie_K1HHXACEJVZ0rMkD_uo42GgmMqqKDYrodjhtM,2297
-dialoghelper-0.0.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dialoghelper-0.0.11.dist-info/METADATA,sha256=PY8bUCy8IiRCCmkHM_bW0hTtSdsbtZvMnoBxkBTnR0o,2558
-dialoghelper-0.0.11.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-dialoghelper-0.0.11.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
-dialoghelper-0.0.11.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
-dialoghelper-0.0.11.dist-info/RECORD,,