movoid-debug 1.2.2__tar.gz → 1.3.0__tar.gz

movoid_debug-1.3.0/PKG-INFO

@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: movoid_debug
+Version: 1.3.0
+Home-page: 
+Author: movoid
+Author-email: bobrobotsun@163.com
+Description-Content-Type: text/markdown
+Requires-Dist: movoid_function
+
+这个是一系列函数、类的装饰器，在运行时，如果报错，那么将会进入调试状态
+默认情况下：
+1、将所有Exception raise 出去，不做任何处理
+2、将Exception保存下来，可以在任意的地方调用某个方法抛出
+
+debug状态下：
+0、直接进入debug模式，弹出窗口，并进行操作
+1、将所有Exception raise 出去，不做任何处理
+2、将Exception保存下来，可以在任意的地方调用某个方法抛出

movoid_debug-1.3.0/README.md

@@ -0,0 +1,9 @@
+这个是一系列函数、类的装饰器，在运行时，如果报错，那么将会进入调试状态
+默认情况下：
+1、将所有Exception raise 出去，不做任何处理
+2、将Exception保存下来，可以在任意的地方调用某个方法抛出
+
+debug状态下：
+0、直接进入debug模式，弹出窗口，并进行操作
+1、将所有Exception raise 出去，不做任何处理
+2、将Exception保存下来，可以在任意的地方调用某个方法抛出

{movoid_debug-1.2.2 → movoid_debug-1.3.0}/movoid_debug/flow/flow.py

@@ -9,7 +9,7 @@
 import sys
 import traceback
 
-from movoid_function import Function, wraps, analyse_args_value_from_function
+from movoid_function import Function, wraps, analyse_args_value_from_function, wraps_ori
 
 from ..simple_ui import MainApp, MainWindow
 
@@ -20,16 +20,26 @@ class Flow:
         self.current_function = self.main
         self.test = False
         self.raise_error = 0
-        self.error_type = 0
-        self.check_error_type()
+        self.debug_type = 0
+        self.debug_flag = 0
+        self.init_debug_param()
         self.app = None
+        self.continue_error_list = []
 
-    def check_error_type(self):
+    def init_debug_param(self):
         for i in sys.argv:
             if i.startswith('__debug='):
-                temp = i[8:]
-                if temp == '1':
-                    self.error_type = 1
+                if i[8:] in ('1', 'debug'):
+                    self.debug_type = 1
+                else:
+                    self.debug_type = 0
+            elif i.startswith('__debug_flag='):
+                if i[13:] in ('0', 'debug'):
+                    self.debug_flag = 0
+                elif i[13:] in ('2',):
+                    self.debug_flag = 2
+                else:
+                    self.debug_flag = 1
 
     @property
     def text(self):
@@ -45,37 +55,63 @@ class Flow:
         else:
             self.current_function = self.current_function.parent
 
-    def when_error(self):
+    def when_error(self, *debug_flag, err=None, traceback_str=None):
+        """
+        这是供FlowFunction反调的函数，保证当前的处理模式是预选模式
+        :param debug_flag: 这是个传入的参数，就是把自己的参数传进去
+        :param err: 把故障传上来
+        :param traceback_str: 把traceback信息传上来
+        :return: 如果return 1 则是需要continue。如果return 2 则是需要 raise Error
+        """
         self.test = True
-        if self.error_type == -1:
-            self.when_error_cmd()
-        elif self.error_type == 1:
-            self.when_error_debug()
+        flag = self.analyse_target_debug_flag(*debug_flag)
+        if flag == 0:
+            re_value = self.when_error_debug()
+        else:
+            re_value = flag
+            if flag == 2:
+                self.continue_error_list.append([err, traceback_str])
         self.test = False
+        return re_value
 
     def when_error_debug(self):
+        """
+        调出一个debug窗口来进行debug，编辑请前往main_window.py进行
+        """
         if self.app is None:
             self.app = MainApp()
         self.app.main = MainWindow(self)
         self.app.exec()
+        return 2 if self.raise_error == 0 else 1
 
-    def when_error_cmd(self):
-        print('错误发生：')
-        while True:
-            print('以下是当前流程')
-            print(self.text)
-            input_str = input('请问如何处理？1、重新测试；2、弹出错误到上一级；3、弹出错误直至退出；其他、以当前的返回值返回：')
-            if input_str == '1':
-                self.current_function(*self.args, **self.kwargs)
-            elif input_str == '2':
-                self.raise_error = 1
-                break
-            elif input_str == '3':
-                self.raise_error = -1
-                break
-            else:
-                self.raise_error = False
-                break
+    def analyse_target_debug_flag(self, default_flag=None, *debug_flag):
+        """
+        解析当前的函数对应的debug flag是多少
+        优先看是否设置，没有设置就按照debug_type==0时的设置，如果也没有设置，那就继承flow的设置
+        当debug_type为0时，flag 0会被强制转换为1
+        :param default_flag: 保证在无设置时，可以继承flow的设置
+        :param debug_flag: 其他debug_type时的设置
+        :return: 返回具体的flag
+        """
+        debug_flag = [default_flag, *debug_flag]
+        ind = self.debug_type
+        tar_ind_flag = debug_flag[ind] if len(debug_flag) > ind else None
+        tar_flag = debug_flag[0] if tar_ind_flag is None else tar_ind_flag
+        flag = self.debug_flag if tar_flag is None else tar_flag
+        flag = max(0, min(2, flag))
+        if self.debug_type == 0:
+            flag = max(1, flag)
+        return flag
+
+    def release_all_pass_error(self, raise_it=True):
+        """
+        如果之前曾经continue掉一部分error，那么可以通过调用这个函数，来将所有的error释放出来。
+        :param raise_it: 是否把这些Error统一在一起raise 一个Error出来
+        """
+        if raise_it and self.continue_error_list:
+            temp = self.continue_error_list
+            self.continue_error_list = []
+            raise DebugError(*temp)
 
 
 class BasicFunction:
@@ -156,13 +192,13 @@ class MainFunction(BasicFunction):
 class FlowFunction(BasicFunction):
     func_type = 'function'
 
-    def __init__(self, func, flow, include=None, exclude=None, error_function=None, error_args=None, error_kwargs=None):
+    def __init__(self, func, flow, include=None, exclude=None, teardown_function=None):
         """
 
         """
         super().__init__()
         self.func = func
-        self.error_func = Function(error_function, error_args, error_kwargs)
+        self.teardown_function = Function() if teardown_function is None else FlowFunction(Function(teardown_function), flow, include=include, exclude=exclude, teardown_function=None)
         if include is None:
             self.include_error = Exception
             if exclude is None:
@@ -188,6 +224,8 @@ class FlowFunction(BasicFunction):
             test = TestFunction(self.func, self.flow, self)
             test(*args, **kwargs)
         else:
+            debug_default = kwargs.pop('__debug_default', None)
+            debug_debug = kwargs.pop('__debug_debug', None)
             try:
                 self.args = args
                 self.kwargs = kwargs
@@ -202,18 +240,9 @@ class FlowFunction(BasicFunction):
                     raise err
                 self.error = err
                 self.traceback = traceback.format_exc()
-                if self.debug_mode.get(self.flow.error_type, False):
-                    if self.flow.error_type in (-1, 1):
-                        self.flow.when_error()
-                        if self.flow.raise_error != 0:
-                            self.flow.raise_error -= 1
-                            raise err
-                        else:
-                            self.has_return = True
-                            return self.re_value
-                    else:
-                        self.error_func()
-                else:
+                error_flag = self.flow.when_error(debug_default, debug_debug, err=self.error, traceback_str=self.traceback)
+                if error_flag == 1:
+                    self.flow.raise_error -= 1
                     raise err
             except Exception as err:
                 raise err
@@ -222,6 +251,7 @@ class FlowFunction(BasicFunction):
                 self.re_value = re_value
                 return self.re_value
             finally:
+                self.teardown_function(args=self.args, kwargs=self.kwargs, re_value=self.re_value, error=self.error, traceback_str=self.traceback)
                 self.end = True
                 self.flow.current_function_end()
 
@@ -297,13 +327,24 @@ class TestError(Exception):
 FLOW = Flow()
 
 
-def debug_function(func):
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        temp = FlowFunction(func, FLOW)
-        temp(*args, **kwargs)
+def debug_function(debug_default=None, debug_debug=None):
+    if callable(debug_default):
+        return debug_function()(debug_default)
 
-    return wrapper
+    def dec(func):
+        if getattr(func, '__debug', False):
+            return func
+        else:
+            @wraps(func)
+            def wrapper(*args, __debug_default=debug_default, __debug_debug=debug_debug, **kwargs):
+                temp = FlowFunction(func, FLOW)
+                re_value = temp(*args, __debug_default=debug_default, __debug_debug=debug_debug, **kwargs)
+                return re_value
+
+            setattr(wrapper, '__debug', True)
+            return wrapper
+
+    return dec
 
 
 def debug_class_include(name_list):
@@ -339,3 +380,34 @@ def debug_class_exclude(name_list=None):
         return cls
 
     return dec
+
+
+class DebugError(Exception):
+    def __init__(self, *args):
+        self.args = args
+
+    def __str__(self):
+        re_str = ''
+        for err, trace in self.args:
+            re_str += f'{type(err).__name__}\n'
+        re_str.strip('\n')
+        return re_str
+
+    def traceback(self):
+        re_str = ''
+        for err, trace in self.args:
+            re_str += f'{trace}\n'
+        re_str.strip('\n')
+        return re_str
+
+
+def teardown(func):
+    """
+    这个函数可以规范teardown函数，保证无论怎么写，都不会因为参数的传递而报错
+    """
+
+    @wraps_ori(func)
+    def wrapper(args=None, kwargs=None, re_value=None, error=None, traceback_str=None):
+        pass
+
+    return wrapper

{movoid_debug-1.2.2 → movoid_debug-1.3.0}/movoid_debug/simple_ui/main_window.py

@@ -7,7 +7,8 @@
 # Description   : 
 """
 from PySide6.QtWidgets import QMainWindow, QApplication, QWidget, QGridLayout, QTreeWidget, QTextEdit, QHBoxLayout, QVBoxLayout, QPushButton, QTreeWidgetItem
-from .value_set_window import ValueSetWindow
+
+from .value_set_window import ValueSetWindow, tree_item_can_expand, expand_tree_item_to_show_dir
 
 
 class MainWindow(QMainWindow):
@@ -56,7 +57,7 @@ class MainWindow(QMainWindow):
         global_tree.setObjectName('global_tree')
         main_gird.addWidget(global_tree, 1, 2, 2, 1)
         global_tree.setHeaderLabels(['key', 'type', 'value'])
-        global_tree.itemExpanded.connect(self.expand_global_tree_to_show_dir)
+        global_tree.itemExpanded.connect(self.expand_tree_item_to_show_dir)
 
         run_widget = QWidget(main_table)
         end_widget = QWidget(main_table)
@@ -79,11 +80,16 @@ class MainWindow(QMainWindow):
         run_continue_button.clicked.connect(self.run_continue)
         run_grid.addStretch(1)
 
-        run_raise_button = QPushButton('忽略错误并raise error', main_table)
+        run_raise_button = QPushButton('raise错误', main_table)
         run_raise_button.setObjectName('run_raise_button')
         run_grid.addWidget(run_raise_button)
         run_raise_button.clicked.connect(self.run_raise)
 
+        run_raise_one_button = QPushButton('raise错误至上一层', main_table)
+        run_raise_one_button.setObjectName('run_raise_one_button')
+        run_grid.addWidget(run_raise_one_button)
+        run_raise_one_button.clicked.connect(self.run_raise_one)
+
         run_grid.addStretch(10)
 
     def refresh_ui(self):
@@ -174,14 +180,15 @@ class MainWindow(QMainWindow):
     def refresh_global_tree(self):
         global_value = globals()
         global_tree: QTreeWidget = self.findChild(QTreeWidget, 'global_tree')
+        global_tree.clear()
         for k, v in global_value.items():
             if not k.startswith('__'):
                 temp = QTreeWidgetItem(global_tree)
                 temp.setText(0, k)
                 temp.setText(1, type(v).__name__)
                 temp.setText(2, str(v))
-                setattr(temp, '__value', v)
-                self.empty_tree_item_child(temp)
+                setattr(temp, '__tree_object', v)
+                tree_item_can_expand(temp)
 
     def run_test(self, q):
         arg_tree: QTreeWidget = self.findChild(QTreeWidget, 'arg_tree')
@@ -205,6 +212,10 @@ class MainWindow(QMainWindow):
         self.flow.raise_error = -1
         self.close()
 
+    def run_raise_one(self, q):
+        self.flow.raise_error = 1
+        self.close()
+
     def change_arg_tree_value(self):
         arg_tree: QTreeWidget = self.findChild(QTreeWidget, 'arg_tree')
         flow = getattr(arg_tree, 'flow')
@@ -219,28 +230,10 @@ class MainWindow(QMainWindow):
             temp[current_value[-2]] = new_value
             self.refresh_arg_tree(flow, kwarg_value)
 
-    def empty_tree_item_child(self, item):
-        value = getattr(item, '__value')
-        if type(value) in (int, float, bool, str, list, dict) or value is None:
-            setattr(item, '__expand', False)
-        else:
-            temp = QTreeWidgetItem(item)
-            setattr(temp, '__delete', True)
-
-    def expand_global_tree_to_show_dir(self, item: QTreeWidgetItem):
-        if getattr(item, '__expand', True):
-            for i in range(item.childCount() - 1, -1, -1):
-                tar_item = item.child(i)
-                if getattr(tar_item, '__delete', False):
-                    item.removeChild(tar_item)
-            value = getattr(item, '__value')
-            for k in dir(value):
-                if not k.startswith('__'):
-                    v = getattr(value, k)
-                    if not callable(v):
-                        temp = QTreeWidgetItem(item)
-                        temp.setText(0, k)
-                        temp.setText(1, type(v).__name__)
-                        temp.setText(2, str(v))
-                        setattr(temp, '__value', v)
-                        self.empty_tree_item_child(temp)
+    @staticmethod
+    def expand_tree_item_to_show_dir(item: QTreeWidgetItem):
+        expand_tree_item_to_show_dir(item, {
+            0: lambda k, v: str(k),
+            1: lambda k, v: type(v).__name__,
+            2: lambda k, v: str(v),
+        })

{movoid_debug-1.2.2 → movoid_debug-1.3.0}/movoid_debug/simple_ui/value_set_window.py

@@ -6,10 +6,9 @@
 # Time          : 2024/6/9 23:13
 # Description   : 
 """
-import inspect
 import traceback
 
-from PySide6.QtWidgets import QWidget, QGridLayout, QApplication, QRadioButton, QErrorMessage, QVBoxLayout, QTextEdit, QTreeWidget, QHBoxLayout, QPushButton, QMessageBox, QDialog, QTreeWidgetItem
+from PySide6.QtWidgets import QWidget, QGridLayout, QApplication, QRadioButton, QVBoxLayout, QTextEdit, QTreeWidget, QHBoxLayout, QPushButton, QMessageBox, QDialog, QTreeWidgetItem
 
 
 class ValueSetWindow(QDialog):
@@ -44,7 +43,7 @@ class ValueSetWindow(QDialog):
         arg_tree.setObjectName('arg_tree')
         arg_tree.setHeaderLabels(['from', 'name', 'type', 'value'])
         input_grid.addWidget(arg_tree, 0, 1)
-        arg_tree.itemExpanded.connect(self.expand_object_to_show_dir)
+        arg_tree.itemExpanded.connect(self.expand_tree_item_to_show_dir)
 
         type_widget = QWidget(self)
         main_grid.addWidget(type_widget, 0, 0)
@@ -195,17 +194,17 @@ class ValueSetWindow(QDialog):
             temp.setText(0, 'ori')
             temp.setText(2, type(i).__name__)
             temp.setText(3, str(i))
-            setattr(temp, '__value', i)
+            setattr(temp, '__tree_object', i)
             arg_tree.setCurrentItem(temp)
-            self.empty_tree_item_child(temp)
+            tree_item_can_expand(temp)
         for k, v in global_value.items():
             if not k.startswith('__'):
                 temp = QTreeWidgetItem(arg_tree)
                 temp.setText(1, str(k))
                 temp.setText(2, type(v).__name__)
                 temp.setText(3, str(v))
-                setattr(temp, '__value', v)
-                self.empty_tree_item_child(temp)
+                setattr(temp, '__tree_object', v)
+                tree_item_can_expand(temp)
 
     def end_ok(self):
         try:
@@ -250,7 +249,7 @@ class ValueSetWindow(QDialog):
     def _get_object(self):
         arg_tree: QTreeWidget = self.findChild(QTreeWidget, 'arg_tree')
         tar_arg = arg_tree.currentItem()
-        return getattr(tar_arg, '__value')
+        return getattr(tar_arg, '__tree_object')
 
     def get_re_value(self):
         print('func', self, self.re_value)
@@ -263,30 +262,37 @@ class ValueSetWindow(QDialog):
         temp.exec()
         return temp.re_value
 
-    def empty_tree_item_child(self, item):
-        value = getattr(item, '__value')
-        if type(value) in (int, float, bool, str, list, dict) or value is None:
-            setattr(item, '__expand', False)
-        else:
-            temp = QTreeWidgetItem(item)
-            setattr(temp, '__delete', True)
-            temp = QTreeWidgetItem(item)
-            setattr(temp, '__delete', True)
-
-    def expand_object_to_show_dir(self, item: QTreeWidgetItem):
-        if getattr(item, '__expand', True):
-            for i in range(item.childCount() - 1, -1, -1):
-                tar_item = item.child(i)
-                if getattr(tar_item, '__delete'):
-                    item.removeChild(tar_item)
-            value = getattr(item, '__value')
-            for k in dir(value):
-                if not k.startswith('__'):
-                    v = getattr(value, k)
-                    if not callable(v):
-                        temp = QTreeWidgetItem(item)
-                        temp.setText(1, k)
-                        temp.setText(2, type(v).__name__)
-                        temp.setText(3, str(v))
-                        setattr(temp, '__value', v)
-                        self.empty_tree_item_child(temp)
+    @staticmethod
+    def expand_tree_item_to_show_dir(item):
+        expand_tree_item_to_show_dir(item, {
+            1: lambda k, v: str(k),
+            2: lambda k, v: type(v).__name__,
+            3: lambda k, v: str(v),
+        })
+
+
+def tree_item_can_expand(item):
+    value = getattr(item, '__tree_object')
+    if type(value) in (int, float, bool, str, list, dict) or value is None:
+        setattr(item, '__expand', False)
+    else:
+        temp = QTreeWidgetItem(item)
+        setattr(temp, '__delete', True)
+
+
+def expand_tree_item_to_show_dir(item: QTreeWidgetItem, show_dict: dict):
+    if getattr(item, '__expand', True):
+        for i in range(item.childCount() - 1, -1, -1):
+            tar_item = item.child(i)
+            if getattr(tar_item, '__delete'):
+                item.removeChild(tar_item)
+        value = getattr(item, '__tree_object')
+        for k in dir(value):
+            if not k.startswith('__'):
+                v = getattr(value, k)
+                if not callable(v):
+                    temp = QTreeWidgetItem(item)
+                    for k2, v2 in show_dict.items():
+                        temp.setText(int(k2), v2(k, v))
+                    setattr(temp, '__tree_object', v)
+                    tree_item_can_expand(temp)

movoid_debug-1.3.0/movoid_debug.egg-info/PKG-INFO

@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: movoid_debug
+Version: 1.3.0
+Home-page: 
+Author: movoid
+Author-email: bobrobotsun@163.com
+Description-Content-Type: text/markdown
+Requires-Dist: movoid_function
+
+这个是一系列函数、类的装饰器，在运行时，如果报错，那么将会进入调试状态
+默认情况下：
+1、将所有Exception raise 出去，不做任何处理
+2、将Exception保存下来，可以在任意的地方调用某个方法抛出
+
+debug状态下：
+0、直接进入debug模式，弹出窗口，并进行操作
+1、将所有Exception raise 出去，不做任何处理
+2、将Exception保存下来，可以在任意的地方调用某个方法抛出

{movoid_debug-1.2.2 → movoid_debug-1.3.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setup(
     name='movoid_debug',
-    version='1.2.2',
+    version='1.3.0',
     packages=find_packages(),
     url='',
     license='',

movoid_debug-1.2.2/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 2.1
-Name: movoid_debug
-Version: 1.2.2
-Home-page: 
-Author: movoid
-Author-email: bobrobotsun@163.com
-Description-Content-Type: text/markdown
-Requires-Dist: movoid_function
-
-This is a simple program for developer to 

movoid_debug-1.2.2/README.md

@@ -1 +0,0 @@
-This is a simple program for developer to 

movoid_debug-1.2.2/movoid_debug.egg-info/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 2.1
-Name: movoid_debug
-Version: 1.2.2
-Home-page: 
-Author: movoid
-Author-email: bobrobotsun@163.com
-Description-Content-Type: text/markdown
-Requires-Dist: movoid_function
-
-This is a simple program for developer to