ok-script 0.0.28__tar.gz → 0.0.31__tar.gz

{ok-script-0.0.28 → ok-script-0.0.31}/PKG-INFO

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

{ok-script-0.0.28 → ok-script-0.0.31}/ok/capture/adb/DeviceManager.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 import threading
 
@@ -24,7 +25,9 @@ def fix_adbutils_safe_connect(self):
     try:
         return self._create_socket()
     except (AdbConnectionError, AdbTimeout):
-        subprocess.run([adb_path(), "start-server"], timeout=20.0)  # 20s should enough for adb start
+        flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
+        subprocess.run([adb_path(), "start-server"], timeout=20.0,
+                       creationflags=flags)  # 20s should enough for adb start
         return self._create_socket()
 
 

{ok-script-0.0.28 → ok-script-0.0.31}/ok/feature/FeatureSet.py

@@ -11,6 +11,7 @@ from ok.feature.Box import Box, sort_boxes
 from ok.feature.Feature import Feature
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
+from ok.util.path import resource_path
 
 logger = get_logger(__name__)
 
@@ -29,7 +30,9 @@ class FeatureSet:
             width (int): Scale images to this width.
             height (int): Scale images to this height.
         """
-        self.coco_folder = coco_folder
+        self.coco_folder = resource_path(coco_folder)
+
+        logger.debug(f'Loading features from {self.coco_folder}')
 
         # Process images and annotations
         self.width = 0
@@ -57,7 +60,7 @@ class FeatureSet:
             height (int): Target height for scaling images.
         """
         self.featureDict.clear()
-        json_path = f'{self.coco_folder}/_annotations.coco.json'
+        json_path = os.path.join(self.coco_folder, '_annotations.coco.json')
         with open(json_path, 'r') as file:
             data = json.load(file)
 

{ok-script-0.0.28 → ok-script-0.0.31}/ok/util/path.py

@@ -24,6 +24,15 @@ def get_path_relative_to_exe(*files):
     return normalized_path
 
 
+def resource_path(relative_path):
+    """ Get absolute path to resource, works for dev and for PyInstaller """
+    base_dir = os.path.dirname(os.path.abspath(__file__))
+    base_dir = os.path.dirname(base_dir)
+    base_dir = os.path.dirname(base_dir)
+    base_path = getattr(sys, '_MEIPASS', base_dir)
+    return os.path.join(base_path, relative_path)
+
+
 def ensure_dir_for_file(file_path):
     # Extract the directory from the file path
     directory = os.path.dirname(file_path)

{ok-script-0.0.28 → ok-script-0.0.31}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.28 → ok-script-0.0.31}/setup.py

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