ok-script 0.0.87__tar.gz → 0.0.89__tar.gz

{ok-script-0.0.87 → ok-script-0.0.89}/PKG-INFO

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

{ok-script-0.0.87 → ok-script-0.0.89}/ok/capture/adb/DeviceManager.py

@@ -263,7 +263,7 @@ class DeviceManager:
             self.use_windows_capture()
             if not isinstance(self.interaction, Win32Interaction):
                 self.interaction = Win32Interaction(self.capture_method)
-            preferred['connected'] = self.capture_method.connected()
+            preferred['connected'] = self.capture_method is not None and self.capture_method.connected()
         else:
             width, height = self.get_resolution()
             if self.config.get('capture') == "windows":

{ok-script-0.0.87 → ok-script-0.0.89}/ok/feature/FeatureSet.py

@@ -49,14 +49,15 @@ class FeatureSet:
         self.lock = threading.Lock()
 
     def check_size(self, frame):
-        height, width = frame.shape[:2]
-        if self.width != width or self.height != height and height > 0 and width > 0:
-            logger.info(f"FeatureSet: Width and height changed from {self.width}x{self.height} to {width}x{height}")
-            self.width = width
-            self.height = height
-            self.process_data()
-        elif not self.feature_dict:
-            self.process_data()
+        with self.lock:
+            height, width = frame.shape[:2]
+            if self.width != width or self.height != height and height > 0 and width > 0:
+                logger.info(f"FeatureSet: Width and height changed from {self.width}x{self.height} to {width}x{height}")
+                self.width = width
+                self.height = height
+                self.process_data()
+            elif not self.feature_dict:
+                self.process_data()
 
     def process_data(self) -> None:
         """
@@ -66,60 +67,59 @@ class FeatureSet:
             width (int): Target width for scaling images.
             height (int): Target height for scaling images.
         """
-        with self.lock:
-            if self.debug:
-                folder_size = sum(os.path.getsize(os.path.join(dirpath, filename))
-                                  for dirpath, dirnames, filenames in os.walk(self.coco_folder)
-                                  for filename in filenames)
-                # Convert size to MB
-                folder_size_mb = folder_size / (1024 * 1024)
-                if folder_size_mb > 5:
-                    from ok.feature.CompressCoco import compress_coco
-                    logger.info(f'template folder greater than 5MB try to compress the COCO dataset')
-                    compress_coco(self.coco_json)
-            self.feature_dict.clear()
-            self.box_dict.clear()
-            with open(self.coco_json, 'r') as file:
-                data = json.load(file)
-
-            # Create a map from image ID to file name
-            image_map = {image['id']: image['file_name'] for image in data['images']}
-
-            # Create a map from category ID to category name
-            category_map = {category['id']: category['name'] for category in data['categories']}
-
-            for annotation in data['annotations']:
-                image_id = annotation['image_id']
-                category_id = annotation['category_id']
-                bbox = annotation['bbox']
-
-                # Load and scale the image
-                image_path = str(os.path.join(self.coco_folder, image_map[image_id]))
-                image = cv2.imread(image_path)
-                _, original_width = image.shape[:2]
-                if image is None:
-                    logger.error(f'Could not read image {image_path}')
-                    continue
-                x, y, w, h = bbox
-                if self.width != image.shape[1] or self.height != image.shape[0]:
-                    scale_x, scale_y = self.width / image.shape[1], self.height / image.shape[0]
-                    logger.debug(f'scaling images {scale_x}, {scale_y}')
-                    image = cv2.resize(image, (self.width, self.height))
-                    # Calculate the scaled bounding box
-                    x, y, w, h = x * scale_x, y * scale_y, w * scale_x, h * scale_y
-
-                # Crop the image to the bounding box
-                image = image[round(y):round(y + h), round(x):round(x + w), :3]
-
-                # Store in featureDict using the category name
-                category_name = category_map[category_id]
-                logger.debug(
-                    f"loaded {category_name} resized width {self.width} / original_width:{original_width},scale_x:{self.width / original_width}")
-                if category_name in self.feature_dict:
-                    raise ValueError(f"Multiple boxes found for category {category_name}")
-                if not category_name.startswith('box_'):
-                    self.feature_dict[category_name] = Feature(image, x, y, w, h)
-                self.box_dict[category_name] = Box(x, y, w, h, name=category_name)
+        if self.debug:
+            folder_size = sum(os.path.getsize(os.path.join(dirpath, filename))
+                              for dirpath, dirnames, filenames in os.walk(self.coco_folder)
+                              for filename in filenames)
+            # Convert size to MB
+            folder_size_mb = folder_size / (1024 * 1024)
+            if folder_size_mb > 5:
+                from ok.feature.CompressCoco import compress_coco
+                logger.info(f'template folder greater than 5MB try to compress the COCO dataset')
+                compress_coco(self.coco_json)
+        self.feature_dict.clear()
+        self.box_dict.clear()
+        with open(self.coco_json, 'r') as file:
+            data = json.load(file)
+
+        # Create a map from image ID to file name
+        image_map = {image['id']: image['file_name'] for image in data['images']}
+
+        # Create a map from category ID to category name
+        category_map = {category['id']: category['name'] for category in data['categories']}
+
+        for annotation in data['annotations']:
+            image_id = annotation['image_id']
+            category_id = annotation['category_id']
+            bbox = annotation['bbox']
+
+            # Load and scale the image
+            image_path = str(os.path.join(self.coco_folder, image_map[image_id]))
+            image = cv2.imread(image_path)
+            _, original_width = image.shape[:2]
+            if image is None:
+                logger.error(f'Could not read image {image_path}')
+                continue
+            x, y, w, h = bbox
+            if self.width != image.shape[1] or self.height != image.shape[0]:
+                scale_x, scale_y = self.width / image.shape[1], self.height / image.shape[0]
+                logger.debug(f'scaling images {scale_x}, {scale_y}')
+                image = cv2.resize(image, (self.width, self.height))
+                # Calculate the scaled bounding box
+                x, y, w, h = x * scale_x, y * scale_y, w * scale_x, h * scale_y
+
+            # Crop the image to the bounding box
+            image = image[round(y):round(y + h), round(x):round(x + w), :3]
+
+            # Store in featureDict using the category name
+            category_name = category_map[category_id]
+            logger.debug(
+                f"loaded {category_name} resized width {self.width} / original_width:{original_width},scale_x:{self.width / original_width}")
+            if category_name in self.feature_dict:
+                raise ValueError(f"Multiple boxes found for category {category_name}")
+            if not category_name.startswith('box_'):
+                self.feature_dict[category_name] = Feature(image, x, y, w, h)
+            self.box_dict[category_name] = Box(x, y, w, h, name=category_name)
 
     def get_box_by_name(self, mat, category_name: str) -> Box:
         self.check_size(mat)

{ok-script-0.0.87 → ok-script-0.0.89}/ok/gui/debug/LogWindow.py

@@ -69,6 +69,8 @@ class LogModel(QAbstractListModel):
         self.beginInsertRows(QModelIndex(), self.rowCount(QModelIndex()), self.rowCount(QModelIndex()))
         self.do_filter_logs()
         self.endInsertRows()
+        self.layoutChanged.emit()
+        self.log_list.scrollToBottom()
 
     def do_filter_logs(self):
 

{ok-script-0.0.87 → ok-script-0.0.89}/ok/ocr/OCR.py

@@ -55,13 +55,13 @@ class OCR:
                     pos = res[0]
                     text = res[1]
                     confidence = res[2]
-                    width, height = int(pos[2][0] - pos[0][0]), int(pos[2][1] - pos[0][1])
+                    width, height = round(pos[2][0] - pos[0][0]), round(pos[2][1] - pos[0][1])
                     if width <= 0 or height <= 0:
                         logger.error(f'ocr result negative box {text} {confidence} {width}x{height} pos:{pos}')
                         continue
                     if confidence >= threshold:
-                        detected_box = Box(int(pos[0][0]), int(pos[0][1]), int(pos[2][0] - pos[0][0]),
-                                           int(pos[2][1] - pos[0][1]),
+                        detected_box = Box(pos[0][0], pos[0][1], width,
+                                           height,
                                            confidence, text)
                         scale_box(detected_box, scale_factor)
                         if box is not None:

{ok-script-0.0.87 → ok-script-0.0.89}/ok/update/Updater.py

@@ -70,27 +70,10 @@ REM Check all PIDs every second and terminate them after 10 seconds if still run
 set "check_duration=10"
 
 for %%A in (%pid_list%) do (
-    set "elapsed_time=0"
-    :check_loop
-    echo %time% - Waiting for PID %%A to exit...
-    tasklist /fi "PID eq %%A" | find ":" >nul
-    if errorlevel 1 (
-        echo %time% - PID %%A has exited.
-        goto next_pid
-    ) else (
-        timeout /t 1 /nobreak >nul
-        set /a elapsed_time+=1
-        if !elapsed_time! geq %check_duration% (
-            echo %time% - PID %%A is still running after %check_duration% seconds, killing it...
-            taskkill /f /pid %%A
-            goto next_pid
-        )
-        goto check_loop
-    )
-    :next_pid
-    echo %time% - continue
+    call :check_pid %%A
 )
 
+
 REM Sleep for one second
 timeout /t 1 /nobreak >nul
 
@@ -114,6 +97,29 @@ for /D %%D in ("%source_dir%\*") do (
 echo %time% Update Success
 start "" %exe%
 endlocal
+pause
+
+goto :eof
+
+:check_pid
+set "elapsed_time=0"
+:check_loop
+echo %time% - Waiting for PID %1 to exit...
+tasklist /fi "PID eq %1" | find ":" >nul
+if errorlevel 1 (
+    echo %time% - PID %1 has exited.
+    goto :eof
+) else (
+    timeout /t 1 /nobreak >nul
+    set /a elapsed_time+=1
+    if !elapsed_time! geq %check_duration% (
+        echo %time% - PID %1 is still running after %check_duration% seconds, killing it...
+        taskkill /f /pid %1
+        goto :eof
+    )
+    goto check_loop
+)
+goto :eof
 '''
 
 
@@ -287,17 +293,23 @@ class Updater:
         return True
 
     def update(self):
+        ok.gui.device_manager.adb_kill_server()
         exe_folder = get_path_relative_to_exe()
         batch_command = [self.to_update.get("updater_bat"), self.to_update.get("update_package_folder"), exe_folder,
-                         os.path.join(exe_folder, self.exe_name), os.path.join(exe_folder, 'md5.txt'), str(os.getpid())]
-        for proc in psutil.process_iter(['pid', 'name']):
-            if proc.info['name'] == 'adb.exe':
+                         os.path.join(exe_folder, self.exe_name), str(os.getpid())]
+        for proc in psutil.process_iter(['pid', 'name', 'exe']):
+            if proc.info['name'] == 'adb.exe' and os.path.normpath(proc.info['exe']).startswith(
+                    os.path.normpath(exe_folder)):
+                try:
+                    logger.info(f'try kill the adb process {proc.info}')
+                    proc.kill()
+                except Exception as e:
+                    logger.error(f'kill process error', e)
                 batch_command.append(str(proc.info['pid']))
 
         logger.info(f'execute update {batch_command}')
 
         subprocess.Popen(batch_command, creationflags=subprocess.CREATE_NEW_CONSOLE)
-        ok.gui.device_manager.adb_kill_server()
         ok.gui.ok.quit()
 
     def check_package_error(self):

{ok-script-0.0.87 → ok-script-0.0.89}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.87 → ok-script-0.0.89}/setup.py

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