dialoghelper 0.0.29__tar.gz → 0.0.30__tar.gz

{dialoghelper-0.0.29/dialoghelper.egg-info → dialoghelper-0.0.30}/PKG-INFO

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

dialoghelper-0.0.30/dialoghelper/__init__.py

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

{dialoghelper-0.0.29 → dialoghelper-0.0.30}/dialoghelper/_modidx.py

@@ -12,6 +12,7 @@ d = { 'settings': { 'branch': 'main',
                                    'dialoghelper.core.call_endp': ('core.html#call_endp', 'dialoghelper/core.py'),
                                    'dialoghelper.core.curr_dialog': ('core.html#curr_dialog', 'dialoghelper/core.py'),
                                    'dialoghelper.core.del_msg': ('core.html#del_msg', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.find_dname': ('core.html#find_dname', '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-0.0.29 → dialoghelper-0.0.30}/dialoghelper/core.py

@@ -1,9 +1,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
-__all__ = ['Placements', 'empty', 'find_var', 'call_endp', 'curr_dialog', 'find_msgs', 'find_msg_id', 'msg_idx', 'read_msg',
-           'add_html', 'del_msg', 'run_msg', 'add_msg', 'update_msg', 'load_gist', 'gist_file', 'import_string',
-           'is_usable_tool', 'mk_toollist', 'import_gist', 'tool_info', 'asdict']
+__all__ = ['Placements', 'empty', 'find_var', 'call_endp', 'find_dname', 'find_msg_id', 'curr_dialog', 'find_msgs', 'msg_idx',
+           'read_msg', 'add_html', 'del_msg', 'run_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
@@ -37,74 +37,90 @@ def find_var(var:str):
     raise ValueError(f"Could not find {var} in any scope")
 
 # %% ../nbs/00_core.ipynb
-def call_endp(path, json=False, raiseex=False, **data):
+def call_endp(path, dname='', json=False, raiseex=False, **data):
+    if not dname: dname = find_dname()
+    data['dlg_name'] = dname
     res = xpost(f'http://localhost:5001/{path}', data=data)
     if raiseex: res.raise_for_status()
-    return res.json() if json else res.text
+    try: return res.json() if json else res.text
+    except Exception as e: return str(e)
+
+# %% ../nbs/00_core.ipynb
+def find_dname():
+    "Get the message id by searching the call stack for __dialog_id."
+    return find_var('__dialog_name')
+
+# %% ../nbs/00_core.ipynb
+def find_msg_id():
+    "Get the message id by searching the call stack for __dialog_id."
+    return find_var('__msg_id')
 
 # %% ../nbs/00_core.ipynb
 def curr_dialog(
-    with_messages:bool=False  # Include messages as well?
+    with_messages:bool=False,  # Include messages as well?
+    dname:str='' # Running dialog to get info for; defaults to current dialog
 ):
     "Get the current dialog info."
-    return call_endp('curr_dialog_', json=True, with_messages=with_messages)
+    res = call_endp('curr_dialog_', dname, json=True, with_messages=with_messages)
+    if res: return {'name': res['name'], 'mode': res['mode']}
 
 # %% ../nbs/00_core.ipynb
 def find_msgs(
     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?
+    include_output:bool=True, # Include output in returned dict?
+    dname:str='' # Running dialog to get info for; defaults to current dialog
 ):
     "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']
+    res = call_endp('find_msgs_', dname, 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
 
-# %% ../nbs/00_core.ipynb
-def find_msg_id():
-    "Get the message id by searching the call stack for __dialog_id."
-    return find_var('__msg_id')
-
 # %% ../nbs/00_core.ipynb
 def msg_idx(
     msgid=None,  # Message id to find (defaults to current message)
+    dname:str='' # Running dialog to get info for; defaults to current dialog
 ):
     "Get absolute index of message in dialog."
     if not msgid: msgid = find_msg_id()
-    return call_endp('msg_idx_', json=True, msgid=msgid)['msgid']
+    return call_endp('msg_idx_', dname, json=True, msgid=msgid)['msgid']
 
 # %% ../nbs/00_core.ipynb
 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)?
+    relative:bool=True,  # Is `n` relative to current message (True) or absolute (False)?
+    dname:str='' # Running dialog to get info for; defaults to current dialog
     ):
     "Get the `Message` object indexed in the current dialog."
     if not msgid: msgid = find_msg_id()
-    return call_endp('read_msg_', json=True, msgid=msgid, n=n, relative=relative)['msg']
+    return call_endp('read_msg_', dname, 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)
+    dname:str='' # Running dialog to get info for; defaults to current dialog
 ):
     "Send HTML to the browser to be swapped into the DOM"
-    call_endp('add_html_', content=to_xml(content))
+    call_endp('add_html_', dname, content=to_xml(content))
 
 # %% ../nbs/00_core.ipynb
 def del_msg(
     msgid:str=None, # id of message to delete
+    dname:str='' # Running dialog to get info for; defaults to current dialog
 ):
     "Delete a message from the dialog."
-    call_endp('rm_msg_', raiseex=True, msid=msgid)
+    call_endp('rm_msg_', dname, raiseex=True, msid=msgid)
 
 # %% ../nbs/00_core.ipynb
 def run_msg(
     msgid:str=None, # id of message to execute
+    dname:str='' # Running dialog to get info for; defaults to current dialog
 ):
     "Adds a message to the run queue. Use read_msg to see the output once it runs."
-    return call_endp('add_runq_', msgid=msgid, api=True)
+    return call_endp('add_runq_', dname, msgid=msgid, api=True)
 
 # %% ../nbs/00_core.ipynb
 Placements = str_enum('Placements', 'add_after', 'add_before', 'at_start', 'at_end')
@@ -123,11 +139,12 @@ def add_msg(
     o_collapsed: int | None = 0, # Collapse output?
     heading_collapsed: int | None = 0, # Collapse heading section?
     pinned: int | None = 0, # Pin to context?
+    dname:str='' # Running dialog to get info for; defaults to current dialog
 ):
     "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,
+        'add_relative_', dname, 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)
 
@@ -143,8 +160,9 @@ def _add_msg_unsafe(
     """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"""
     if placement not in ('at_start','at_end') and not msgid: msgid = find_msg_id()
+    dname = kwargs.pop('dname')
     return call_endp(
-        'add_relative_', content=content, placement=placement, msgid=msgid, run=run, **kwargs)
+        'add_relative_', dname, content=content, placement=placement, msgid=msgid, run=run, **kwargs)
 
 # %% ../nbs/00_core.ipynb
 def _umsg(
@@ -165,12 +183,13 @@ def _umsg(
 def update_msg(
     msgid:str=None, # id of message to update (if None, uses current message)
     msg:Optional[Dict]=None, # Dictionary of field keys/values to update
+    dname:str='', # Running dialog to get info for; defaults to current dialog
     **kwargs):
     """Update an existing message. Provide either `msg` OR field key/values to update.
     Use `content` param to update contents.
     Only include parameters to update--missing ones will be left unchanged."""
     if not msgid and not msg: raise TypeError("update_msg needs either a dict message or `msgid=`")
-    return call_endp('add_relative_', placement='update', msgid=msgid, **kwargs)
+    return call_endp('add_relative_', dname, placement='update', msgid=msgid, **kwargs)
 
 # %% ../nbs/00_core.ipynb
 def load_gist(gist_id:str):

{dialoghelper-0.0.29 → dialoghelper-0.0.30/dialoghelper.egg-info}/PKG-INFO

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

{dialoghelper-0.0.29 → dialoghelper-0.0.30}/settings.ini

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

dialoghelper-0.0.29/dialoghelper/__init__.py

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