osis-python 0.1.9__tar.gz → 0.2.0__tar.gz

{osis_python-0.1.9/src/osis_python.egg-info → osis_python-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.1.9
+Version: 0.2.0
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT
@@ -59,23 +59,14 @@ pip install osis-python -i https://pypi.org/simple
 
 ## Usage
 
-First, install the latest version of OSIS (>=5.0) and configure the Python environment variables. pyosis requires Python 3.11 or higher. You need to set PYTHONHOME in the environment variables to your Python installation directory, e.g., C:\Program Files\python, and set PYTHONIOENCODING to utf-8. Then add %PYTHONHOME% and %PYTHONHOME%\Scripts to the Path variable.
+First, install the latest version of OSIS (>=5.0), which includes the required Python environment.
 
-Your scripts should be placed in the python folder under the OSIS installation directory, e.g., C:\Program Files\osis\python. Suppose there is a script named test_osis.py with the following content:
+Switch AI assistant to command mode and send:
 
 
 ```python
 import json
-from pyosis.core import osis_run    # Import required functions
-from pyosis.control import *
-from pyosis.general import *
-from pyosis.section import *
-from pyosis.material import *
-from pyosis.node import *
-from pyosis.element import *
-from pyosis.boundary import *
-from pyosis.load import *
-from pyosis.post import *
+from pyosis.core.all_func import *
 
 osis_clear()
 
@@ -120,10 +111,8 @@ osis_loadcase("Custom Load Case 1", "USER", 1, "Two forces applied at nodes 3 an
 osis_load_nforce("NFORCE", "Custom Load Case 1", 3, 0, -1000000, 0, 0, 0, 0)
 osis_load_nforce("NFORCE", "Custom Load Case 1", 4, 200000, 0, 0, 0, 0, 0)
 
-# osis_solve()
-
-print(osis_run())      # Let OSIS execute all preprocessing commands
+osis_solve()
 
 ```
 
-Select and run this script in OSIS. If everything is normal, you will see OSIS finish the preprocessing.
+If everything is normal, you will see OSIS finish the processing.

{osis_python-0.1.9 → osis_python-0.2.0}/README.md

@@ -20,23 +20,14 @@ pip install osis-python -i https://pypi.org/simple
 
 ## Usage
 
-First, install the latest version of OSIS (>=5.0) and configure the Python environment variables. pyosis requires Python 3.11 or higher. You need to set PYTHONHOME in the environment variables to your Python installation directory, e.g., C:\Program Files\python, and set PYTHONIOENCODING to utf-8. Then add %PYTHONHOME% and %PYTHONHOME%\Scripts to the Path variable.
+First, install the latest version of OSIS (>=5.0), which includes the required Python environment.
 
-Your scripts should be placed in the python folder under the OSIS installation directory, e.g., C:\Program Files\osis\python. Suppose there is a script named test_osis.py with the following content:
+Switch AI assistant to command mode and send:
 
 
 ```python
 import json
-from pyosis.core import osis_run    # Import required functions
-from pyosis.control import *
-from pyosis.general import *
-from pyosis.section import *
-from pyosis.material import *
-from pyosis.node import *
-from pyosis.element import *
-from pyosis.boundary import *
-from pyosis.load import *
-from pyosis.post import *
+from pyosis.core.all_func import *
 
 osis_clear()
 
@@ -81,10 +72,8 @@ osis_loadcase("Custom Load Case 1", "USER", 1, "Two forces applied at nodes 3 an
 osis_load_nforce("NFORCE", "Custom Load Case 1", 3, 0, -1000000, 0, 0, 0, 0)
 osis_load_nforce("NFORCE", "Custom Load Case 1", 4, 200000, 0, 0, 0, 0, 0)
 
-# osis_solve()
-
-print(osis_run())      # Let OSIS execute all preprocessing commands
+osis_solve()
 
 ```
 
-Select and run this script in OSIS. If everything is normal, you will see OSIS finish the preprocessing.
+If everything is normal, you will see OSIS finish the processing.

{osis_python-0.1.9 → osis_python-0.2.0/src/osis_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.1.9
+Version: 0.2.0
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT
@@ -59,23 +59,14 @@ pip install osis-python -i https://pypi.org/simple
 
 ## Usage
 
-First, install the latest version of OSIS (>=5.0) and configure the Python environment variables. pyosis requires Python 3.11 or higher. You need to set PYTHONHOME in the environment variables to your Python installation directory, e.g., C:\Program Files\python, and set PYTHONIOENCODING to utf-8. Then add %PYTHONHOME% and %PYTHONHOME%\Scripts to the Path variable.
+First, install the latest version of OSIS (>=5.0), which includes the required Python environment.
 
-Your scripts should be placed in the python folder under the OSIS installation directory, e.g., C:\Program Files\osis\python. Suppose there is a script named test_osis.py with the following content:
+Switch AI assistant to command mode and send:
 
 
 ```python
 import json
-from pyosis.core import osis_run    # Import required functions
-from pyosis.control import *
-from pyosis.general import *
-from pyosis.section import *
-from pyosis.material import *
-from pyosis.node import *
-from pyosis.element import *
-from pyosis.boundary import *
-from pyosis.load import *
-from pyosis.post import *
+from pyosis.core.all_func import *
 
 osis_clear()
 
@@ -120,10 +111,8 @@ osis_loadcase("Custom Load Case 1", "USER", 1, "Two forces applied at nodes 3 an
 osis_load_nforce("NFORCE", "Custom Load Case 1", 3, 0, -1000000, 0, 0, 0, 0)
 osis_load_nforce("NFORCE", "Custom Load Case 1", 4, 200000, 0, 0, 0, 0, 0)
 
-# osis_solve()
-
-print(osis_run())      # Let OSIS execute all preprocessing commands
+osis_solve()
 
 ```
 
-Select and run this script in OSIS. If everything is normal, you will see OSIS finish the preprocessing.
+If everything is normal, you will see OSIS finish the processing.

{osis_python-0.1.9 → osis_python-0.2.0}/src/osis_python.egg-info/SOURCES.txt

@@ -9,13 +9,15 @@ src/osis_python.egg-info/top_level.txt
 src/pyosis/__init__.py
 src/pyosis/boundary/__init__.py
 src/pyosis/boundary/interface.py
+src/pyosis/common/__init__.py
+src/pyosis/common/interface.py
 src/pyosis/control/__init__.py
 src/pyosis/control/interface.py
 src/pyosis/core/PyInterface.pyi
 src/pyosis/core/__init__.py
 src/pyosis/core/all_func.py
+src/pyosis/core/client.py
 src/pyosis/core/command.py
-src/pyosis/core/engine.py
 src/pyosis/core/project.py
 src/pyosis/element/__init__.py
 src/pyosis/element/interface.py
@@ -36,7 +38,8 @@ src/pyosis/material/interface.py
 src/pyosis/node/__init__.py
 src/pyosis/node/interface.py
 src/pyosis/post/__init__.py
-src/pyosis/post/interface.py
+src/pyosis/post/check.py
+src/pyosis/post/loadcase.py
 src/pyosis/property/__init__.py
 src/pyosis/property/coordinate.py
 src/pyosis/property/creep_shrink.py
@@ -54,4 +57,5 @@ src/pyosis/section/rib.py
 src/pyosis/section/steel.py
 src/pyosis/stage/__init__.py
 src/pyosis/stage/define.py
-src/pyosis/stage/overall.py
+src/pyosis/stage/overall.py
+tests/test.py

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

osis_python-0.2.0/src/pyosis/common/interface.py

@@ -0,0 +1,110 @@
+from typing import Any, Dict, Literal, List, Union, Sequence
+from ..core import REGISTRY, osis_run
+from ..core.command import _log
+
+def osis_matrix(matrix_name: str, matrix_data: Union[List, int, float, str]):
+    """
+    将Python多维列表转换为OSIS DSL格式的矩阵定义和赋值语句。适用于自定义截面函数osis_section_custom、osis_section_steel_custom所需的坐标参数矩阵输入。
+    
+    Args:
+        matrix_name: OSIS中的矩阵变量名
+        matrix_data: 任意维度的列表（1维/2维/3维/...）或单个数值（0维）
+    
+    Returns:
+        OSIS DSL格式的字符串（拼接后的完整命令）
+    
+    Example:
+        >>> # 2维矩阵示例
+        >>> matrix_2d = [[1, 2, 20], [2, 3, 25], [3, 4, 30], [4, 1, 25]]
+        >>> osis_matrix("LineMatrix", matrix_2d)
+        >>> # 3维矩阵示例
+        >>> matrix_3d = [[[1.5, 2.5], [3.5, 4.5]], [[5.5, 6.5], [7.5, 8.5]]]
+        >>> osis_matrix("CubeMatrix", matrix_3d)
+        >>> # 1维矩阵示例
+        >>> matrix_1d = [10, 20, 30, 40]
+        >>> osis_matrix("VectorMatrix", matrix_1d)
+        >>> # 0维矩阵示例
+        >>> matrix_0d = 10
+        >>> osis_matrix("ScalarMatrix", matrix_0d)
+    """
+    # 存储所有生成的命令
+    all_cmds = []
+    
+    # 验证和获取矩阵维度信息
+    def get_dimensions_and_validate(data: Any) -> List[int]:
+        """递归获取矩阵维度并验证是否规则"""
+        dimensions = []
+        current = data
+        
+        # 递归获取维度
+        while isinstance(current, list):
+            if not current:
+                dimensions.append(0)
+                break
+            dimensions.append(len(current))
+            # 检查当前维度下所有元素的子维度是否一致
+            first_sub_dim = get_dimensions_and_validate(current[0]) if isinstance(current[0], list) else []
+            for elem in current[1:]:
+                elem_sub_dim = get_dimensions_and_validate(elem) if isinstance(elem, list) else []
+                if elem_sub_dim != first_sub_dim:
+                    raise ValueError(f"矩阵维度不规则：元素维度不一致，第一个元素维度={first_sub_dim}，当前元素维度={elem_sub_dim}")
+            current = current[0]
+        
+        # 处理0维（单个数值）
+        if not dimensions:
+            return [1]  # 0维视为1x1矩阵
+        
+        return dimensions
+    
+    # 获取维度信息
+    try:
+        dims = get_dimensions_and_validate(matrix_data)
+        matrix_data = [matrix_data]
+    except Exception as e:
+        raise ValueError(f"矩阵验证失败：{str(e)}") from e
+    
+    # 处理空矩阵
+    if any(d == 0 for d in dims):
+        raise ValueError("不支持空矩阵输入")
+    
+    # 生成 *DIM 定义语句
+    # 如果数组元素为字符串，用charn定义
+    dim_type = "charn" if (isinstance(matrix_data, list) and isinstance(matrix_data[0], str)) or isinstance(matrix_data, str) else "*dim"
+    
+    dim_str = ",".join(map(str, dims))
+    dim_cmd = f"{dim_type},{matrix_name},{dim_str}"
+
+    all_cmds.append(dim_cmd)
+    
+    # 递归生成赋值语句
+    def generate_assignments(data: Any, indices: List):
+        """递归遍历矩阵并生成赋值语句"""
+        if isinstance(data, list):
+            for idx, elem in enumerate(data):
+                new_indices = indices + [idx]
+                generate_assignments(elem, new_indices)
+        else:
+            # 处理数值赋值
+            value = data
+            
+            # 格式化数值
+            if isinstance(value, int) or isinstance(value, float):
+                val_str = str(value)
+            else:
+                # 其他类型尝试转为string
+                val_str = f"\"{value}\""
+            
+            # 生成OSIS赋值命令
+            idx_str = ",".join(map(str, indices))
+            assign_cmd = f"{matrix_name}[{idx_str}] = {val_str}"
+            # _log(assign_cmd)
+            # osis_run(assign_cmd, "stash")
+            all_cmds.append(assign_cmd)
+    
+    # 开始递归生成赋值语句（OSIS索引从0开始）
+    generate_assignments(matrix_data, [])
+    # osis_run()
+    # 返回拼接后的完整命令字符串
+    str_cmds = "\n".join(all_cmds)
+    _log(str_cmds)
+    return osis_run(str_cmds, "exec")

{osis_python-0.1.9 → osis_python-0.2.0}/src/pyosis/control/interface.py

@@ -6,7 +6,7 @@ Interfaces of OSIS functions
 """
 
 
-from ..core import OSISEngine, REGISTRY
+from ..core import REGISTRY
 
 @REGISTRY.register("Acel")
 def osis_acel(dG: float = 9.8066):
@@ -72,7 +72,7 @@ def osis_calc_creep(bFlag: int=1):
     '''
     pass
 
-@REGISTRY.register("CalcCreep")
+@REGISTRY.register("CalcShear")
 def osis_calc_shear(bFlag: int=1):
     '''
     是否计算剪切

{osis_python-0.1.9 → osis_python-0.2.0}/src/pyosis/core/PyInterface.pyi

@@ -154,3 +154,9 @@ class PyInterface:
 
     def OSIS_QBStage(self, eBridgeType: str, stageInfo: list) -> Tuple[bool, str]:
         return True, ""
+
+    def OSIS_CheckResult(slef, eSheetType: str, eCheckItem: str, strCheckName: str) -> tuple[bool, str, str]:
+        return True, "", ""
+
+    def OSIS_LoadCaseResult(self, fileName:str, eType: str) -> tuple[bool, str, str]:
+        return True, "", ""

{osis_python-0.1.9 → osis_python-0.2.0}/src/pyosis/core/all_func.py

@@ -1,4 +1,5 @@
 from ..core import *
+from ..common import *
 from ..boundary import *
 from ..control import *
 from ..element import *
@@ -6,7 +7,7 @@ from ..live import *
 from ..load import *
 from ..material import *
 from ..node import *
-# from ..post import *
+from ..post import *
 from ..property import *
 from ..general import *
 from ..section import *

osis_python-0.2.0/src/pyosis/core/client.py

@@ -0,0 +1,51 @@
+import requests
+import json
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
+
+# ========== 全局初始化：连接池 Session（只创建一次） ==========
+# 配置重试策略
+retry_strategy = Retry(
+    total=3,                # 最多重试3次
+    backoff_factor=0.1,      # 重试间隔：0.1, 0.2, 0.4... 秒
+    status_forcelist=[429, 500, 502, 503, 504]  # 遇到这些状态码自动重试
+)
+
+# 配置连接池适配器
+adapter = HTTPAdapter(
+    max_retries=retry_strategy,
+    pool_connections=10,    # 最大连接池数
+    pool_maxsize=100         # 每个池最大连接数
+)
+
+# 创建全局 Session
+session = requests.Session()
+session.mount("http://", adapter)
+session.mount("https://", adapter)  # 如果你后续用HTTPS
+
+# ========== 通用客户端函数（复用连接池） ==========
+def osis_client(func_name: str, payload: dict) -> dict | tuple[bool, str]:
+    """
+    通用 OSIS 接口客户端（复用连接池，高效批量调用）
+    Args:
+        func_name: C++ 接口名（如 "OSIS_Run", "OSIS_Run_Batch"）
+        payload: 请求参数字典（自动序列化为 JSON）
+    Returns: 
+        异常时返回 (False, 错误信息)
+    """
+    url = f"http://localhost:8080/{func_name}"
+    
+    try:
+        # 复用连接池发送 POST 请求
+        response = session.post(
+            url,
+            data=json.dumps(payload, ensure_ascii=False).encode("utf-8"),
+            headers={"Content-Type": "application/json; charset=utf-8"},
+            timeout=30  # 批量调用适当延长超时
+        )
+        response.raise_for_status()  # 抛出 HTTP 状态码错误
+        return tuple(response.json())
+        
+    except Exception as e:
+        # 异常时保持和 C++ 一致的返回格式
+        return False, f"调用失败: {str(e)}"

{osis_python-0.1.9 → osis_python-0.2.0}/src/pyosis/core/command.py

@@ -9,27 +9,29 @@ import datetime
 import inspect
 import functools
 from typing import Dict, Any, Tuple, Literal, Optional
-from .engine import OSISEngine
+# from .engine import OSISEngine
+from .client import osis_client
 
-def osis_run(strCmd: str="", mode: Literal["stash", "exec"]="exec") -> Tuple[bool, str, Any]:
-    '''
-    直接以命令流的形式运行OSIS功能
     
-    Args:
-        strCmd: 完整的命令流
-        mode: 运行模式，此参数为了同时执行多条命令提高效率
-            * 使用 stash 仅会将命令流存到OSIS中，不会执行
-            * 收到 exec 信号才会执行暂存包括当前的所有命令流。
+# def osis_run(strCmd: str="", mode: Literal["stash", "exec"]="exec") -> Tuple[bool, str, Any]:
+#     '''
+#     直接以命令流的形式运行OSIS功能
+    
+#     Args:
+#         strCmd: 完整的命令流
+#         mode: 运行模式，此参数为了同时执行多条命令提高效率
+#             * 使用 stash 仅会将命令流存到OSIS中，不会执行
+#             * 收到 exec 信号才会执行暂存包括当前的所有命令流。
 
-    Returns:
-        tuple (bool, str, Any): 是否成功，失败原因，其他结果数据
-    '''
-#     # 自动判断模式：非空默认暂存，为空默认执行
-#     if mode is None:
-#         mode = "stash" if strCmd else "exec"
+#     Returns:
+#         tuple (bool, str, Any): 是否成功，失败原因，其他结果数据
+#     '''
+# #     # 自动判断模式：非空默认暂存，为空默认执行
+# #     if mode is None:
+# #         mode = "stash" if strCmd else "exec"
     
-    e = OSISEngine.GetInstance()
-    return e.OSIS_Run(strCmd, mode)
+#     e = OSISEngine.GetInstance()
+#     return e.OSIS_Run(strCmd, mode)
 
 # def _log(text, filename="pyosis.log"):
 #     """简单的日志函数"""
@@ -38,6 +40,47 @@ def osis_run(strCmd: str="", mode: Literal["stash", "exec"]="exec") -> Tuple[boo
 #         f.write(f"[{timestamp}] {text}\n")
 #         f.close()
 
+def osis_run(strCmd: str="", mode: Literal["stash", "exec"]="exec") -> tuple[bool, str]:
+    """
+    http 模拟 C++ 原生 OSIS_Run 函数
+    Args:
+        strCmd: 完整的命令流
+        mode: 运行模式，此参数为了同时执行多条命令提高效率
+            * 使用 stash 仅会将命令流存到OSIS中，不会执行
+            * 收到 exec 信号才会执行暂存包括当前的所有命令流。
+
+    Returns:
+        tuple (bool, str): 是否成功，失败原因
+    """
+    return osis_client("OSIS_Run", locals())
+    # # 1. 配置 C++ 服务地址
+    # url = "http://localhost:8080/OSIS_Run"
+    
+    # # 2. 构造请求参数（JSON 格式，UTF-8 编码）
+    # payload = {
+    #     "strCmd": strCmd,
+    #     "mode": mode
+    # }
+    
+    # # 3. 发送 POST 请求（自动处理中文编码）
+    # try:
+    #     response = requests.post(
+    #         url,
+    #         data=json.dumps(payload, ensure_ascii=False).encode("utf-8"),
+    #         headers={"Content-Type": "application/json; charset=utf-8"},
+    #         timeout=10
+    #     )
+    #     response.raise_for_status()  # 抛出 HTTP 错误
+        
+    #     # 4. 解析返回值，还原为 C++ 原生返回格式
+    #     resp_data = response.json()
+    #     return resp_data["success"], resp_data["message"]
+    
+    # except Exception as e:
+    #     # 异常时返回和 C++ 一致的格式
+    #     return False, f"调用失败：{str(e)}"
+    
+
 def _log(text, log_dir="pyosis_logs"):
     """
     同一轮执行（<1秒间隔）的代码追加到同一文件，

osis_python-0.2.0/src/pyosis/core/project.py

@@ -0,0 +1,8 @@
+# --- project相关的函数
+
+from typing import Tuple
+# from .engine import OSISEngine
+from .client import osis_client
+
+def get_project_directory() -> Tuple[bool, str]:
+    return osis_client("GetProjectDirectory", {})

{osis_python-0.1.9 → osis_python-0.2.0}/src/pyosis/element/interface.py

@@ -7,7 +7,7 @@ Interfaces of OSIS functions
 
 
 from typing import Any, Dict, Literal
-from ..core import OSISEngine, REGISTRY
+from ..core import REGISTRY
 
 
 # @REGISTRY.register("Element")

osis_python-0.2.0/src/pyosis/post/__init__.py

@@ -0,0 +1,2 @@
+from .loadcase import *
+from .check import *

osis_python-0.2.0/src/pyosis/post/check.py

@@ -0,0 +1,133 @@
+from pathlib import Path
+from typing import Literal, Any
+from ..core import project, command
+import json
+
+# /output,D:\\temp\\Temp1\\Check\\频遇组合包络.txt,echk,混凝土_PC腹板斜截面抗裂验算_频遇组合包络
+_CMD = "/output,{out_file_path}.txt,echk,{check_file_name}"
+_CHECK_FILE_PATH = "Temperary"
+_CHECK_TXT_PATH = "Temperary"
+
+def osis_check_result(
+        eSheetType: Literal["一般", "混凝土"], 
+        eCheckItem: Literal["正截面抗弯验算",
+                            "斜截面抗剪验算",
+                            "正截面抗压验算",
+                            "PC抗扭验算",
+                            "PS正截面短期抗裂验算",
+                            "PC正截面长期抗裂验算",
+                            "PC顶底板斜截面抗裂验算",
+                            "PC腹板斜截面抗裂验算",
+                            "裂缝宽度验算",
+                            "挠度验算",
+                            "PC正截面压应力验算",
+                            "PC斜截面主压应力验算",
+                            "PC钢束拉应力验算",
+                            "PC施工阶段正截面压应力验算",
+                            "PC施工阶段正截面拉应力验算"], 
+        strCheckName: str) -> tuple[bool, str, Any]:
+    '''
+    验算
+    
+    Args:
+        eSheetType (str): 
+            * "一般"
+            * "混凝土"
+        eCheckItem (Literal["正截面抗弯验算",
+                            "斜截面抗剪验算",
+                            "正截面抗压验算",
+                            "PC抗扭验算",
+                            "PS正截面短期抗裂验算",
+                            "PC正截面长期抗裂验算",
+                            "PC顶底板斜截面抗裂验算",
+                            "PC腹板斜截面抗裂验算",
+                            "裂缝宽度验算",
+                            "挠度验算",
+                            "PC正截面压应力验算",
+                            "PC斜截面主压应力验算",
+                            "PC钢束拉应力验算",
+                            "PC施工阶段正截面压应力验算",
+                            "PC施工阶段正截面拉应力验算"
+                            ])
+        strCheckName (str): 文件名称
+
+    Returns:
+        tuple (bool, str):
+            - bool: 操作是否成功
+            - str: 失败原因（如果操作失败）
+    '''
+    # e = OSISEngine.GetInstance()
+    # # return e.OSIS_CheckResult(base_path, middle_path, end_path)
+    # isok, error, result_txt_path = e.OSIS_CheckResult(eSheetType, eCheckItem, strCheckName)
+    # if isok:
+    #     data = read_ansi_file_to_json(result_txt_path)
+    #     return isok, error, json.dumps(data, indent=2, ensure_ascii=False)
+    # else:
+    #     return isok, error, None
+    # 1 获取项目目录
+    is_ok, project_path = project.get_project_directory()
+    if not is_ok:
+        return False, "获取文件夹失败", ""
+
+    project_path = Path(project_path)
+    check_name = eSheetType + "_" + eCheckItem + "_" + strCheckName
+
+    # 2 工况文件路径
+    check_file_path = project_path / _CHECK_FILE_PATH / check_name
+
+    # 3 生成命令
+    str_cmd = _CMD.format(out_file_path=check_file_path, check_file_name=check_name)
+
+    # 4 执行命令
+    is_ok, error = command.osis_run(str_cmd, mode="exec")
+    if not is_ok:
+        return False, error, ""
+
+    # 5 读取结果
+    txt_file_path = project_path / _CHECK_TXT_PATH / check_name
+    txt_file_path = txt_file_path.with_suffix(".txt")
+    data = read_check_txt_file_to_json(str(txt_file_path))
+
+    return True, "", data
+
+    
+def read_check_txt_file_to_json(file_path):
+
+    with open(file_path, 'r', encoding='gbk') as f:
+        lines = f.readlines()
+    
+    # 查找实际数据开始的位置
+    start_index = 0
+    for i, line in enumerate(lines):
+        if "单元" in line and "验算位置" in line:  # 查找包含表头的行
+            start_index = i
+            break
+    
+    if start_index == 0 and len(lines) < 2:
+        return []
+    
+    # 解析表头
+    headers = lines[start_index].strip().split('\t')
+    
+    # 处理数据行
+    result = []
+    for line in lines[start_index + 1:]:
+        line = line.strip()
+        if not line:  # 跳过空行
+            continue
+            
+        values = line.split('\t')
+        if len(values) != len(headers):
+            continue  # 跳过不完整行
+            
+        # 创建字典对象
+        row_dict = {}
+        for i, header in enumerate(headers):
+            header = header.replace(' ','')
+            value = values[i].replace(' ','')
+
+            row_dict[header] = value
+        
+        result.append(row_dict)
+    
+    return result

osis_python-0.2.0/src/pyosis/post/loadcase.py

@@ -0,0 +1,96 @@
+from pathlib import Path
+from typing import Literal, Any
+from ..core import project, command
+import json
+
+# 将工况结果转换为txt的命令
+_CMD = "/output,{out_file_path}.txt,{e_type},{check_file_name}"
+_LOAD_CASE_FILE_PATH = "Temperary"
+_LOAD_CASE_TXT_PATH = "Temperary"
+
+# def osis_elem_force(strLCName: str, eDataItem: Literal['EF'], eElementType: Literal["BEAM3D", "TRUSS", "SPRING", "CABLE", "SHELL"]):
+#     '''
+#     提取内力结果
+#
+#     Args:
+#         strLCName (str): 工况名称
+#         eDataItem (str): 数据类型，不区分大小写。EF = 内力
+#         eElementType (str): 单元类型，不区分大小写。BEAM3D = 梁柱单元，TRUSS = 桁架单元，SPRING = 弹簧单元，CABLE = 拉索单元，SHELL = 壳单元
+#
+#     Returns:
+#         tuple (bool, str):
+#             - bool: 操作是否成功
+#             - str: 失败原因（如果操作失败）
+#     '''
+#     e = OSISEngine.GetInstance()
+#     eDataItem = eDataItem.upper()
+#     eElementType = eElementType.upper()
+#     return e.OSIS_ElemForce(strLCName, eDataItem, eElementType)
+
+def osis_loadcase_result(fileName:str, eType: Literal['LCEF','LCED','LCND','LCBF','LCTL','LCS']) -> tuple[bool, str, Any]:
+    """
+    提取荷载工况结果
+    Args:
+        fileName (str): 文件名字
+        eType (str): 荷载工况结果名
+            * LCEF = 荷载工况结果的单元内力;
+            * LCED = 荷载工况结果的单元位移;
+            * LCND = 荷载工况结果的节点位移;
+            * LCBF = 荷载工况结果的边界反力;
+            * LCTL = 荷载工况结果的钢束损失;
+            * LCS = 荷载工况结果的单元应力;
+    Returns:
+        tuple (bool, str): 是否成功，失败原因
+
+    """
+    # 1 获取项目目录
+    is_ok, project_path = project.get_project_directory()
+    if not is_ok:
+        return False, "获取文件夹失败", ""
+
+    project_path = Path(project_path)
+
+    # 2 工况文件路径
+    load_case_file_path = project_path / _LOAD_CASE_FILE_PATH / fileName
+
+    # 3 生成命令
+    str_cmd = _CMD.format(out_file_path=load_case_file_path,e_type=eType,check_file_name=fileName)
+
+    # 4 执行命令
+    is_ok, error = command.osis_run(str_cmd, mode="exec")
+    if not is_ok:
+        return False, error, ""
+
+    # 5 读取结果
+    txt_file_path = project_path / _LOAD_CASE_TXT_PATH / fileName
+    txt_file_path = txt_file_path.with_suffix(".txt")
+    data = read_loadcase_txt_file_to_json(str(txt_file_path))
+
+    return True, "", data
+
+def read_loadcase_txt_file_to_json(file_path)-> list[dict]:
+    with open(file_path, 'r', encoding='gbk') as f:
+        lines = [line.rstrip('\n') for line in f if line.strip()]
+
+    # 提取表头（第一行）
+    headers = lines[0].split()
+    num_cols = len(headers)
+
+    # 初始化结果列表
+    result = []
+
+    # 处理数据行
+    for line in lines[1:]:
+        # 按空白分割，但最多分割 num_cols - 1 次，防止 Rw 列缺失导致错位
+        parts = line.split(maxsplit=num_cols - 1)
+
+        # 如果列数不足，用空字符串补齐到 num_cols
+        while len(parts) < num_cols:
+            parts.append("")
+
+        # 构建字典，所有值保持为字符串
+        row_dict = {headers[i]: parts[i].strip() for i in range(num_cols)}
+        result.append(row_dict)
+    # json_result = json.dumps(result, ensure_ascii=False)
+    # 打印结果
+    return result

{osis_python-0.1.9 → osis_python-0.2.0}/src/pyosis/section/common.py

@@ -2,76 +2,8 @@
 pyosis.section.interface 的 Docstring
 '''
 
-from typing import Any, Dict, Literal, List, Union, Sequence
-from ..core import REGISTRY, osis_run
-from ..core.command import _log
-
-def osis_matrix(matrix_name: str, matrix_data: List[List[Union[int, float]]]):
-    """
-    将Python矩阵转换为OSIS DSL格式的矩阵定义和赋值语句。适用于自定义截面函数osis_section_custom、osis_section_steel_custom所需的坐标参数矩阵输入。
-    
-    Args:
-        matrix_name: OSIS中的矩阵变量名
-        matrix_data: 二维列表（List[List[int|float]]）
-    
-    Returns:
-        OSIS DSL格式的字符串
-    
-    Example:
-        >>> matrix = [[1, 2, 20], [2, 3, 25], [3, 4, 30], [4, 1, 25]]
-        >>> osis_matrix("LineMatrix", matrix)
-        >>> osis_section_custom(1,"三角形截面","CUSTOM","LineMatrix")
-    """
-    # 验证输入
-    if not matrix_data or not isinstance(matrix_data, list):
-        raise ValueError("输入必须是二维列表且不能为空")
-    
-    if not all(isinstance(row, list) for row in matrix_data):
-        raise ValueError("输入必须是二维列表")
-    
-    rows = len(matrix_data)
-    cols = len(matrix_data[0]) if rows > 0 else 0
-    
-    # 检查矩阵是否规则（所有行列数一致）
-    for i, row in enumerate(matrix_data):
-        if len(row) != cols:
-            raise ValueError(f"第{i}行长度({len(row)})与首行长度({cols})不一致")
-    
-    lines = []
-    
-    # 生成 *DIM 定义语句
-    cmd = f"*dim,{matrix_name},{rows},{cols}"
-    _log(cmd)
-    osis_run(cmd, "stash")
-    # 生成赋值语句
-    for i in range(rows):
-        for j in range(cols):
-            value = matrix_data[i][j]
-            
-            # 格式化数值
-            if isinstance(value, int):
-                val_str = str(value)
-            elif isinstance(value, float):
-                if value.is_integer():
-                    val_str = str(int(value))
-                else:
-                    val_str = f"{value:.6g}"
-            else:
-                # 其他类型尝试转为float
-                try:
-                    fval = float(value)
-                    if fval.is_integer():
-                        val_str = str(int(fval))
-                    else:
-                        val_str = f"{fval:.6g}"
-                except (TypeError, ValueError):
-                    raise ValueError(f"位置[{i},{j}]的值'{value}'不是有效数字")
-            cmd = f"{matrix_name}[{i},{j}] = {val_str}"
-            _log(cmd)
-            osis_run(cmd, "stash")
-    
-    return
-
+from typing import Any, Dict, Literal
+from ..core import REGISTRY
 
 @REGISTRY.register('Section')
 def osis_section_Lshape(nSec: int, strName: str, eSectionType: Literal["LSHAPE"]="LSHAPE", nDir: Literal[0, 1]=1, H: float=0.1, B: float=0.1, Tf1: float=0.016, Tf2: float=0.016):

osis_python-0.2.0/tests/test.py

@@ -0,0 +1,6 @@
+from pyosis.core.all_func import *
+from pyosis.post import osis_check_result, osis_loadcase_result
+
+if __name__ == '__main__':
+    osis_check_result("混凝土","PC腹板斜截面抗裂验算","频遇组合包络")
+    osis_loadcase_result("_钢束二次_CS1_主梁预制、张拉预应力", "lcef")

osis_python-0.1.9/src/pyosis/core/engine.py

@@ -1,13 +0,0 @@
-import os
-import sys
-
-# 查找dll路径
-current_dir =os.path.dirname(os.path.abspath(__file__))
-# dll_dir= os.path.abspath(os.path.join(current_dir, "../../../../bin64"))
-
-if os.path.exists(os.path.join(current_dir, "PyInterface.pyi")):
-    from PyInterface import PyInterface as OSISEngine       # 如果有pyi，认为pyd已经被找到了，直接导入就行
-else:
-    from .PyInterface import PyInterface as OSISEngine      # 如果没有pyi，认为只是简单实验下能不能跑，不用打开pyd
-
-

osis_python-0.1.9/src/pyosis/core/project.py

@@ -1,8 +0,0 @@
-# --- project相关的函数
-
-from typing import Tuple
-from .engine import OSISEngine
-
-def get_project_directory() -> Tuple[bool, str]:
-    e = OSISEngine.GetInstance()
-    return e.GetProjectDirectory()

osis_python-0.1.9/src/pyosis/post/interface.py

@@ -1,21 +0,0 @@
-from typing import Literal
-from ..core import OSISEngine
-
-def osis_elem_force(strLCName: str, eDataItem: Literal['EF'], eElementType: Literal["BEAM3D", "TRUSS", "SPRING", "CABLE", "SHELL"]):
-    '''
-    提取内力结果
-    
-    Args:
-        strLCName (str): 工况名称
-        eDataItem (str): 数据类型，不区分大小写。EF = 内力
-        eElementType (str): 单元类型，不区分大小写。BEAM3D = 梁柱单元，TRUSS = 桁架单元，SPRING = 弹簧单元，CABLE = 拉索单元，SHELL = 壳单元
-
-    Returns:
-        tuple (bool, str):
-            - bool: 操作是否成功
-            - str: 失败原因（如果操作失败）
-    '''
-    e = OSISEngine.GetInstance()
-    eDataItem = eDataItem.upper()
-    eElementType = eElementType.upper()
-    return e.OSIS_ElemForce(strLCName, eDataItem, eElementType)