dialoghelper 0.0.23__tar.gz → 0.0.25__tar.gz

{dialoghelper-0.0.23/dialoghelper.egg-info → dialoghelper-0.0.25}/PKG-INFO

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

dialoghelper-0.0.25/dialoghelper/__init__.py

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

{dialoghelper-0.0.23 → dialoghelper-0.0.25}/dialoghelper/_modidx.py

@@ -23,12 +23,18 @@ d = { 'settings': { 'branch': 'main',
                                    'dialoghelper.core.mk_toollist': ('core.html#mk_toollist', 'dialoghelper/core.py'),
                                    'dialoghelper.core.msg_idx': ('core.html#msg_idx', '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.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._load_screenshot_js': ( 'experimental.html#_load_screenshot_js',
-                                                                                              'dialoghelper/experimental.py'),
+            '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.create_iife': ( 'experimental.html#create_iife',
-                                                                                      '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-0.0.23 → dialoghelper-0.0.25}/dialoghelper/core.py

@@ -2,8 +2,8 @@
 
 # %% 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']
+           '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
@@ -94,11 +94,18 @@ def add_html(
 
 # %% ../nbs/00_core.ipynb
 def del_msg(
-    msgid:str=None, # id of message that placement is relative to (if None, uses current message)
+    msgid:str=None, # id of message to delete
 ):
-    "Delete a message from the dialog. Be sure to pass a `sid`, not a `mid`."
+    "Delete a message from the dialog."
     call_endp('rm_msg_', raiseex=True, msid=msgid)
 
+# %% ../nbs/00_core.ipynb
+def run_msg(
+    msgid:str=None, # id of message to execute
+):
+    "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)
+
 # %% ../nbs/00_core.ipynb
 Placements = str_enum('Placements', 'add_after', 'add_before', 'at_start', 'at_end')
 
@@ -240,6 +247,7 @@ 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.
 - &`del_msg`: Delete a message from the dialog.
 - &`add_msg`: Add/update a message to the queue to show after code execution completes.

dialoghelper-0.0.25/dialoghelper/experimental.py

@@ -0,0 +1,93 @@
+"""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
+from importlib import resources
+import uuid
+from fasthtml.common import Div, Script
+import json
+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)
+
+# %% ../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, condition=lambda d: d.get('js_status') == 'ready', fail_msg="Failed to load screenshot.js.")
+    _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, condition=lambda d: d.get('js_status') == 'ready', fail_msg="Screen share failed.")
+    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=5, condition=lambda d: 'img_data' in d and 'img_type' in d, fail_msg="Screenshot capture failed, failed to retrieve data.")
+    if 'error' in data: raise RuntimeError(f"Screenshot failed: {data['error']}")
+    return ToolResult(data=data['img_data'], result_type=data['img_type'])

{dialoghelper-0.0.23 → dialoghelper-0.0.25/dialoghelper.egg-info}/PKG-INFO

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

{dialoghelper-0.0.23 → dialoghelper-0.0.25}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = dialoghelper
 lib_name = dialoghelper
-version = 0.0.23
+version = 0.0.25
 min_python = 3.9
 license = apache2
 black_formatting = False
@@ -30,8 +30,8 @@ language = English
 status = 3
 user = AnswerDotAI
 readme_nb = index.ipynb
-allowed_metadata_keys = 
-allowed_cell_metadata_keys = 
+allowed_metadata_keys = solveit_dialog_mode solveit_ver
+allowed_cell_metadata_keys = skipped pinned solveit_ai
 jupyter_hooks = False
 clean_ids = True
 clear_all = False

dialoghelper-0.0.23/dialoghelper/__init__.py

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

dialoghelper-0.0.23/dialoghelper/experimental.py

@@ -1,68 +0,0 @@
-"""Experimental `dialoghelper` capabilities."""
-
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_experimental.ipynb.
-
-# %% auto 0
-__all__ = ['create_iife', '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
-
-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
-
-# %% ../nbs/01_experimental.ipynb
-def create_iife(code: str) -> str:
-    "Wrap javascript code string in an IIFE"
-    return f'''
-(async () => {{
-{code}
-}})();
-'''
-
-# %% ../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"