dialoghelper 0.0.30__tar.gz → 0.0.41__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dialoghelper
-Version: 0.0.30
+Version: 0.0.41
 Summary: Helper functions for solveit dialogs
 Home-page: https://github.com/AnswerDotAI/dialoghelper
 Author: Jeremy Howard
@@ -18,13 +18,18 @@ 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"
+Requires-Dist: pillow; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

dialoghelper-0.0.41/dialoghelper/__init__.py

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

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

@@ -5,37 +5,45 @@ 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_unsafe': ('core.html#_add_msg_unsafe', 'dialoghelper/core.py'),
+  'syms': { 'dialoghelper.capture': { 'dialoghelper.capture.capture_screen': ('capture.html#capture_screen', 'dialoghelper/capture.py'),
+                                      'dialoghelper.capture.capture_tool': ('capture.html#capture_tool', 'dialoghelper/capture.py'),
+                                      'dialoghelper.capture.setup_share': ('capture.html#setup_share', 'dialoghelper/capture.py'),
+                                      'dialoghelper.capture.start_share': ('capture.html#start_share', 'dialoghelper/capture.py')},
+            '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_scr': ('core.html#add_scr', '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'),
+                                   'dialoghelper.core.fire_event': ('core.html#fire_event', 'dialoghelper/core.py'),
                                    'dialoghelper.core.gist_file': ('core.html#gist_file', 'dialoghelper/core.py'),
+                                   'dialoghelper.core.iife': ('core.html#iife', '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'),
                                    '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.pop_data': ('core.html#pop_data', '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.db_dc': {},
-            'dialoghelper.experimental': { 'dialoghelper.experimental._pop_data': ( 'experimental.html#_pop_data',
-                                                                                    'dialoghelper/experimental.py'),
-                                           'dialoghelper.experimental.capture_screen': ( 'experimental.html#capture_screen',
-                                                                                         'dialoghelper/experimental.py'),
-                                           'dialoghelper.experimental.iife': ('experimental.html#iife', 'dialoghelper/experimental.py'),
-                                           'dialoghelper.experimental.load_screenshot_js': ( 'experimental.html#load_screenshot_js',
-                                                                                             'dialoghelper/experimental.py'),
-                                           'dialoghelper.experimental.start_screen_share': ( 'experimental.html#start_screen_share',
-                                                                                             'dialoghelper/experimental.py'),
-                                           'dialoghelper.experimental.stop_screen_share': ( 'experimental.html#stop_screen_share',
-                                                                                            'dialoghelper/experimental.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-0.0.41/dialoghelper/capture.py

@@ -0,0 +1,42 @@
+"""Screen Capture."""
+
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_capture.ipynb.
+
+# %% auto 0
+__all__ = ['setup_share', 'start_share', 'capture_screen', 'capture_tool']
+
+# %% ../nbs/01_capture.ipynb
+from .core import *
+from fastcore.all import *
+from fasthtml.common import Div,Script
+from httpx import post as xpost
+from importlib import resources
+from lisette.core import *
+
+import base64,json,time,uuid
+
+# %% ../nbs/01_capture.ipynb
+def setup_share():
+    "Setup screen sharing"
+    iife((resources.files('dialoghelper')/'screenshot.js').read_text())
+    add_scr(Div(id='share-screen', style='display:none;'))
+    add_scr(Div(id='capture-screen', style='display:none;'))
+
+# %% ../nbs/01_capture.ipynb
+def start_share(): fire_event('shareScreen', id='share-screen')
+
+# %% ../nbs/01_capture.ipynb
+def capture_screen(timeout=15):
+    "Capture the screen. Re-call this function to get the most recent screenshot, as needed. Use default timeout where possible"
+    idx = uuid.uuid4()
+    fire_event('captureScreen', 'share-screen', data={'idx': str(idx)})
+    d = pop_data(idx, timeout)
+    if 'img_data' in d: return d.img_data
+    else: raise Exception(f'Capture failed: {d.error}')
+
+# %% ../nbs/01_capture.ipynb
+def capture_tool(timeout:int=15):
+    "Capture the screen. Re-call this function to get the most recent screenshot, as needed. Use default timeout where possible"
+    try: d = capture_screen(timeout)
+    except Exception as e: return f'Capture failed: {e}'
+    return ToolResponse([{'type': 'image_url', 'image_url': d}])

{dialoghelper-0.0.30 → dialoghelper-0.0.41}/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', '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']
+__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', 'add_scr', 'iife', 'pop_data', 'fire_event', '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,27 +22,53 @@ 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,Script,Div
 
 # %% ../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")
 
+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
+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:5001/{path}', data=data)
+    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)
@@ -52,7 +80,7 @@ def find_dname():
 
 # %% ../nbs/00_core.ipynb
 def find_msg_id():
-    "Get the message id by searching the call stack for __dialog_id."
+    "Get the message id by searching the call stack for __msg_id."
     return find_var('__msg_id')
 
 # %% ../nbs/00_core.ipynb
@@ -64,6 +92,41 @@ def curr_dialog(
     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_', dname, json=True, msgid=msgid)['msgid']
+
+# %% ../nbs/00_core.ipynb
+def add_scr(scr, oob='beforeend:#js-script'):
+    "Swap a script element to the end of the js-script element"
+    if isinstance(scr,str): scr = Script(scr)
+    add_html(Div(scr, hx_swap_oob=oob))
+
+# %% ../nbs/00_core.ipynb
+def iife(code: str) -> str:
+    "Wrap javascript code string in an IIFE and execute it via `add_html`"
+    add_scr(f'''
+(async () => {{
+{code}
+}})();
+''')
+
+# %% ../nbs/00_core.ipynb
+def pop_data(idx, timeout=15):
+    url = 'http://localhost:5001/pop_data_blocking_'
+    return dict2obj(xpost(url, data={'data_id': idx, 'timeout': timeout}).json())
+
+# %% ../nbs/00_core.ipynb
+def fire_event(evt:str, id, data=None):
+    params = f"'{evt}'"
+    if data is not None: params += f", {json.dumps(data)}"
+    add_html(Script(f"htmx.trigger(document.body, {params});", id=id, hx_swap_oob='true'))
+
 # %% ../nbs/00_core.ipynb
 def find_msgs(
     re_pattern:str='', # Optional regex to search for (re.DOTALL+re.MULTILINE is used)
@@ -78,26 +141,6 @@ def find_msgs(
         for o in res: o.pop('output', None)
     return res
 
-# %% ../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_', 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)?
-    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_', 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)
@@ -107,23 +150,26 @@ def add_html(
     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_', dname, raiseex=True, msid=msgid)
+Placements = str_enum('Placements', 'add_after', 'add_before', 'at_start', 'at_end')
 
 # %% ../nbs/00_core.ipynb
-def run_msg(
-    msgid:str=None, # id of message to execute
+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
-):
-    "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
-Placements = str_enum('Placements', 'add_after', 'add_before', 'at_start', 'at_end')
+    ):
+    """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 relative and 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(
@@ -131,7 +177,7 @@ def add_msg(
     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
+    output:str='', # Prompt/code output; Code outputs must be .ipynb-compatible JSON array
     time_run: str | None = '', # When was message executed
     is_exported: int | None = 0, # Export message to a module?
     skipped: int | None = 0, # Hide message from prompt?
@@ -143,10 +189,20 @@ def add_msg(
 ):
     "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(
+    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)
@@ -155,20 +211,22 @@ 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()
-    dname = kwargs.pop('dname')
-    return call_endp(
+    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(
     content:str|None=None, # Content of the message (i.e the message prompt, code, or note text)
     msg_type: str|None = None, # Message type, can be 'code', 'note', or 'prompt'
-    output:str|None = None, # For prompts/code, the output
+    output:str|None = None, # Prompt/code output; Code outputs must be .ipynb-compatible JSON array
     time_run: str | None = None, # When was message executed
     is_exported: int | None = None, # Export message to a module?
     skipped: int | None = None, # Hide message from prompt?
@@ -186,10 +244,90 @@ def update_msg(
     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_', dname, placement='update', msgid=msgid, **kwargs)
+    res = call_endp('update_msg_', dname, 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):
@@ -268,7 +406,31 @@ def tool_info():
 - &`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-0.0.41/dialoghelper/screenshot.js

@@ -0,0 +1,26 @@
+window.getScreenshot = async (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();
+    }
+}
+
+document.body.addEventListener('shareScreen', async (e) => {
+    vstream = await navigator.mediaDevices.getDisplayMedia();
+    window.vtrack = vstream.getVideoTracks()[0];
+});
+
+document.body.addEventListener('captureScreen', async (e) => {
+    pushData(e.detail.idx, {img_data: await getScreenshot()});
+});
+

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dialoghelper
-Version: 0.0.30
+Version: 0.0.41
 Summary: Helper functions for solveit dialogs
 Home-page: https://github.com/AnswerDotAI/dialoghelper
 Author: Jeremy Howard
@@ -18,13 +18,18 @@ 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"
+Requires-Dist: pillow; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{dialoghelper-0.0.30 → dialoghelper-0.0.41}/dialoghelper.egg-info/SOURCES.txt

@@ -6,9 +6,9 @@ settings.ini
 setup.py
 dialoghelper/__init__.py
 dialoghelper/_modidx.py
+dialoghelper/capture.py
 dialoghelper/core.py
 dialoghelper/db_dc.py
-dialoghelper/experimental.py
 dialoghelper/screenshot.js
 dialoghelper.egg-info/PKG-INFO
 dialoghelper.egg-info/SOURCES.txt

dialoghelper-0.0.41/dialoghelper.egg-info/requires.txt

@@ -0,0 +1,13 @@
+fastcore>=1.8.10
+fastlite
+ghapi
+ipykernel-helper
+claudette
+ast-grep-cli
+ast-grep-py
+MonsterUI
+lisette>=0.0.13
+
+[dev]
+python-fasthtml
+pillow

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

@@ -1,12 +1,12 @@
 [DEFAULT]
 repo = dialoghelper
 lib_name = dialoghelper
-version = 0.0.30
+version = 0.0.41
 min_python = 3.9
 license = apache2
 black_formatting = False
-requirements = fastcore>=1.8.5 fastlite ghapi ipykernel-helper claudette
-dev_requirements = python-fasthtml
+requirements = fastcore>=1.8.10 fastlite ghapi ipykernel-helper claudette ast-grep-cli ast-grep-py MonsterUI lisette>=0.0.13
+dev_requirements = python-fasthtml pillow
 doc_path = _docs
 lib_path = dialoghelper
 nbs_path = nbs

dialoghelper-0.0.30/dialoghelper/__init__.py

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

dialoghelper-0.0.30/dialoghelper/experimental.py

@@ -1,96 +0,0 @@
-"""Experimental `dialoghelper` capabilities."""
-
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_experimental.ipynb.
-
-# %% auto 0
-__all__ = ['iife', 'load_screenshot_js', 'start_screen_share', 'stop_screen_share', 'capture_screen']
-
-# %% ../nbs/01_experimental.ipynb
-import uuid,json
-from importlib import resources
-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):
-    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:
-    "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
-_js_loaded = False
-
-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 ...")
-    status_id = str(uuid.uuid4())
-    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)
-    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")        
-
-# %% ../nbs/01_experimental.ipynb
-_screen_share_active = False
-
-def start_screen_share(timeout=45):
-    "Start persistent screen sharing session, waiting for confirmation."
-    global _screen_share_active
-    load_screenshot_js()
-    status_id = str(uuid.uuid4())
-    iife(f'startPersistentScreenShare("{status_id}");')
-#     print("Requesting screen share permission ...")
-    data = _pop_data(status_id, timeout)
-    js_status = data.get('js_status')
-    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.")
-
-# %% ../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.")
-
-# %% ../nbs/01_experimental.ipynb
-def capture_screen():
-    "Capture screenshot, automatically starting screen share if needed."
-    global _screen_share_active
-    load_screenshot_js()
-    if not _screen_share_active:
-#         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...")
-    iife(screenshot_code)
-    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.30/dialoghelper/screenshot.js

@@ -1,129 +0,0 @@
-/**
- * Screenshot capture functionality for dialoghelper
- * Provides persistent screen sharing with HTTP polling for screenshots
- */
-
-let persistentStream = null;
-let streamStatus = "disconnected"; // 'disconnected', 'connecting', 'connected', 'error'
-
-function sendDataToServer(dataId, data) {
-    return fetch('/push_data_blocking_', {
-        method: 'POST',
-        headers: {'Content-Type': 'application/json'},
-        body: JSON.stringify({data_id: dataId, ...data})
-    });
-}
-
-async function streamToBlob(stream, maxWidth = 1280, maxHeight = 1024) {
-  return new Promise((resolve, reject) => {
-    const video = document.createElement("video");
-    video.srcObject = stream;
-    video.muted = true;
-    video.playsInline = true;
-    video.addEventListener("loadedmetadata", () => {
-      // Downscale to maxWidth x maxHeight using canvas
-      const videoWidth = video.videoWidth;
-      const videoHeight = video.videoHeight;
-      const scaleX = maxWidth / videoWidth;
-      const scaleY = maxHeight / videoHeight;
-      const scale = Math.min(scaleX, scaleY, 1); // don't upscale
-      const newWidth = Math.floor(videoWidth * scale);
-      const newHeight = Math.floor(videoHeight * scale);
-      const canvas = document.createElement("canvas");
-      canvas.width = newWidth;
-      canvas.height = newHeight;
-      const ctx = canvas.getContext("2d");
-      ctx.drawImage(video, 0, 0, newWidth, newHeight);
-      canvas.toBlob(resolve, "image/png");
-    });
-    video.addEventListener("error", reject);
-    video.play().catch(reject);
-  });
-}
-
-async function waitForGetDisplayMedia(timeout = 30000) {
-  const start = Date.now();
-  while (Date.now() - start < timeout) {
-    if (navigator.mediaDevices && navigator.mediaDevices.getDisplayMedia) { return true; }
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-  throw new Error("getDisplayMedia not available after timeout");
-}
-
-async function startPersistentScreenShare(statusId = null) {
-  try {
-    await waitForGetDisplayMedia();
-    persistentStream = await navigator.mediaDevices.getDisplayMedia({
-      video: { mediaSource: "screen", displaySurface: "monitor" }, audio: false,
-    });
-    persistentStream.getVideoTracks()[0].addEventListener("ended", () => {
-      console.log("Screen share ended by user");
-      stopPersistentScreenShare();
-    });
-    console.log("✅ Persistent screen share started");
-    if (statusId) { sendDataToServer(statusId, { js_status: "ready" }); }
-		streamStatus = "connected";
-    return { status: "success", message: "Screen share started" };
-  } catch (error) {
-    console.error("Failed to start persistent screen share:", error);
-    if (statusId) { sendDataToServer(statusId, { js_status: "error", error: error.message }); }
-    return { status: "error", message: error.message };
-  }
-}
-
-function stopPersistentScreenShare() {
-  if (persistentStream) {
-    persistentStream.getTracks().forEach((track) => track.stop());
-    persistentStream = null;
-  }
-  streamStatus = "disconnected";
-  console.log("🛑 Persistent screen share stopped");
-  return { status: "success", message: "Screen share stopped" };
-}
-
-function blobToBase64(blob) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onload = () => resolve(reader.result);
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-}
-
-async function processScreenshotBlob(blob, dataId) {
-  const base64String = await blobToBase64(blob);
-  const blob_type = blob.type || "image/png";
-  const b64data = base64String.split(",")[1]; // Remove the data URL prefix
-  return { 
-		data_id: dataId,
-		size: blob.size,
-		img_type: blob_type,
-		img_data: b64data,
-  };
-}
-
-async function captureScreenFromStream(dataId) {
-  console.log("Executing screenshot from persistent stream");
-  try {
-    if (!persistentStream || streamStatus !== "connected") {
-			console.log("Stream status:", streamStatus);
-			console.log("Persistent stream:", persistentStream);
-      throw new Error("No active screen share. Call startPersistentScreenShare() first.");
-    }
-    const blob = await streamToBlob(persistentStream);
-    const result = await processScreenshotBlob(blob, dataId);
-    console.log("Screenshot result:", result);
-    const pushResponse = await sendDataToServer(dataId, result)
-    if (pushResponse.ok) { console.log("✅ Screenshot data pushed to server"); }
-		else { console.log("❌ Failed to push screenshot data"); }
-  } catch (error) {
-    console.error("Screenshot error:", error);
-		sendDataToServer(dataId, { error: error.message });
-  }
-  console.log("Finished executing screenshot");
-}
-
-window.startPersistentScreenShare = startPersistentScreenShare;
-window.stopPersistentScreenShare = stopPersistentScreenShare;
-window.captureScreenFromStream = captureScreenFromStream;
-window.getStreamStatus = () => streamStatus;

dialoghelper-0.0.30/dialoghelper.egg-info/requires.txt

@@ -1,8 +0,0 @@
-fastcore>=1.8.5
-fastlite
-ghapi
-ipykernel-helper
-claudette
-
-[dev]
-python-fasthtml