computer-use-ootb-internal 0.0.96.post1__py3-none-any.whl → 0.0.96.post2__py3-none-any.whl

computer_use_ootb_internal/computer_use_demo/animation/click_animation.py

@@ -1,214 +1,81 @@
-"""
-show_click(x, y, duration_ms=800)
- → 在屏幕 (x,y) 显示点击动画，停留 duration_ms 毫秒
-依赖: pyside6
-确保同目录有 click.gif
-"""
-import sys, time
+# click_anim_async.py   ←  put this in its own file  (important for Windows "spawn")
+import sys, multiprocessing as mp
 from pathlib import Path
-from PySide6.QtCore import Qt, QPoint, QTimer, QEventLoop, QSize, QEasingCurve, QPropertyAnimation
-from PySide6.QtGui  import QPainter, QPixmap, QMovie
+from PySide6.QtCore    import Qt, QPoint, QTimer, QEasingCurve, QPropertyAnimation, QSize
+from PySide6.QtGui     import QMovie
 from PySide6.QtWidgets import QApplication, QWidget, QLabel
 
 CLICK_GIF = Path(__file__).with_name("icons8-select-cursor-transparent-96.gif")
 
+# ---------------------------- tiny in‑process GUI helpers ----------------------------
 class ClickAnimation(QWidget):
-    def __init__(self, pos: QPoint, life_ms: int):
+    def __init__(self, pos: QPoint, life_ms: int, size_px: int = 50):
         super().__init__(None,
             Qt.FramelessWindowHint | Qt.Tool | Qt.WindowStaysOnTopHint
             | Qt.WindowTransparentForInput)
         self.setAttribute(Qt.WA_TranslucentBackground)
-        
-        if not CLICK_GIF.exists():
-            print(f"Error: click.gif not found at {CLICK_GIF}")
-            return
-            
-        try:
-            # 创建标签显示GIF
-            self.label = QLabel(self)
-            self.movie = QMovie(str(CLICK_GIF))
-            
-            # 获取原始尺寸并打印（仅供参考）
-            self.movie.jumpToFrame(0)
-            original_size = self.movie.currentPixmap().size()
-            print(f"GIF original size: {original_size.width()}x{original_size.height()}")
-            
-            # 将GIF缩放到30x30像素
-            target_size = QSize(50, 50)
-            self.movie.setScaledSize(target_size)
-            
-            # 设置标签尺寸和GIF
-            self.label.setMovie(self.movie)
-            self.label.setFixedSize(target_size)
-            
-            # 设置窗口大小和位置
-            self.resize(target_size)
-            self.move(pos.x() - 15, pos.y() - 15)  # 居中显示
-            
-            # 提高播放性能
-            self.movie.setCacheMode(QMovie.CacheAll)
-            
-            # 开始播放动画
-            self.movie.start()
-            
-            # 设置定时器关闭窗口
-            QTimer.singleShot(life_ms, self.close)
-            
-            self.show()
-            self.raise_()
-            print(f"Click animation created at ({pos.x()}, {pos.y()}), size: 30x30, duration: {life_ms}ms")
-        except Exception as e:
-            print(f"Error creating click animation: {str(e)}")
 
-# ---------- 外部接口 ----------
-_app = None
-def _ensure_app():
-    global _app
-    if _app is None:
-        if QApplication.instance() is None:
-            print("Creating new QApplication instance")
-            _app = QApplication(sys.argv)
-        else:
-            print("Using existing QApplication instance")
-            _app = QApplication.instance()
+        self.label  = QLabel(self)
+        movie       = QMovie(str(CLICK_GIF))
+        movie.setScaledSize(QSize(size_px, size_px))
+        self.label.setMovie(movie)
+        self.label.setFixedSize(size_px, size_px)
 
-# Keep references to animations to prevent garbage collection
-_active_animations = []
-
-def show_click(x: int, y: int, duration_ms: int = 2000, existing_ms: int = 1000):  # 增加默认播放时间和静止时间
-    """非阻塞式点击动画：立即返回，动画在后台运行
-    
-    Args:
-        x, y          : 屏幕坐标
-        duration_ms   : 动画播放时长
-        existing_ms   : 动画结束后静止显示的时间
-    """
-    print(f"Attempting to show click at ({x}, {y})")
-    
-    if not CLICK_GIF.exists():
-        raise FileNotFoundError(f"click.gif not found at {CLICK_GIF}")
-        
-    _ensure_app()
-    
-    try:
-        # 总生存时间 = 动画时间 + 静止显示时间
-        total_life_ms = duration_ms + existing_ms
-        animation = ClickAnimation(QPoint(x, y), total_life_ms)
-        
-        # Store reference to prevent garbage collection
-        global _active_animations
-        _active_animations.append(animation)
-        
-        # Set up cleanup after animation completes + existing time
-        QTimer.singleShot(total_life_ms + 150, lambda: _clean_animation(animation))
-        
-        print(f"Click animation started (non-blocking, will exist for {total_life_ms}ms)")
-    except Exception as e:
-        print(f"Error during show_click: {str(e)}")
+        self.resize(size_px, size_px)
+        self.move(pos.x() - size_px//2, pos.y() - size_px//2)
 
+        movie.setCacheMode(QMovie.CacheAll)
+        movie.start()
+        QTimer.singleShot(life_ms, self.close)
+        self.show()
+        self.raise_()
 
-def _clean_animation(animation):
-    """Remove animation from reference list after it completes"""
-    global _active_animations
-    if animation in _active_animations:
-        _active_animations.remove(animation)
-    print("Animation cleaned up")
+# ------------------------- worker functions that live in a **child** -----------------
+def _worker_click(x, y, duration_ms, existing_ms):
+    app = QApplication(sys.argv)
+    total = duration_ms + existing_ms
+    widget = ClickAnimation(QPoint(x, y), total)  # Store in variable to prevent garbage collection
+    QTimer.singleShot(total + 200, app.quit)      # close event‑loop afterwards
+    app.exec()
 
+def _worker_move(x1, y1, x2, y2, duration_ms, existing_ms):
+    app     = QApplication(sys.argv)
+    total   = duration_ms + existing_ms
+    widget  = ClickAnimation(QPoint(x1, y1), total)
 
-# ---------- 新增函数 ----------
-def show_move_to(x1: int, y1: int, x2: int, y2: int, duration_ms: int = 1000, existing_ms: int = 1000):
-    """
-    非阻塞式移动动画：在 (x1, y1) 处出现光标 GIF，
-    并在 duration_ms 毫秒内平滑移动到 (x2, y2)，
-    然后在终点静止显示 existing_ms 毫秒。
-    立即返回，动画在后台运行。
+    anim = QPropertyAnimation(widget, b"pos")
+    anim.setDuration(duration_ms)
+    anim.setStartValue(widget.pos())
+    anim.setEndValue(QPoint(x2 - widget.width()//2, y2 - widget.height()//2))
+    anim.setEasingCurve(QEasingCurve.OutQuad)
+    anim.start()
 
-    Args:
-        x1, y1        : 起点屏幕坐标
-        x2, y2        : 终点屏幕坐标
-        duration_ms   : 移动总时长
-        existing_ms   : 移动结束后在终点静止显示的时间
-    """
-    print(f"Attempting to move click from ({x1}, {y1}) → ({x2}, {y2}) "
-          f"in {duration_ms} ms, then stay for {existing_ms} ms")
+    QTimer.singleShot(total + 200, app.quit)
+    app.exec()
 
+# ------------------------------- public API (non‑blocking) ---------------------------
+def show_click(x: int, y: int, duration_ms: int = 800, existing_ms: int = 800):
     if not CLICK_GIF.exists():
-        raise FileNotFoundError(f"click.gif not found at {CLICK_GIF}")
+        raise FileNotFoundError(f"GIF not found at {CLICK_GIF}")
+    mp.get_context("spawn").Process(
+        target=_worker_click,
+        args=(x, y, duration_ms, existing_ms),
+        daemon=False                   # keep running even if parent exits
+    ).start()
 
-    _ensure_app()
+def show_move_to(x1: int, y1: int, x2: int, y2: int,
+                 duration_ms: int = 1000, existing_ms: int = 800):
+    if not CLICK_GIF.exists():
+        raise FileNotFoundError(f"GIF not found at {CLICK_GIF}")
+    mp.get_context("spawn").Process(
+        target=_worker_move,
+        args=(x1, y1, x2, y2, duration_ms, existing_ms),
+        daemon=False
+    ).start()
 
-    # 总生存时间 = 动画时间 + 静止显示时间
-    total_life_ms = duration_ms + existing_ms
-    widget = ClickAnimation(QPoint(x1, y1), total_life_ms)
-    
-    # 用 QPropertyAnimation 平滑移动窗口
-    anim = QPropertyAnimation(widget, b"pos")
-    anim.setDuration(duration_ms)
-    # ClickAnimation 内部已经向左上偏移了 15px，这里沿用同样的偏移
-    anim.setStartValue(QPoint(x1 - 15, y1 - 15))
-    anim.setEndValue(QPoint(x2 - 15, y2 - 15))
-    anim.setEasingCurve(QEasingCurve.OutQuad)     # 可自行更换缓动曲线
-    
-    # Store references to both widget and animation to prevent garbage collection
-    global _active_animations
-    # Store them as a tuple to keep both references
-    animation_pair = (widget, anim)
-    _active_animations.append(animation_pair)
-    
-    # Clean up both widget and animation after completion of total life time
-    def cleanup():
-        if animation_pair in _active_animations:
-            _active_animations.remove(animation_pair)
-        print("Move animation cleaned up")
-    
-    # Connect finished signal only to print a message
-    anim.finished.connect(lambda: print("Movement finished, now staying still"))
-    
-    # Start the animation
-    anim.start()
-    
-    # Process events immediately to kickstart the animation
-    QApplication.processEvents()
-    
-    # Set up final cleanup after animation + existing time
-    QTimer.singleShot(total_life_ms, cleanup)
-    
-    print("Move-to animation started (non-blocking)")
 
 
-# ---------- 命令行测试 ----------
 if __name__ == "__main__":
-    # 确保应用程序实例存在
-    # _ensure_app()
-    
-    # 测试点击
-    print("Testing non-blocking click animation...")
-    x, y = 500, 500
-    show_click(x, y)
-    
-    # 测试同时运行两个动画
-    print("\nTesting simultaneous animations...")
-    x1, y1 = 200, 200
-    x2, y2 = 600, 600
-    # show_click(x1, y1)
-    show_move_to(x1, y1, x2, y2)
-    
-    # # 测试先移动，然后点击
-    print("\nTesting sequence with pyautogui simulation...")
-    x3, y3 = 800, 300
-    x4, y4 = 400, 500
-    
-    # 启动移动动画
-    show_move_to(x3, y3, x4, y4)
-    
-    # 模拟移动完成后的点击动画（延迟1.5秒）
-    QTimer.singleShot(1500, lambda: show_click(x4, y4))
-    
-    # 保持主程序运行，等待所有动画完成
-    print("\nWaiting for all animations to complete...")
-    loop = QEventLoop()
-    # 等待足够长的时间，确保所有动画都完成（最长的动画是2000ms + 清理时间）
-    QTimer.singleShot(4000, loop.quit)
-    loop.exec()
-    
-    print("All animations completed, exiting test.")
+    # from click_anim_async import show_click
+    show_click(500, 500)
+    show_move_to(300, 300, 600, 600)

computer_use_ootb_internal/computer_use_demo/animation/test_animation.py

@@ -0,0 +1,40 @@
+"""
+Test script to verify cursor animation is working
+"""
+import asyncio
+import sys
+import time
+from pathlib import Path
+from computer_use_ootb_internal.computer_use_demo.tools.computer import ComputerTool
+
+async def test_animations():
+    
+    # Initialize the computer tool
+    computer = ComputerTool()
+    
+    # Test mouse move animation
+    print("Testing mouse move animation...")
+    await computer(action="mouse_move_windll", coordinate=(500, 500))
+    print("Waiting 2 seconds...")
+    await asyncio.sleep(2)
+    
+    # Test click animation
+    print("Testing click animation...")
+    await computer(action="left_click_windll", coordinate=(700, 300))
+    print("Waiting 2 seconds...")
+    await asyncio.sleep(2)
+    
+    # Test another move
+    print("Testing move and click sequence...")
+    await computer(action="mouse_move_windll", coordinate=(300, 300))
+    await asyncio.sleep(1)
+    await computer(action="left_click_windll", coordinate=(300, 300))
+    
+    # Wait for animations to complete
+    print("Waiting for animations to complete...")
+    await asyncio.sleep(3)
+    
+    print("Test completed")
+
+if __name__ == "__main__":
+    asyncio.run(test_animations()) 

computer_use_ootb_internal/computer_use_demo/executor/teachmode_executor.py

@@ -249,9 +249,6 @@ class TeachmodeExecutor:
             else:
                 parsed_action_list.append(action)
 
-        # parsed_action_list.extend([{"action": "key_down_windll", "text": "alt", "coordinate": None}])
-        # parsed_action_list.extend(action_list)
-        # parsed_action_list.extend([{"action": "key_up_windll", "text": "alt", "coordinate": None}])
         return parsed_action_list
 
 

computer_use_ootb_internal/computer_use_demo/tools/computer.py

@@ -317,7 +317,6 @@ class ComputerTool(BaseAnthropicTool):
                 pyautogui.mouseDown()
                 time.sleep(1)
                 pyautogui.mouseUp()
-                show_click(x, y)
             elif action == "scroll_down":
                 pyautogui.scroll(-200)  # Adjust scroll amount as needed
                 return ToolResult(output="Scrolled down")

computer_use_ootb_internal/run_teachmode_ootb_args.py

@@ -41,7 +41,7 @@ def simple_teachmode_sampling_loop(
     if "star_rail" in user_id or "star_rail" in user_id:
         full_screen_game_mode = 1
     
-    if "star_rail_dev" in trace_id or "star_rail_dev" in user_id or "hero_case" in trace_id:
+    if "star_rail_dev" in trace_id or "star_rail_dev" in user_id or "hero_case" in user_id:
         full_screen_game_mode = 2
 
     print(f"Full Screen Game Mode: {full_screen_game_mode}")
@@ -102,7 +102,7 @@ def simple_teachmode_sampling_loop(
 
         try:
             step_plan = infer_server_response["generated_plan"]
-            step_info = infer_server_response["generated_action"]["step_info"]
+            step_info = infer_server_response["generated_plan"]["step_info"]
             step_action = infer_server_response["generated_action"]["content"]
             step_traj_idx = infer_server_response["current_traj_step"]
 
@@ -125,8 +125,6 @@ def simple_teachmode_sampling_loop(
 
 
 
-
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
         description="Run a synchronous sampling loop for assistant/tool interactions in teach-mode."
@@ -138,8 +136,6 @@ if __name__ == "__main__":
     )
     parser.add_argument(
         "--task",
-        # default="Help me to complete the extraction of the viewer data of Downald Trump's first video on youtube,\
-        # fill in the excel sheet.",
         default="Click on the Google Chorme icon",
         help="The task to be completed by the assistant (e.g., 'Complete some data extraction.').",
     )

{computer_use_ootb_internal-0.0.96.post1.dist-info → computer_use_ootb_internal-0.0.96.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: computer-use-ootb-internal
-Version: 0.0.96.post1
+Version: 0.0.96.post2
 Summary: Computer Use OOTB
 Author-email: Siyuan Hu <siyuan.hu.sg@gmail.com>
 Requires-Python: >=3.11

{computer_use_ootb_internal-0.0.96.post1.dist-info → computer_use_ootb_internal-0.0.96.post2.dist-info}/RECORD

@@ -3,10 +3,11 @@ computer_use_ootb_internal/app_teachmode.py,sha256=zmUPvFjqdhysnN1bD2QQhaAKONnAt
 computer_use_ootb_internal/app_teachmode_gradio.py,sha256=zAw-n3s20j1Jr0S4TzXHwllKV6APJ8HEHB1KqBuzriY,7907
 computer_use_ootb_internal/dependency_check.py,sha256=y8RMEP6RXQzTgU1MS_1piBLtz4J-Hfn9RjUZg59dyvo,1333
 computer_use_ootb_internal/requirements-lite.txt,sha256=5DAHomz4A_P2BmTIXNkNqkHbnIF0AyZ4_1XAlb1LaYs,290
-computer_use_ootb_internal/run_teachmode_ootb_args.py,sha256=djr4E7_G_qG9H6qmRz1mrM9Yrcxf1tnlSPH5ZqykF5Y,6845
-computer_use_ootb_internal/computer_use_demo/animation/click_animation.py,sha256=BsHW1yFLHE5DqLUofnR-D3jnglLcYCaVN34jquWvh94,7725
+computer_use_ootb_internal/run_teachmode_ootb_args.py,sha256=UEiwLSdERzBqbCH2Em20b4UNzAb__S8cJSnkceVcBsY,6686
+computer_use_ootb_internal/computer_use_demo/animation/click_animation.py,sha256=QR_DEDk7bVON5EQ_xsJGrxNa3NoxqubYyXPFRB12pmQ,3183
 computer_use_ootb_internal/computer_use_demo/animation/icons8-select-cursor-transparent-96.gif,sha256=4LfwsfFQnREXrNRs32aJU2jO65JXianJoL_8q7-8elg,30966
-computer_use_ootb_internal/computer_use_demo/executor/teachmode_executor.py,sha256=y7lg_PjMif2WwCKWWC7g8Ys2zPRMh08Vtt42fStujY4,16623
+computer_use_ootb_internal/computer_use_demo/animation/test_animation.py,sha256=SOJz2yffXTkjuAHqk0IZLcMriR0KQYTo7W1b8wGyRGY,1222
+computer_use_ootb_internal/computer_use_demo/executor/teachmode_executor.py,sha256=Rr_I0Uk8hsqTmq3Fr3KOtjkXTqSb4pkNxmutENbv8dc,16368
 computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/simple_parser/__init__.py,sha256=h2CNeuACklxVpJC65QR8_6AvSybEZLmeO45hY_-lLBs,61
 computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/simple_parser/gui_capture.py,sha256=CxFJbsSb68ERKH7-C4RaaZy7FIhhzrzGx5qQJ4C37cA,13907
 computer_use_ootb_internal/computer_use_demo/gui_agent/gui_parser/simple_parser/gui_parser.py,sha256=KSTJ0cMwh3ahUMzHRaDgA2sVNUL4MNlF7qEBGN3G0SI,28993
@@ -30,12 +31,12 @@ computer_use_ootb_internal/computer_use_demo/tools/base.py,sha256=QDqpuuKlhUKJT2
 computer_use_ootb_internal/computer_use_demo/tools/bash.py,sha256=rHetQ80_v-TTi-1oxIA7ncFEwJxFTh8FJCErIoZbGeY,4236
 computer_use_ootb_internal/computer_use_demo/tools/collection.py,sha256=8RzHLobL44_Jjt8ltXS6I8XJlEAQOfc75dmnDUaHE-8,922
 computer_use_ootb_internal/computer_use_demo/tools/colorful_text.py,sha256=cvlmnhAImDTwoRRwhT5au7mNFhfAD7ZfeoDEVdVzDKw,892
-computer_use_ootb_internal/computer_use_demo/tools/computer.py,sha256=bKOkCtE4iYmPpRxldslAAa5yQOs6NkhITJYCfZllWXI,25526
+computer_use_ootb_internal/computer_use_demo/tools/computer.py,sha256=kpcp3orAdSwzBJMvL8zt_OgF6kT9UdZaJuqkjja7bic,25493
 computer_use_ootb_internal/computer_use_demo/tools/computer_marbot.py,sha256=zZuWz9ArfP3Zss-afnscrPkgCtB5UWbCy7HwAOvO2bo,5970
 computer_use_ootb_internal/computer_use_demo/tools/edit.py,sha256=b0PwUitxckHCQqFP3ZwlthWdqNkn7WETeTHeB6-o98c,11486
 computer_use_ootb_internal/computer_use_demo/tools/run.py,sha256=xhXdnBK1di9muaO44CEirL9hpGy3NmKbjfMpyeVmn8Y,1595
 computer_use_ootb_internal/computer_use_demo/tools/screen_capture.py,sha256=L8qfvtUkPPQGt92N-2Zfw5ZTDBzLsDps39uMnX3_uSA,6857
-computer_use_ootb_internal-0.0.96.post1.dist-info/METADATA,sha256=45BKygjaYFw3snR8rr1qk9pH9cVJYmjZP9T5O5PSjAo,915
-computer_use_ootb_internal-0.0.96.post1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-computer_use_ootb_internal-0.0.96.post1.dist-info/entry_points.txt,sha256=-AbmawU7IRQuDZihgVMVDrFoY4E6rnXYOUB-5vSeBKs,93
-computer_use_ootb_internal-0.0.96.post1.dist-info/RECORD,,
+computer_use_ootb_internal-0.0.96.post2.dist-info/METADATA,sha256=Q_cRfIeXWR-MO_d4c-GLxnC2wQZw68BPsvgrBYcaX7c,915
+computer_use_ootb_internal-0.0.96.post2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+computer_use_ootb_internal-0.0.96.post2.dist-info/entry_points.txt,sha256=-AbmawU7IRQuDZihgVMVDrFoY4E6rnXYOUB-5vSeBKs,93
+computer_use_ootb_internal-0.0.96.post2.dist-info/RECORD,,