dialoghelper 0.0.2__tar.gz → 0.0.4__tar.gz

{dialoghelper-0.0.2/dialoghelper.egg-info → dialoghelper-0.0.4}/PKG-INFO

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

dialoghelper-0.0.4/dialoghelper/__init__.py

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

{dialoghelper-0.0.2 → dialoghelper-0.0.4}/dialoghelper/_modidx.py

@@ -5,7 +5,9 @@ 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.add_msg': ('core.html#add_msg', 'dialoghelper/core.py'),
+  'syms': { 'dialoghelper.core': { 'dialoghelper.core._msg': ('core.html#_msg', '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.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-0.0.2 → dialoghelper-0.0.4}/dialoghelper/core.py

@@ -2,7 +2,7 @@
 
 # %% auto 0
 __all__ = ['get_db', 'find_var', 'find_dialog_id', 'find_msgs', 'find_msg_id', 'read_msg_ids', 'msg_idx', 'read_msg', 'add_msg',
-           'update_msg', 'load_gist', 'gist_file', 'import_string', 'import_gist']
+           'update_msg', 'add_html', 'load_gist', 'gist_file', 'import_string', 'import_gist']
 
 # %% ../nbs/00_core.ipynb
 import inspect, json, importlib, linecache
@@ -10,12 +10,14 @@ from tempfile import TemporaryDirectory
 from ipykernel_helper import *
 
 from fastcore.utils import *
+from fastcore.meta import delegates
 from ghapi.all import *
 from fastlite import *
 
 # %% ../nbs/00_core.ipynb
 def get_db(ns:dict=None):
-    if os.environ.get('IN_SOLVEIT', False): dataparent,nm = Path('/app'),'data.db'
+    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]!='_']
@@ -45,6 +47,7 @@ def find_msgs(
 ):
     "Find messages in a specific dialog that contain the given pattern."
     did = find_dialog_id()
+    db = get_db()
     return db.t.message('did=? AND content LIKE ?', [did, f'%{pattern}%'], limit=limit)
 
 # %% ../nbs/00_core.ipynb
@@ -56,6 +59,7 @@ def find_msg_id():
 def read_msg_ids():
     "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='id')]
 
 # %% ../nbs/00_core.ipynb
@@ -74,27 +78,52 @@ def read_msg(n:int=-1,     # Message index (if relative, +ve is downwards)
         idx = idx+n
         if not 0<=idx<len(ids): return None
     else: idx = n
+    db = get_db()
     return db.t.message.fetchone('sid=?', [ids[idx]])
 
 # %% ../nbs/00_core.ipynb
+def _msg(
+    input_tokens: int | None = 0,
+    output_tokens: int | None = 0,
+    time_run: str | None = '',
+    is_exported: int | None = 0,
+    skipped: int | None = 0,
+    did: int | None = None,
+    i_collapsed: int | None = 0,
+    o_collapsed: int | None = 0,
+    header_collapsed: int | None = 0,
+    pinned: int | None = 0
+): ...
+
+# %% ../nbs/00_core.ipynb
+@delegates(_msg)
 def add_msg(
     content:str, # message that we are updating or adding before/after
     msg_type: str='note', # message type, can be 'code', 'note', or 'prompt'
-    output='', # for prompts/code, initial output
-    placement='add_after', # can be 'add_after', 'add_before', 'update', 'at_start', 'at_end'
-    msg_id:str=None # id of message that placement is relative to (if None, uses current message)
+    output:str='', # for prompts/code, initial output
+    placement:str='add_after', # can be 'add_after', 'add_before', 'update', 'at_start', 'at_end'
+    msg_id:str=None, # id of message that placement is relative to (if None, uses current message)
+    **kwargs # additional Message fields such as skipped i/o_collapsed, etc, passed through to the server
 ):
     "Add/update a message to the queue to show after code execution completes."
     assert msg_type in ('note', 'code', 'prompt'), "msg_type must be 'code', 'note', or 'prompt'."
-    kwargs = dict(content=content, msg_type=msg_type, output=output, placement=placement)
-    if msg_id: kwargs['msg_id']=msg_id
-    run_cmd('add_msg', **kwargs)
+    run_cmd('add_msg', content=content, msg_type=msg_type, output=output, placement=placement, msg_id=msg_id, **kwargs)
 
 # %% ../nbs/00_core.ipynb
-def update_msg(msg:dict):
+def update_msg(msg: dict):
     "Update an existing message in the dialog."
-    if not isinstance(msg,dict): msg = asdict(msg)
-    add_msg(content=msg['content'], msg_type=msg['msg_type'], output=msg['output'], placement='update', msg_id=msg['id'])
+    if not isinstance(msg, dict): msg = asdict(msg)
+    exclude = {'id', 'content', 'msg_type', 'output'} # explicit args
+    kw = {k: v for k, v in msg.items() if k not in exclude}
+    add_msg(content=msg['content'], msg_type=msg['msg_type'], output=msg['output'],
+            placement='update', msg_id=msg['id'], **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)
 
 # %% ../nbs/00_core.ipynb
 def load_gist(gist_id:str):

{dialoghelper-0.0.2 → dialoghelper-0.0.4/dialoghelper.egg-info}/PKG-INFO

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

{dialoghelper-0.0.2 → dialoghelper-0.0.4}/settings.ini

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

dialoghelper-0.0.2/dialoghelper/__init__.py

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