ok-script 0.0.48__tar.gz → 0.0.49__tar.gz

{ok-script-0.0.48 → ok-script-0.0.49}/PKG-INFO

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

{ok-script-0.0.48 → ok-script-0.0.49}/ok/OK.py

@@ -28,6 +28,8 @@ class OK:
 
     def __init__(self, config: Dict[str, Any]):
         print(f"AutoHelper init, config: {config}")
+        config_logger(config)
+        logger.info(f"AutoHelper init, config: {config}")
         ok.gui.ok = self
         self.debug = config.get("debug", False)
         try:
@@ -44,6 +46,7 @@ class OK:
                 self.device_manager.start()
                 self.do_init()
         except Exception as e:
+            logger.error(f'__init__ error', e)
             self.quit()
             raise e
 
@@ -94,8 +97,6 @@ class OK:
             inference_num_threads = self.config.get('ocr').get('inference_num_threads', -1)
             self.ocr = RapidOCR(inference_num_threads=inference_num_threads)
 
-        config_logger(self.config)
-
         if self.config.get('coco_feature_folder') is not None:
             coco_feature_folder = self.config.get('coco_feature_folder')
             from ok.feature.FeatureSet import FeatureSet

ok-script-0.0.49/ok/config/Config.py

@@ -0,0 +1,132 @@
+from ok.gui.Communicate import communicate
+from ok.logging.Logger import get_logger
+from ok.util.json import read_json_file, write_json_file
+from ok.util.path import get_path_relative_to_exe
+
+logger = get_logger(__name__)
+
+
+class Config(dict):
+    def __init__(self, default, folder, name, validator=None):
+        """
+        Initialize the Config object.
+
+        :param default: Default configuration values.
+        :param folder: Folder where the config file is stored.
+        :param name: Name of the config file.
+        :param validator: Optional function to validate key-value pairs.
+        """
+        self.default = default
+        self.validator = validator
+        self.config_file = get_path_relative_to_exe(folder, f"{name}.json")
+
+        # Read the config file, if it exists, otherwise use default
+        config = read_json_file(self.config_file)
+        if config is None:
+            self.reset_to_default()
+        else:
+            super().__init__(config)
+            modified = self.verify_config(default)
+            if modified:
+                self.save_file()
+        logger.debug(f'init self.config = {self}')
+
+    def save_file(self):
+        """
+        Save the current configuration to the file.
+        """
+        try:
+            write_json_file(self.config_file, self)
+        except Exception as e:
+            logger.error(f'save_file error: {e}')
+
+    def reset_to_default(self):
+        """
+        Reset the configuration to the default values.
+        """
+        super().clear()
+        self.update(self.default)
+        self.save_file()
+        logger.debug(f'reset_to_default self.config = {self}')
+
+    def pop(self, key, default=None):
+        """
+        Remove and return a value from the configuration.
+
+        :param key: The key to remove.
+        :param default: The default value if the key does not exist.
+        :return: The removed value.
+        """
+        result = super().pop(key, default)
+        self.save_file()
+        return result
+
+    def popitem(self):
+        """
+        Remove and return the last key-value pair from the configuration.
+        """
+        result = super().popitem()
+        self.save_file()
+        return result
+
+    def clear(self):
+        """
+        Clear all configuration values.
+        """
+        super().clear()
+        self.save_file()
+
+    def __setitem__(self, key, value):
+        if self.validate(key, value):
+            super().__setitem__(key, value)
+            self.save_file()
+
+    def __getitem__(self, key):
+        try:
+            return super().__getitem__(key)
+        except KeyError as e:
+            logger.error(f'KeyError: {key} not found in config: {self}')
+            raise e
+
+    def validate(self, key, value):
+        """
+        Validate a configuration key-value pair.
+
+        :param key: The key to validate.
+        :param value: The value to validate.
+        :return: True if valid, False otherwise.
+        """
+        if self.validator is not None:
+            valid, message = self.validator(key, value)
+            if not valid:
+                communicate.config_validation.emit(message)
+                return False
+        return True
+
+    def verify_config(self, default_config):
+        """
+        Verify the configuration against the default configuration.
+
+        :param default_config: The default configuration.
+        :return: True if the config was modified, False otherwise.
+        """
+        modified = False
+
+        # Remove entries that do not exist in default_config
+        for key in list(self.keys()):
+            if key not in default_config:
+                del self[key]
+                modified = True
+
+        # Check entries in default_config
+        for key, default_value in default_config.items():
+            if key not in self or not isinstance(self[key], type(default_value)):
+                self[key] = default_value
+                modified = True
+            elif self.validator is not None:
+                valid = self.validate(key, self[key])
+                if not valid:
+                    self[key] = default_value
+                    modified = True
+
+        return modified

{ok-script-0.0.48 → ok-script-0.0.49}/ok/gui/debug/Screenshot.py

@@ -36,7 +36,6 @@ class Screenshot(QObject):
         self.click_screenshot_folder = get_path_relative_to_exe(ok.gui.ok.config.get("click_screenshots_folder"))
         self.screenshot_folder = get_path_relative_to_exe(ok.gui.ok.config.get("screenshots_folder"))
         logger.debug(f"init Screenshot {self.screenshot_folder} {self.click_screenshot_folder}")
-        print(f"init Screenshot {self.screenshot_folder} {self.screenshot_folder}")
         if self.click_screenshot_folder is not None or self.screenshot_folder is not None:
             self.task_queue = queue.Queue()
             self.exit_event.bind_queue(self.task_queue)

{ok-script-0.0.48 → ok-script-0.0.49}/ok/gui/resources.py

@@ -334,7 +334,7 @@ StartCard\x01\x03\x00\x00\x00\x08N\
 *\x89\xe6S\xd1Vh\x08\x00\x00\x00\x00\x06\x00\x00\x00\
 \x0dTrigger Tasks\x07\x00\
 \x00\x00\x09StartCard\x01\x03\x00\x00\
-\x00\x10{I_\x85\x90\x09b\xe9N\xfbR\xa1_\x00\
+\x00\x10p\xb9Q\xfb\x90\x09b\xe9N\xfbR\xa1_\x00\
 Y\xcb\x08\x00\x00\x00\x00\x06\x00\x00\x00\x1eWait\
 ing for task to \
 be enabled\x07\x00\x00\x00\x09S\
@@ -1160,7 +1160,7 @@ qt_resource_struct = b"\
 \x00\x00\x00>\x00\x01\x00\x00\x00\x01\x00\x00\x1a\x85\
 \x00\x00\x01\x8e2\xed>\xd3\
 \x00\x00\x00(\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x8f\xce\x0b<g\
+\x00\x00\x01\x8f\xcf\xc5~\xab\
 \x00\x00\x00T\x00\x02\x00\x00\x00\x05\x00\x00\x00\x0d\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00b\x00\x02\x00\x00\x00\x05\x00\x00\x00\x08\

{ok-script-0.0.48 → ok-script-0.0.49}/ok/gui/start/StartCard.py

@@ -143,16 +143,21 @@ class StartCard(SettingCard):
             if not ok.gui.executor.connected():
                 self.status_bar.setTitle(self.tr("Game Window Disconnected"))
                 self.status_bar.setState(True)
-            elif not ok.gui.executor.can_capture():
-                self.status_bar.setTitle(self.tr('Paused: PC Game Window Must Be in Front!'))
-                self.status_bar.setState(True)
             elif active_trigger_task_count := ok.gui.executor.active_trigger_task_count():
-                self.status_bar.setTitle(
-                    self.tr("Running") + ": " + str(active_trigger_task_count) + ' ' + self.tr("Trigger Tasks"))
-                self.status_bar.setState(False)
+                if not ok.gui.executor.can_capture():
+                    self.status_bar.setTitle(self.tr('Paused: PC Game Window Must Be in Front!'))
+                    self.status_bar.setState(True)
+                else:
+                    self.status_bar.setTitle(
+                        self.tr("Running") + ": " + str(active_trigger_task_count) + ' ' + self.tr("Trigger Tasks"))
+                    self.status_bar.setState(False)
             elif task := ok.gui.executor.current_task:
-                self.status_bar.setTitle(self.tr("Running") + ": " + task.name)
-                self.status_bar.setState(False)
+                if not ok.gui.executor.can_capture():
+                    self.status_bar.setTitle(self.tr('Paused: PC Game Window Must Be in Front!'))
+                    self.status_bar.setState(True)
+                else:
+                    self.status_bar.setTitle(self.tr("Running") + ": " + task.name)
+                    self.status_bar.setState(False)
             else:
                 self.status_bar.setTitle(self.tr("Waiting for task to be enabled"))
                 self.status_bar.setState(False)

{ok-script-0.0.48 → ok-script-0.0.49}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.48 → ok-script-0.0.49}/setup.py

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

ok-script-0.0.48/ok/config/Config.py

@@ -1,100 +0,0 @@
-from ok.gui.Communicate import communicate
-from ok.util.json import read_json_file, write_json_file
-from ok.util.path import get_path_relative_to_exe
-
-
-class Config:
-    def __init__(self, default, folder, name, validator=None):
-        super().__init__()
-        self.default = default
-        self.validator = validator
-        self.config_file = get_path_relative_to_exe(folder, f"{name}.json")
-        self.config = read_json_file(self.config_file)
-        if self.config is None:
-            self.config = default
-        elif self.verify_config(self.config, default):
-            self.save_file()
-
-    def save_file(self):
-        write_json_file(self.config_file, self.config)
-
-    def reset_to_default(self):
-        self.config.clear()
-        self.update(self.default)
-        self.save_file()
-
-    def update(self, *args, **kwargs):
-        self.config.update(*args, **kwargs)
-        self.save_file()
-
-    def get(self, key, default=None):
-        return self.config.get(key, default)
-
-    def keys(self):
-        return self.config.keys()
-
-    def values(self):
-        return self.config.values()
-
-    def items(self):
-        return self.config.items()
-
-    def pop(self, key, default=None):
-        result = self.config.pop(key, default)
-        self.save_file()
-        return result
-
-    def popitem(self):
-        result = self.config.popitem()
-        self.save_file()
-        return result
-
-    def setdefault(self, key, default=None):
-        result = self.config.setdefault(key, default)
-        self.save_file()
-        return result
-
-    def clear(self):
-        self.config.clear()
-        self.save_file()
-
-    def __len__(self):
-        return len(self.config)
-
-    def __setitem__(self, key, value):
-        if self.validate(key, value):
-            self.config[key] = value
-            self.save_file()
-
-    def __getitem__(self, key):
-        return self.config[key]
-
-    def validate(self, key, value):
-        if self.validator is not None:
-            valid, message = self.validator(key, value)
-            if not valid:
-                communicate.config_validation.emit(message)
-                return False
-        return True
-
-    def verify_config(self, config, default_config):
-        modified = False
-
-        # Remove entries that do not exist in default_config
-        for key in list(config.keys()):
-            if key not in default_config:
-                del config[key]
-                modified = True
-
-        # Check entries in default_config
-        for key, default_value in default_config.items():
-            if key not in config or (default_value is not None and type(config[key]) != type(default_value)):
-                config[key] = default_value
-                modified = True
-            elif self.validator is not None:
-                valid = self.validate(key, self.config[key])
-                if not valid:
-                    config[key] = default_value
-                    modified = True
-
-        return not modified