ok-script 0.0.145__tar.gz → 0.0.147__tar.gz

{ok-script-0.0.145/ok_script.egg-info → ok-script-0.0.147}/PKG-INFO

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

{ok-script-0.0.145 → ok-script-0.0.147}/ok/OK.py

@@ -128,10 +128,7 @@ class OK:
                 self.app.show_path_ascii_error(path)
                 self.init_error = True
                 return False
-            # try:
             from rapidocr_openvino import RapidOCR
-            # except (ImportError or ModuleNotFoundError):
-            # from rapidocr_onnxruntime import RapidOCR
             self.ocr = RapidOCR()
             self.task_executor.ocr = self.ocr
 

{ok-script-0.0.145 → ok-script-0.0.147}/ok/gui/tasks/TaskTab.py

@@ -64,7 +64,8 @@ class TaskTab(Tab):
                 self.task_info_container.show()
             info = task.info
             self.task_info_container.titleLabel.setText(
-                self.tr('Running') + f": {ok.gui.app.tr(task.name)} {self.time_elapsed(task.start_time)}")
+                self.tr(
+                    'Running') + f": {ok.gui.app.tr(task.name)} {self.time_elapsed(task.start_time)} {ok.gui.app.tr(task.description)}")
             self.task_info_table.setRowCount(len(info))
             for row, (key, value) in enumerate(info.items()):
                 if not self.task_info_table.item(row, 0):
@@ -74,7 +75,7 @@ class TaskTab(Tab):
                 if not self.task_info_table.item(row, 1):
                     item1 = self.uneditable_item()
                     self.task_info_table.setItem(row, 1, item1)
-                self.task_info_table.item(row, 1).setText(value_to_string(value))
+                self.task_info_table.item(row, 1).setText(ok.gui.app.tr(value_to_string(value)))
 
     def uneditable_item(self):
         item = QTableWidgetItem()

{ok-script-0.0.145 → ok-script-0.0.147}/ok/ocr/OCR.py

@@ -47,8 +47,7 @@ class OCR:
 
             image, scale_factor = resize_image(image, original_height, target_height)
 
-            result, _ = self.executor.ocr(image, use_det=True, use_cls=False, use_rec=True, det_use_dml=True,
-                                          cls_use_dml=True, rec_use_dml=True)
+            result, _ = self.executor.ocr(image, use_det=True, use_cls=False, use_rec=True)
 
             detected_boxes = []
             ocr_boxes = None

{ok-script-0.0.145 → ok-script-0.0.147}/ok/task/BaseTask.py

@@ -106,7 +106,8 @@ class BaseTask(ExecutorOperation):
             self.notification(message)
 
     def notification(self, message, title=None, error=False):
-        communicate.notification.emit(message, title, error, False)
+        from ok.gui import app
+        communicate.notification.emit(app.tr(message), app.tr(title), error, False)
 
     @property
     def enabled(self):

{ok-script-0.0.145 → ok-script-0.0.147}/ok/task/TaskExecutor.py

@@ -137,7 +137,7 @@ class TaskExecutor:
                         logger.warning(f"captured wrong size frame: {width}x{height}")
                         self._frame = None
                     return self._frame
-            self.sleep(0.001)
+            self.sleep(0.00001)
         raise FinishedException()
 
     def is_executor_thread(self):
@@ -304,6 +304,7 @@ class TaskExecutor:
                 if self._frame is not None:
                     communicate.screenshot.emit(self.frame, name)
                 self.current_task = None
+                communicate.notification.emit(None, str(e), True, True)
                 communicate.task.emit(None)
 
         logger.debug(f'exit_event is set, destroy all tasks')

{ok-script-0.0.145 → ok-script-0.0.147/ok_script.egg-info}/PKG-INFO

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

{ok-script-0.0.145 → ok-script-0.0.147}/setup.py

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