ok-script 0.0.36__tar.gz → 0.0.37__tar.gz

{ok-script-0.0.36 → ok-script-0.0.37}/PKG-INFO

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

{ok-script-0.0.36 → ok-script-0.0.37}/ok/capture/adb/ADBCaptureMethod.py

@@ -1,7 +1,6 @@
 # original https://github.com/Toufool/AutoSplit/blob/master/src/capture_method/WindowsGraphicsCaptureMethod.py
 import cv2
 import numpy as np
-from adbutils import AdbError
 from typing_extensions import override
 
 from ok.capture.BaseCaptureMethod import BaseCaptureMethod
@@ -14,12 +13,12 @@ class ADBCaptureMethod(BaseCaptureMethod):
     name = "ADB command line Capture"
     description = "use the adb screencap command, slow but works when in background/minimized, takes 300ms per frame"
 
-    def __init__(self, device, exit_event, width=0, height=0):
+    def __init__(self, device_manager, exit_event, width=0, height=0):
         super().__init__()
         self.exit_event = exit_event
         self._size = (width, height)
         self._connected = (width != 0 and height != 0)
-        self.device = device
+        self.device_manager = device_manager
 
     @property
     def width(self):
@@ -40,7 +39,7 @@ class ADBCaptureMethod(BaseCaptureMethod):
     def screencap(self):
         if self.exit_event.is_set():
             return None
-        frame = do_screencap(self.device)
+        frame = do_screencap(self.device_manager)
         if frame is not None:
             height, width, _ = frame.shape
             self._connected = True
@@ -50,21 +49,17 @@ class ADBCaptureMethod(BaseCaptureMethod):
         return frame
 
     def connected(self):
-        if not self._connected and self.device is not None:
+        if not self._connected and self.device_manager.device is not None:
             self.screencap()
-        return self._connected and self.device is not None
+        return self._connected and self.device_manager.device is not None
 
 
-def do_screencap(device) -> np.ndarray | None:
-    if device is not None:
-        try:
-            png_bytes = device.shell("screencap -p", encoding=None)
-            if png_bytes is not None and len(png_bytes) > 0:
-                image_data = np.frombuffer(png_bytes, dtype=np.uint8)
-                image = cv2.imdecode(image_data, cv2.IMREAD_COLOR)
-                if image is not None:
-                    return image
-                else:
-                    logger.error(f"Screencap image decode error, probably disconnected")
-        except AdbError as e:
-            logger.error(f"Device {device} error", e)
+def do_screencap(device_manager) -> np.ndarray | None:
+    png_bytes = device_manager.shell("screencap -p", encoding=None)
+    if png_bytes is not None and len(png_bytes) > 0:
+        image_data = np.frombuffer(png_bytes, dtype=np.uint8)
+        image = cv2.imdecode(image_data, cv2.IMREAD_COLOR)
+        if image is not None:
+            return image
+        else:
+            logger.error(f"Screencap image decode error, probably disconnected")

{ok-script-0.0.36 → ok-script-0.0.37}/ok/capture/adb/DeviceManager.py

@@ -2,6 +2,7 @@ import threading
 
 import adbutils
 import win32gui
+from adbutils import AdbError
 
 from ok.capture.HwndWindow import HwndWindow, find_hwnd_by_title_and_exe
 from ok.capture.adb.ADBCaptureMethod import ADBCaptureMethod, do_screencap
@@ -217,7 +218,7 @@ class DeviceManager:
             elif not isinstance(self.capture_method, ADBCaptureMethod):
                 if self.capture_method is not None:
                     self.capture_method.close()
-                self.capture_method = ADBCaptureMethod(self._device, self.exit_event, width=width,
+                self.capture_method = ADBCaptureMethod(self, self.exit_event, width=width,
                                                        height=height)
             self.interaction = ADBBaseInteraction(self, self.capture_method, width, height)
             if self.debug and hwnd_name:
@@ -255,5 +256,10 @@ class DeviceManager:
         if device is not None:
             try:
                 return device.shell(*args, **kwargs)
-            except Exception as e:
-                logger.error(f"shell_wrapper error occurred: {e}")
+            except AdbError as e:
+                addr = self.get_preferred_device()['address']
+                self.adb.connect(addr)
+                logger.error(f"shell_wrapper error occurred: {e} ,try reconnect {addr}")
+                return device.shell(*args, **kwargs)
+        else:
+            raise Exception('Device is none')

{ok-script-0.0.36 → ok-script-0.0.37}/ok/interaction/ADBInteraction.py

@@ -27,4 +27,4 @@ class ADBBaseInteraction(BaseInteraction):
         super().click(x, y)
         x = int(x * self.width / self.capture.width)
         y = int(y * self.height / self.capture.height)
-        self.device_manager.device.shell(f"input tap {x} {y}")
+        self.device_manager.shell(f"input tap {x} {y}")

{ok-script-0.0.36 → ok-script-0.0.37}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.36 → ok-script-0.0.37}/ok_script.egg-info/SOURCES.txt

@@ -100,8 +100,6 @@ ok/logging/Logger.py
 ok/logging/__init__.py
 ok/ocr/OCR.py
 ok/ocr/__init__.py
-ok/predict/__init__.py
-ok/predict/predict.py
 ok/rotypes/__init__.py
 ok/rotypes/delegate.py
 ok/rotypes/export.py

{ok-script-0.0.36 → ok-script-0.0.37}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.36",
+    version="0.0.37",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",

ok-script-0.0.36/ok/predict/predict.py

@@ -1,45 +0,0 @@
-import torch
-from PIL import Image, ImageDraw
-import numpy as np
-from ultralytics import YOLO
-
-# Load the model
-# model = torch.hub.load('ultralytics/yolov8', 'custom', path='models/best.pt')
-model = YOLO('models/best.pt')  # pretrained YOLOv8n model
-
-# Run batched inference on a list of images
-# results = model(['im1.jpg', 'im2.jpg'])  # return a list of Results objects
-
-# Load an image
-image_path = 'images/3.jpg'
-image = Image.open(image_path)
-
-# Perform inference
-results = model(image)
-
-# Extract data
-for result in results:
-    boxes = result.boxes  # Boxes object for bbox outputs
-    print(boxes)
-    masks = result.masks  # Masks object for segmentation masks outputs
-    keypoints = result.keypoints  # Keypoints object for pose outputs
-    probs = result.probs  # Probs object for classification outputs
-
-for r in results:
-    im_array = r.plot()  # plot a BGR numpy array of predictions
-    im = Image.fromarray(im_array[..., ::-1])  # RGB PIL image
-    im.show()  # show image
-    im.save('results.jpg')  # save image
-# labels, cord = results.xyxyn[0][:, -1], results.xyxyn[0][:, :-1]
-
-# # Draw bounding boxes and labels
-# draw = ImageDraw.Draw(image)
-# for label, (*xyxy,) in zip(labels, cord):
-#     label = model.module.names[int(label)]  # Get label name
-#     xyxy = (xyxy * np.array([image.width, image.height, image.width, image.height])).tolist()  # Scale coords
-#     draw.rectangle(xyxy, outline='red', width=3)
-#     draw.text(xyxy[:2], label, fill='red')
-
-# Save or display image
-# image.save('output/1.jpg')
-# image.show()