osis-python 0.3.9__tar.gz → 0.4.1__tar.gz

{osis_python-0.3.9/src/osis_python.egg-info → osis_python-0.4.1}/PKG-INFO

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

{osis_python-0.3.9 → osis_python-0.4.1/src/osis_python.egg-info}/PKG-INFO

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

{osis_python-0.3.9 → osis_python-0.4.1}/src/osis_python.egg-info/SOURCES.txt

@@ -74,6 +74,7 @@ src/pyosis/result/manager.py
 src/pyosis/result/result.py
 src/pyosis/section/__init__.py
 src/pyosis/section/common.py
+src/pyosis/section/composite.py
 src/pyosis/section/manager.py
 src/pyosis/section/numeric.py
 src/pyosis/section/param.py

{osis_python-0.3.9 → osis_python-0.4.1}/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.3.9"
+__version__ = "0.4.1"
 __author__ = "CCCC Highway Consultant Co. Ltd." # 中交公路规划设计院 - 工程技术研究中心 - lzh - wjh - myf
 
 from .core.engine import OSISEngine

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/boundary/manager.py

@@ -293,7 +293,7 @@ class ElstcSptBoundary(Boundary):
             is_occupied=d.get("isOccupied"),
             is_selected=d.get("isSelected"),
             is_ploted=d.get("isPloted"),
-            constraints=list(d.get("constraints")),
+            # constraints=list(d.get("constraints")),
             coor_no=d.get("coorNO"),
             k_values=list(d.get("k")),
             elastic_k=list(d.get("elasticK")),
@@ -333,8 +333,8 @@ class GeneralElstcSptBoundary(Boundary):
             flag_m=d.get("flagM"),
             flag_c=d.get("flagC"),
             stiffness_matrix=list(d.get("stiffnessMatrix")),
-            mass_matrix=list(d.get("massMatrix")),
-            damping_matrix=list(d.get("dampingMatrix")),
+            # mass_matrix=list(d.get("massMatrix")),
+            # damping_matrix=list(d.get("dampingMatrix")),
         )
 
     def __repr__(self) -> str:

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/core/__init__.py

@@ -9,3 +9,4 @@ OSISEngine中的函数，将会分发到各个模块，被再次封装，意图
 """
 
 from .command import REGISTRY, osis_run, set_run_mode
+from .client import set_osis_port, set_osis_url

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/core/client.py

@@ -24,6 +24,23 @@ session = requests.Session()
 session.mount("http://", adapter)
 session.mount("https://", adapter)  # 如果你后续用HTTPS
 
+DEFAULT_PORT = 18080
+DEFAULT_URL = "http://localhost"
+
+def set_osis_url(url):
+    '''
+    设置OSIS默认网址
+    '''
+    global DEFAULT_URL
+    DEFAULT_URL = url
+
+def set_osis_port(port):
+    '''
+    设置要连接的OSIS端口
+    '''
+    global DEFAULT_PORT
+    DEFAULT_PORT = port
+
 # ========== 通用客户端函数（复用连接池） ==========
 def osis_client(func_name: str, payload: dict, base_url=None) -> dict:
     """
@@ -34,7 +51,7 @@ def osis_client(func_name: str, payload: dict, base_url=None) -> dict:
     Returns:
         异常时返回 (False, 错误信息)
     """
-    base_url = base_url or os.environ.get("OSIS_URL", "http://localhost:18080")
+    base_url = base_url or os.environ.get("OSIS_URL", f"{DEFAULT_URL}:{DEFAULT_PORT}")
     url = f"{base_url}/{func_name}"
 
     try:

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/core/engine.py

@@ -19,6 +19,7 @@
 
 from __future__ import annotations
 
+import os
 from typing import Any
 
 from ..material.manager import MaterialManager, material_manager
@@ -48,6 +49,7 @@ from ..general.interface import (
     osis_solve,
 )
 from .command import osis_run
+from .client import set_osis_port, set_osis_url
 
 
 class OSISEngine:
@@ -81,7 +83,12 @@ class OSISEngine:
         - matrix(), output_result_for_calc_book()
     """
 
-    def __init__(self) -> None:
+    def __init__(self, port=None, url="http://localhost") -> None:
+        '''
+        Args:
+            port (int): OSIS 端口号，为 `None` 自动尝试加载 `OSIS_HTTP_PORT` 环境变量，加载失败将设为默认值 18080
+            url (str): OSIS 网址
+        '''
         # 引用全局单例管理器
         self._material = material_manager
         self._section = section_manager
@@ -103,6 +110,15 @@ class OSISEngine:
         self._post = post_manager
         self._result = result_manager
 
+        # OSIS端口与网址
+        if port is None:
+            self._port = os.environ.get("OSIS_HTTP_PORT", 18080)     # 如果设置了环境变量
+        else:
+            self._port = port
+        self._url = url
+        set_osis_url(self._url)
+        set_osis_port(self._port)
+
     # ──────────────────────────────────────────
     # 子管理器属性
     # ──────────────────────────────────────────
@@ -306,7 +322,7 @@ class OSISEngine:
             path (str): 完整文件名
          
         Notes: 
-            path 中如果不输入绝对路径的话，默认使用程序执行文件所在的路径，比如“D:\Rbin\X.sml”。
+            path 中如果不输入绝对路径的话，默认使用程序执行文件所在的路径，比如“D:\\Rbin\\X.sml”。
         """
         self.control.import_apdl(path)
 

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/dynamic/load_to_mass.py

@@ -42,12 +42,12 @@ def osis_ltm_anal_del(strName: str):
 
 
 @REGISTRY.register("LTMAnalMod")
-def osis_ltm_anal_mod(nOld: int, nNew: int):
-    """修改荷载转换质量编号。
+def osis_ltm_anal_mod(old_name: str, new_name: str):
+    """修改荷载转换质量名称。
 
     Args:
-        nOld (int): 旧编号
-        nNew (int): 新编号
+        old_name (str): 旧名称
+        new_name (str): 新名称
 
     Returns:
         tuple (bool, str): 返回一个元组，包含：

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/dynamic/manager.py

@@ -7,7 +7,7 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Literal
 
 from .load_to_mass import (
@@ -28,18 +28,54 @@ from .seismic import (
 )
 from ..core.client import osis_client
 
-
+@dataclass(frozen=False)
+class LoadToMassLcPara:
+  """荷载转换质量中的单个荷载工况参数"""
+  load_case: str
+  mass_factor: float
+  g: float
+  mass_dir: list[int] = field(default_factory=lambda: [1, 1, 1])  # [X, Y, Z]
+  trans_node_force: bool = True   # transNForce
+  trans_beam_force: bool = True   # transBForce
+  trans_surface_force: bool = False  # transSForce
+  @classmethod
+  def _from_dict(cls, d: dict) -> LoadToMassLcPara:
+      return cls(
+          load_case=d.get("loadCase"),
+          mass_factor=d.get("massFactor"),
+          g=d.get("G"),
+          mass_dir=list(d.get("massDir") or [1, 1, 1]),
+          trans_node_force=bool(d.get("transNForce")),
+          trans_beam_force=bool(d.get("transBForce")),
+          trans_surface_force=bool(d.get("transSForce")),
+      )
 # ──────────────────────────────────────────────
 # 管理类
 # ──────────────────────────────────────────────
 @dataclass(frozen=False)
 class LoadToMass:
     name: str
+    no: int
+    analysis_type: int = 0
+    ok: bool = False
+    related_stages: list[int] = field(default_factory=list)
+    lc_paras_count: int = 0
+    lc_paras: list[LoadToMassLcPara] = field(default_factory=list)
 
     @classmethod
     def _from_dict(cls, d: dict) -> LoadToMass:
         return cls(
             name=d.get("name"),
+            no=d.get("no"),
+            analysis_type=d.get("analysisType", 0),
+            ok=bool(d.get("ok")),
+            related_stages=list(d.get("relatedStages") or []),
+            lc_paras_count=d.get("lcParasCount", 0),
+            lc_paras=[
+                LoadToMassLcPara._from_dict(p)
+                for p in (d.get("lcParas") or [])
+                if isinstance(p, dict)
+            ],
         )
 
 class LoadToMassManager:
@@ -102,16 +138,16 @@ class LoadToMassManager:
         if not ok:
             raise RuntimeError(f"删除荷载转换质量 {name} 失败: {err}")
 
-    def renumber_ltm(self, old_no: int, new_no: int) -> None:
-        """修改荷载转换质量编号。
+    def rename_ltm(self, old_name: str, new_name: str) -> None:
+        """修改荷载转换质量名称。
 
         Args:
-            old_no: 旧编号
-            new_no: 新编号
+            old_name: 旧名称
+            new_name: 新名称
         """
-        ok, err = osis_ltm_anal_mod(old_no, new_no)
+        ok, err = osis_ltm_anal_mod(old_name, new_name)
         if not ok:
-            raise RuntimeError(f"修改荷载转换质量编号 {old_no} -> {new_no} 失败: {err}")
+            raise RuntimeError(f"修改荷载转换质量名称 {old_name} -> {new_name} 失败: {err}")
 
     def add_ltm(
         self,
@@ -262,7 +298,7 @@ class SeisRspSpecManager:
             names = [str(name)]
         if not isinstance(names, list):
             raise TypeError(f"不支持的名称类型: {type(name)}")
-        resp = osis_client("GetSeisRspSpecInfoByNames", {"name": names})
+        resp = osis_client("GetSeisRspSpecByNames", {"name": names})
         if not resp['success']:
             raise RuntimeError(f"{resp['error']}")
         rsp = [SeisRspSpec._from_dict(d) if d else None for d in resp.get("data", [])]
@@ -291,8 +327,13 @@ class SeisRspSpecManager:
             g: 输入g值
             spectrum_data: 反应谱数据列表，每个元素为 (周期, 谱值) 元组
         """
-        n_num = len(spectrum_data)
-        ok, err = osis_seis_rsp_spec_import(name, spec_type, g, n_num, spectrum_data)
+        if spectrum_data and isinstance(spectrum_data[0], tuple):
+            n_num = len(spectrum_data)
+            flat = [v for pair in spectrum_data for v in pair]
+        else:
+            flat = list(spectrum_data)
+            n_num = len(flat) // 2
+        ok, err = osis_seis_rsp_spec_import(name, spec_type, g, 0, n_num, flat)
         if not ok:
             raise RuntimeError(f"创建地震反应谱 {name} 失败: {err}")
 
@@ -332,7 +373,7 @@ class SeisRspSpecManager:
             delta_t: 周期间隔
         """
         ok, err = osis_seis_rsp_spec_code(
-            name, spec_type, g,
+            name, spec_type, g,1,
             code, bridge_type, is_long_span, level, intensity,
             site, direction, period, ksi, t, delta_t
         )
@@ -349,16 +390,16 @@ class SeisRspSpecManager:
         if not ok:
             raise RuntimeError(f"删除地震反应谱 {name} 失败: {err}")
 
-    def renumber_rsp_spec(self, old_no: int, new_no: int) -> None:
-        """修改地震反应谱编号。
+    def rename_rsp_spec(self, old_name: str, new_name: str) -> None:
+        """修改地震反应谱名称。
 
         Args:
-            old_no: 旧编号
-            new_no: 新编号
+            old_name: 旧名称
+            new_name: 新名称
         """
-        ok, err = osis_seis_rsp_spec_mod(old_no, new_no)
+        ok, err = osis_seis_rsp_spec_mod(old_name, new_name)
         if not ok:
-            raise RuntimeError(f"修改地震反应谱编号 {old_no} -> {new_no} 失败: {err}")
+            raise RuntimeError(f"修改地震反应谱名称 {old_name} -> {new_name} 失败: {err}")
 
 @dataclass(frozen=False)
 class RspecAnal:
@@ -474,16 +515,16 @@ class RspecAnalManager:
         if not ok:
             raise RuntimeError(f"删除反应谱工况 {name} 失败: {err}")
 
-    def renumber_rspec_anal(self, old_no: int, new_no: int) -> None:
-        """修改反应谱工况编号。
+    def rename_rspec_anal(self, old_name: str, new_name: str) -> None:
+        """修改反应谱工况名称。
 
         Args:
-            old_no: 旧编号
-            new_no: 新编号
+            old_name: 旧名称
+            new_name: 新名称
         """
-        ok, err = osis_rspec_anal_mod(old_no, new_no)
+        ok, err = osis_rspec_anal_mod(old_name, new_name)
         if not ok:
-            raise RuntimeError(f"修改反应谱工况编号 {old_no} -> {new_no} 失败: {err}")
+            raise RuntimeError(f"修改反应谱工况名称 {old_name} -> {new_name} 失败: {err}")
 
 class DynamicManager:
     """动力分析管理器

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/dynamic/seismic.py

@@ -18,6 +18,7 @@ def osis_seis_rsp_spec_import(
     strName: str,
     strType: Literal["N", "A", "V", "D"],
     dG: float,
+    inputType: int,
     nNum: int,
     spectrum_data: list[tuple[float, float]],
 ):
@@ -27,6 +28,7 @@ def osis_seis_rsp_spec_import(
         strName (str): 名称
         strType (str): 谱类型，N=无量纲加速度谱，A=加速度谱，V=速度谱，D=位移谱
         dG (float): 输入g值
+        inputtype：类型，0 = 导入
         nNum (int): 点数
         spectrum_data (list): 反应谱数据列表，每个元素为 (周期, 谱值) 元组
 
@@ -49,6 +51,7 @@ def osis_seis_rsp_spec_code(
     strName: str,
     strType: Literal["N", "A", "V", "D"],
     dG: float,
+    inputType: int = 1,
     strCode: str = "JTGT_2231_01_2020",
     strBridgeType: Literal["A", "B", "C", "D"] = "A",
     nIsLongSpan: Literal[0, 1] = 0,
@@ -67,6 +70,7 @@ def osis_seis_rsp_spec_code(
         strName (str): 名称
         strType (str): 谱类型，N=无量纲加速度谱，A=加速度谱，V=速度谱，D=位移谱
         dG (float): 输入g值
+        inputtype：类型，1 = 按规范生成
         strCode (str): 规范名称，如 "JTGT_2231_01_2020"
         strBridgeType (str): 桥梁类别，A/B/C/D
         nIsLongSpan (int): 0=非高速公路和一级公路上的B类大桥特大桥，1=高速公路和一级公路上的B类大桥特大桥
@@ -111,12 +115,12 @@ def osis_seis_rsp_spec_del(strName: str):
 
 
 @REGISTRY.register("SeisRspSpecMod")
-def osis_seis_rsp_spec_mod(nOld: int, nNew: int):
-    """修改地震反应谱编号。
+def osis_seis_rsp_spec_mod(old_name: str, new_name: str):
+    """修改地震反应谱名称。
 
     Args:
-        nOld (int): 旧编号
-        nNew (int): 新编号
+        old_name (int): 旧名称
+        new_name (int): 新名称
 
     Returns:
         tuple (bool, str): 返回一个元组，包含：
@@ -180,12 +184,12 @@ def osis_rspec_anal_del(strName: str):
 
 
 @REGISTRY.register("RSpecAnalMod")
-def osis_rspec_anal_mod(nOld: int, nNew: int):
-    """修改反应谱工况编号。
+def osis_rspec_anal_mod(old_name: str, new_name: str):
+    """修改反应谱工况名称。
 
     Args:
-        nOld (int): 旧编号
-        nNew (int): 新编号
+        old_name (str): 旧名称
+        new_name (str): 新名称
 
     Returns:
         tuple (bool, str): 返回一个元组，包含：

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/element/manager.py

@@ -24,6 +24,9 @@ from .interface import (
     osis_element_del,
     osis_element_mod,
     osis_element_group,
+    osis_taperele,
+    osis_element_tapereledel,
+    osis_element_taperelemod,
 )
 
 
@@ -380,6 +383,48 @@ class TaperEleGroupManager:
         taper_ele_groups = [TaperEleGroup._from_dict(d) for d in resp.get("data", []) if "name" in d]
         return taper_ele_groups
 
+    def create(
+        self,
+        name: str,
+        z_type: Literal["0", "1"],
+        z_trans: float = 1.0,
+        z_pos: Literal["0", "1"] = "0",
+        z_dis: float = 0.0,
+        y_type: Literal["0", "1"] = "0",
+        y_trans: float = 1.0,
+        y_pos: Literal["0", "1"] = "0",
+        y_dis: float = 0.0,
+        *eles: str,
+
+    ) -> TaperEleGroup:
+        """创建变截面单元组"""
+        ok, err = osis_taperele(
+            name,
+            z_type,
+            z_trans,
+            z_pos,
+            z_dis,
+            y_type,
+            y_trans,
+            y_pos,
+            y_dis,
+            *eles,
+        )
+        if not ok:
+            raise RuntimeError(f"创建变截面单元组 {name} 失败: {err}")
+        return self.get(name)
+
+    def delete(self, name: str) -> None:
+        ok, err = osis_element_tapereledel(name)
+        if not ok:
+            raise RuntimeError(f"删除变截面单元组 {name} 失败: {err}")
+
+    def rename(self, old_name: str, new_name: str) -> TaperEleGroup:
+        ok, err = osis_element_taperelemod(old_name, new_name)
+        if not ok:
+            raise RuntimeError(f"重命名变截面单元组 {old_name} -> {new_name} 失败: {err}")
+        return self.get(new_name)
+
     def get(self, name: str | list[str]) -> TaperEleGroup | list[TaperEleGroup | None] | None:
         """根据名称获取变截面单元组
         Args:
@@ -570,7 +615,7 @@ class ElementManager:
         ok, err = osis_element_shell(no, "SHELL", bIsThin, nMat, nThk, node1, node2, node3, node4)
         if not ok:
             raise RuntimeError(f"创建壳单元 {no} 失败: {err}")
-        return self.get(no)  # type: ignore[return-value]
+        return self.get(no)
 
     def delete(self, no: int) -> None:
         """删除单元"""

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/live/manager.py

@@ -267,6 +267,13 @@ class LiveCase:
                 - SUSPENSION: 悬索桥
                 - CUSTOM: 自定义，直接输入基频
             mu_params: 冲击系数计算参数列表（根据桥型不同参数不同）
+                * SIMPLE	            = 桥长、弹模、惯性矩、质量
+                * CONTINUOUS	        = 基频计算常数a、基频计算常数b、桥长、弹模、惯性矩、质量
+                * ARCH	                = 拱厚变化系数、拱桥矢跨比、桥长、弹模、惯性矩，质量
+                * CABLE_STAYED	        = 计算常数、主跨跨径
+                * CABLE_STAYED_AUX	    = 计算常数、主跨跨径
+                * SUSPENSION	        = 主跨跨径、弹模、惯性矩、主缆水平拉力、质量
+                * CUSTOM	            = 用户直接输入基频
             lane_names: 车道名称列表
 
         Returns:
@@ -316,6 +323,13 @@ class LiveCase:
                 - SUSPENSION: 悬索桥
                 - CUSTOM: 自定义，直接输入基频
             mu_params: 冲击系数计算参数列表（根据桥型不同参数不同）
+                * SIMPLE	            = 桥长、弹模、惯性矩、质量
+                * CONTINUOUS	        = 基频计算常数a、基频计算常数b、桥长、弹模、惯性矩、质量
+                * ARCH	                = 拱厚变化系数、拱桥矢跨比、桥长、弹模、惯性矩，质量
+                * CABLE_STAYED	        = 计算常数、主跨跨径
+                * CABLE_STAYED_AUX	    = 计算常数、主跨跨径
+                * SUSPENSION	        = 主跨跨径、弹模、惯性矩、主缆水平拉力、质量
+                * CUSTOM	            = 用户直接输入基频
             lane_names: 车道名称列表
 
         Returns:
@@ -501,6 +515,8 @@ class LiveGradeManager:
         Raises:
             RuntimeError: 创建失败时抛出异常
         """
+        raise RuntimeError(f"暂不支持创建LiveGrade对象")
+        # TODO 需要修改DB文件grade字段值
         ok, err = osis_livegrade_crowd(name, "JTGD60_2015", "CROWD", eBridgeType, dPara)
         if not ok:
             raise RuntimeError(f"创建人群荷载等级 {name} 失败: {err}")

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/load/manager.py

@@ -606,6 +606,7 @@ class LoadCase:
         Returns:
             更新后的 LoadCase 对象
         """
+        raise Exception("暂不支持添加单元面荷载（方向向量）到工况")
         ok, err = osis_load_surface_load_vector(
             "ESRFC", self.name, strEntity, strPlanei, strDir,
             strXi, strYi, strZi, strP1i, strP2i, strP3i, strP4i

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/post/manager.py

@@ -10,6 +10,8 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..core import osis_run
+
 from .combine import (
     osis_combine_create,
     osis_combine_post,
@@ -495,6 +497,18 @@ class PostManager:
         if not ok:
             raise RuntimeError(f"删除验算作用 ({item}) 失败: {err}")
 
+    # ═══════════════════════════════════════════
+    # 快捷功能
+    # ═══════════════════════════════════════════
+
+    def combination_and_check(self):
+        '''
+        自动组合与验算
+        '''
+        ok, err = osis_run("CombinationAndCheck")
+        if not ok:
+            raise RuntimeError(f"自动组合与验算失败: {err}")
+        
     # ═══════════════════════════════════════════
     # 结果显示
     # ═══════════════════════════════════════════

{osis_python-0.3.9 → osis_python-0.4.1}/src/pyosis/section/common.py

@@ -371,7 +371,7 @@ def osis_section_conventionalbox(nSec: int, strName: str, eSectionType: Literal[
     pass
 
 @REGISTRY.register('Section')
-def osis_section_flat_box(nSec: int, strName: str, eSectionType: Literal["FLATBOX"]="FLATBOX",
+def osis_section_streamed_box(nSec: int, strName: str, eSectionType: Literal["STREAMEDBOX"]="STREAMEDBOX",
                           H: float=4.0, BtL: float=20.0, BtR: float=20.0, BbL: float=10.5, BbR: float=10.5, Bs: float=0.8,
                           Tt: float=0.28, Tb1: float=0.27, Tb2: float=0.27, Tw: float=0.25, Ttj: float=0.5, Tbj: float=0.27, Twj: float=0.4,
                           nCellNum: int=5, Bi1: float=4.7, Bi2: float=6.85, Bi3: float=6, Bi4: float=6.85,
@@ -384,12 +384,12 @@ def osis_section_flat_box(nSec: int, strName: str, eSectionType: Literal["FLATBO
                           eSlopeType: Literal["Integral", "CastInPlace"]="Integral",
                           i: float=0.0, i1: float=0.0, i2: float=0.0, i3: float=0.0, i4: float=0.0,
                           R1: float=0.5, R2: float=0.2):
-    """定义或修改扁平箱梁截面(FlatBox)。
+    """定义或修改扁平箱梁截面(STREAMEDBOX)。
 
     Args:
         nSec (int): 截面编号，从1开始编号。
         strName (str): 截面名称。
-        eSectionType (str): 截面类型，固定为 FLATBOX。
+        eSectionType (str): 截面类型，固定为 STREAMEDBOX。
         H (float): 截面高度。
         BtL (float): 设计线左顶板宽。
         BtR (float): 设计线右顶板宽。