vools 0.2.3__tar.gz → 0.2.4__tar.gz

{vools-0.2.3 → vools-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vools
-Version: 0.2.3
+Version: 0.2.4
 Summary: Python 函数式编程工具集
 Author-email: Victor <victortop921129@gmail.com>
 License: Apache License

{vools-0.2.3 → vools-0.2.4}/vools/__init__.py

@@ -7,7 +7,7 @@ vools - Python 函数式编程工具集
 import importlib
 from typing import Any
 
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 __author__ = "Victor"
 __license__ = "Apache 2.0"
 

{vools-0.2.3 → vools-0.2.4}/vools/bridge/probe.py

@@ -24,7 +24,7 @@ import subprocess
 import shutil
 import json
 from typing import Dict, List, Optional, Tuple, Any
-from ...core.dataclass_compat import dataclass, field, asdict
+from ..core.dataclass_compat import dataclass, field, asdict
 
 _IS_WINDOWS = platform.system() == 'Windows'
 _IS_LINUX = platform.system() == 'Linux'

vools-0.2.4/vools/core/contextvars_compat.py

@@ -0,0 +1,87 @@
+"""
+vools.core.contextvars_compat - contextvars 兼容性模块
+
+Python 3.7 引入了 contextvars，但 Python 3.6 没有此模块。
+本模块提供兼容实现，在 3.6 中使用 threading.local 模拟基础功能。
+
+注意：由于 3.6 没有真正的 contextvars，模拟版本不是 async-safe 的，
+仅保证线程内有效。在 3.6 环境下，如果异步代码和同步代码混用，
+可能需要额外注意上下文隔离。
+"""
+
+import sys
+import threading
+from typing import TypeVar, Generic, Optional, Any
+
+_T = TypeVar('_T')
+
+# Python 版本检测
+_PY37_PLUS = sys.version_info >= (3, 7)
+
+if _PY37_PLUS:
+    import contextvars as _ctx
+    ContextVar = _ctx.ContextVar
+    Context = _ctx.Context
+    copy_context = _ctx.copy_context
+    Token = _ctx.Token
+else:
+    # Python 3.6 兼容实现
+    # 使用简单的类来模拟 ContextVar 的基本行为
+    
+    class Token:
+        """Token 用于重置 ContextVar（模拟）"""
+        __slots__ = ('_value',)
+        
+        def __init__(self, value):
+            self._value = value
+
+
+    class ContextVar:
+        """
+        ContextVar 兼容实现（Python 3.6）
+        
+        使用 threading.local 存储每个线程的上下文，
+        不保证 async-safe，仅作为基础替代。
+        """
+        __slots__ = ('_name', '_default', '_local')
+        
+        def __init__(self, name: str, default: _T = None):
+            self._name = name
+            self._default = default
+            self._local = threading.local()
+        
+        @property
+        def name(self) -> str:
+            return self._name
+        
+        def get(self, default: _T = None) -> _T:
+            """
+            获取当前线程的 ContextVar 值。
+            
+            如果当前线程未设置值，返回默认值。
+            """
+            value = getattr(self._local, 'value', self)
+            if value is self:
+                return self._default if self._default is not None else default
+            return value
+        
+        def set(self, value: _T):
+            """
+            设置当前线程的 ContextVar 值。
+            
+            返回 Token 用于后续 reset。
+            """
+            old_value = getattr(self._local, 'value', self)
+            self._local.value = value
+            return Token(old_value)
+        
+        def reset(self, token: Token):
+            """
+            重置 ContextVar 到设置前的值。
+            
+            注意：这不是真正的 reset，仅用于兼容 API。
+            """
+            self._local.value = token._value
+
+
+__all__ = ['ContextVar', 'Context', 'copy_context', 'Token']

{vools-0.2.3 → vools-0.2.4}/vools/reactive/monitoring/clipboard.py

@@ -32,7 +32,7 @@ import time
 import tkinter as tk
 from collections import deque
 from ctypes import wintypes as wt
-from ....core.dataclass_compat import dataclass
+from ...core.dataclass_compat import dataclass
 from datetime import datetime
 from enum import IntEnum
 from typing import (

{vools-0.2.3 → vools-0.2.4}/vools/reactive/monitoring/file_watcher.py

@@ -30,7 +30,7 @@ import threading
 import time
 from collections import deque
 from ctypes import wintypes as wt
-from ....core.dataclass_compat import dataclass
+from ...core.dataclass_compat import dataclass
 from datetime import datetime
 from enum import IntEnum
 from typing import (

{vools-0.2.3 → vools-0.2.4}/vools/reactive/monitoring/folder_watcher.py

@@ -30,7 +30,7 @@ import threading
 import time
 from collections import deque
 from ctypes import wintypes as wt
-from ....core.dataclass_compat import dataclass
+from ...core.dataclass_compat import dataclass
 from datetime import datetime
 from enum import IntEnum
 from typing import (

{vools-0.2.3 → vools-0.2.4}/vools/reactive/monitoring/keyboard.py

@@ -12,7 +12,7 @@ import logging
 import pickle
 import sys
 import time
-from ....core.dataclass_compat import dataclass, field, asdict
+from ...core.dataclass_compat import dataclass, field, asdict
 from enum import IntEnum, IntFlag
 from typing import (
     Any, Callable, Dict, List, Optional, Tuple,
@@ -878,7 +878,7 @@ class KeyboardDispatcher:
         tags: Tuple[str, ...] = (),
         metadata: Optional[Dict[str, Any]] = None,
     ) -> None:
-        from ...core.subject import Subject
+        from ..core.subject import Subject
         self._backend_name: str = ""
         self._backend: Optional[_BaseBackend] = None
         self._filter_self = bool(filter_self)
@@ -1268,7 +1268,7 @@ class _WriteKeyboardOperator:
                 else:
                     self._dispatcher.release(key)
 
-        from ..reactive import operators as _ops
+        from ...reactive import operators as _ops
         return source.pipe(
             _ops.map(lambda x: (on_next(x) or x))
         )

{vools-0.2.3 → vools-0.2.4}/vools/reactive/monitoring/mouse.py

@@ -11,7 +11,7 @@ import logging
 import pickle
 import sys
 import time
-from ....core.dataclass_compat import dataclass, field, asdict
+from ...core.dataclass_compat import dataclass, field, asdict
 from enum import IntEnum
 from typing import (
     Any, Callable, Dict, List, Optional, Tuple,
@@ -804,7 +804,7 @@ class MouseDispatcher:
         tags: Tuple[str, ...] = (),
         metadata: Optional[Dict[str, Any]] = None,
     ) -> None:
-        from ...core.subject import Subject
+        from ..core.subject import Subject
         self._backend_name: str = ""
         self._backend: Optional[_BaseBackend] = None
         self._filter_self = bool(filter_self)
@@ -1260,7 +1260,7 @@ class _WriteMouseOperator:
                 elif et in ("scroll", "SCROLL"):
                     self._dispatcher.scroll(item.get("delta", 1))
 
-        from ..reactive import operators as _ops
+        from ...reactive import operators as _ops
         return source.pipe(
             _ops.map(lambda x: (on_next(x) or x))
         )

{vools-0.2.3 → vools-0.2.4}/vools/reactive/operators/extended_operators.py

@@ -52,7 +52,7 @@ def from_range(start: int, stop: int = None, step: int = 1) -> Callable:
         except Exception as e:
             observer.on_error(e)
         
-        from .observable import Subscription
+        from ..core.observable import Subscription
         return Subscription(lambda: None)
     
     return Observable(subscribe)
@@ -176,7 +176,7 @@ def sample(period: float) -> Callable:
                     task[0].cancel()
                 source_sub.unsubscribe()
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(unsubscribe)
         
         return Observable(subscribe)
@@ -306,7 +306,7 @@ def throttle_latest(period: float) -> Callable:
                     task[0].cancel()
                 source_sub.unsubscribe()
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(unsubscribe)
         
         return Observable(subscribe)
@@ -457,7 +457,7 @@ def subscribe_on(scheduler) -> Callable:
             
             scheduler.schedule(subscribe_inner)
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(lambda: None)
         
         return Observable(subscribe)
@@ -636,7 +636,7 @@ def flat_map_latest(fn: Callable[[T], Observable]) -> Callable:
                     inner_sub[0].unsubscribe()
                 source_sub.unsubscribe()
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(unsubscribe)
         
         return Observable(subscribe)
@@ -735,7 +735,7 @@ def amb() -> Callable:
                 if winner_sub[0]:
                     winner_sub[0].unsubscribe()
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(unsubscribe)
         
         return Observable(subscribe)
@@ -784,7 +784,7 @@ def switch() -> Callable:
                     inner_sub[0].unsubscribe()
                 source_sub.unsubscribe()
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(unsubscribe)
         
         return Observable(subscribe)
@@ -800,7 +800,7 @@ class ConnectableObservable(Generic[T]):
     __slots__ = ('_source', '_subject', '_connection', '_ref_count')
     
     def __init__(self, source, subject=None):
-        from .subject import Subject
+        from ..core.subject import Subject
         self._source = source
         self._subject = subject or Subject()
         self._connection = None
@@ -818,7 +818,7 @@ class ConnectableObservable(Generic[T]):
             connection = [None]
             subject = None
             
-            from .subject import Subject
+            from ..core.subject import Subject
             
             def get_subject():
                 nonlocal subject
@@ -843,7 +843,7 @@ class ConnectableObservable(Generic[T]):
                             connection[0] = None
                         subject = None
                 
-                from .observable import Subscription
+                from ..core.observable import Subscription
                 return Subscription(unsubscribe)
             
             from ..core.observable import Observable
@@ -856,7 +856,7 @@ class ConnectableObservable(Generic[T]):
         def operator(source):
             subject = None
             
-            from .subject import Subject
+            from ..core.subject import Subject
             
             def subscribe(observer):
                 nonlocal subject
@@ -1248,7 +1248,7 @@ def cache(duration: float = None, max_size: int = None) -> Callable:
                 if sub in subscriptions:
                     subscriptions.remove(sub)
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(unsubscribe)
         
         return Observable(subscribe)
@@ -1325,7 +1325,7 @@ def parallel(max_concurrent: int = 4) -> Callable:
                 executor.shutdown(wait=False)
                 source_sub.unsubscribe()
             
-            from .observable import Subscription
+            from ..core.observable import Subscription
             return Subscription(unsubscribe)
         
         return Observable(subscribe)

{vools-0.2.3 → vools-0.2.4}/vools/reactive/operators/operators.py

@@ -2073,7 +2073,7 @@ def lazy_flat_map(lazy_fn: Callable[[T], Any] = None, **kwargs) -> Callable[[Obs
 def seq_bridge(seq_op: Callable) -> Callable[[Observable[T]], Observable[Any]]:
     """Seq 操作桥接器"""
     def operator(source: Observable[T]) -> Observable[Any]:
-        from ..data import Seq
+        from ...data import Seq
         
         def subscribe(observer: Observer[Any]) -> Subscription:
             buf = []

{vools-0.2.3 → vools-0.2.4}/vools/serialize/context.py

@@ -3,9 +3,11 @@
 
 提供 contextvars.ContextVar 机制，让 __getstate__ 方法感知当前序列化协议。
 Serializer.dumps/loads 在调用后端前设置上下文，调用后重置。
+
+注意：Python 3.6 使用兼容实现，不是 async-safe 的。
 """
 
-import contextvars
+from vools.core.contextvars_compat import ContextVar
 from ..core import dataclass
 from typing import Optional, Any
 __all__ = ['SerializeContext', 'get_context', 'get_protocol', 'set_context', 'reset_context', 'get_current_serializer']
@@ -18,10 +20,8 @@ class SerializeContext:
     serializer: Optional[Any] = None  # Serializer 实例引用（用于 handler 回退）
 
 
-# 使用 contextvars 保证 async-safe
-_ctx: contextvars.ContextVar[Optional[SerializeContext]] = contextvars.ContextVar(
-    'vools_serialize_ctx', default=None
-)
+# 使用 ContextVar 保证线程内上下文隔离
+_ctx = ContextVar('vools_serialize_ctx', default=None)
 
 
 def get_context() -> Optional[SerializeContext]:

{vools-0.2.3 → vools-0.2.4}/vools/sql/core/decorators.py

@@ -8,6 +8,7 @@ vools.sql.core.decorators - SQL 装饰器
 import functools
 import inspect
 import typing
+import sys
 
 from .types import SqlTypeMapper
 from .result import ResultSet, Row
@@ -16,6 +17,19 @@ from .result import ResultSet, Row
 _FUNC_NAME_ATTR = '_sql_func_name'
 _SQL_INFO_ATTR = '_sql_info'
 
+# Python 3.6 兼容：typing.get_origin/get_args 是 3.8+ 才有的
+if sys.version_info >= (3, 8):
+    _get_origin = typing.get_origin
+    _get_args = typing.get_args
+else:
+    def _get_origin(tp):
+        """获取类型的 origin（兼容 Python 3.6）"""
+        return getattr(tp, '__origin__', None)
+    
+    def _get_args(tp):
+        """获取类型的 args（兼容 Python 3.6）"""
+        return getattr(tp, '__args__', None)
+
 
 def _get_signature_info(func):
     """
@@ -125,8 +139,8 @@ def _convert_result(result, return_type):
     if not isinstance(result, ResultSet):
         return SqlTypeMapper.convert_result(result, return_type)
 
-    origin = typing.get_origin(return_type)
-    args = typing.get_args(return_type)
+    origin = _get_origin(return_type)
+    args = _get_args(return_type)
 
     if return_type is list or origin is list:
         return result.to_list()

{vools-0.2.3 → vools-0.2.4}/vools/sql/manager.py

@@ -36,7 +36,7 @@ import json
 import importlib
 from typing import Dict, List, Optional, Type, Any
 
-from ...core.dataclass_compat import asdict
+from ..core.dataclass_compat import asdict
 
 from .core.config import DialectConfig
 from .core.dialect import Dialect

{vools-0.2.3 → vools-0.2.4}/vools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vools
-Version: 0.2.3
+Version: 0.2.4
 Summary: Python 函数式编程工具集
 Author-email: Victor <victortop921129@gmail.com>
 License: Apache License

{vools-0.2.3 → vools-0.2.4}/vools.egg-info/SOURCES.txt

@@ -161,6 +161,7 @@ vools/core/__init__.py
 vools/core/asyncio_compat.py
 vools/core/base.py
 vools/core/config.py
+vools/core/contextvars_compat.py
 vools/core/dataclass_compat.py
 vools/core/datetime_compat.py
 vools/core/exceptions.py