osis-python 0.2.1__tar.gz → 0.2.3__tar.gz

{osis_python-0.2.1/src/osis_python.egg-info → osis_python-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.2.1
+Version: 0.2.3
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT

{osis_python-0.2.1 → osis_python-0.2.3/src/osis_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.2.1
+Version: 0.2.3
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT

{osis_python-0.2.1 → osis_python-0.2.3}/src/osis_python.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/osis_python.egg-info/top_level.txt
 src/pyosis/__init__.py
 src/pyosis/boundary/__init__.py
 src/pyosis/boundary/interface.py
+src/pyosis/boundary/manager.py
 src/pyosis/common/__init__.py
 src/pyosis/common/interface.py
 src/pyosis/common/project.py
@@ -21,27 +22,40 @@ src/pyosis/core/client.py
 src/pyosis/core/command.py
 src/pyosis/element/__init__.py
 src/pyosis/element/interface.py
+src/pyosis/element/manager.py
 src/pyosis/general/__init__.py
 src/pyosis/general/interface.py
 src/pyosis/geometry/__init__.py
 src/pyosis/geometry/interface.py
+src/pyosis/io/__init__.py
+src/pyosis/io/boundary_info.py
+src/pyosis/io/coordinate.py
+src/pyosis/io/element_info.py
+src/pyosis/io/group_info.py
+src/pyosis/io/material_info.py
+src/pyosis/io/node_info.py
+src/pyosis/io/prestressed_info.py
+src/pyosis/io/response.py
+src/pyosis/io/section_info.py
+src/pyosis/io/stage_info.py
 src/pyosis/live/__init__.py
 src/pyosis/live/analysis.py
 src/pyosis/live/grade.py
 src/pyosis/live/lane.py
+src/pyosis/live/manager.py
 src/pyosis/load/__init__.py
 src/pyosis/load/loadcase.py
+src/pyosis/load/manager.py
 src/pyosis/load/static.py
 src/pyosis/load/tendon.py
 src/pyosis/material/__init__.py
 src/pyosis/material/interface.py
+src/pyosis/material/manager.py
 src/pyosis/node/__init__.py
 src/pyosis/node/interface.py
+src/pyosis/node/manager.py
 src/pyosis/post/__init__.py
-src/pyosis/post/check.py
-src/pyosis/post/env.py
-src/pyosis/post/loadcase.py
-src/pyosis/post/result.py
+src/pyosis/post/combine.py
 src/pyosis/property/__init__.py
 src/pyosis/property/comp_thickness.py
 src/pyosis/property/coordinate.py
@@ -50,9 +64,14 @@ src/pyosis/property/damping.py
 src/pyosis/property/pu_curve.py
 src/pyosis/quick_building/__init__.py
 src/pyosis/quick_building/interface.py
+src/pyosis/result/__init__.py
+src/pyosis/result/check.py
+src/pyosis/result/env.py
+src/pyosis/result/loadcase.py
+src/pyosis/result/result.py
 src/pyosis/section/__init__.py
 src/pyosis/section/common.py
-src/pyosis/section/io.py
+src/pyosis/section/manager.py
 src/pyosis/section/numeric.py
 src/pyosis/section/param.py
 src/pyosis/section/rebar.py
@@ -60,6 +79,7 @@ src/pyosis/section/rib.py
 src/pyosis/section/steel.py
 src/pyosis/stage/__init__.py
 src/pyosis/stage/define.py
+src/pyosis/stage/manager.py
 src/pyosis/stage/overall.py
 src/pyosis/thickness/__init__.py
 src/pyosis/thickness/interface.py

{osis_python-0.2.1 → osis_python-0.2.3}/src/pyosis/__init__.py

@@ -7,7 +7,7 @@ A library for extending OSIS functionality.
 A library that allows users to use CAE with great flexibility.
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.3"
 __author__ = "CCCC Highway Consultant Co. Ltd." # 中交公路规划设计院 - 工程技术研究中心 - lzh - wjh - myf
 
 # from .core import engine

osis_python-0.2.3/src/pyosis/boundary/__init__.py

@@ -0,0 +1,7 @@
+'''
+pyosis.boundary 的 Docstring
+
+'''
+
+from .interface import *
+from .manager import boundary_manager

osis_python-0.2.3/src/pyosis/boundary/manager.py

@@ -0,0 +1,342 @@
+"""边界管理器 - 统一管理边界的增删改查
+
+设计理念：
+- 隐藏 HTTP 接口细节，提供原生 Python 风格 API
+- 返回数据类对象而非 HTTP 元组
+- 内部维护边界列表，通过 get 等方法查询，不暴露 HTTP 接口细节
+
+支持的边界类型：GENERAL（一般边界）、MSTSLV（主从约束）、RELEASE（释放梁端约束）、
+ELSTCSPT（弹性支承）
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from ..core.client import osis_client
+from .interface import (
+    osis_boundary_general,
+    osis_boundary_elstcspt,
+    osis_boundary_master_slave,
+    osis_boundary_release,
+    osis_boundary_dle,
+)
+
+
+# ──────────────────────────────────────────────
+# 数据类
+# ──────────────────────────────────────────────
+
+
+@dataclass(frozen=True)
+class Boundary:
+    """边界对象
+
+    由 BoundaryManager 内部创建，用户不应直接实例化。
+    """
+
+    no: int
+    name: str = ""
+    boundary_type: str = ""  # "General", "MstSlv", "Release", "ElstcSpt", "GeneralElstcSpt"
+    entity_vec: list[int] | None = None
+    is_occupied: bool = False
+
+    @classmethod
+    def _from_dict(cls, d: dict) -> Boundary:
+        """从接口 dict 构造 Boundary 对象（内部使用）"""
+        type_names = {
+            1: "General",
+            2: "MstSlv",
+            3: "Rigid",
+            4: "Release",
+            5: "ElstcSpt",
+            6: "GeneralElstcSpt",
+        }
+        return cls(
+            no=d.get("no", 0),
+            name=d.get("name", ""),
+            boundary_type=type_names.get(d.get("type", 0), "Unknown"),
+            entity_vec=d.get("entityVec", []),
+            is_occupied=d.get("isOccupied", False),
+        )
+
+
+# ──────────────────────────────────────────────
+# 管理类
+# ──────────────────────────────────────────────
+
+
+class BoundaryManager:
+    """边界管理器
+
+    统一管理边界的创建、删除和查询。
+
+    用法:
+        >>> from pyosis.boundary import boundary_manager
+        >>> boundary_manager.create_general(1, bX=1, bY=1, bZ=1, bRX=0, bRY=0, bRZ=0)  # 创建一般边界
+        >>> boundary_manager.create_elstcspt(2, DX=1e10, DY=1e10, DZ=1e10)              # 创建弹性支承
+        >>> boundary_manager.create_master_slave(3, nNode=1, bX=1, bY=1, bZ=1)         # 创建主从约束
+        >>> bd = boundary_manager.get(1)                                                # 按编号查询
+        >>> all_bds = boundary_manager.all()                                           # 获取全部边界
+        >>> boundary_manager.delete(1)                                                # 删除边界
+    """
+
+    def __init__(self) -> None:
+        self._boundaries: list[Boundary] = []
+        self._bd_map: dict[int, Boundary] = {}  # 按编号索引：O(1) 查询
+        self._loaded: bool = False
+
+    # ── 数据加载 ──────────────────────────────
+
+    def _load(self) -> None:
+        """从服务端加载所有边界信息（延迟加载，带缓存）"""
+        if self._loaded:
+            return
+        resp = osis_client("GetAllBoundaryInfo", {})
+        if isinstance(resp, tuple):
+            raise RuntimeError(f"加载边界信息失败: {resp[1]}")
+        self._boundaries = [
+            Boundary._from_dict(d) for d in resp.get("data", []) if isinstance(d, dict) and "no" in d
+        ]
+
+        # 构建索引：编号 -> 边界对象 (O(1) 查询)
+        self._bd_map = {bd.no: bd for bd in self._boundaries}
+
+        self._loaded = True
+
+    def refresh(self) -> None:
+        """强制刷新缓存（模型变更后自动调用，也可手动调用）"""
+        self._boundaries = []
+        self._bd_map = {}
+        self._loaded = False
+        self._load()
+
+    # ── 增删改 ────────────────────────────────
+
+    def create_general(
+        self,
+        no: int,
+        nCoor: int = None,
+        bX: bool = 1,
+        bY: bool = 1,
+        bZ: bool = 1,
+        bRX: bool = 1,
+        bRY: bool = 1,
+        bRZ: bool = 1,
+        bRW: bool = 1,
+    ) -> None:
+        """创建一般边界
+
+        Args:
+            no: 边界编号
+            nCoor: 局部坐标系编号，"" 代表缺省
+            bX: UX方向，0=释放，1=约束
+            bY: UY方向，0=释放，1=约束
+            bZ: UZ方向，0=释放，1=约束
+            bRX: RX方向，0=释放，1=约束
+            bRY: RY方向，0=释放，1=约束
+            bRZ: RZ方向，0=释放，1=约束
+            bRW: RW方向，0=释放，1=约束
+
+        Raises:
+            RuntimeError: 创建失败时抛出异常
+        """
+        if nCoor is None:
+            nCoor = ""
+        ok, err = osis_boundary_general(no, "GENERAL", nCoor, bX, bY, bZ, bRX, bRY, bRZ, bRW)
+        if not ok:
+            raise RuntimeError(f"创建一般边界 {no} 失败: {err}")
+        self._loaded = False
+
+    def create_elstcspt(
+        self,
+        no: int,
+        nCoor: int = None,
+        bX: bool = 1,
+        DX: float = 1e13,
+        bY: bool = 1,
+        DY: float = 1e13,
+        bZ: bool = 1,
+        DZ: float = 1e13,
+        bRX: bool = 1,
+        RX: float = 1e16,
+        bRY: bool = 1,
+        RY: float = 1e16,
+        bRZ: bool = 1,
+        RZ: float = 1e16,
+    ) -> None:
+        """创建弹簧单元弹性支承
+
+        Args:
+            no: 边界编号
+            nCoor: 局部坐标系编号，固定使用""缺省
+            bX: UX方向，0=弹性，1=固定
+            DX: 坐标系X轴方向的弹性支承刚度
+            bY: UY方向，0=弹性，1=固定
+            DY: 坐标系Y轴方向的弹性支承刚度
+            bZ: UZ方向，0=弹性，1=固定
+            DZ: 坐标系Z轴方向的弹性支承刚度
+            bRX: RX方向，0=弹性，1=固定
+            RX: 绕坐标系X轴方向的转动弹性刚度
+            bRY: RY方向，0=弹性，1=固定
+            RY: 绕坐标系Y轴方向的转动弹性刚度
+            bRZ: RZ方向，0=弹性，1=固定
+            RZ: 绕坐标系Z轴方向的转动弹性刚度
+
+        Raises:
+            RuntimeError: 创建失败时抛出异常
+        """
+        if nCoor is None:
+            nCoor = ""
+        ok, err = osis_boundary_elstcspt(
+            no, "ELSTCSPT", nCoor, bX, DX, bY, DY, bZ, DZ, bRX, RX, bRY, RY, bRZ, RZ
+        )
+        if not ok:
+            raise RuntimeError(f"创建弹性支承 {no} 失败: {err}")
+        self._loaded = False
+
+    def create_master_slave(
+        self,
+        no: int,
+        nNode: int,
+        bX: bool = 1,
+        bY: bool = 1,
+        bZ: bool = 1,
+        bRX: bool = 1,
+        bRY: bool = 1,
+        bRZ: bool = 1,
+    ) -> None:
+        """创建主从约束
+
+        Args:
+            no: 边界编号
+            nNode: 主节点编号
+            bX: UX方向，0=释放，1=约束
+            bY: UY方向，0=释放，1=约束
+            bZ: UZ方向，0=释放，1=约束
+            bRX: RX方向，0=释放，1=约束
+            bRY: RY方向，0=释放，1=约束
+            bRZ: RZ方向，0=释放，1=约束
+
+        Raises:
+            RuntimeError: 创建失败时抛出异常
+        """
+        ok, err = osis_boundary_master_slave(no, "MSTSLV", nNode, bX, bY, bZ, bRX, bRY, bRZ)
+        if not ok:
+            raise RuntimeError(f"创建主从约束 {no} 失败: {err}")
+        self._loaded = False
+
+    def create_release(
+        self,
+        no: int,
+        Fxi_state: bool,
+        Fyi_state: bool,
+        Fzi_state: bool,
+        Mxi_state: bool,
+        Myi_state: bool,
+        Mzi_state: bool,
+        Mbi_state: bool,
+        Fxi: float,
+        Fyi: float,
+        Fzi: float,
+        Mxi: float,
+        Myi: float,
+        Mzi: float,
+        Mbi: float,
+        Fxj_state: bool,
+        Fyj_state: bool,
+        Fzj_state: bool,
+        Mxj_state: bool,
+        Myj_state: bool,
+        Mzj_state: bool,
+        Mbj_state: bool,
+        Fxj: float,
+        Fyj: float,
+        Fzj: float,
+        Mxj: float,
+        Myj: float,
+        Mzj: float,
+        Mbj: float,
+    ) -> None:
+        """创建释放梁端约束
+
+        Args:
+            no: 边界编号
+            Fxi_state等: 端部约束状态，0=释放，1=约束
+            Fxi等: 约束值，0-1之间，表示释放后残余的约束能力的百分比
+
+        Raises:
+            RuntimeError: 创建失败时抛出异常
+        """
+        ok, err = osis_boundary_release(
+            no, "RELEASE",
+            Fxi_state, Fyi_state, Fzi_state, Mxi_state, Myi_state, Mzi_state, Mbi_state,
+            Fxi, Fyi, Fzi, Mxi, Myi, Mzi, Mbi,
+            Fxj_state, Fyj_state, Fzj_state, Mxj_state, Myj_state, Mzj_state, Mbj_state,
+            Fxj, Fyj, Fzj, Mxj, Myj, Mzj, Mbj,
+        )
+        if not ok:
+            raise RuntimeError(f"创建释放梁端约束 {no} 失败: {err}")
+        self._loaded = False
+
+    def delete(self, no: int) -> None:
+        """删除边界
+
+        Args:
+            no: 边界编号
+
+        Raises:
+            RuntimeError: 删除失败时抛出异常
+        """
+        ok, err = osis_boundary_dle(no)
+        if not ok:
+            raise RuntimeError(f"删除边界 {no} 失败: {err}")
+        self._loaded = False
+
+    # ── 查询 ──────────────────────────────────
+
+    def get(self, no: int | list[int]) -> Boundary | list[Boundary | None]:
+        """根据编号获取单个或多个边界 (O(k))
+
+        Args:
+            no: 边界编号
+
+        Returns:
+            Boundary 对象或数组；边界不存在返回 None
+        """
+        self._load()
+        if isinstance(no, int):
+            return self._bd_map.get(no)
+        elif isinstance(no, list):
+            return [self._bd_map.get(n) for n in no]
+        else:
+            raise TypeError(f"不支持的编号类型: {type(no)}")
+
+    def all(self) -> list[Boundary]:
+        """获取所有边界
+
+        Returns:
+            全部边界列表
+        """
+        self._load()
+        return list(self._boundaries)
+
+    def count(self) -> int:
+        """获取边界总数
+
+        Returns:
+            边界数量
+        """
+        self._load()
+        return len(self._boundaries)
+
+    def __repr__(self) -> str:
+        self._load()
+        return f"BoundaryManager(count={len(self._boundaries)})"
+
+
+# ──────────────────────────────────────────────
+# 全局单例
+# ──────────────────────────────────────────────
+
+boundary_manager = BoundaryManager()

{osis_python-0.2.1 → osis_python-0.2.3}/src/pyosis/core/all_func.py

@@ -7,10 +7,11 @@ from ..live import *
 from ..load import *
 from ..material import *
 from ..node import *
-from ..post import *
+from ..result import *
 from ..property import *
 from ..general import *
 from ..section import *
 from ..stage import *
 from ..geometry import *
-from ..thickness import *
+from ..thickness import *
+from ..io import *

{osis_python-0.2.1 → osis_python-0.2.3}/src/pyosis/core/client.py

@@ -30,7 +30,7 @@ def osis_client(func_name: str, payload: dict) -> dict | tuple[bool, str]:
     Args:
         func_name: C++ 接口名（如 "OSIS_Run", "OSIS_Run_Batch"）
         payload: 请求参数字典（自动序列化为 JSON）
-    Returns: 
+    Returns:
         异常时返回 (False, 错误信息)
     """
     url = f"http://localhost:8080/{func_name}"
@@ -44,8 +44,7 @@ def osis_client(func_name: str, payload: dict) -> dict | tuple[bool, str]:
             timeout=30  # 批量调用适当延长超时
         )
         response.raise_for_status()  # 抛出 HTTP 状态码错误
-        return tuple(response.json())
-        
+        return response.json()
     except Exception as e:
         # 异常时保持和 C++ 一致的返回格式
         return False, f"调用失败: {str(e)}"

osis_python-0.2.3/src/pyosis/element/__init__.py

@@ -0,0 +1,2 @@
+from .interface import *
+from .manager import element_manager