uiml 0.2.3__tar.gz → 0.3.0.dev1__tar.gz

{uiml-0.2.3/src/uiml.egg-info → uiml-0.3.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uiml
-Version: 0.2.3
+Version: 0.3.0.dev1
 Home-page: https://github.com/xystudio889/
 Author: xystudio
 Author-email: xystudio <173288240@qq.com>

{uiml-0.2.3 → uiml-0.3.0.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "uiml"
-version = "0.2.3"
+version = "0.3.0.dev1"
 description = ""
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [

{uiml-0.2.3 → uiml-0.3.0.dev1}/setup.py

@@ -2,10 +2,10 @@ from setuptools import setup, find_packages
 
 setup(
     name = "uiml",
-    version = "0.2.3",
+    version = "0.3.0.dev1",
     package_dir={"": "src"},
     packages=find_packages(where="src"),
-    install_requires = ["PySide6>=6.10.0"],
+    install_requires = ["PySide6>=6.10.0", "deprecated>=1.3"],
     python_requires = ">=3.10",
     author = "xystudio",
     author_email = "173288240@qq.com",

{uiml-0.2.3 → uiml-0.3.0.dev1}/src/uiml/__init__.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-from typing import Any, Dict, Optional, Tuple
+from typing import Any, Dict, Optional, Tuple, Callable
+from deprecated import deprecated
+from warnings import warn
 
 try:
     from uiml.uilib import *
@@ -12,6 +14,77 @@ except ImportError as e:
 
 import inspect
 import re
+from enum import Enum
+
+_UNICODE = re.compile(r'&#[xX]([0-9a-fA-F]+);',)
+func = list[Callable]
+
+namespace_api_enabled = False
+
+class ParserEnum(Enum):
+    replacer = 1 # 参数替换器
+    widget_parser = 2 # 组件解析器
+    layout_parser = 3 # 布局解析器
+
+    removed_widget_key = 5 # 自动删除的组件项目列表
+    removed_layout_key = 6 # 自动删除的布局项目列表
+
+    uiml_class = 7 # 对layout渲染的扩展
+
+class ParamEnum(Enum):
+    reverse_namespace = 1 # 翻转命名空间顺序
+    value_convert = 2 # 允许变量转化
+    debug_mode = 3 # 调试模式
+    namespace_parser = 4 # 命名空间的解析器
+
+class ParserChain:
+    def __init__(self, funcs: Optional[func] = None):
+        self._funcs = [] if funcs is None else funcs
+
+        if funcs is not None:
+            self.funcs = funcs # 初始校验
+
+    def add(self, func:func):
+        '''添加一个函数 / 装饰器'''
+        self.funcs.append(func)
+        self.check(func)
+        return func
+
+    def remove(self, func:func):
+        '''删除一个函数'''
+        self.funcs.remove(func)
+
+    def set(self, funcs: func):
+        self.funcs = funcs
+
+    @property
+    def funcs(self):
+        return self._funcs
+
+    @funcs.setter
+    def funcs(self, v):
+        self.check(v)
+
+    def check(self, v):
+        if isinstance(v, list):
+            for func in v:
+                if not isinstance(func, Callable):
+                    raise TypeError('Function list item must be function')
+            self._funcs = v
+        else:
+            raise TypeError('Function list must be list')
+
+    def run(self, *args, **kwargs):
+        '''按照列表的反向顺序执行'''
+        for func in reversed(self.funcs):
+            result = func(*args, **kwargs)
+
+            if result is not None:
+                return result
+
+replacer_chain = ParserChain()
+widget_parser_chain = ParserChain()
+layout_parser_chain = ParserChain()
 
 skip_level=1
 
@@ -355,6 +428,23 @@ def set_style(widget, class_name: str):
 used_widget_key = ['name', 'type', 'args', 'kwargs', 'init_steps', 'signals', 'style']
 used_layout_key = ['name', 'direction', 'content', 'stretch']
 
+def enable_namespace_api():
+    global namespace_api_enabled
+
+    namespace_api_enabled = True
+
+    set_namespace(
+        default_replacer, default_layout_parser, default_widget_parser, 
+        namespace_parser_func=load_namespace, reverse=False, 
+        enable_value_convert=False, is_debug=False
+    ) # 设置默认解析函数
+
+    warn(
+        'Namespace API is deprecated, please use Parser API (add_parser) instead. Now Parser API is disabled.',
+         category=DeprecationWarning
+    )
+
+@deprecated(reason="Namespace API is deprecated, please use Parser API (add_parser) instead.")
 def set_namespace(value_replace_func=None, layout_parser_func=None, widget_parser_func=None, 
                   additional_used_widget_key=None, additional_used_layout_key=None,
                   namespace_parser_func=None, reverse=None, enable_value_convert=None,
@@ -363,6 +453,8 @@ def set_namespace(value_replace_func=None, layout_parser_func=None, widget_parse
     '''
     设置解析函数/变量时使用的操作。
     '''
+    assert namespace_api_enabled, "Please add 'uiml.enable_namespace_api()' at the beginning of the code to enable the Namespace API"
+
     global replacer, layout_parser, widget_parser, used_widget_key, used_layout_key, namespace_parser, default_reverse, value_convert, debug
     if value_replace_func is not None:replacer = value_replace_func
     if layout_parser_func is not None:layout_parser = layout_parser_func
@@ -373,11 +465,18 @@ def set_namespace(value_replace_func=None, layout_parser_func=None, widget_parse
     if reverse is not None:default_reverse = reverse
     if enable_value_convert is not None:value_convert = enable_value_convert
     if is_debug is not None:debug = is_debug
-    
+
+@replacer_chain.add
 def default_replacer(value: str):
     '''默认替换函数，返回原值，可以自定义添加函数，如替换变量、函数调用等。'''
-    return value
-
+    unicode = re.sub(
+        _UNICODE,
+        lambda m: chr(int(m.group(1), 16)),
+        value
+    )
+    return unicode
+
+@layout_parser_chain.add
 def default_layout_parser(ui_data: Dict[str, Any], namespace: Dict[str, Any]=None, additional=None):
     '''默认布局解析函数，进行递归解析返回'''
     additional_value = {} if additional is None else additional  # 默认添加额外的空字典
@@ -395,7 +494,10 @@ def default_layout_parser(ui_data: Dict[str, Any], namespace: Dict[str, Any]=Non
 
 def reg_replacer(value):
     if isinstance(value, str):
-        return replacer(value)
+        if namespace_api_enabled:
+            return replacer(value) # 使用 Namespace API
+        else:
+            return replacer_chain.run(value) # 使用 Parser API
     elif isinstance(value, dict):
         return default_reg_replacer_dict(value)
     elif isinstance(value, list) or isinstance(value, tuple) or isinstance(value, set):
@@ -421,6 +523,7 @@ def _pop_dict(dict_data, key):
         dict_copy.pop(k, None)
     return dict_copy
 
+@widget_parser_chain.add
 def default_widget_parser(widget_data: Dict[str, Any], namespace: Dict[str, Any]=None, additional=None):
     '''默认控件解析函数，进行解析返回'''
     additional_value = {} if additional is None else additional  # 默认添加额外的空字典
@@ -464,12 +567,19 @@ def default_widget_parser(widget_data: Dict[str, Any], namespace: Dict[str, Any]
 
 def compile_ui(ui_data, namespace=None, additional=None):
     additional_value = {} if additional is None else additional  # 默认添加额外的空字典
-    if namespace is None:namespace = namespace_parser() # 获取命名空间
+    if namespace is None:
+        namespace = namespace_parser() # 获取命名空间
 
     if ui_data.get('direction'): # 这是layout类型
-        return layout_parser(ui_data, namespace, additional=additional_value)
+        if namespace_api_enabled: # namespace API 语法
+            return layout_parser(ui_data, namespace, additional=additional_value)
+        else:
+            return layout_parser_chain.run(ui_data, namespace, additional=additional)
     else: # 这是widget类型
-        return widget_parser(ui_data, namespace, additional=additional_value)
+        if namespace_api_enabled: # namespace API 语法
+            return widget_parser(ui_data, namespace, additional=additional_value)
+        else:
+            return widget_parser_chain.run(ui_data, namespace, additional=additional)
     
 def compile_ui_file(file_path: str, namespace=None, additional=None):
     '''
@@ -481,7 +591,12 @@ def compile_ui_file(file_path: str, namespace=None, additional=None):
     '''
     additional_value = {} if additional is None else additional  # 默认添加额外的空字典
     return compile_ui(xml_parse_file(file_path, namespace, additional=additional_value), namespace, additional=additional_value)  # 解析 XML 字符串并编译
-    
+
+default_reverse = False
+debug = False
+value_convert = True
+namespace_parser = load_namespace
+
 class UIMLLayout:
     def __init__(self, list):
         self.list = list
@@ -522,20 +637,7 @@ class UIMLLayout:
 
             # 最后一段
             if i == len(parts) - 1:
-                if 'direction' in current:
-                    # 普通布局：返回 content 列表
-                    content = current.get('content')
-                    if content is None:
-                        raise ValueError(f"Layout '{part}' has no content")
-                    if not isinstance(content, list):
-                        raise TypeError(f"Layout '{part}' content is not a list")
-                    return content
-                else:
-                    # 控件：返回 content 属性
-                    content = current.get('content')
-                    if content is None:
-                        raise ValueError(f"Widget '{part}' has no content")
-                    return content
+                return self.loader(current, part)
 
             # 不是最后一段，当前节点必须是布局
             if 'direction' not in current:
@@ -545,10 +647,7 @@ class UIMLLayout:
             found = None
 
             # 普通布局从 content 中查找
-            for child in current.get('content', []):
-                if child.get('name') == next_name:
-                    found = child
-                    break
+            found = self.subelement_finder(current, next_name)
 
             if found is None:
                 raise KeyError(f"Child '{next_name}' not found in layout '{part}'")
@@ -557,6 +656,35 @@ class UIMLLayout:
         # 正常流程不会执行到这里
         return None
 
+    def loader(self, current, part):
+        if 'direction' in current: # layout 类型
+            return self.layout_loader(current, part)
+        else:
+            return self.widget_loader(current, part)
+
+    def layout_loader(self, current, part):
+        # 普通布局：返回 content 列表
+        content = current.get('content')
+        if content is None:
+            raise ValueError(f"Layout '{part}' has no content")
+        if not isinstance(content, list):
+            raise TypeError(f"Layout '{part}' content is not a list")
+        return content
+
+    def widget_loader(self, current, part):
+        # 控件：返回 content 属性
+        content = current.get('content')
+        if content is None:
+            raise ValueError(f"Widget '{part}' has no content")
+        return content
+
+    def subelement_finder(self, current, next):
+        # 普通布局从 content 中查找
+        for child in current.get('content', []):
+            if child.get('name') == next:
+                found = child
+                return found
+
     def show(self):   
         '''显示布局，返回布局对象和类型字符串'''
         return self.draw_layout()[0]
@@ -616,7 +744,7 @@ class UIMLLayout:
         '''
         return (widget[0], ), {}
     
-    def return_layout(layout):
+    def return_layout(self, layout):
         '''
         返回布局对象和类型字符串，可以在不复制draw_layout()函数的情况下，直接在原布局上添加加载时代码
         参数:
@@ -628,20 +756,14 @@ class UIMLLayout:
     
     def extend_layout(self, list_info):
         '''扩展布局，可以在不复制draw_layout()函数的情况下，直接在原布局上添加加载时代码'''
-        WidgetError.direction_error() # 默认这里抛出错误，因为widget类型没有direction属性
+        UIMLException.direction_error(list_info['direction'].lower()) # 默认这里抛出错误，因为widget类型没有direction属性
         
     def extend_widget(self, widget_info):
         '''扩展控件，可以在不复制draw_layout()函数的情况下，直接在原控件上添加加载时代码'''
         return widget_info['content'], 'widget'
             
-class WidgetError:
+class UIMLException(Exception):
     @staticmethod
-    def direction_error():
+    def direction_error(direction):
         '''错误方案：在widget类型中找不到direction属性时，抛出错误。可以自定义添加函数，如替换变量、函数调用等。'''
-        raise ValueError('Direction error: cannot find direction attribute in widget type')
-
-set_namespace(
-    default_replacer, default_layout_parser, default_widget_parser, 
-    namespace_parser_func=load_namespace, reverse=False, 
-    enable_value_convert=False, is_debug=False
-) # 设置默认解析函数
+        raise UIMLException(f'Cannot load direction "{direction}" in class uiml::layout')

{uiml-0.2.3 → uiml-0.3.0.dev1/src/uiml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uiml
-Version: 0.2.3
+Version: 0.3.0.dev1
 Home-page: https://github.com/xystudio889/
 Author: xystudio
 Author-email: xystudio <173288240@qq.com>

{uiml-0.2.3 → uiml-0.3.0.dev1}/src/uiml.egg-info/SOURCES.txt

@@ -9,4 +9,6 @@ src/uiml.egg-info/SOURCES.txt
 src/uiml.egg-info/dependency_links.txt
 src/uiml.egg-info/requires.txt
 src/uiml.egg-info/top_level.txt
+tests/test_error.py
+tests/test_fallback.py
 tests/test_symbol.py

uiml-0.3.0.dev1/tests/test_error.py

@@ -0,0 +1,87 @@
+from typing import Optional, Callable
+
+func = list[Callable]
+
+class ParserChain:
+    def __init__(self, funcs: Optional[func] = None):
+        self._funcs = [] if funcs is None else funcs
+
+        if funcs is not None:
+            self.funcs = funcs # 初始校验
+
+    def add(self, func:func):
+        '''添加一个函数 / 装饰器'''
+        self.funcs.append(func)
+        self.check(func)
+        return func
+
+    def remove(self, func:func):
+        '''删除一个函数'''
+        self.funcs.remove(func)
+
+    def set(self, funcs: func):
+        self.funcs = funcs
+
+    @property
+    def funcs(self):
+        return self._funcs
+
+    @funcs.setter
+    def funcs(self, v):
+        self.check(v)
+
+    def check(self, v):
+        if isinstance(v, list):
+            for func in v:
+                if not isinstance(func, Callable):
+                    raise TypeError('Function list item must be function')
+            self._funcs = v
+        else:
+            raise TypeError('Function list must be list')
+
+    def run(self, *args, **kwargs):
+        '''按照列表的反向顺序执行'''
+        for func in reversed(self.funcs):
+            result = func(*args, **kwargs)
+
+            if result is not None:
+                return result
+
+def test_main():
+    try:
+        ParserChain(123) # 初始化：不是列表
+
+        assert False
+    except TypeError:
+        print('Success!')
+
+    try:
+        ParserChain([123]) # 初始化：列表项不是函数
+
+        assert False
+    except TypeError:
+        print('Success!')
+
+    try:
+        v = ParserChain([]) # 初始化：列表项不是函数
+        v.set(123) # 设置非法值
+
+        assert False
+    except TypeError:
+        print('Success!')
+
+    try:
+        v = ParserChain([]) # 初始化：列表项不是函数
+        v.add(123) # 添加非法值
+
+        assert False
+    except TypeError:
+        print('Success!')
+
+    try:
+        v = ParserChain([]) # 初始化：列表项不是函数
+        v.funcs = 123 # 连接非法值
+
+        assert False
+    except TypeError:
+        print('Success!')

uiml-0.3.0.dev1/tests/test_fallback.py

@@ -0,0 +1,60 @@
+from typing import Callable, Optional
+
+func = list[Callable]
+
+class ParserChain:
+    def __init__(self, funcs: Optional[func] = None):
+        self.funcs: func = [] if funcs is None else funcs
+
+    def add(self, func:func):
+        '''添加一个函数 / 装饰器'''
+        self.funcs.append(func)
+        return func
+
+    def remove(self, func:func):
+        '''删除一个函数'''
+        self.funcs.remove(func)
+
+    @property
+    def get_funcs(self):
+        return self.funcs
+
+    def run(self, *args, **kwargs):
+        '''按照列表的反向顺序执行'''
+        for func in reversed(self.funcs):
+            result = func(*args, **kwargs)
+
+            if result is not None:
+                return result
+
+def test_main():
+    # ---------------- 示例 ----------------
+    chain = ParserChain()
+
+    @chain.add
+    def low(v):                       # 最先添加 → 最后执行
+        return f"low({v})"
+
+    @chain.add
+    def mid(v):                       # 第二个添加
+        return None if v < 10 else f"mid({v})"
+
+    @chain.add
+    def high(v):                      # 最后添加 → 最先执行
+        return None if v < 100 else f"high({v})"
+
+    @chain.add
+    def no_add(v):
+        raise ValueError('This is Added and runed!')
+
+    chain.remove(no_add)
+
+    assert chain.get_funcs == [low, mid, high]
+    assert chain.run(5) == "low(5)"    # high→None, mid→None, low→"low(5)"
+    assert chain.run(50) == "mid(50)"    # high→None, mid→"mid(50)"
+    assert chain.run(500) == "high(500)"   # "high(500)"
+
+    # 用列表初始化也支持
+    c2 = ParserChain([lambda v: None, lambda v: f"got {v}"])
+    assert c2.run(1) == "got 1"        # "got 1"
+    assert ParserChain().run(1) is None  # None