dialoghelper 0.0.23__py3-none-any.whl → 0.0.37__py3-none-any.whl

dialoghelper/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.0.23"
+__version__ = "0.0.37"
 from .core import *

dialoghelper/_modidx.py

@@ -6,12 +6,18 @@ 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._find_frame_dict': ('core.html#_find_frame_dict', '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.add_styles': ('core.html#add_styles', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.ast_grep': ('core.html#ast_grep', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.ast_py': ('core.html#ast_py', 'dialoghelper/core.py'),
                                    '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.fc_tool_info': ('core.html#fc_tool_info', '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'),
@@ -22,13 +28,19 @@ d = { 'settings': { 'branch': 'main',
                                    '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.msg_insert_line': ('core.html#msg_insert_line', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.msg_replace_lines': ('core.html#msg_replace_lines', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.msg_str_replace': ('core.html#msg_str_replace', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.msg_strs_replace': ('core.html#msg_strs_replace', 'dialoghelper/core.py'),
                                    'dialoghelper.core.read_msg': ('core.html#read_msg', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.run_msg': ('core.html#run_msg', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.set_var': ('core.html#set_var', '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.core.update_msg': ('core.html#update_msg', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.url2note': ('core.html#url2note', 'dialoghelper/core.py')},
             'dialoghelper.db_dc': {},
-            'dialoghelper.experimental': { 'dialoghelper.experimental._load_screenshot_js': ( 'experimental.html#_load_screenshot_js',
-                                                                                              'dialoghelper/experimental.py'),
-                                           'dialoghelper.experimental.capture_screen': ( 'experimental.html#capture_screen',
+            'dialoghelper.experimental': { 'dialoghelper.experimental.capture_screen': ( 'experimental.html#capture_screen',
                                                                                          'dialoghelper/experimental.py'),
-                                           'dialoghelper.experimental.create_iife': ( 'experimental.html#create_iife',
+                                           'dialoghelper.experimental.iife': ('experimental.html#iife', 'dialoghelper/experimental.py'),
+                                           'dialoghelper.experimental.start_share': ( 'experimental.html#start_share',
                                                                                       'dialoghelper/experimental.py')}}}

dialoghelper/core.py

@@ -1,12 +1,14 @@
 # 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', 'add_msg', 'update_msg', 'load_gist', 'gist_file', 'import_string', 'is_usable_tool',
-           'mk_toollist', 'import_gist', 'tool_info', 'asdict']
+__all__ = ['md_cls_d', 'dh_settings', 'Placements', 'empty', 'add_styles', 'find_var', 'set_var', 'call_endp', 'find_dname',
+           'find_msg_id', 'curr_dialog', 'msg_idx', 'find_msgs', 'add_html', 'read_msg', 'add_msg', 'del_msg',
+           'update_msg', 'run_msg', 'url2note', 'ast_py', 'ast_grep', 'msg_insert_line', 'msg_str_replace',
+           'msg_strs_replace', 'msg_replace_lines', 'load_gist', 'gist_file', 'import_string', 'is_usable_tool',
+           'mk_toollist', 'import_gist', 'tool_info', 'fc_tool_info']
 
 # %% ../nbs/00_core.ipynb
-import json, importlib, linecache
+import json,importlib,linecache,re,inspect
 from typing import Dict
 from tempfile import TemporaryDirectory
 from ipykernel_helper import *
@@ -20,87 +22,128 @@ 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
+from monsterui.all import franken_class_map,apply_classes
+from fasthtml.common import Safe
 
 # %% ../nbs/00_core.ipynb
-_all_ = ["asdict"]
+md_cls_d = {
+    **{f'h{i}': f'uk-h{i}' for i in range(1,5)},
+    'a': "uk-link",
+    'blockquote': "uk-blockquote",
+    'hr':'uk-divider-icon',
+    'table':'uk-table uk-table-sm uk-table-middle uk-table-divider border [&_tr]:divide-x w-[80%] mx-auto',
+    'ol': 'uk-list uk-list-decimal space-y-0', 
+    'ul': 'uk-list uk-list-bullet space-y-0',
+    'p': 'leading-tight',
+    'li': 'leading-tight',
+    'pre': '', 'pre code': '',
+    'code': 'tracking-tight'
+}
+
+def add_styles(s:str, cls_map:dict=None):
+    "Add solveit styles to `s`"
+    return Safe(apply_classes(s, class_map=cls_map or md_cls_d))
 
 # %% ../nbs/00_core.ipynb
-def find_var(var:str):
-    "Search for var in all frames of the call stack"
-    frame = currentframe()
+def _find_frame_dict(var:str):
+    "Find the dict (globals or locals) containing var"
+    frame = currentframe().f_back.f_back
     while frame:
-        dv = frame.f_globals.get(var, frame.f_locals.get(var, None))
-        if dv: return dv
+        if var in frame.f_globals: return frame.f_globals
         frame = frame.f_back
     raise ValueError(f"Could not find {var} in any scope")
 
-# %% ../nbs/00_core.ipynb
-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
+def find_var(var:str):
+    "Search for var in all frames of the call stack"
+    return _find_frame_dict(var)[var]
+    
+def set_var(var:str, val):
+    "Set var to val after finding it in all frames of the call stack"
+    _find_frame_dict(var)[var] = val
 
 # %% ../nbs/00_core.ipynb
-def curr_dialog(
-    with_messages:bool=False  # Include messages as well?
-):
-    "Get the current dialog info."
-    return call_endp('curr_dialog_', json=True, with_messages=with_messages)
+dh_settings = {'port':5001}
+
+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:{dh_settings["port"]}/{path}', data=data)
+    if raiseex: res.raise_for_status()
+    try: return res.json() if json else res.text
+    except Exception as e: return str(e)
 
 # %% ../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?
-):
-    "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
+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?
+    dname:str='' # Running dialog to get info for; defaults to current dialog
+):
+    "Get the current dialog info."
+    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 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)?
-    ):
-    "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']
+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?
+    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_', 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 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 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`."
-    call_endp('rm_msg_', raiseex=True, msid=msgid)
+Placements = str_enum('Placements', 'add_after', 'add_before', 'at_start', 'at_end')
 
 # %% ../nbs/00_core.ipynb
-Placements = str_enum('Placements', 'add_after', 'add_before', 'at_start', 'at_end')
+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)?
+    msgid:str=None,  # Message id to find (defaults to current message)
+    view_range:list[int,int]=None, # Optional 1-indexed (start, end) line range for files, end=-1 for EOF
+    nums:bool=False, # Whether to show line numbers
+    dname:str='' # Running dialog to get info for; defaults to current dialog
+    ):
+    """Get the message indexed in the current dialog.
+    - To get the exact message use `n=0` and `relative=True` together with `msgid`.
+    - To get a relative message use `n` (relative position index).
+    - To get the nth message use `n` with `relative=False`, e.g `n=0` first message, `n=-1` last message."""
+    if not msgid: msgid = find_msg_id()
+    data = dict(n=n, relative=relative, msgid=msgid)
+    if view_range: data['view_range'] = view_range # None gets converted to '' so we avoid passing it to use the p.default
+    if nums: data['nums'] = nums
+    return call_endp('read_msg_', dname, json=True, **data)
 
 # %% ../nbs/00_core.ipynb
 def add_msg(
@@ -116,13 +159,24 @@ 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,
+    res = call_endp(
+        '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)
+    set_var('__msg_id', res)
+    return res
+
+# %% ../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_', dname, raiseex=True, msid=msgid)
 
 # %% ../nbs/00_core.ipynb
 @delegates(add_msg)
@@ -131,13 +185,16 @@ def _add_msg_unsafe(
     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)
     run:bool=False, # For prompts, send it to the AI; for code, execute it (*DANGEROUS -- be careful of what you run!)
+    dname:str='', # Running dialog to get info for; defaults to current dialog
     **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"""
     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, run=run, **kwargs)
+    res = call_endp(
+        'add_relative_', dname, content=content, placement=placement, msgid=msgid, run=run, **kwargs)
+    set_var('__msg_id', res)
+    return res
 
 # %% ../nbs/00_core.ipynb
 def _umsg(
@@ -158,12 +215,93 @@ 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."""
+    - 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)
+    res = call_endp('add_relative_', dname, placement='update', msgid=msgid, **kwargs)
+    set_var('__msg_id', res)
+    return res
+
+# %% ../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_', dname, msgid=msgid, api=True)
+
+# %% ../nbs/00_core.ipynb
+def url2note(
+    url:str, # URL to read
+    extract_section:bool=True, # If url has an anchor, return only that section
+    selector:str=None # Select section(s) using BeautifulSoup.select (overrides extract_section)
+):
+    "Read URL as markdown, and add a note below current message with the result"
+    res = read_url(url, as_md=True, extract_section=extract_section, selector=selector)
+    return add_msg(res)
+
+# %% ../nbs/00_core.ipynb
+def ast_py(code:str):
+    "Get an SgRoot root node for python `code`"
+    from ast_grep_py import SgRoot
+    return SgRoot(code, "python").root()
+
+# %% ../nbs/00_core.ipynb
+def ast_grep(
+    pattern:str, # ast-grep pattern to search
+    path=".", # path to recursively search for files
+    lang="python" # language to search/scan
+):
+    "Use the `ast-grep` command to find `pattern` in `path`"
+    import json, subprocess
+    cmd = f"ast-grep --pattern '{pattern}' --lang {lang} --json=compact"
+    if path != ".": cmd = f"cd {path} && {cmd}"
+    res = subprocess.run(cmd, shell=True, capture_output=True, text=True)
+    return json.loads(res.stdout) if res.stdout else res.stderr
+
+# %% ../nbs/00_core.ipynb
+def msg_insert_line(
+    msgid:str,  # Message id to edit
+    insert_line: int, # The line number after which to insert the text (0 for beginning of file)
+    new_str: str, # The text to insert
+    dname:str='' # Running dialog to get info for; defaults to current dialog
+    ):
+    "Insert text at a specific line number in a message"
+    return call_endp('msg_insert_line_', dname, json=True, msgid=msgid, insert_line=insert_line, new_str=new_str)
+
+# %% ../nbs/00_core.ipynb
+def msg_str_replace(
+    msgid:str,  # Message id to edit
+    old_str: str, # Text to find and replace
+    new_str: str, # Text to replace with
+    dname:str='' # Running dialog to get info for; defaults to current dialog
+):
+    "Replace first occurrence of old_str with new_str in a message"
+    return call_endp('msg_str_replace_', dname, json=True, msgid=msgid, old_str=old_str, new_str=new_str)
+
+# %% ../nbs/00_core.ipynb
+def msg_strs_replace(
+    msgid:str,  # Message id to edit
+    old_strs:list[str], # List of strings to find and replace
+    new_strs:list[str], # List of replacement strings (must match length of old_strs)
+    dname:str='' # Running dialog to get info for; defaults to current dialog
+):
+    "Replace multiple strings simultaneously in a message"
+    return call_endp('msg_strs_replace_', dname, json=True, msgid=msgid, old_strs=old_strs, new_strs=new_strs)
+
+# %% ../nbs/00_core.ipynb
+def msg_replace_lines(
+    msgid:str,  # Message id to edit
+    start_line:int, # Starting line number to replace (1-based indexing)
+    end_line:int, # Ending line number to replace (1-based indexing, inclusive)
+    new_content:str, # New content to replace the specified lines
+    dname:str='' # Running dialog to get info for; defaults to current dialog
+):
+    "Replace a range of lines with new content in a message"
+    return call_endp('msg_replace_lines_', dname, json=True, msgid=msgid, start_line=start_line, end_line=end_line, new_content=new_content)
 
 # %% ../nbs/00_core.ipynb
 def load_gist(gist_id:str):
@@ -240,8 +378,33 @@ def tool_info():
 - &`add_html`: Send HTML to the browser to be swapped into the DOM using hx-swap-oob.
 - &`find_msg_id`: Get the current message id.
 - &`find_msgs`: Find messages in current specific dialog that contain the given information.
+  - (solveit can often get this id directly from its context, and will not need to use this if the required information is already available to it.)
 - &`read_msg`: Get the message indexed in the current dialog.
+  - To get the exact message use `n=0` and `relative=True` together with `msgid`.
+  - To get a relative message use `n` (relative position index).
+  - To get the nth message use `n` with `relative=False`, e.g `n=0` first message, `n=-1` last message.
 - &`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.'''
+- &`update_msg`: Update an existing message.
+- &`url2note`: Read URL as markdown, and add a note below current message with the result
+- &`msg_insert_line`: Insert text at a specific location in a message.
+- &`msg_str_replace`: Find and replace text in a message.
+- &`msg_strs_replace`: Find and replace multiple strings in a message.
+- &`msg_replace_lines`: Replace a range of lines in a message with new content.
+  - Always first use `read_msg( msgid=msgid, n=0, relative=True, nums=True)` to view the content with line numbers.'''
+    add_msg(cts)
+
+# %% ../nbs/00_core.ipynb
+def fc_tool_info():
+    cts='''Tools available from `fastcore.tools`:
+
+- &`rg`: Run the `rg` command with the args in `argstr` (no need to backslash escape)
+- &`sed`: Run the `sed` command with the args in `argstr` (e.g for reading a section of a file)
+- &`view`: View directory or file contents with optional line range and numbers
+- &`create`: Creates a new file with the given content at the specified path
+- &`insert`: Insert new_str at specified line number
+- &`str_replace`: Replace first occurrence of old_str with new_str in file
+- &`strs_replace`: Replace for each str pair in old_strs,new_strs
+- &`replace_lines`: Replace lines in file using start and end line-numbers'''
     add_msg(cts)
+    add_msg('from fastcore.tools import *', msg_type='code')

dialoghelper/experimental.py

@@ -3,66 +3,39 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_experimental.ipynb.
 
 # %% auto 0
-__all__ = ['create_iife', 'capture_screen']
+__all__ = ['iife', 'start_share', 'capture_screen']
 
 # %% ../nbs/01_experimental.ipynb
-from importlib import resources
-import uuid
-from fasthtml.common import Div, Script
-from time import sleep
-import base64
-import json
-import time
-from claudette import ToolResult
 from .core import *
-from dataclasses import dataclass
-from httpx import get as xget, post as xpost
-
-# %% ../nbs/01_experimental.ipynb
-_js_loaded = False
+from fastcore.all import *
+from fasthtml.common import Div,Script
+from httpx import post as xpost
+from importlib import resources
+from lisette.core import *
 
-def _load_screenshot_js():
-    "Load screenshot capability if not already present."
-    global _js_loaded
-    if _js_loaded:
-        print("screenshot.js already loaded")
-        return
-    js_content = (resources.files('dialoghelper') / 'screenshot.js').read_text()
-    add_html(Div(Script(js_content), hx_swap_oob='beforeend:#js-script'))
-    print("Added screenshot.js")
-    _js_loaded = True
+import base64,json,uuid,time
 
 # %% ../nbs/01_experimental.ipynb
-def create_iife(code: str) -> str:
-    "Wrap javascript code string in an IIFE"
-    return f'''
+def iife(code: str) -> str:
+    "Wrap javascript code string in an IIFE and execute it via `add_html`"
+    trigger_script = f'''
 (async () => {{
 {code}
 }})();
 '''
+    add_html(Div(Script(trigger_script), hx_swap_oob=f'beforeend:#js-script'))
+
+# %% ../nbs/01_experimental.ipynb
+def start_share():
+    iife((resources.files('dialoghelper')/'screenshot.js').read_text())
+    iife('await setupVideoStream();')
 
 # %% ../nbs/01_experimental.ipynb
 def capture_screen():
-    "Capture current desktop returning the screenshot as a ToolImageResult."
-    _load_screenshot_js()        
-    data_id = str(uuid.uuid4())  # Generate random ID for data communication
-    screenshot_code = f'captureScreenAndUpload("{data_id}");'
-    trigger_script = create_iife(screenshot_code)
-    add_html(Div(Script(trigger_script), hx_swap_oob=f'beforeend:#js-script'))
-    max_attempts = 50
-    for attempt in range(max_attempts):
-        result = xpost('http://localhost:5001/pop_data_', data={'data_id': data_id})
-        if result.status_code == 200:
-            try:
-                if not result.text.strip():
-                    time.sleep(0.5)
-                    continue
-                data = result.json() # data is a dict
-                if 'error' in data: return f"Screenshot failed: {data['error']}"
-                if 'img_data' in data and 'img_type' in data:
-                    return ToolResult(data=data['img_data'], result_type=data['img_type'])
-                return f"Screenshot data incomplete: {data}"
-            except json.JSONDecodeError as e: print(f"JSON decode error: {e}, Raw text: '{result.text}'")
-            except Exception as e: print(f"Error processing screenshot data: {e}")
-        time.sleep(0.5)
-    return "Screenshot capture timed out"
+    'Capture screenshot, automatically starting screen share if needed.'
+    idx = uuid.uuid4()
+    iife(f"pushData('{idx}', {{img_data: await getScreenshot()}});")
+    time.sleep(0.5)
+    d = dict2obj(xpost('http://localhost:5001/pop_data_blocking_', data={'data_id': idx}).json())
+    if 'img_data' in d: return ToolResponse([{'type': 'image_url', 'image_url': d.img_data}])
+    else: return f'Capture failed: {d.error}'

dialoghelper/screenshot.js

@@ -0,0 +1,33 @@
+async function setupVideoStream() {
+    vstream = await navigator.mediaDevices.getDisplayMedia();
+    window.vtrack = vstream.getVideoTracks()[0];
+}
+
+async function getScreenshot(maxWidth = 1280, maxHeight = 1024) {
+    if (window?.vtrack) {
+        const cap = new ImageCapture(window.vtrack);
+        const img = await cap.grabFrame();
+        // rescale and convert to b64
+        const scaleX = maxWidth / img.width;
+        const scaleY = maxHeight / img.height;
+        const scale = Math.min(scaleX, scaleY, 1); // don't upscale
+        const newWidth = Math.floor(img.width * scale);
+        const newHeight = Math.floor(img.height * scale);
+        const c = document.createElement('canvas');
+        c.width = newWidth; c.height = newHeight;
+        c.getContext('2d').drawImage(img, 0, 0, newWidth, newHeight);
+        return c.toDataURL();
+    }
+}
+
+function pushData(dataId, data) {
+    return fetch('/push_data_blocking_', {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json'},
+        body: JSON.stringify({data_id: dataId, ...data})
+    });
+}
+
+window.setupVideoStream = setupVideoStream;
+window.getScreenshot = getScreenshot;
+window.pushData = pushData;

{dialoghelper-0.0.23.dist-info → dialoghelper-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dialoghelper
-Version: 0.0.23
+Version: 0.0.37
 Summary: Helper functions for solveit dialogs
 Home-page: https://github.com/AnswerDotAI/dialoghelper
 Author: Jeremy Howard
@@ -18,12 +18,17 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastcore>=1.8.5
+Requires-Dist: fastcore>=1.8.10
 Requires-Dist: fastlite
 Requires-Dist: ghapi
 Requires-Dist: ipykernel-helper
 Requires-Dist: claudette
+Requires-Dist: ast-grep-cli
+Requires-Dist: ast-grep-py
+Requires-Dist: MonsterUI
+Requires-Dist: lisette>=0.0.13
 Provides-Extra: dev
+Requires-Dist: python-fasthtml; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

dialoghelper-0.0.37.dist-info/RECORD

@@ -0,0 +1,12 @@
+dialoghelper/__init__.py,sha256=38YNAJyeXf7hteiqxTtdpbcKxmqYNHn5TJE6Yfg5Ks4,43
+dialoghelper/_modidx.py,sha256=a_9jKSOoEZsMp0piUBSKFNxtbGt9XMWnRoPhUaK4jls,4832
+dialoghelper/core.py,sha256=Kc5T6tpaGimEYt3dqi9lY2XiAVCMVRrqdGrAvGsNsxc,18867
+dialoghelper/db_dc.py,sha256=mi2Q2am_SoAPGpNQg7KPFS5pR9WEapRXT8ypkNmMfw0,2330
+dialoghelper/experimental.py,sha256=k-vCuRzzWYrKCg-zi_EJmUPp40s_O3ji3eF1Bn27YGE,1351
+dialoghelper/screenshot.js,sha256=nzmnO3bon1d_6pvgGOUY-EQb_IlqCA8_X5vx7JT_M5M,1194
+dialoghelper-0.0.37.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dialoghelper-0.0.37.dist-info/METADATA,sha256=QaYuRY5KHLblAlH47AFW7j6BIRbBl69PxdqH3Hixf_A,2749
+dialoghelper-0.0.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dialoghelper-0.0.37.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
+dialoghelper-0.0.37.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
+dialoghelper-0.0.37.dist-info/RECORD,,

dialoghelper-0.0.23.dist-info/RECORD

@@ -1,11 +0,0 @@
-dialoghelper/__init__.py,sha256=AqD8emlypM0LZM9Km2Wj1qvaXCNpm0U46JDDXPEy5d8,43
-dialoghelper/_modidx.py,sha256=dqZjsj-FkFgiTcIeiCB7rSCpUzStGILPMqC0NRt4jO4,3402
-dialoghelper/core.py,sha256=3zWfyFZPDkzHVIh2sjI4PESpezXhOKMnWNqOJ1zXXBA,10859
-dialoghelper/db_dc.py,sha256=mi2Q2am_SoAPGpNQg7KPFS5pR9WEapRXT8ypkNmMfw0,2330
-dialoghelper/experimental.py,sha256=6tDnbY3JBA8MLdzMZ18uCHnT5BapgzH61sGxfUt8HQ8,2459
-dialoghelper-0.0.23.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dialoghelper-0.0.23.dist-info/METADATA,sha256=wQW5EBgPIq4cQbqNn7EqZ2Qm8nv4VxgAwUUEXvwRnbk,2590
-dialoghelper-0.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dialoghelper-0.0.23.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
-dialoghelper-0.0.23.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
-dialoghelper-0.0.23.dist-info/RECORD,,