dialoghelper 0.0.28__py3-none-any.whl → 0.0.30__py3-none-any.whl

dialoghelper/__init__.py

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

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/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/experimental.py

@@ -6,22 +6,22 @@
 __all__ = ['iife', 'load_screenshot_js', 'start_screen_share', 'stop_screen_share', 'capture_screen']
 
 # %% ../nbs/01_experimental.ipynb
+import uuid,json
 from importlib import resources
-import uuid
-from fasthtml.common import Div, Script
-import json
+from fasthtml.common import Div,Script
 from claudette import ToolResult
 from .core import *
 from httpx import post as xpost
 
 # %% ../nbs/01_experimental.ipynb
-def _pop_data(data_id, timeout=20, condition=None, fail_msg = "`_pop_data` failed to return a value."):
-  result = xpost('http://localhost:5001/pop_data_blocking_', data={'data_id': data_id}, timeout=timeout)
-  if result.status_code == 200 and result.text.strip():
-      try:
-        if (data := result.json()) and (not condition or condition(data)): return data
-      except json.JSONDecodeError as e: print(f"JSON decode error: {e}")
-  raise RuntimeError(fail_msg)
+def _pop_data(data_id, timeout=20):
+    params = {'data_id': data_id, 'timeout':timeout}
+    result = xpost('http://localhost:5001/pop_data_blocking_', data=params, timeout=timeout+1)
+    if result.status_code==200 and result.text.strip():
+        if (data := result.json()): return data
+#         except json.JSONDecodeError as e: print(f"JSON decode error: {e}")
+        raise RuntimeError("No data received")
+    raise RuntimeError(result.status_code)
 
 # %% ../nbs/01_experimental.ipynb
 def iife(code: str) -> str:
@@ -40,13 +40,14 @@ def load_screenshot_js(force=False, timeout=5):
     "Load screenshot capability and wait for confirmation it's ready."
     global _js_loaded
     if _js_loaded and not force: return
-    print("Loading screenshot.js ...")
+#     print("Loading screenshot.js ...")
     status_id = str(uuid.uuid4())
-    js_content = (resources.files('dialoghelper') / 'screenshot.js').read_text()    
+    js_content = (resources.files('dialoghelper')/'screenshot.js').read_text()    
     iife(js_content + f'sendDataToServer("{status_id}", {{"js_status": "ready"}});')
-    data = _pop_data(status_id, timeout, condition=lambda d: d.get('js_status') == 'ready', fail_msg="Failed to load screenshot.js.")
+    data = _pop_data(status_id, timeout)
+    if (stat:=data.get('js_status'))!='ready': raise RuntimeError(f"Failed to load screenshot.js: {stat}")
     _js_loaded = True
-    print("Screenshot.js loaded and ready")        
+#     print("Screenshot.js loaded and ready")        
 
 # %% ../nbs/01_experimental.ipynb
 _screen_share_active = False
@@ -57,23 +58,23 @@ def start_screen_share(timeout=45):
     load_screenshot_js()
     status_id = str(uuid.uuid4())
     iife(f'startPersistentScreenShare("{status_id}");')
-    print("Requesting screen share permission ...")
-    data = _pop_data(status_id, timeout, condition=lambda d: d.get('js_status') == 'ready', fail_msg="Screen share failed.")
+#     print("Requesting screen share permission ...")
+    data = _pop_data(status_id, timeout)
     js_status = data.get('js_status')
-    if js_status == 'ready':
+    if js_status=='ready':
         _screen_share_active = True
-        print("Screen share started successfully.")
-    elif js_status == 'error': raise RuntimeError(f"Screen share failed: {data.get('error', 'Unknown error')}")
-    elif js_status == 'connecting': raise RuntimeError("Screen share timed out after {timeout} seconds.")
+#         print("Screen share started successfully.")
+    elif js_status=='error': raise RuntimeError(f"Screen share failed: {data.get('error', 'Unknown error')}")
+    elif js_status=='connecting': raise RuntimeError("Screen share timed out after {timeout} seconds.")
 
 # %% ../nbs/01_experimental.ipynb
 def stop_screen_share():
-  "Stop persistent screen sharing session."
-  global _screen_share_active
-  load_screenshot_js()
-  iife('stopPersistentScreenShare();')
-  _screen_share_active = False
-  print("Screen share stopped.")
+    "Stop persistent screen sharing session."
+    global _screen_share_active
+    load_screenshot_js()
+    iife('stopPersistentScreenShare();')
+    _screen_share_active = False
+#     print("Screen share stopped.")
 
 # %% ../nbs/01_experimental.ipynb
 def capture_screen():
@@ -81,13 +82,15 @@ def capture_screen():
     global _screen_share_active
     load_screenshot_js()
     if not _screen_share_active:
-        print("🔄 No active screen share, starting one...")
+#         print("🔄 No active screen share, starting one...")
         result = start_screen_share()
         if not _screen_share_active: raise RuntimeError(f"Failed to start screen share: {result}")
     data_id = str(uuid.uuid4())
     screenshot_code = f'captureScreenFromStream("{data_id}");'
-    print("📸 Capturing from persistent stream...")
+#     print("📸 Capturing from persistent stream...")
     iife(screenshot_code)
-    data = _pop_data(data_id, timeout=5, condition=lambda d: 'img_data' in d and 'img_type' in d, fail_msg="Screenshot capture failed, failed to retrieve data.")
+    data = _pop_data(data_id, timeout=45)
     if 'error' in data: raise RuntimeError(f"Screenshot failed: {data['error']}")
+    if not ('img_data' in data and 'img_type' in data):
+        raise RuntimeError("Screenshot capture failed, failed to retrieve data.")
     return ToolResult(data=data['img_data'], result_type=data['img_type'])

{dialoghelper-0.0.28.dist-info → dialoghelper-0.0.30.dist-info}/METADATA

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

dialoghelper-0.0.30.dist-info/RECORD

@@ -0,0 +1,12 @@
+dialoghelper/__init__.py,sha256=Y4J_58Un2NkktVq246vbfUB1fr9alL7LxlQNIsZE5ec,43
+dialoghelper/_modidx.py,sha256=Au4FWcKVoSRyKPwVeiqCCKTL8cZ2vGPnjgk4FQfMlyg,4273
+dialoghelper/core.py,sha256=c7wGjFYucWTCDfOYGex3QX728elUdqGR34FfxsspvsA,12319
+dialoghelper/db_dc.py,sha256=mi2Q2am_SoAPGpNQg7KPFS5pR9WEapRXT8ypkNmMfw0,2330
+dialoghelper/experimental.py,sha256=yTXzyY37MPW-9mqzbem-q6CCPXElN0GwAyOK-iJofMY,3910
+dialoghelper/screenshot.js,sha256=DDqlRhemwj8I0AloxMJBnBqDDIqu5knlT1lpG_0rphI,4851
+dialoghelper-0.0.30.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dialoghelper-0.0.30.dist-info/METADATA,sha256=PhB6_-rVkKRmbPunN35xi7qJpZ1HeS7BQkjOXCGQpcY,2637
+dialoghelper-0.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dialoghelper-0.0.30.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
+dialoghelper-0.0.30.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
+dialoghelper-0.0.30.dist-info/RECORD,,

dialoghelper-0.0.28.dist-info/RECORD

@@ -1,12 +0,0 @@
-dialoghelper/__init__.py,sha256=8HrOWQMlI7GHrSa28WqtbTcHFu77JS0jXiRiXl5fL54,43
-dialoghelper/_modidx.py,sha256=haFiPtlNF3j0tsHG-ODfyiy85H1OTbbdjR3ojhP6K4U,4156
-dialoghelper/core.py,sha256=U9FvC8ZR6-v7X_PoP-D2etYrZX_Agzed5xpyNFL6a-8,11160
-dialoghelper/db_dc.py,sha256=mi2Q2am_SoAPGpNQg7KPFS5pR9WEapRXT8ypkNmMfw0,2330
-dialoghelper/experimental.py,sha256=7kUcsYRMd30A1QSE1chyGgnREFrvCmmT5ZJM9Pg5oQY,3964
-dialoghelper/screenshot.js,sha256=DDqlRhemwj8I0AloxMJBnBqDDIqu5knlT1lpG_0rphI,4851
-dialoghelper-0.0.28.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dialoghelper-0.0.28.dist-info/METADATA,sha256=z0v8195A4JF4fADbNVe7JYR3J8fo6NDmYcbpwAqumec,2637
-dialoghelper-0.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dialoghelper-0.0.28.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
-dialoghelper-0.0.28.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
-dialoghelper-0.0.28.dist-info/RECORD,,