dialoghelper 0.0.27__py3-none-any.whl → 0.0.29__py3-none-any.whl

dialoghelper/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.0.27"
+__version__ = "0.0.29"
 from .core import *

dialoghelper/experimental.py

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

dialoghelper/screenshot.js

@@ -0,0 +1,129 @@
+/**
+ * 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.27.dist-info → dialoghelper-0.0.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dialoghelper
-Version: 0.0.27
+Version: 0.0.29
 Summary: Helper functions for solveit dialogs
 Home-page: https://github.com/AnswerDotAI/dialoghelper
 Author: Jeremy Howard
@@ -24,6 +24,7 @@ Requires-Dist: ghapi
 Requires-Dist: ipykernel-helper
 Requires-Dist: claudette
 Provides-Extra: dev
+Requires-Dist: python-fasthtml; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

dialoghelper-0.0.29.dist-info/RECORD

@@ -0,0 +1,12 @@
+dialoghelper/__init__.py,sha256=WbA03-_Zk9_bs1UWTpY7lBis1mVY0z7IJ3-qkKikrHE,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/screenshot.js,sha256=DDqlRhemwj8I0AloxMJBnBqDDIqu5knlT1lpG_0rphI,4851
+dialoghelper-0.0.29.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dialoghelper-0.0.29.dist-info/METADATA,sha256=koS3q01TrcrDbKaWXZJXFyCryirDDUvvKDIq3ck-buM,2637
+dialoghelper-0.0.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dialoghelper-0.0.29.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
+dialoghelper-0.0.29.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
+dialoghelper-0.0.29.dist-info/RECORD,,

dialoghelper-0.0.27.dist-info/RECORD

@@ -1,11 +0,0 @@
-dialoghelper/__init__.py,sha256=RR5qXprLU41FEqcFMBsvo0Vdtv-eF_LS0-htzpt3GGI,43
-dialoghelper/_modidx.py,sha256=haFiPtlNF3j0tsHG-ODfyiy85H1OTbbdjR3ojhP6K4U,4156
-dialoghelper/core.py,sha256=U9FvC8ZR6-v7X_PoP-D2etYrZX_Agzed5xpyNFL6a-8,11160
-dialoghelper/db_dc.py,sha256=mi2Q2am_SoAPGpNQg7KPFS5pR9WEapRXT8ypkNmMfw0,2330
-dialoghelper/experimental.py,sha256=7kUcsYRMd30A1QSE1chyGgnREFrvCmmT5ZJM9Pg5oQY,3964
-dialoghelper-0.0.27.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dialoghelper-0.0.27.dist-info/METADATA,sha256=huwfNYq5GGZW30fuZuc1A488HVoQ-6zVZb7zH8uuRgg,2590
-dialoghelper-0.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dialoghelper-0.0.27.dist-info/entry_points.txt,sha256=wvDeX-XTS_XVjWiiPQe6yVfmyNwy9eCr36ewp9baFIg,46
-dialoghelper-0.0.27.dist-info/top_level.txt,sha256=VXLlkgltFs_q-XB9imt2G64I_-MPm1RnxlpvUWPuLKM,13
-dialoghelper-0.0.27.dist-info/RECORD,,