dialoghelper 0.0.24__py3-none-any.whl → 0.0.26__py3-none-any.whl

dialoghelper/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.0.24"
+__version__ = "0.0.26"
 from .core import *

dialoghelper/_modidx.py

@@ -27,13 +27,13 @@ d = { 'settings': { 'branch': 'main',
                                    '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._wait_for_pop_data': ( 'experimental.html#_wait_for_pop_data',
-                                                                                             '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.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

@@ -3,113 +3,94 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/01_experimental.ipynb.
 
 # %% auto 0
-__all__ = ['iife', 'start_screen_share', 'stop_screen_share', 'capture_screen']
+__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
-from time import sleep
-import base64
-import json
-import time
+from fasthtml.common import Div,Script
 from claudette import ToolResult
 from .core import *
-from dataclasses import dataclass
-from httpx import get as xget, post as xpost
+from httpx import post as xpost
 
 # %% ../nbs/01_experimental.ipynb
-def _wait_for_pop_data(data_id, timeout=20, retry_interval=1, condition=None):
-    "Wait for data from pop endpoint with optional condition validation."
-    max_attempts = int(timeout / retry_interval)
-    for attempt in range(max_attempts):
-        result = xpost('http://localhost:5001/pop_data_', data={'data_id': data_id})
-        if result.status_code == 200 and result.text.strip():
-            try:
-                data = result.json()
-                if condition and not condition(data):
-                    time.sleep(retry_interval)
-                    continue
-                return data
-            except json.JSONDecodeError: pass
-        time.sleep(retry_interval)
-    return None
-
-# %% ../nbs/01_experimental.ipynb
-_js_loaded = False
-
-def _load_screenshot_js(timeout=10, retry_interval=1):
-    "Load screenshot capability and wait for confirmation it's ready."
-    global _js_loaded
-    if _js_loaded: return True    
-    js_content = (resources.files('dialoghelper') / 'screenshot.js').read_text()
-    ready_id = str(uuid.uuid4())
-    js_with_ready = js_content + f'\n\n// Signal ready\nsendDataToServer("{ready_id}", {{"js_status": "ready"}});'
-    add_html(Div(Script(js_with_ready), hx_swap_oob='beforeend:#js-script'))
-    print("Loading screenshot.js ...")    
-    data = _wait_for_pop_data(ready_id, timeout, retry_interval, condition=lambda d: d.get('js_status') == 'ready')
-    if data and data.get('js_status') == 'ready':
-        _js_loaded = True
-        print("Screenshot.js loaded and ready")
-        return True
-    else:
-        print("Failed to load screenshot.js")
-        return False
+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"
-    return f'''
+    "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=30, retry_interval=1):
+def start_screen_share(timeout=45):
     "Start persistent screen sharing session, waiting for confirmation."
     global _screen_share_active
-    _load_screenshot_js()
+    load_screenshot_js()
     status_id = str(uuid.uuid4())
-    trigger_script = iife(f'startPersistentScreenShare("{status_id}");')
-    add_html(Div(Script(trigger_script), hx_swap_oob=f'beforeend:#js-script'))
-    print("Requesting screen share permission ...")
-    data = _wait_for_pop_data(status_id, timeout, retry_interval, condition=lambda d: d.get('js_status') == 'ready')
-    if not data: print(f"Screen share timed out after {timeout} seconds.")
+    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':
+    if js_status=='ready':
         _screen_share_active = True
-        print("Screen share started successfully.")
-    elif js_status == 'error': print(f"Screen share failed: {data.get('error', 'Unknown error')}")
-    elif js_status == 'connecting': print("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()
-  trigger_script = iife('stopPersistentScreenShare();')
-  add_html(Div(Script(trigger_script), hx_swap_oob=f'beforeend:#js-script'))
-  _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():
     "Capture screenshot, automatically starting screen share if needed."
     global _screen_share_active
-    _load_screenshot_js()
+    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: return f"Failed to start screen share: {result}"
+        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...")
-    trigger_script = iife(screenshot_code)
-    add_html(Div(Script(trigger_script), hx_swap_oob=f'beforeend:#js-script'))
-    data = _wait_for_pop_data(data_id, timeout=10, retry_interval=1, condition=lambda d: 'img_data' in d and 'img_type' in d)
-    if not data: return "Screenshot capture timed out"
-    if 'error' in data: return f"Screenshot failed: {data['error']}"
+#     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.24.dist-info → dialoghelper-0.0.26.dist-info}/METADATA

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

dialoghelper-0.0.26.dist-info/RECORD

@@ -0,0 +1,11 @@
+dialoghelper/__init__.py,sha256=T5uV0maF9yfgQ1UV0AAqQ9nk841BFYnEyutwUBFl41Q,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=yTXzyY37MPW-9mqzbem-q6CCPXElN0GwAyOK-iJofMY,3910
+dialoghelper-0.0.26.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dialoghelper-0.0.26.dist-info/METADATA,sha256=wcsDAH-8E684pnHy9qxcxGY-A48558PeOerTkk0bus8,2590
+dialoghelper-0.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dialoghelper-0.0.26.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
+dialoghelper-0.0.26.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
+dialoghelper-0.0.26.dist-info/RECORD,,

dialoghelper-0.0.24.dist-info/RECORD

@@ -1,11 +0,0 @@
-dialoghelper/__init__.py,sha256=XceGW5BBYEHXaLYMK7w89BsJFYgkMux1YgdeR7Odp4A,43
-dialoghelper/_modidx.py,sha256=agYQ9ims3OEGqX9xZZMHvnFP35Ks-tyqJ4yHAwbe7-M,4186
-dialoghelper/core.py,sha256=U9FvC8ZR6-v7X_PoP-D2etYrZX_Agzed5xpyNFL6a-8,11160
-dialoghelper/db_dc.py,sha256=mi2Q2am_SoAPGpNQg7KPFS5pR9WEapRXT8ypkNmMfw0,2330
-dialoghelper/experimental.py,sha256=cCH1ndJgj7cM6m5-074d7cJ0kFnjkPJPLO3E19Nquvs,4728
-dialoghelper-0.0.24.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dialoghelper-0.0.24.dist-info/METADATA,sha256=KAaLJ0bJXWsMvZ_GnYgJ-9VvCmczMeKGfQShaAKL2Mk,2590
-dialoghelper-0.0.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dialoghelper-0.0.24.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
-dialoghelper-0.0.24.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
-dialoghelper-0.0.24.dist-info/RECORD,,