ok-script 0.0.332__tar.gz → 0.0.333__tar.gz

{ok_script-0.0.332/ok_script.egg-info → ok_script-0.0.333}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.332
+Version: 0.0.333
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok_script-0.0.332 → ok_script-0.0.333}/ok/analytics/Analytics.py

@@ -6,11 +6,11 @@ import uuid
 
 import requests
 import wmi
+from ok.Util import Handler
 
 import ok.gui
 from ok.config.Config import Config
 from ok.logging.Logger import get_logger
-from ok.Util import Handler
 
 logger = get_logger(__name__)
 

{ok_script-0.0.332 → ok_script-0.0.333}/ok/feature/Box.py

@@ -186,7 +186,8 @@ def sort_boxes(boxes: List[Box]) -> List[Box]:
 
         return cmp
 
-    return sorted(boxes, key=cmp_to_key(compare_boxes))
+    sorted_list = sorted(boxes, key=cmp_to_key(compare_boxes))
+    return sorted_list
 
 
 def find_box_by_name(boxes, names) -> Box:
@@ -222,7 +223,7 @@ def get_bounding_box(boxes):
     return bounding_box
 
 
-def find_boxes_within_boundary(boxes, boundary_box):
+def find_boxes_within_boundary(boxes, boundary_box, sort=True):
     """
     Find all boxes that are entirely within the specified boundary box.
 
@@ -242,7 +243,8 @@ def find_boxes_within_boundary(boxes, boundary_box):
                 box.x + box.width <= boundary_box.x + boundary_box.width and
                 box.y + box.height <= boundary_box.y + boundary_box.height):
             within_boundary.append(box)
-
+    if sort:
+        within_boundary = sort_boxes(within_boundary)
     return within_boundary
 
 

{ok_script-0.0.332 → ok_script-0.0.333}/ok/gui/Communicate.py

@@ -8,6 +8,7 @@ class Communicate(QObject):
     scene = Signal(str)
     draw_box = Signal(str, object, str, object)
     task = Signal(object)
+    task_done = Signal(object)
     window = Signal(bool, int, int, int, int, int, int, float)
     loading_progress = Signal(str)
     notification = Signal(str, str, bool, bool)

{ok_script-0.0.332 → ok_script-0.0.333}/ok/gui/MainWindow.py

@@ -1,5 +1,6 @@
 from PySide6.QtCore import QObject, Signal, Qt, QEvent
 from PySide6.QtWidgets import QMenu, QSystemTrayIcon
+from ok.Util import init_class_by_name
 from qfluentwidgets import FluentIcon, NavigationItemPosition, MSFluentWindow, InfoBar, InfoBarPosition
 
 import ok.gui
@@ -53,6 +54,11 @@ class MainWindow(MSFluentWindow):
                 self.first_task_tab = self.trigger_tab
             self.addSubInterface(self.trigger_tab, FluentIcon.ROBOT, self.tr('Triggers'))
 
+        if custom_tabs := config.get('custom_tabs'):
+            for tab in custom_tabs:
+                tab_obj = init_class_by_name(tab[0], tab[1])
+                self.addSubInterface(tab_obj, tab_obj.icon, tab_obj.name)
+
         if debug:
             debug_tab = DebugTab(config, exit_event)
             self.addSubInterface(debug_tab, FluentIcon.DEVELOPER_TOOLS, self.tr('Debug'),
@@ -76,6 +82,7 @@ class MainWindow(MSFluentWindow):
 
         communicate.executor_paused.connect(self.executor_paused)
         communicate.tab.connect(self.navigate_tab)
+        communicate.task_done.connect(self.activateWindow)
 
         # Create a context menu for the tray
         menu = QMenu()

{ok_script-0.0.332 → ok_script-0.0.333}/ok/gui/StartController.py

@@ -113,12 +113,12 @@ class StartController(QObject):
                 'supported_resolution', {})
             supported_ratio = supported_resolution.get('ratio')
             min_size = supported_resolution.get('min_size')
-            resize_to_ratio = supported_resolution.get('resize_to_ratio')
+            resize_to = supported_resolution.get('resize_to')
             supported, resolution = ok.gui.executor.check_frame_and_resolution(supported_ratio, min_size)
             if not supported:
                 resize_success = False
-                if resize_to_ratio and isinstance(ok.gui.device_manager.capture_method, BaseWindowsCaptureMethod):
-                    resize_success = ok.gui.device_manager.capture_method.hwnd_window.try_resize_to(supported_ratio)
+                if resize_to and isinstance(ok.gui.device_manager.capture_method, BaseWindowsCaptureMethod):
+                    resize_success = ok.gui.device_manager.capture_method.hwnd_window.try_resize_to(resize_to)
                 if not resize_success:
                     error = self.tr(
                         'Resolution {resolution} check failed, some tasks might not work correctly!').format(

{ok_script-0.0.332 → ok_script-0.0.333}/ok/gui/debug/Screenshot.py

@@ -8,13 +8,13 @@ import cv2
 from PIL import Image, ImageFont, ImageDraw
 from PySide6.QtCore import QObject
 from PySide6.QtGui import QColor
+from ok.Util import find_first_existing_file, clear_folder, sanitize_filename, \
+    get_relative_path
 
 import ok.gui
 from ok.feature.Box import Box
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
-from ok.Util import find_first_existing_file, clear_folder, sanitize_filename, \
-    get_relative_path
 
 logger = get_logger(__name__)
 
@@ -113,29 +113,27 @@ class Screenshot(QObject):
 
         originl_name = self.save_pil_image(name + '_original', folder, pil_image)
 
-        if folder == self.click_screenshot_folder:
-            # Ensure no fill
+        if len(ui_dict) > 0:
             draw = ImageDraw.Draw(pil_image)
 
             frame_ratio = 1
-            if len(ui_dict) > 0:
-                for key, value in ui_dict.items():
-                    boxes = value[0]
-                    color = tuple([int(x) for x in value[2].getRgb()])  # Convert QColor to BGR tuple
-                    for box in boxes:
-                        width = int(box.width * frame_ratio)
-                        height = int(box.height * frame_ratio)
-                        if width <= 0 or height <= 0:
-                            logger.error(f"box height and width <=0 {box}")
-                            continue
-                        x = int(box.x * frame_ratio)
-                        y = int(box.y * frame_ratio)
-                        # Draw a rectangle. Arguments are (x, y, width, height).
-                        # Adjust these values according to the desired size and position.
-                        draw.rectangle([x, y, x + width, y + height], outline=color, width=2)
-                        # Put text
-                        draw.text((x, y + height + 8), f"{box.name or key}_{round(box.confidence * 100)}", fill=color,
-                                  font=self.pil_font)
+            for key, value in ui_dict.items():
+                boxes = value[0]
+                color = tuple([int(x) for x in value[2].getRgb()])  # Convert QColor to BGR tuple
+                for box in boxes:
+                    width = int(box.width * frame_ratio)
+                    height = int(box.height * frame_ratio)
+                    if width <= 0 or height <= 0:
+                        logger.error(f"box height and width <=0 {box}")
+                        continue
+                    x = int(box.x * frame_ratio)
+                    y = int(box.y * frame_ratio)
+                    # Draw a rectangle. Arguments are (x, y, width, height).
+                    # Adjust these values according to the desired size and position.
+                    draw.rectangle([x, y, x + width, y + height], outline=color, width=2)
+                    # Put text
+                    draw.text((x, y + height + 8), f"{box.name or key}_{round(box.confidence * 100)}", fill=color,
+                              font=self.pil_font)
             self.save_pil_image(name + '_boxed', folder, pil_image)
         return originl_name
 

{ok_script-0.0.332 → ok_script-0.0.333}/ok/gui/widget/Tab.py

@@ -1,6 +1,6 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QVBoxLayout, QWidget, QSizePolicy
-from qfluentwidgets import ScrollArea
+from qfluentwidgets import ScrollArea, FluentIcon
 
 from ok.gui.common.style_sheet import StyleSheet
 from ok.gui.widget.Card import Card
@@ -9,6 +9,8 @@ from ok.gui.widget.Card import Card
 class Tab(ScrollArea):
     def __init__(self):
         super().__init__()
+        self.name = ""
+        self.icon = FluentIcon.GAME
         self.view = QWidget(self)
         self.vBoxLayout = QVBoxLayout(self.view)
 

{ok_script-0.0.332 → ok_script-0.0.333}/ok/interaction/ADBInteraction.py

@@ -20,7 +20,7 @@ class ADBBaseInteraction(BaseInteraction):
         super().send_key(key, down_time)
         self.device_manager.device.shell(f"input keyevent {key}")
 
-    def swipe(self, from_x, from_y, to_x, to_y, duration):
+    def swipe(self, from_x, from_y, to_x, to_y, duration, settle_time=0.1):
         self.device_manager.device.shell(f"input swipe {from_x} {from_y} {to_x} {to_y} {duration}")
 
     def click(self, x=-1, y=-1, move_back=False, name=None, down_time=0.01, move=True):

{ok_script-0.0.332 → ok_script-0.0.333}/ok/interaction/BaseInteraction.py

@@ -23,14 +23,14 @@ class BaseInteraction:
     def move(self, x, y):
         pass
 
-    def swipe(self, from_x, from_y, to_x, to_y, duration):
+    def swipe(self, from_x, from_y, to_x, to_y, duration, settle_time):
         pass
 
     def middle_click(self, x=-1, y=-1, move_back=False, name=None, down_time=0.05):
         logger.debug(f"middle_click {x, y}")
         pass
 
-    def click(self, x=-1, y=-1, name=None):
+    def click(self, x=-1, y=-1, move_back=False, name=None, move=move, down_time=0.05):
         if name is None:
             logger.debug(f"click {x, y}")
         else:
@@ -41,3 +41,6 @@ class BaseInteraction:
             logger.debug(f"right_click {x, y}")
         else:
             logger.debug(f"right_click {name} {x, y}")
+
+    def on_run(self):
+        pass

{ok_script-0.0.332 → ok_script-0.0.333}/ok/interaction/PostMessageInteraction.py

@@ -78,7 +78,7 @@ class PostMessageInteraction(BaseInteraction):
     def post(self, message, wParam=0, lParam=0):
         win32gui.PostMessage(self.hwnd, message, wParam, lParam)
 
-    def swipe(self, x1, y1, x2, y2, duration=3):
+    def swipe(self, x1, y1, x2, y2, duration=3, settle_time=0.1):
         # Move the mouse to the start point (x1, y1)
         self.move(x1, y1)
         time.sleep(0.1)  # Pause for a moment
@@ -100,8 +100,9 @@ class PostMessageInteraction(BaseInteraction):
         # Move the mouse to the end point (x2, y2) in small steps
         for i in range(steps):
             self.move(x1 + int(i * step_dx), y1 + int(i * step_dy), down_btn=win32con.MK_LBUTTON)
-            time.sleep(0.1)  # Sleep for 10ms
-
+            time.sleep(0.01)  # Sleep for 10ms
+        if settle_time > 0:
+            time.sleep(settle_time)
         # Release the left mouse button
         self.mouse_up()
 

{ok_script-0.0.332 → ok_script-0.0.333}/ok/interaction/PyDirectInteraction.py

@@ -1,11 +1,11 @@
 import time
 
 import pydirectinput
-
 from ok.Capture import BaseCaptureMethod
+from ok.Util import is_admin
+
 from ok.interaction.BaseInteraction import BaseInteraction
 from ok.logging.Logger import get_logger
-from ok.Util import is_admin
 
 logger = get_logger(__name__)
 
@@ -16,6 +16,7 @@ class PyDirectInteraction(BaseInteraction):
 
     def __init__(self, capture: BaseCaptureMethod, hwnd_window):
         super().__init__(capture)
+        self.hwnd_window = hwnd_window
         if not is_admin():
             logger.error(f"You must be an admin to use Win32Interaction")
 
@@ -45,7 +46,7 @@ class PyDirectInteraction(BaseInteraction):
         x, y = self.capture.get_abs_cords(x, y)
         pydirectinput.moveTo(x, y)
 
-    def swipe(self, x1, y1, x2, y2, duration):
+    def swipe(self, x1, y1, x2, y2, duration, settle_time=0.1):
         # Convert coordinates to integers
         x1, y1 = self.capture.get_abs_cords(x1, y1)
         x2, y2 = self.capture.get_abs_cords(x2, y2)
@@ -71,8 +72,9 @@ class PyDirectInteraction(BaseInteraction):
         # Move the mouse to the end point (x2, y2) in small steps
         for i in range(steps):
             pydirectinput.moveTo(x1 + int(i * step_dx), y1 + int(i * step_dy))
-            time.sleep(0.1)  # Sleep for 10ms
-
+            time.sleep(0.01)  # Sleep for 10ms
+        if settle_time > 0:
+            time.sleep(settle_time)
         # Release the left mouse button
         pydirectinput.mouseUp()
 
@@ -136,3 +138,6 @@ class PyDirectInteraction(BaseInteraction):
 
     def should_capture(self):
         return self.capture.clickable()
+
+    def on_run(self):
+        self.hwnd_window.bring_to_front()

{ok_script-0.0.332 → ok_script-0.0.333}/ok/logging/Logger.py

@@ -119,7 +119,7 @@ class Logger:
 def exception_to_str(exception):
     if exception is not None:
         try:
-            stack_trace_str = traceback.format_exc().replace("\\\\", "\\")
+            stack_trace_str = traceback.format_exc()
         except Exception as e:
             stack_trace_str = f"Error formatting exception: {e}"
     else:

{ok_script-0.0.332 → ok_script-0.0.333}/ok/test/TaskTestCase.py

@@ -1,6 +1,7 @@
+import unittest
+
 from ok.Capture import ImageCaptureMethod
 
-import unittest
 from ok.interaction.DoNothingInteraction import DoNothingInteraction
 from ok.logging.Logger import get_logger
 
@@ -18,7 +19,7 @@ class TaskTestCase(unittest.TestCase):
 
         if TaskTestCase._ok is None:
             from ok.OK import OK
-
+            self.config['debug'] = True
             TaskTestCase._ok = OK(self.config)
             TaskTestCase._ok.task_executor.debug_mode = True
             TaskTestCase._ok.device_manager.capture_method = ImageCaptureMethod(
@@ -38,6 +39,11 @@ class TaskTestCase(unittest.TestCase):
 
     def set_image(self, image):
         self._ok.device_manager.capture_method.set_images([image])
+        self.task.next_frame()
+
+    def set_images(self, *images):
+        self._ok.device_manager.capture_method.set_images(images)
+        self.task.next_frame()
 
     def tearDown(self):
         self.task.reset_scene()

{ok_script-0.0.332 → ok_script-0.0.333/ok_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.332
+Version: 0.0.333
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok_script-0.0.332 → ok_script-0.0.333}/ok_script.egg-info/SOURCES.txt

@@ -187,4 +187,5 @@ ok_script.egg-info/dependency_links.txt
 ok_script.egg-info/requires.txt
 ok_script.egg-info/top_level.txt
 tests/__init__.py
+tests/test_box.py
 tests/test_updater.py

{ok_script-0.0.332 → ok_script-0.0.333}/setup.py

@@ -47,7 +47,7 @@ extensions = find_pyx_packages(base_dir)
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.332",
+    version="0.0.333",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",

ok_script-0.0.333/tests/test_box.py

@@ -0,0 +1,30 @@
+import unittest
+
+from ok.feature.Box import Box, sort_boxes
+from ok.logging.Logger import get_logger
+
+logger = get_logger(__name__)
+
+
+class TestUpdater(unittest.TestCase):
+
+    def test_sort_box(self):
+        logger.debug("start test_check_for_updates")
+        # Create an Updater instance with a mocked config
+        box1 = Box(0, 10, 10, 10)
+        box2 = Box(10, 10, 10, 10)
+        box_list = [box2, box1]
+        box_list_sorted = sort_boxes(box_list)
+
+        # Assert the function returned the expected result
+        self.assertEqual([box1, box2], box_list_sorted)
+
+        box1 = Box(120, 740, 147, 38, name='41乐进', confidence=0.9998183)
+        box2 = Box(461, 736, 149, 41, name='41左慈', confidence=0.99900174)
+        box_list = [box2, box1]
+        box_list_sorted = sort_boxes(box_list)
+        self.assertEqual([box1, box2], box_list_sorted)
+
+
+if __name__ == '__main__':
+    unittest.main()