ipa-python-kit 0.1.3.dev1__py3-none-any.whl → 1.0.1__py3-none-any.whl

ipa/app/__init__.py

@@ -0,0 +1,57 @@
+__doc__ = """
+配置模块
+包含一些全局配置
+"""
+
+
+import logging
+from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Optional
+
+
+class IAppConfig(ABC):
+    """
+    应用配置接口
+    """
+
+    @abstractmethod
+    def get_runtime_root_dir(self, *args, **kwargs) -> Optional[Path]:
+        pass
+
+    def get_root_dir(self, *args, **kwargs) -> Optional[Path]:
+        """
+        此方法只是一个别名，返回与get_runtime_root_dir相同的结果
+        """
+        return self.get_runtime_root_dir(*args, **kwargs)
+
+    # @abstractmethod
+    # def get_user_data_root_dir(self, *args, **kwargs) -> Optional[Path]:
+    #     pass
+
+    @abstractmethod
+    def get_logs_dir(self, *args, **kwargs) -> Optional[Path]:
+        pass
+
+    @abstractmethod
+    def get_config_dir(self, *args, **kwargs) -> Optional[Path]:
+        pass
+
+    @abstractmethod
+    def get_data_dir(self, *args, **kwargs) -> Optional[Path]:
+        pass
+
+    def get_temp_dir(self, *args, **kwargs) -> Optional[Path]:
+        raise NotImplementedError()
+
+    def get_middleware_dir(self, *args, **kwargs) -> Optional[Path]:
+        raise NotImplementedError()
+
+    def get_extension_dir(self, *args, **kwargs) -> Optional[Path]:
+        raise NotImplementedError()
+
+    def get_app_logger(self, *args, **kwargs) -> logging.Logger:
+        raise NotImplementedError()
+
+    def get_sidecar_dir(self, *args, **kwargs) -> Optional[Path]:
+        raise NotImplementedError()

ipa/data_type/unitable.py

@@ -196,15 +196,15 @@ class Time(QuantifiedValue):
     pass
 
 
-def get_time(l: Length, v: Speed):
+def get_time(length: Length, v: Speed):
     """
     距离/速度=时间
     TODO：处理单位
     """
-    assert l.value is not None, "length is not specified"
+    assert length.value is not None, "length is not specified"
     assert v.value is not None, "speed is not specified"
     assert v.value != 0, "speed cannot be zero"
-    return abs(l.value / v.value)
+    return abs(length.value / v.value)
 
 
 def get_time_3d(delta_distance: Point, v: ThreeDimensionalVelocity):

ipa/datetime/__init__.py

@@ -1 +1,28 @@
+import time
+from typing import Literal
+
 from .core import *
+
+
+def timestamp(
+    unit: Literal["second", "millisecond", "microsecond"] = "millisecond",
+    type: Union[float, int] = int,
+) -> Union[float, int]:
+    """
+    获取当前时间戳
+    Args:
+        unit: 时间戳单位，默认毫秒
+        type: 时间戳类型，默认整数
+    Returns:
+        时间戳
+    """
+    s = time.time()
+    if unit == "millisecond":
+        v = s * 1000
+    elif unit == "microsecond":
+        v = s * 1000000
+    elif unit == "second":
+        v = s
+    else:
+        raise NotImplementedError(f"unsupported unit: {unit}")
+    return type(v)

ipa/datetime/core.py

@@ -2,11 +2,6 @@ from datetime import datetime
 from enum import Enum
 from typing import Union
 
-try:
-    import pandas
-except ImportError:
-    pandas = None
-
 from dateutil.parser import parse
 
 
@@ -35,8 +30,13 @@ def parse_datetime(date_str: str):
     if not date_str:  # 处理空值
         return None
 
-    if pandas and isinstance(date_str, (pandas.Timestamp)):
-        return date_str.to_pydatetime()
+    try:
+        import pandas as pd
+
+        if isinstance(date_str, (pd.Timestamp)):
+            return date_str.to_pydatetime()
+    except ImportError:
+        pass
 
     if isinstance(date_str, (datetime)):
         return date_str

ipa/func/dict.py

@@ -2,7 +2,7 @@ __doc__ = """
 字典工具类
 """
 
-from typing import Any, Callable, Dict, Iterable, Tuple, Union
+from typing import Any, Dict, Iterable, Optional, Tuple, TypeVar, Union
 
 cn_en_dict = dict(
     半径="radius",
@@ -32,24 +32,33 @@ def remove_key_not_in(dc: dict, keys: Iterable[Any], delete_value: bool = False)
     Args:
         delete_value: 是否同时del value
     """
+    keys_removed = []
     for key in list(dc.keys()):
         if key not in keys:
             v = dc.pop(key, None)
             if delete_value and v is not None:
                 del v
+                keys_removed.append(key)
+    return keys_removed
 
 
-def get_the_first_existent_key(obj: dict, *keys, default=None) -> Tuple[Any, Any]:
+K = TypeVar("K")
+V = TypeVar("V")
+
+
+def get_the_first_existent_key(
+    obj: Dict[K, V], *keys: K, default: Optional[V] = None
+) -> Tuple[Optional[K], Optional[V]]:
     """
     获取第一个存在的key的值
 
     Args:
-        obj (dict): 输入的字典，键名可能是中文或其他形式。
-        keys (Iterable[Any]): 要查找的键名列表。
-        default (Any, optional): 如果没有找到任何键，返回的默认值。默认值为None。
+        obj (Dict[K,V]):  输入的字典，键名可能是中文或其他形式。
+        keys (Iterable[K]): 要查找的键名列表。
+        default (V, optional): 如果没有找到任何键，返回的默认值。默认值为None。
 
     Returns:
-        (Tuple[Any, Any]): 第一个存在的键值对，键为存在的键名，值为对应的值。如果没有找到任何键，返回(None, default)。
+        (Tuple[K, V]): 第一个存在的键值对，键为存在的键名，值为对应的值。如果没有找到任何键，返回(None, default)。
     """
     for key in keys:
         if key in obj:

ipa/network/__init__.py

@@ -1,10 +1,12 @@
 from typing import Any, Dict, List, Literal, Optional, Union
 
-from ..data_type import Point
+from ipa.data_type import Point
 
 Grid2 = List[List[Point]]
 Grid3 = List[Grid2]
 
+from ipa.func import get_the_first_existent_key
+
 
 def to_grid(
     points: List[Point], include_x=True, include_y=True, include_z=False, **kwargs
@@ -133,7 +135,20 @@ def nx_digraph_to_graph(
 
     links = []
     for u, v, attrs in G.edges(data=True):
-        links.append(opts.GraphLink(source=str(u), target=str(v)))
+        _, label = get_the_first_existent_key(attrs, "label", "name", "id")
+        links.append(
+            opts.GraphLink(
+                source=str(u),
+                target=str(v),
+                label_opts=opts.LabelOpts(
+                    is_show=False, position="middle", formatter=label, font_size=15
+                ),
+                emphasis_label_opts=opts.LabelOpts(
+                    is_show=True,
+                ),
+                linestyle_opts=opts.LineStyleOpts(),
+            )
+        )
 
     graph = (
         Graph()
@@ -143,6 +158,7 @@ def nx_digraph_to_graph(
             links=links,
             layout=layout,
             is_draggable=True,
+            edge_symbol=graph_opts.pop("edge_symbol", ["circle", "arrow"]),
             **graph_opts,
         )
         .set_global_opts(
@@ -164,6 +180,8 @@ def nx_digraph_to_tree(
     color_key: str = "color",
     default_name: str = "node",
     virtual_root_id: Optional[str] = None,
+    initial_tree_depth: int | None = None,
+    tooltip_opts=opts.TooltipOpts(trigger="item", formatter="{b}"),
 ) -> Tree:
     """
     将树状结构的 networkx.DiGraph 转换为 Pyecharts Tree 图表
@@ -196,6 +214,7 @@ def nx_digraph_to_tree(
     def build_node(current: Any) -> Dict[str, Any]:
         attrs = G.nodes.get(current, {})
         node = {
+            "nodeAttrs": attrs,
             "name": attrs.get(name_key, str(current) or default_name),
             "itemStyle": {"color": attrs[color_key]} if color_key in attrs else {},
         }
@@ -207,7 +226,7 @@ def nx_digraph_to_tree(
     tree = Tree().set_global_opts(
         # datazoom_opts=opts.DataZoomOpts(orient="vertical"),# not work
         title_opts=opts.TitleOpts(title=title),
-        tooltip_opts=opts.TooltipOpts(trigger="item", formatter="{b}"),
+        tooltip_opts=tooltip_opts,
     )
     for root in roots:
         tree_data = [build_node(root)]
@@ -221,6 +240,7 @@ def nx_digraph_to_tree(
                 vertical_align="middle",
                 horizontal_align="right",
             ),
+            initial_tree_depth=initial_tree_depth,
         )
 
     return tree

ipa/pkg/__init__.py

@@ -1,43 +1,99 @@
 import inspect
+import logging
+from importlib import import_module
 from types import ModuleType
-from typing import List, Tuple, Type, TypeVar
+from typing import Callable, List, Optional, Set, Tuple, Type, TypeVar
 
-T = TypeVar("T")
 
+def try_import(path: str):
+    """
+    支持以x.y.z的方式导入模块或模块内的属性
+    Args:
+        path: 模块路径或属性路径
+    Returns:
+        导入的模块或属性, 如果导入失败则返回None
+    """
+    try:
+        return import_module(path)
+    except ModuleNotFoundError:
+        tmps = path.split(".")
+        assert len(tmps) > 1, f"unexpected path: {path}"
+        module = try_import(".".join(tmps[0:-1]))
+        return getattr(module, tmps[-1], None)
+    except Exception as e:
+        logging.warning("failed to import %s: %s", path, e)
+        return None
 
-def get_class_full_path(cls) -> str:
+
+def try_import(path: str):
     """
-    获取类的全路径表示（模块路径.类名）
+    支持以x.y.z的方式导入模块或模块内的属性
+    Args:
+        path: 模块路径或属性路径
+    Returns:
+        导入的模块或属性, 如果导入失败则返回None
+    """
+    try:
+        return import_module(path)
+    except ModuleNotFoundError:
+        tmps = path.split(".")
+        assert len(tmps) > 1, f"unexpected path: {path}"
+        module = try_import(".".join(tmps[0:-1]))
+        return getattr(module, tmps[-1], None)
+    except Exception as e:
+        logging.warning("failed to import %s: %s", path, e)
+        return None
 
-    参数:
-        cls: 目标类（需传入类本身，而非实例）
 
-    返回:
-        str: 类的全路径，格式为 "模块路径.类名"
+T = TypeVar("T")
+
+
+def is_subclass_of(
+    child: Type[T], parent: Type[T], include_parent: bool = True
+) -> bool:
     """
-    # __qualname__ 获取类的限定名（含嵌套关系，如 "OuterClass.InnerClass"）
-    return f"{cls.__module__}.{cls.__qualname__}"
+    判断child是否是parent的子类
+    Args:
+        child: 子类
+        parent: 父类
+        include_parent: 父类本身是否视为子类
+    Returns:
+        是否是子类
+    """
+    if (not include_parent) and (child is parent):
+        return False
+    return inspect.isclass(child) and issubclass(child, parent)
 
 
 def collect_subclass_of(
-    base_class: Type[T], _from: ModuleType, include_base_class: bool = False
+    parent: Type[T], _from: ModuleType, include_parent: bool = False
 ):
     """
-    收集指定模块中所有继承自 base_class 的子类
-
-    参数:
-        base_class: 基类类型
-        _from: 要搜索的模块对象
-        include_base_class: 是否包含基类本身，默认为 False
-
-    返回:
-        List[Tuple[str, T]]: 包含子类名和子类对象的元组列表
+    收集所有子类
+    Args:
+        parent: 父类
+        _from: 模块
+        include_parent: 父类本身是否视为子类
+    Returns:
+        所有子类的(名称,类,全路径)元组
     """
 
-    def predicate(m):
-        if not include_base_class and m is base_class:
-            return False
-        return inspect.isclass(m) and issubclass(m, base_class)
+    def predicate(child):
+        return is_subclass_of(child=child, parent=parent, include_parent=include_parent)
 
     name_class_map: List[Tuple[str, T]] = inspect.getmembers(_from, predicate=predicate)
     return name_class_map
+
+
+def get_class_full_path(cls) -> str:
+    """
+    获取类的全路径表示（模块路径.类名）
+
+    参数:
+        cls: 目标类（需传入类本身，而非实例）
+
+    返回:
+        str: 类的全路径，格式为 "模块路径.类名"
+    """
+    # __qualname__ 获取类的限定名（含嵌套关系，如 "OuterClass.InnerClass"）
+    return f"{cls.__module__}.{cls.__qualname__}"

ipa/pkg/hot_reload.py

@@ -2,7 +2,6 @@ import logging
 from importlib import import_module
 from typing import Callable, Optional, Set, Tuple
 
-import hmr
 from watchfiles import Change, PythonFilter, awatch
 
 
@@ -13,10 +12,13 @@ def try_hot_reload(name, package: Optional[str] = None):
         name: 模块名
         package: 包名
     """
-
     try:
         hmlib = import_module(name=name, package=package)
+        assert hmlib, f"failed to import module: {package}.{name}"
         logging.info("shall reload: %s", hmlib)
+        # TODO: exclude怎么用
+        import hmr
+
         hmr.reload(hmlib)
     except Exception as e:
         logging.warning("failed to reload: %s", e)

ipa/pydantic/core/__init__.py

@@ -45,6 +45,7 @@ def rename_keys_by_field_name(m: Type[BaseModel], data: dict):
         2. 如果有多个别名，以最后一个别名为准
     """
     for name, f in m.model_fields.items():
+        # TODO: 是否可能因为集合的无序性导致不一致问题
         aliases = collect_field_aliases(f)
         for alias in aliases:
             if alias in data:

ipa/version.py

@@ -1,5 +1,6 @@
-# file generated by setuptools-scm
+# file generated by vcs-versioning
 # don't change, don't track in version control
+from __future__ import annotations
 
 __all__ = [
     "__version__",
@@ -10,25 +11,14 @@ __all__ = [
     "commit_id",
 ]
 
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
 version: str
 __version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
 
-__version__ = version = '0.1.3.dev1'
-__version_tuple__ = version_tuple = (0, 1, 3, 'dev1')
+__version__ = version = '1.0.1'
+__version_tuple__ = version_tuple = (1, 0, 1)
 
 __commit_id__ = commit_id = None

ipa/websocket/core/__init__.py

@@ -1,7 +1,6 @@
 import asyncio
-from typing import Union
+from typing import TypeAlias, Union
 
-import fastapi
 import websockets
 from websockets.asyncio.client import connect
 
@@ -11,15 +10,19 @@ try:
 except:
     from websockets import ClientConnection, ServerConnection
 
+try:
+    from fastapi import WebSocket
+except:
+    WebSocket: TypeAlias = None
 
-WebSocketConnection = Union[ServerConnection, fastapi.WebSocket, ClientConnection]
+WebSocketConnection = Union[ServerConnection, WebSocket, ClientConnection]
 
 
 def is_websocket_closed(conn: WebSocketConnection):
     """
     判断WebSocket连接是否已关闭
     """
-    if isinstance(conn, fastapi.WebSocket):
+    if isinstance(conn, WebSocket):
         from starlette.websockets import WebSocketState
 
         return conn.client_state == WebSocketState.DISCONNECTED
@@ -34,7 +37,7 @@ def is_websocket_closed(conn: WebSocketConnection):
 async def send_text(conn: WebSocketConnection, data: str):
     if isinstance(conn, ServerConnection):
         await conn.send(data)
-    elif isinstance(conn, fastapi.WebSocket):
+    elif isinstance(conn, WebSocket):
         await conn.send_text(data)
     else:
         raise NotImplementedError(
@@ -45,7 +48,7 @@ async def send_text(conn: WebSocketConnection, data: str):
 def get_close_code(conn: WebSocketConnection):
     if isinstance(conn, ServerConnection):
         return conn.close_code
-    elif isinstance(conn, fastapi.WebSocket):
+    elif isinstance(conn, WebSocket):
         return None
 
 
@@ -55,7 +58,7 @@ def parse_client_info(connection: WebSocketConnection):
     """
     if isinstance(connection, ServerConnection):
         client_ip, client_port = connection.transport.get_extra_info("peername")
-    elif isinstance(connection, fastapi.WebSocket):
+    elif isinstance(connection, WebSocket):
         client_ip, client_port = connection.client.host, connection.client.port
     else:
         client_ip, client_port = None, None

{ipa_python_kit-0.1.3.dev1.dist-info → ipa_python_kit-1.0.1.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: ipa-python-kit
-Version: 0.1.3.dev1
+Version: 1.0.1
 Summary: kit for python
 Author-email: xdewx <present150608@sina.com>
 Keywords: python,kit,lib,util
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: deprecated>=1.3.1
 Requires-Dist: pint>=0.21.1
@@ -43,11 +43,19 @@ Requires-Dist: ipa-python-kit[visualization]; extra == "all"
 Provides-Extra: des
 Requires-Dist: simpy>=4.1.1; extra == "des"
 
-# pyproject-tmpl
+# ipa-python-kit
+
+## usage
+
+`import ipa`
+
+or
+
+`from ipa.xx import yy`
 
 ## features
 
-1. pytest
+1. pytest & pytest-cov
 2. pre-commit
 3. darker for code format
 4. ruff for lint
@@ -58,20 +66,24 @@ Requires-Dist: simpy>=4.1.1; extra == "des"
 
 ## introduction
 
-the project uses `src-layout`, includes `sdk` (for publish) and `biz` (for business logic).
-`sdk` is designed for publish and no need to rename, we use file/folder mapping `mylib=src/sdk` in `pyproject.toml`.
+the project uses `src-layout`, includes `my_sdk` (for publish) and `biz` (for business logic).
+
+~~`sdk` is designed for publish and no need to rename, we use file/folder mapping `my_sdk=src/sdk` in `pyproject.toml`.~~
+
+feel free to rename `my_sdk` to `[the name you want]` in the whole project for your own use or publish.
 
 ### dev
 
 before you start:
 
 1. must run `./scripts/setup`
-1. just replace `mylib` with `[the name you want]` in the whole project
-1. remember to `uv pip install -e .[all]` to make sure `mylib` is available in development.
+1. replace `my_sdk` with `[the name you want]` in the whole project
+1. ~~remember to `uv pip install -e .[all]` to make sure `my_sdk` is available in development.~~
 
 ### unit test
 
 `uv run -m pytest`
+> `htmlcov` folder contains html coverage report.
 
 ### run cli
 

{ipa_python_kit-0.1.3.dev1.dist-info → ipa_python_kit-1.0.1.dist-info}/RECORD

@@ -1,5 +1,6 @@
 ipa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipa/version.py,sha256=QoW52qo3GMLTeZ0fH3Wz2Je9ELIaRJTFNj8XLzgdrok,751
+ipa/version.py,sha256=9c7Tl9g3gfjrXmE7H04a_dPracz6dNMOSBdT2fhCzVw,544
+ipa/app/__init__.py,sha256=PsYzgVAzJSYDUopPAnMe7pMVMcpyOC90NYrqZ-XIyNY,1539
 ipa/cli/__init__.py,sha256=YYZYz2QwK34Ro-EBrEDd4sZJ6IeqvUCP-b2cjPWbPa8,44
 ipa/cli/model.py,sha256=Tdvn8XWcJ_aoghf5N8PlLc38-O01_XPlef66i_--z08,2584
 ipa/cli/proxy.py,sha256=rEqxH9RacIrb2lxglCnihmF2RooT719WE3NGur5hIfE,7131
@@ -21,24 +22,21 @@ ipa/data_type/page.py,sha256=8gixlNo2YgY41BK2lwBm84BJUEp9BW4OoT4cr6AJ-mw,1389
 ipa/data_type/point.py,sha256=wJrXONLstZubS3bqRBJCskj268PV5k92qzkk-5YOWgc,9748
 ipa/data_type/process.py,sha256=Wgr9gmY_Q6UBIYEtGY5259iqhBZ9oJZVoSUwMIancdY,1826
 ipa/data_type/spatial.py,sha256=TcehRvqxpWzo4iBZjnXSBoGTejJaR_5bgw-2goidXlI,1408
-ipa/data_type/unitable.py,sha256=2zpM8ttViWYH7Po0gEErXvO2rZ5okZHXs7XpLGh8f3A,12598
-ipa/datetime/__init__.py,sha256=nE8jJjGJaKuJKCyuf6QLfrj8xPj8IqGKeH2VXP3FMzY,21
-ipa/datetime/core.py,sha256=rKr_G3kNkIm4lC9P-BqaSorb_311hs9rijdfW-kaH7A,1733
+ipa/data_type/unitable.py,sha256=pZ8-rEx2h8SLvO7xAaAT52JX2608pwkempPLlBT2h7s,12613
+ipa/datetime/__init__.py,sha256=FDmUO-LWFrTRKZlVv2mVCP_KUClURpSWUXE9Vn9fs34,672
+ipa/datetime/core.py,sha256=jwkljzWPX74WOa004Ply9HVffXEAr7aVMg0sBvoef5k,1739
 ipa/decorator/__init__.py,sha256=vD9dHyCtblfLmOPCJ-cAAybWwdMtG4IVdZmbald52yI,177
 ipa/decorator/exception.py,sha256=vvNt-LsgU8hM3NM6eJZfFdk8ZTxgJiXDAz2tfnUdlug,1525
 ipa/echarts/__init__.py,sha256=nE8jJjGJaKuJKCyuf6QLfrj8xPj8IqGKeH2VXP3FMzY,21
 ipa/echarts/core/__init__.py,sha256=7k4ayFIkBg5SeKC35d1Jm_XNT03G1QaRF42Qf7jHm-8,6161
-ipa/extra/simpy/__init__.py,sha256=nE8jJjGJaKuJKCyuf6QLfrj8xPj8IqGKeH2VXP3FMzY,21
-ipa/extra/simpy/core.py,sha256=9UE2W4_j_gmtm0lD7DVJmTNu-txJSiI9z6Rj7nGjeb4,8724
 ipa/fastapi/__init__.py,sha256=nE8jJjGJaKuJKCyuf6QLfrj8xPj8IqGKeH2VXP3FMzY,21
 ipa/fastapi/core/__init__.py,sha256=FjrwqRWQ353UToZM6nEfc2awpJkMxDHFTb4SIPyTjtU,303
 ipa/func/__init__.py,sha256=2Nhw9QKqMXozWhEJltO-8_vl8aVCkdi2nnkXaZVAQMk,162
 ipa/func/_async.py,sha256=hiaTvncAkuFZl_UG_sLlaLkU4j6M3HD8i9rCxa4WtAo,594
 ipa/func/_lambda.py,sha256=S2aa0FE4n8ZSEMHe4bc6bUq1bZU6vb0eVaBrQtLwLr0,1321
 ipa/func/_object.py,sha256=dD8LzxHnA3oVarMeHm-Mloc0RrivE1qKPrtXhtUO0rM,1025
-ipa/func/app.py,sha256=_55uIeg_7z7VA3dPPEMCoh683tWi1bP5-m-_IPqKMmg,304
 ipa/func/database.py,sha256=RAADcLKF4te0mOHh-5qCTkL14As7njeYUn8PuJB3_XQ,160
-ipa/func/dict.py,sha256=8kUL-eM84VRK5cBdQ3t9Mw8qug5mf7C5GTIz-YL07Ts,2837
+ipa/func/dict.py,sha256=jleT0jC2FSoykauQHavre_Qic4yEGbJ5xf7qQJV_1c8,3022
 ipa/func/num.py,sha256=PmOAJIeaXS5Maw4rLpC9RCoTIFansnMjPKEsukbGWIc,1620
 ipa/func/shortcut.py,sha256=K3QjNbbd4puS5c8DBzhj8Qbwh_gqufFwfhOwm4HrXnQ,639
 ipa/func/table.py,sha256=wAeiJazUGuMHhevDKY6pFzR47Ric95IWE_mljo07TQU,323
@@ -47,28 +45,28 @@ ipa/i18n/core.py,sha256=qkp4HYKcmYxar5Ztbyy11vIX2QpmMhAA-ZD0XtXYjgY,710
 ipa/i18n/locales/__init__.py,sha256=um3B6elBvsWhWNxlZlrbzVtfdA4Bd9MuPyPOe3KxfU8,104
 ipa/io/__init__.py,sha256=vqHQtntss1eXsM1sJaC8LNWK3Jh9S2SmSTVBRiIM7HI,23
 ipa/io/buffer.py,sha256=2a18Qmx5SfNQB_nDK8BEQc5xMn7L5x0qQuDAVg-_6Xk,7347
-ipa/logger/__init__.py,sha256=ejMSLTUiIDtCYh69INFx84Byfmse6X2VDtiuWGjICy8,1579
-ipa/logger/builder.py,sha256=AnfpSchz3hzMHk8kdsUwCDLa4WzrXFtBxMXjSBsYZaU,5793
-ipa/logger/fmt.py,sha256=mvB02qhFY20QOMkownG9MUHsUBKS1j6SWpqS7sHzQVE,649
-ipa/logger/handler.py,sha256=d9bifBms4Bn_Iwl71RkBDix6Rm8aQO4pCcBCpATJ3Mo,488
-ipa/logger/util.py,sha256=fMnxe_7hnQmY1AtFZs_zwqihMOdS60jbaoCNSi_GUzo,9868
-ipa/logger/model/__init__.py,sha256=xngWypB4IA8Y9jR9XfVftRxIeG5DsXQ34xZ5sE8pHxQ,28
-ipa/logger/model/dict_config.py,sha256=MlFEv761AOptxv_-s6GOWWcNECmVHpjLb9OfExRDJ4c,1815
+ipa/logging/__init__.py,sha256=ejMSLTUiIDtCYh69INFx84Byfmse6X2VDtiuWGjICy8,1579
+ipa/logging/builder.py,sha256=AnfpSchz3hzMHk8kdsUwCDLa4WzrXFtBxMXjSBsYZaU,5793
+ipa/logging/fmt.py,sha256=mvB02qhFY20QOMkownG9MUHsUBKS1j6SWpqS7sHzQVE,649
+ipa/logging/handler.py,sha256=d9bifBms4Bn_Iwl71RkBDix6Rm8aQO4pCcBCpATJ3Mo,488
+ipa/logging/util.py,sha256=fMnxe_7hnQmY1AtFZs_zwqihMOdS60jbaoCNSi_GUzo,9868
+ipa/logging/model/__init__.py,sha256=xngWypB4IA8Y9jR9XfVftRxIeG5DsXQ34xZ5sE8pHxQ,28
+ipa/logging/model/dict_config.py,sha256=MlFEv761AOptxv_-s6GOWWcNECmVHpjLb9OfExRDJ4c,1815
 ipa/math/__init__.py,sha256=88LjYXcDsH6pV1RwwQVKFGkY3NH3PGjVynWlD9JigBQ,239
 ipa/math/core.py,sha256=8wp_Sa8XybdAR914OxVm8FiTv4A0QFa0khkz0p4qpqw,720
-ipa/network/__init__.py,sha256=dhLkiVP-S6--80oCxCg7BT1Q-ut9sXB0sFWUarVxMJE,10455
-ipa/pkg/__init__.py,sha256=Oj0wdT3VLX-5exaJpleBJk7aCzfFOGOZsY_rmkGVeo0,1269
-ipa/pkg/hot_reload.py,sha256=k2v13u_GQlJ2rwHV_TC2oY0Vablrg8CbthVpGog12c8,935
+ipa/network/__init__.py,sha256=yxuS7OoEeBgXojJzvdJOufzWaKOnm-RWUKXqGQV8nNo,11208
+ipa/pkg/__init__.py,sha256=V2-AAF0JITA3Qb-eK2EgX4iExURjD570ZUV8s03WtT0,2881
+ipa/pkg/hot_reload.py,sha256=OCMdx6kxpGUfi2edi6S_KM_uZI-td6FYYaqGh-4RIKc,1045
 ipa/pydantic/__init__.py,sha256=nE8jJjGJaKuJKCyuf6QLfrj8xPj8IqGKeH2VXP3FMzY,21
-ipa/pydantic/core/__init__.py,sha256=roV1r2q36rmvdJ0TPLllu03LGt6ScxePpmMTiDdDqTc,2036
+ipa/pydantic/core/__init__.py,sha256=0j74mrC93tbczjJeyonIlRQai1EbyFCabM-i_wrKg0A,2111
 ipa/system/__init__.py,sha256=iTpqRchOpz1GLEY5AvQt0wEGL0dFCz1bczRcBwj7U7k,45
 ipa/system/disk.py,sha256=CkR7WWEJOcTeeVJXQdHOxd9kXJgvOYLIRam1TdPAWv4,955
 ipa/system/process.py,sha256=E2RRt1cMhjC2_ZDseU-sU52VXq2DVxpn0umturaQoeA,5885
 ipa/visualization/__init__.py,sha256=FnTG9eLlbkd4vPyyzteOMjrm3IEtdOYYRUAg0hw-ejg,26
 ipa/visualization/_networkx.py,sha256=5bUbKTtTwdFYgEY1ww99-fvVjvWhJkfTf1sVYfUax8k,1598
 ipa/websocket/__init__.py,sha256=nE8jJjGJaKuJKCyuf6QLfrj8xPj8IqGKeH2VXP3FMzY,21
-ipa/websocket/core/__init__.py,sha256=1nSItnQzfZt2bBJ8NGeKEZdAuAhnFloSCr28hZpqgTo,4805
-ipa_python_kit-0.1.3.dev1.dist-info/METADATA,sha256=HkJnpok1Snyo_oRBinFdHgxIQj4bqTwY3hXldio_Skc,2671
-ipa_python_kit-0.1.3.dev1.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-ipa_python_kit-0.1.3.dev1.dist-info/top_level.txt,sha256=jpjQhUSwP61wKQAysY61KwKKom42vtQTiJNXMT6AyCc,4
-ipa_python_kit-0.1.3.dev1.dist-info/RECORD,,
+ipa/websocket/core/__init__.py,sha256=EOqo4MnWXdjHcmqiP61pWIinbhDYb4_Lesiei7uiyXk,4843
+ipa_python_kit-1.0.1.dist-info/METADATA,sha256=M3YWGy74OQ5jqCd0zu34bZS5SmVGF6YJ0py3sBmilMM,2910
+ipa_python_kit-1.0.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+ipa_python_kit-1.0.1.dist-info/top_level.txt,sha256=jpjQhUSwP61wKQAysY61KwKKom42vtQTiJNXMT6AyCc,4
+ipa_python_kit-1.0.1.dist-info/RECORD,,

{ipa_python_kit-0.1.3.dev1.dist-info → ipa_python_kit-1.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ipa/extra/simpy/__init__.py

@@ -1 +0,0 @@
-from .core import *

ipa/extra/simpy/core.py

@@ -1,288 +0,0 @@
-import logging
-import math
-import time
-from abc import ABC
-from typing import Any, List, Optional, Union
-
-import simpy
-import simpy.resources
-import simpy.resources.resource
-from simpy.core import EmptySchedule, StopSimulation
-from simpy.events import URGENT
-
-
-def try_put(
-    env: simpy.Environment,
-    container: simpy.Container,
-    amount: Union[int, float],
-    timeout: Optional[int] = None,
-):
-    x = container.put(amount)
-    if timeout:
-        x = x | env.timeout(timeout)
-    v = yield x
-    return v
-
-
-def get_free_capacity(container: simpy.Container):
-    """
-    获取容器的空闲容量
-    Args:
-        container (simpy.Container): 容器
-    Returns:
-        int | float: 空闲容量
-    """
-    # TODO：这里预先触发存取操作，可能会有性能影响，后续可考虑分离出去
-    container._trigger_put(None)
-    container._trigger_get(None)
-    return container.capacity - container.level
-
-
-def resize_container(
-    container: simpy.Container, capacity: Union[int, float], is_delta=False
-):
-    """
-    调整容器容量
-    Args:
-        container (simpy.Container): 容器
-        capacity (int | float): 新容量
-        is_delta (bool, optional): 是否是增量调整. 默认False
-    """
-    old_capacity = container.capacity
-    capacity = capacity + old_capacity if is_delta else capacity
-    dx = capacity - old_capacity
-    if not dx:
-        return
-    # 如果是减容，先触发取操作
-    if dx < 0:
-        container._trigger_get(None)
-        assert (
-            container.level <= capacity
-        ), f"容器当前等级{container.level}大于新容量{capacity}，无法完成减容"
-    container._capacity = capacity
-    if dx > 0:
-        container._trigger_put(None)
-
-
-def resource_to_dict(resource: Any):
-    if isinstance(resource, simpy.Container):
-        return dict(level=resource.level, capacity=resource.capacity)
-    if isinstance(resource, simpy.Resource):
-        return dict(level=resource.count, capacity=resource.capacity)
-    if isinstance(resource, simpy.Store):
-        return dict(level=len(resource.items), capacity=resource.capacity)
-    print("unexpected type:" + resource)
-
-
-def schedule_event_at(
-    env: simpy.Environment, at: Union[float, int], ev: Optional[simpy.Event] = None
-):
-    """
-    计划在指定时间触发事件
-    Args:
-        env (simpy.Environment): 仿真环境
-        at (float | int): 触发时间
-        ev (simpy.Event | None, optional): 事件. 默认None
-    """
-    if at < env.now:
-        return
-    if ev is None:
-        ev = env.event()
-        ev._ok = True
-        ev._value = None
-    env.schedule(ev, URGENT, at - env.now)
-    return ev
-
-
-def interrupt_on_event(env: simpy.Environment, ev: simpy.Event):
-    """
-    当事件触发时中断仿真
-    Args:
-        env (simpy.Environment): 仿真环境
-        ev (simpy.Event): 事件
-    """
-
-    raise NotImplementedError("interrupt_on_event not implemented")
-
-
-def interrupt_if_timeout(
-    env: simpy.Environment,
-    timeout: Optional[float] = None,
-    check_interval: float = 10,
-    exit_signal: Optional[simpy.Event] = None,
-):
-    """
-    根据仿真真实运行时间是否超时来中断仿真
-
-    Args:
-        env (simpy.Environment): 仿真环境
-        timeout (float | None, optional): 最大运行时间. 默认不限时
-        check_interval (float, optional): 这个时间是仿真中的时间
-        exit_signal (simpy.Event | None, optional): 外部信号，用于外部中断仿真. 默认不使用.
-    """
-
-    def inner():
-        cpu_start_time = time.time()
-        while True:
-            dt = time.time() - cpu_start_time
-            if timeout is not None and dt > timeout:
-                raise simpy.Interrupt(
-                    f"仿真运行时间{dt}超过最大运行时间{timeout}，强制退出"
-                )
-            if exit_signal and exit_signal.triggered:
-                raise simpy.Interrupt(f"外部信号{exit_signal}触发，强制退出")
-            yield env.timeout(check_interval)
-
-    return env.process(inner())
-
-
-def has_no_event_left(env: simpy.Environment):
-    """
-    判断指定环境中是否还有未处理的事件
-    """
-    return not env._queue and not env.active_process
-
-
-class DeadlineException(StopSimulation):
-    """
-    截止事件异常
-    """
-
-    def __init__(self, cause):
-        super().__init__(cause)
-
-
-class DeadlineEvent(simpy.Event):
-    """
-    截止事件，用于在指定时间触发**DeadlineException**异常从而正常退出
-    如果仿真早于截止时间完成, 则此事件仍会执行
-    """
-
-    def interrupt(self, *args, **kwargs):
-        """
-        中断事件
-        """
-        # 如果后续还有事件,忽略事件正常退出,此时时钟停止在deadline时间
-        raise DeadlineException(f"deadline {self.at} reached, force exit")
-
-    def __init__(
-        self,
-        env: simpy.Environment,
-        at: Union[float, int, None] = None,
-    ):
-        super().__init__(env)
-        self.at: Union[float, int, None] = None
-        self._ok = True
-        self._value = None
-        if at is not None:
-            self.schedule_at(at)
-        # self.callbacks = [StopSimulation.callback]
-        self.callbacks = [self.interrupt]
-
-    def schedule_at(self, at: Union[float, int]):
-        """
-        计划在指定时间触发事件
-        Args:
-            at (float | int): 触发时间
-        """
-        if self.at is not None:
-            raise ValueError("deadline event already scheduled")
-        self.at = at
-        return schedule_event_at(self.env, at, self)
-
-
-def run_until(
-    env: simpy.Environment,
-    exit_signal: Optional[simpy.Event] = None,
-    max_sim_time: Optional[float] = None,
-    extra_events: Optional[List[simpy.Event]] = None,
-):
-    """
-
-    运行仿真直到指定事件触发或仿真时间超过最大运行时间
-
-    TODO: 如果重复调用,可能添加多次until事件,如何规避?
-
-    Args:
-        env (simpy.Environment): 仿真环境
-        exit_signal (simpy.Event | None, optional): 外部信号，用于外部中断仿真. 默认不使用.
-        max_sim_time (float | None, optional): 最大运行时间. 默认不限时
-        extra_events (List[simpy.Event] | None, optional): 额外事件. 默认不使用.
-    """
-    if getattr(env, "__old_step__", None) is None:
-        env.__old_step__ = env.step
-
-    def _step():
-        next_time = env.peek()
-        if next_time is None or next_time == math.inf:
-            raise EmptySchedule from None
-        if next_time > env.__max_sim_time__:
-            raise DeadlineException(
-                f"next simulation time {next_time} will exceeds max_sim_time {max_sim_time}"
-            )
-        env.__old_step__()
-
-    events = []
-    if exit_signal:
-        events.append(exit_signal)
-    if max_sim_time is not None:
-        env.__max_sim_time__ = max_sim_time
-        env.step = _step
-    # 这种方式会将事件加入调度队列,还是会造成仿真延迟
-    #     # dt = max(0, max_sim_time - env.now)
-    #     # events.append(env.timeout(dt))
-    #     events.append(DeadlineEvent(env, max_sim_time))
-    if extra_events:
-        events.extend(extra_events)
-    until = env.any_of(events) if events else None
-    try:
-        env.run(until=until)
-    except Exception as e:
-        if has_no_event_left(env):
-            logging.warning(
-                "error happens but there is no event left, will ignore: %s", e
-            )
-            return
-        raise e
-
-
-def stop_simulation(env: simpy.Environment):
-    """
-    停止仿真
-    1. 清空事件队列，诱发底层异常
-    """
-
-    def clear_queue():
-        size = len(env._queue)
-        logging.debug("will remove %s events in queue", size)
-        env._queue.clear()
-        yield env.timeout(0)
-        return size
-
-    return env.process(clear_queue())
-
-
-class ISimLock(ABC):
-
-    def __init__(self, env: simpy.Environment):
-        self._occupied_ = simpy.Resource(env, capacity=1)
-        self._lock_ = False
-
-    @property
-    def is_occupied(self):
-        """
-        判断锁是否被占用
-        """
-        return self._occupied_.count > 0
-
-    def lock(self):
-        """
-        请求锁
-        """
-        return self._occupied_.request()
-
-    def unlock(self, req: simpy.resources.resource.Request):
-        """
-        请求解锁
-        """
-        return self._occupied_.release(req)

ipa/func/app.py

@@ -1,12 +0,0 @@
-from pathlib import Path
-
-
-class AppRoot(Path):
-    """
-    鉴于每个应用都要有自己的logs、data目录，这里索性增加个工具统一管理
-    """
-
-    def dir_of(self, name: str):
-        d = self.joinpath(name)
-        d.mkdir(parents=True, exist_ok=True)
-        return d