dialoghelper 0.0.16__tar.gz → 0.0.18__tar.gz

{dialoghelper-0.0.16/dialoghelper.egg-info → dialoghelper-0.0.18}/PKG-INFO

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

dialoghelper-0.0.18/dialoghelper/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "0.0.18"
+from .core import *

{dialoghelper-0.0.16 → dialoghelper-0.0.18}/dialoghelper/_modidx.py

@@ -6,19 +6,15 @@ d = { 'settings': { 'branch': 'main',
                 'git_url': 'https://github.com/AnswerDotAI/dialoghelper',
                 'lib_path': 'dialoghelper'},
   '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.call_endp': ('core.html#call_endp', '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'),
                                    'dialoghelper.core.find_msgs': ('core.html#find_msgs', 'dialoghelper/core.py'),
                                    'dialoghelper.core.find_var': ('core.html#find_var', 'dialoghelper/core.py'),
-                                   'dialoghelper.core.get_db': ('core.html#get_db', 'dialoghelper/core.py'),
                                    'dialoghelper.core.gist_file': ('core.html#gist_file', 'dialoghelper/core.py'),
-                                   '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'),
@@ -26,7 +22,6 @@ d = { 'settings': { 'branch': 'main',
                                    '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-0.0.16 → dialoghelper-0.0.18}/dialoghelper/core.py

@@ -1,9 +1,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['Placements', 'empty', 'get_db', 'find_var', 'find_dialog_id', 'find_msgs', 'find_msg_id', 'read_msg_ids', 'msg_idx',
-           'read_msg', 'add_html', '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']
+__all__ = ['Placements', 'empty', 'find_var', 'call_endp', 'find_msgs', 'find_msg_id', 'msg_idx', 'read_msg', 'add_html',
+           'del_msg', 'add_msg', 'update_msg', 'load_gist', 'gist_file', 'import_string', 'is_usable_tool',
+           'mk_toollist', 'import_gist', 'tool_info', 'asdict']
 
 # %% ../nbs/00_core.ipynb
 import json, importlib, linecache
@@ -26,17 +26,6 @@ from IPython.display import display,Markdown
 # %% ../nbs/00_core.ipynb
 _all_ = ["asdict"]
 
-# %% ../nbs/00_core.ipynb
-def get_db(ns:dict=None):
-    app_path = Path('/app') if Path('/.dockerenv').exists() else Path('.')
-    if os.environ.get('IN_SOLVEIT', False): dataparent,nm = app_path, 'data.db'
-    else: dataparent,nm = Path('..'),'dev_data.db'
-    db = database(dataparent/'data'/nm)
-    dcs = [o for o in all_dcs(db) if o.__name__[0]!='_']
-    if ns:
-        for o in dcs: ns[o.__name__]=o
-    return db
-
 # %% ../nbs/00_core.ipynb
 def find_var(var:str):
     "Search for var in all frames of the call stack"
@@ -48,22 +37,20 @@ def find_var(var:str):
     raise ValueError(f"Could not find {var} in any scope")
 
 # %% ../nbs/00_core.ipynb
-def find_dialog_id():
-    "Get the dialog id by searching the call stack for __dialog_id."
-    return find_var('__dialog_id')
+def call_endp(path, json=False, raiseex=False, **data):
+    res = xpost(f'http://localhost:5001/{path}', data=data)
+    if raiseex: res.raise_for_status()
+    return res.json() if json else res.text
 
 # %% ../nbs/00_core.ipynb
 def find_msgs(
-    pattern:str='', # Optional text to search for
+    re_pattern:str='', # Optional regex to search for (re.DOTALL+re.MULTILINE is used)
     msg_type:str=None, # optional limit by message type ('code', 'note', or 'prompt')
     limit:int=None, # Optionally limit number of returned items
     include_output:bool=True # Include output in returned dict?
 )->list[dict]:
-    "Find `list[dict]` of messages in current specific dialog that contain the given information. To refer to a message found later, use its `sid` field (which is the pk)."
-    did = find_dialog_id()
-    db = get_db()
-    res = db.t.message('did=? AND content LIKE ? ORDER BY mid', [did, f'%{pattern}%'], limit=limit)
-    res = [asdict(o) for o in res if not msg_type or (msg_type==o.msg_type)]
+    "Find `list[dict]` of messages in current specific dialog that contain the given information. To refer to a message found later, use its `id` field."
+    res = call_endp('find_msgs_', json=True, re_pattern=re_pattern, msg_type=msg_type, limit=limit)['msgs']
     if not include_output:
         for o in res: o.pop('output', None)
     return res
@@ -74,48 +61,45 @@ def find_msg_id():
     return find_var('__msg_id')
 
 # %% ../nbs/00_core.ipynb
-def read_msg_ids()->list[str]:
-    "Get all ids in current dialog."
-    did = find_dialog_id()
-    db = get_db()
-    return [o.sid for o in db.t.message('did=?', [did], select='sid', order_by='mid')]
-
-# %% ../nbs/00_core.ipynb
-def msg_idx():
-    "Get relative index of current message in dialog."
-    ids = read_msg_ids()
-    return ids,ids.index(find_msg_id())
+def msg_idx(
+    msgid=None # Message id to find (defaults to current message)
+):
+    "Get relative index of message in dialog."
+    if not msgid: msgid = find_msg_id()
+    return call_endp('msg_idx_', json=True, msgid=msgid)['msgid']
 
 # %% ../nbs/00_core.ipynb
-def read_msg(n:int=-1,     # Message index (if relative, +ve is downwards)
-             relative:bool=True  # Is `n` relative to current message (True) or absolute (False)?
+def read_msg(
+    n:int=-1,     # Message index (if relative, +ve is downwards)
+    msgid=None,  # Message id to find (defaults to current message)
+    relative:bool=True  # Is `n` relative to current message (True) or absolute (False)?
     ):
     "Get the `Message` object indexed in the current dialog."
-    ids,idx = msg_idx()
-    if relative:
-        idx = idx+n
-        if not 0<=idx<len(ids): return None
-    else: idx = n
-    db = get_db()
-    return db.t.message.selectone('sid=?', [ids[idx]])
+    if not msgid: msgid = find_msg_id()
+    return call_endp('read_msg_', json=True, msgid=msgid, n=n, relative=relative)['msg']
 
 # %% ../nbs/00_core.ipynb
 def add_html(
     content:str, # The HTML to send to the client (generally should include hx-swap-oob)
 ):
     "Send HTML to the browser to be swapped into the DOM"
-    res = to_xml(content)
-    xpost('http://localhost:5001/add_html_', data=dict(content=res))
+    call_endp('add_html_', content=to_xml(content))
 
 # %% ../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)
+    msgid:str=None, # id 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()
+    call_endp('rm_msg_', raiseex=True, msid=msgid)
+
+# %% ../nbs/00_core.ipynb
+Placements = str_enum('Placements', 'add_after', 'add_before', 'at_start', 'at_end')
 
 # %% ../nbs/00_core.ipynb
-def _msg(
+def add_msg(
+    content:str, # Content of the message (i.e the message prompt, code, or note text)
+    placement:str='add_after', # Can be 'add_after', 'add_before', 'at_start', 'at_end'
+    msgid:str=None, # id of message that placement is relative to (if None, uses current message)
     msg_type: str='note', # Message type, can be 'code', 'note', or 'prompt'
     output:str='', # For prompts/code, initial output
     time_run: str | None = '', # When was message executed
@@ -123,34 +107,15 @@ def _msg(
     skipped: int | None = 0, # Hide message from prompt?
     i_collapsed: int | None = 0, # Collapse input?
     o_collapsed: int | None = 0, # Collapse output?
-    header_collapsed: int | None = 0, # Collapse heading section?
-    pinned: int | None = 0 # Pin to context?
-): ...
-
-Placements = str_enum('Placements', 'add_after', 'add_before', 'update', 'at_start', 'at_end')
-
-# %% ../nbs/00_core.ipynb
-@delegates(_msg)
-def add_msg(
-    content:str, # Content of the message (i.e the message prompt, code, or note text)
-    placement:str='add_after', # Can be 'add_after', 'add_before', 'update', 'at_start', 'at_end'
-    sid:str=None, # sid (stable id -- pk) of message that placement is relative to (if None, uses current message)
-    **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).
-    Sets msg_type to 'note' by default if not update placement."""
-    if 'msg_type' not in kwargs and placement!='update': kwargs['msg_type']='note'
-    mt = kwargs.get('msg_type',None)
-    ot = kwargs.get('output',None)
-    if mt and mt not in ('note', 'code', 'prompt'): return "msg_type must be 'code', 'note', or 'prompt'."
-    if mt=='note' and ot: return "note messages cannot have an output."
-    if mt=='code':
-        try: json.loads(ot or '[]')
-        except: return "Code output must be valid json"
-    if not sid: sid = find_msg_id()
-    data = dict(content=content, placement=placement, sid=sid, **kwargs)
-    return xpost('http://localhost:5001/add_relative_', data=data).text
+    heading_collapsed: int | None = 0, # Collapse heading section?
+    pinned: int | None = 0, # Pin to context?
+    **kwargs):
+    "Add/update a message to the queue to show after code execution completes."
+    if placement not in ('at_start','at_end') and not msgid: msgid = find_msg_id()
+    return call_endp(
+        'add_relative_', content=content, placement=placement, msgid=msgid, msg_type=msg_type, output=output,
+        time_run=time_run, is_exported=is_exported, skipped=skipped, pinned=pinned,
+        i_collapsed=i_collapsed, o_collapsed=o_collapsed, heading_collapsed=heading_collapsed, **kwargs)
 
 # %% ../nbs/00_core.ipynb
 @delegates(add_msg)
@@ -172,26 +137,22 @@ def _umsg(
     skipped: int | None = None, # Hide message from prompt?
     i_collapsed: int | None = None, # Collapse input?
     o_collapsed: int | None = None, # Collapse output?
-    header_collapsed: int | None = None, # Collapse heading section?
+    heading_collapsed: int | None = None, # Collapse heading section?
     pinned: int | None = None # Pin to context?
 ): ...
 
 # %% ../nbs/00_core.ipynb
 @delegates(_umsg)
 def update_msg(
-    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)
+    msgid:str=None, # id 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`
-    (which is used only for sorting, and can change).
+    Use `content` param to update contents.
     Only include parameters to update--missing ones will be left unchanged."""
-    kw = (msg or {}) | kwargs
-    sid = kw.pop('sid', sid)
-    if not sid: raise TypeError("update_msg needs either a dict message or `sid=...`")
-    kw.pop('did', None)
-    return add_msg(content, placement='update', sid=sid, **kw)
+    if not msgid and not msg: raise TypeError("update_msg needs either a dict message or `msgid=`")
+    return call_endp('add_relative_', content=content, placement='update', msgid=msgid, **kwargs)
 
 # %% ../nbs/00_core.ipynb
 def load_gist(gist_id:str):
@@ -259,32 +220,6 @@ def import_gist(
         add_msg(f"{pref}\n\n{mk_toollist(syms)}")
     return module
 
-# %% ../nbs/00_core.ipynb
-__EXPORT_FIELDS = set('content output input_tokens output_tokens msg_type is_exported skipped pinned i_collapsed o_collapsed header_collapsed'.split())
-
-__REQUIRED_FIELDS = set('content output msg_type'.split())
-
-# %% ../nbs/00_core.ipynb
-def export_dialog(filename: str, did:int=None):
-    "Export dialog messages and optionally attachments to JSON"
-    if did is None: did = find_dialog_id()
-    db = get_db()
-    msgs = db.t.message('did=? and (pinned=0 or pinned is null)', [did], order_by='mid')
-    msg_data = [{k:getattr(msg,k) for k in __EXPORT_FIELDS if hasattr(msg, k)}
-                for msg in msgs]
-    result = {'messages': msg_data, 'dialog_name': db.t.dialog[did].name}
-    with open(filename, 'w') as f: json.dump(result, f, indent=2)
-
-# %% ../nbs/00_core.ipynb
-def import_dialog(fname, add_header=True):
-    "Import dialog messages from JSON file using `add_msg`"
-    data = json.loads(Path(fname).read_text())
-    for msg in data['messages'][::-1]:
-        opts = {k:msg[k] for k in __EXPORT_FIELDS - __REQUIRED_FIELDS if k in msg}
-        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`:

{dialoghelper-0.0.16 → dialoghelper-0.0.18}/dialoghelper/db_dc.py

@@ -77,6 +77,7 @@ class Message:
     o_collapsed: int | None = '0'
     header_collapsed: int | None = '0'
     pinned: int | None = '0'
+    use_thinking: int | None = 0
 
 @dataclass
 class Secret:

{dialoghelper-0.0.16 → dialoghelper-0.0.18/dialoghelper.egg-info}/PKG-INFO

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

{dialoghelper-0.0.16 → dialoghelper-0.0.18}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = dialoghelper
 lib_name = dialoghelper
-version = 0.0.16
+version = 0.0.18
 min_python = 3.9
 license = apache2
 black_formatting = False

dialoghelper-0.0.16/dialoghelper/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.0.16"
-from .core import *