osis-python 0.1.7__tar.gz → 0.1.8__tar.gz

{osis_python-0.1.7/src/osis_python.egg-info → osis_python-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.1.7
+Version: 0.1.8
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT
@@ -17,14 +17,16 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: langchain>=1.0.3
-Requires-Dist: langchain-core>=1.0.3
-Requires-Dist: langchain-openai>=1.0.2
-Requires-Dist: pydantic>=2.12.4
-Requires-Dist: pydantic_core>=2.41.5
+Requires-Dist: openai>=2.7.1
+Requires-Dist: agentscope>=1.0.13
 Requires-Dist: fastapi>=0.128.0
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: openai>=2.7.1
+Requires-Dist: langchain-community>=0.4.1
+Requires-Dist: matplotlib>=3.10.7
+Requires-Dist: pandas>=2.3.3
+Requires-Dist: pdfplumber>=0.11.9
+Requires-Dist: python-docx>=1.2.0
+Requires-Dist: requests>=2.32.5
 Requires-Dist: uvicorn>=0.40.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"

{osis_python-0.1.7 → osis_python-0.1.8}/pyproject.toml

@@ -30,16 +30,18 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 
-# 依赖
+# 依赖 pyosis并不直接依赖 OSIS助手依赖这些
 dependencies = [
-    "langchain>=1.0.3",
-    "langchain-core>=1.0.3",
-    "langchain-openai>=1.0.2",
-    "pydantic>=2.12.4",
-    "pydantic_core>=2.41.5",
+    "openai>=2.7.1",
+    "agentscope>=1.0.13",
     "fastapi>=0.128.0",
     "httpx>=0.28.1",
-    "openai>=2.7.1",
+    "langchain-community>=0.4.1",
+    "matplotlib>=3.10.7",
+    "pandas>=2.3.3",
+    "pdfplumber>=0.11.9",
+    "python-docx>=1.2.0",
+    "requests>=2.32.5",
     "uvicorn>=0.40.0",
 ]
 

{osis_python-0.1.7 → osis_python-0.1.8/src/osis_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.1.7
+Version: 0.1.8
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT
@@ -17,14 +17,16 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: langchain>=1.0.3
-Requires-Dist: langchain-core>=1.0.3
-Requires-Dist: langchain-openai>=1.0.2
-Requires-Dist: pydantic>=2.12.4
-Requires-Dist: pydantic_core>=2.41.5
+Requires-Dist: openai>=2.7.1
+Requires-Dist: agentscope>=1.0.13
 Requires-Dist: fastapi>=0.128.0
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: openai>=2.7.1
+Requires-Dist: langchain-community>=0.4.1
+Requires-Dist: matplotlib>=3.10.7
+Requires-Dist: pandas>=2.3.3
+Requires-Dist: pdfplumber>=0.11.9
+Requires-Dist: python-docx>=1.2.0
+Requires-Dist: requests>=2.32.5
 Requires-Dist: uvicorn>=0.40.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"

{osis_python-0.1.7 → osis_python-0.1.8}/src/osis_python.egg-info/SOURCES.txt

@@ -7,14 +7,6 @@ src/osis_python.egg-info/dependency_links.txt
 src/osis_python.egg-info/requires.txt
 src/osis_python.egg-info/top_level.txt
 src/pyosis/__init__.py
-src/pyosis/ai/__init__.py
-src/pyosis/ai/agents/BaseAgent.py
-src/pyosis/ai/agents/DecisionAgent.py
-src/pyosis/ai/agents/MaterialAgent.py
-src/pyosis/ai/agents/ModelAgent.py
-src/pyosis/ai/agents/QuickBuildingAgent.py
-src/pyosis/ai/agents/SectionAgent.py
-src/pyosis/ai/agents/__init__.py
 src/pyosis/boundary/__init__.py
 src/pyosis/boundary/interface.py
 src/pyosis/control/__init__.py
@@ -53,6 +45,7 @@ src/pyosis/quick_building/__init__.py
 src/pyosis/quick_building/interface.py
 src/pyosis/section/__init__.py
 src/pyosis/section/common.py
+src/pyosis/section/io.py
 src/pyosis/section/numeric.py
 src/pyosis/section/param.py
 src/pyosis/section/rebar.py

{osis_python-0.1.7 → osis_python-0.1.8}/src/osis_python.egg-info/requires.txt

@@ -1,11 +1,13 @@
-langchain>=1.0.3
-langchain-core>=1.0.3
-langchain-openai>=1.0.2
-pydantic>=2.12.4
-pydantic_core>=2.41.5
+openai>=2.7.1
+agentscope>=1.0.13
 fastapi>=0.128.0
 httpx>=0.28.1
-openai>=2.7.1
+langchain-community>=0.4.1
+matplotlib>=3.10.7
+pandas>=2.3.3
+pdfplumber>=0.11.9
+python-docx>=1.2.0
+requests>=2.32.5
 uvicorn>=0.40.0
 
 [dev]

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

{osis_python-0.1.7 → osis_python-0.1.8}/src/pyosis/boundary/interface.py

@@ -45,14 +45,14 @@ def osis_boundary_general(nBd: int, eBoundaryType: Literal["GENERAL"]="GENERAL",
     '''
     pass
 @REGISTRY.register("Boundary")
-def osis_boundary_elstcspt(nBd: int, eBoundaryType: Literal["ELSTCSPT"]="ELSTCSPT", nCoor: int = -1, bX: bool = 1, DX: int = 1e13, bY: bool = 1, DY: int = 1e13, bZ: bool = 1, DZ: int = 1e13, bRX: bool = 1, RX: int = 1e16, bRY: bool = 1, RY: int = 1e16, bRZ: bool = 1, RZ: int = 1e16):
+def osis_boundary_elstcspt(nBd: int, eBoundaryType: Literal["ELSTCSPT"]="ELSTCSPT", nCoor: int = "", bX: bool = 1, DX: int = 1e13, bY: bool = 1, DY: int = 1e13, bZ: bool = 1, DZ: int = 1e13, bRX: bool = 1, RX: int = 1e16, bRY: bool = 1, RY: int = 1e16, bRZ: bool = 1, RZ: int = 1e16):
     '''
     定义或修改弹簧单元弹性支承
     
     Args:
         nBd (int): 编号
         eBoundaryType (str): 固定为 ELSTCSPT
-        nCoor (int): 局部坐标系编号，-1代表缺省
+        nCoor (int): 局部坐标系编号，固定使用""缺省
         bX：UX方向，0 = 弹性，1 = 固定
         DX：坐标系X轴方向的弹性支承刚度
         bY：UY方向，0 = 弹性，1 = 固定
@@ -115,26 +115,26 @@ def osis_boundary_release(nBd: int, eBoundaryType: Literal["RELEASE"],
     '''
     pass
 
-@REGISTRY.register("Boundary")
-def osis_boundary_elastic_support(nBd: int, eBoundaryType: Literal["ELSTCSPT"], nCoor: int, bX: float, bY: float, bZ: float, bRX: float, bRY: float, bRZ: float):
-    '''
-    ## 定义或修改节点弹性支撑
-    pyosis.boundary.osis_boundary_elastic_support
+# @REGISTRY.register("Boundary")
+# def osis_boundary_elastic_support(nBd: int, eBoundaryType: Literal["ELSTCSPT"], nCoor: int, bX: float, bY: float, bZ: float, bRX: float, bRY: float, bRZ: float):
+#     '''
+#     ## 定义或修改节点弹性支撑
+#     pyosis.boundary.osis_boundary_elastic_support
     
-    Args:
-        nBd (int): 编号
-        eBoundaryType (str): 固定为 ELSTCSPT
-        nCoor (int): 局部坐标系编号
-        dDX (float): 坐标系 X 轴方向的弹性支承刚度
-        dDY (float): 坐标系 Y 轴方向的弹性支承刚度
-        dDZ (float): 坐标系 Z 轴方向的弹性支承刚度
-        dRX (float): 绕坐标系 X 轴方向的转动弹性刚度
-        dRY (float): 绕坐标系 Y 轴方向的转动弹性刚度
-        dRZ (float): 绕坐标系 Z 轴方向的转动弹性刚度
-    Returns:
-        tuple (bool, str): 是否成功，失败原因
-    '''
-    pass
+#     Args:
+#         nBd (int): 编号
+#         eBoundaryType (str): 固定为 ELSTCSPT
+#         nCoor (int): 局部坐标系编号
+#         dDX (float): 坐标系 X 轴方向的弹性支承刚度
+#         dDY (float): 坐标系 Y 轴方向的弹性支承刚度
+#         dDZ (float): 坐标系 Z 轴方向的弹性支承刚度
+#         dRX (float): 绕坐标系 X 轴方向的转动弹性刚度
+#         dRY (float): 绕坐标系 Y 轴方向的转动弹性刚度
+#         dRZ (float): 绕坐标系 Z 轴方向的转动弹性刚度
+#     Returns:
+#         tuple (bool, str): 是否成功，失败原因
+#     '''
+#     pass
 
 @REGISTRY.register("AsgnBd")
 def osis_assign_boundary(nBd: int=1, eOP: Literal["a", "s", "r", "aa", "ra"]="a", param: list=[]):

{osis_python-0.1.7 → osis_python-0.1.8}/src/pyosis/core/command.py

@@ -8,7 +8,7 @@ import os
 import datetime
 import inspect
 import functools
-from typing import Dict, Any, Tuple, Literal
+from typing import Dict, Any, Tuple, Literal, Optional
 from .engine import OSISEngine
 
 def osis_run(strCmd: str="", mode: Literal["stash", "exec"]="exec") -> Tuple[bool, str, Any]:
@@ -24,6 +24,10 @@ def osis_run(strCmd: str="", mode: Literal["stash", "exec"]="exec") -> Tuple[boo
     Returns:
         tuple (bool, str, Any): 是否成功，失败原因，其他结果数据
     '''
+#     # 自动判断模式：非空默认暂存，为空默认执行
+#     if mode is None:
+#         mode = "stash" if strCmd else "exec"
+    
     e = OSISEngine.GetInstance()
     return e.OSIS_Run(strCmd, mode)
 
@@ -189,6 +193,9 @@ class OSISFunctionRegistry:
     def _execute_command(self, cmd) -> Tuple[bool, str, Any]:
         """执行命令（发送到软件）"""
         _log(cmd)
+        if cmd.split(",")[0].lower() == "section":
+            nSec = cmd.split(",").split(",")[0]
+            cmd += f"ExportSecPic,{nSec};"      # 自动保存截面图片
         result = osis_run(cmd, self.run_mode)
         isok, error, *rest = result
         return result

{osis_python-0.1.7 → osis_python-0.1.8}/src/pyosis/element/interface.py

@@ -199,10 +199,10 @@ def osis_element_mod(nOld: int=1, nNew: int=2):
 @REGISTRY.register("EleGrp")
 def osis_element_group(strName: str="单元组1", eOP: Literal["c", "a", "s", "r", "aa", "ra", "m", "d"]='a', param: list=[1]):
     '''
-    分配边界给节点(一般支撑，节点弹性支撑)
+    添加或移除单元
     
     Args:
-        strName (str): 边界编号
+        strName (str): 单元组名
         eOP (str): 操作
             * c = 创建
             * a = 添加

{osis_python-0.1.7 → osis_python-0.1.8}/src/pyosis/live/grade.py

@@ -1,31 +1,9 @@
 from typing import Dict, Any, Literal
 from ..core import REGISTRY
 
-# @REGISTRY.register("LiveGrade")
-# def osis_live_grade(strName: str, 
-#                     eCode: Literal["JTGD60_2015", "CUSTOM"], 
-#                     eLiveLoadType: Literal["HIGHWAY_I", "HIGHWAY_II", "VEHICLE", "CROWD", "FATIGUE_I", "FATIGUE_II", "FATIGUE_III"], 
-#                     params: Dict[str, Any]):
-#     '''
-#     定义活载
 
-#     Args:
-#         strName (str): 名称
-#         eCode (str): 规范类型，JTGD60_2015，不区分大小写
-#         eLiveLoadType (str): 活载类型，不区分大小写
-#         params (dict): 附加参数
-#             - CROWD: eBridgeType=桥类型, dPara=人群横向宽度
-#             - FATIGUE_II: dCenterDis=车辆中心间距
-    
-#     Returns:
-#         tuple (bool, str): 是否成功，失败原因
-#     '''
-#     e = OSISEngine.GetInstance()
-#     eCode = eCode.upper()
-#     eLiveLoadType = eLiveLoadType.upper()
-#     return e.OSIS_LiveGrade(strName, eCode, eLiveLoadType, params)
 @REGISTRY.register("LiveGrade")
-def osis_livegrade_highway(strName: str="活载-HIGHWAY", eCode: str="JTGD60_2015", eLiveLoadType: Literal["HIGHWAY_I", "HIGHWAY_II"]="HIGHWAY_I"):
+def osis_livegrade_highway(strName: str="活载-HIGHWAY", eCode: Literal["JTGD60_2015"]="JTGD60_2015", eLiveLoadType: Literal["HIGHWAY_I", "HIGHWAY_II"]="HIGHWAY_I"):
     '''
     定义活载-公路活载
 
@@ -42,7 +20,7 @@ def osis_livegrade_highway(strName: str="活载-HIGHWAY", eCode: str="JTGD60_201
     pass
 
 @REGISTRY.register("LiveGrade")
-def osis_livegrade_highway(strName: str="活载-HIGHWAY", eCode: str="JTGD60_2015", eLiveLoadType: Literal["VEHICLE"]="VEHICLE"):
+def osis_livegrade_vehicle(strName: str="活载-VEHICLE", eCode: str="JTGD60_2015", eLiveLoadType: Literal["VEHICLE"]="VEHICLE"):
     '''
     定义活载-车辆荷载
 
@@ -50,8 +28,6 @@ def osis_livegrade_highway(strName: str="活载-HIGHWAY", eCode: str="JTGD60_201
         strName (str): 名称
         eCode (str): 规范类型，不区分大小写，固定为 JTGD60_2015
         eLiveLoadType (str): 活载类型，不区分大小写，固定为 VEHICLE
-
-        dPara (float): 人群横向宽度
     
     Returns:
         tuple (bool, str): 是否成功，失败原因

{osis_python-0.1.7 → osis_python-0.1.8}/src/pyosis/load/loadcase.py

@@ -28,6 +28,9 @@ def osis_loadcase(strName: str="自定义工况1", eLoadCaseType: Literal["USER"
         strPrompt (str): 说明，默认空
     Returns:
         tuple (bool, str): 是否成功，失败原因
+    
+    Example:
+        osis_loadcase("自重工况","USER",1.0,"Load")
     '''
     pass
 

{osis_python-0.1.7 → osis_python-0.1.8}/src/pyosis/load/tendon.py

@@ -183,7 +183,7 @@ def osis_tendon_prop_del(strName: str="钢束特性1"):
 @REGISTRY.register("TdPropMod")
 def osis_tendon_prop_mod(strOldName: str="钢束特性1", strNewName: str="钢束特性2"):
     '''
-    定义或修改荷载工况
+    修改钢束特性
 
     Args:
         strOldName (str): 旧名称

{osis_python-0.1.7 → osis_python-0.1.8}/src/pyosis/material/interface.py

@@ -7,51 +7,6 @@ Interfaces of OSIS functions
 from typing import Literal
 from ..core import REGISTRY
 
-# 后续会重写这部分接口
-
-# @REGISTRY.register('Material')
-# def osis_material(nMat: int, strName: str, eMaterialType: Literal["CONC", "STEEL", "PRESTRESSED", "REBAR", "CUSTOM"], eCode: str, eGrade: str, nCrepShrk: int, dDmp: float, params: dict[str, Any]={}):
-#     """创建或修改材料。
-
-#     Args:
-#         nMat (int): 材料编号
-#         strName (str): 材料名称
-#         eMaterialType (str): 材料类型，不区分大小写。可选值：
-#             * CONC: 混凝土
-#             * STEEL: 钢材
-#             * PRESTRESSED: 预应力材料
-#             * REBAR: 普通钢筋
-#             * CUSTOM: 自定义材料
-#         eCode (str): 材料标准代码，可选值：
-#             * 钢材: JTGD64_2015
-#             * 其他材料: JTG3362_2018, JTGD62_2004
-#         eGrade (str): 材料等级牌号，根据材料类型可选：
-#             * 混凝土: C15, C20, C25, C30, C35, C40, C45, C50, C55, C60, C65, C70, C75, C80
-#             * 钢材: Q235, Q345, Q390, Q420
-#             * 预应力材料:
-#                 ** JTG3362_2018: Strand1720, Strand1860, Strand1960, Wire1470, Wire1570, 
-#                   Wire1770, Wire1860, Rebar785, Rebar930, Rebar1080
-#                 ** JTGD62_2004: Strand1860, Wire1670, Wire1770, Rebar785, Rebar930
-#             * 普通钢筋:
-#                 ** JTG3362_2018: HPB300, HRB400, HRBF400, RRB400, HRB500
-#                 ** JTGD62_2004: R235, HRB335, HRB400, KL400
-#         nCrepShrk (int): 收缩徐变特性编号（混凝土材料需要，其他材料设置为-1）
-#         dDmp (float): 材料阻尼比
-#         params (dict): 自定义材料的参数 (E, G, Mu, ExpCoeff, UnitWeight, Density, Dmp)，创建其他材料不填。创建自定义材料 eCode eGrade nCrepShrk dDmp 会被忽略
-
-#     Returns:
-#         tuple (bool, str):
-#             - bool: 操作是否成功
-#             - str: 失败原因（如果操作失败）
-
-#     Examples:
-#         >>> result = osis_material(1, "C30", "CONC", "JTG3362_2018", "C30", 1, 0.05)
-#         >>> print(result)
-#         (True, "")
-#     """
-#     e = OSISEngine.GetInstance()
-#     eMaterialType = eMaterialType.upper()
-#     return e.OSIS_Material(nMat, strName, eMaterialType, eCode, eGrade, nCrepShrk, dDmp, params)
 
 @REGISTRY.register('Material')
 def osis_material_conc(nMat: int, strName: str, eMaterialType: Literal["CONC"],
@@ -69,7 +24,7 @@ def osis_material_conc(nMat: int, strName: str, eMaterialType: Literal["CONC"],
             * JTGD62_2004
         eGrade (str): 材料等级牌号，不区分大小写。根据材料类型可选：
             * C15, C20, C25, C30, C35, C40, C45, C50, C55, C60, C65, C70, C75, C80
-        nCrepShrk (int): 收缩徐变特性编号
+        nCrepShrk (int): 收缩徐变特性编号，可以缺省，缺省时设为 ""， 不缺省时设置为1
         dDmp (float): 材料阻尼比
 
     Returns:
@@ -118,9 +73,7 @@ def osis_material_prestressed(nMat: int, strName: str, eMaterialType: Literal["P
             * JTG3362_2018: Strand1720, Strand1860, Strand1960, Wire1470, Wire1570, 
                   Wire1770, Wire1860, Rebar785, Rebar930, Rebar1080
             * JTGD62_2004: Strand1860, Wire1670, Wire1770, Rebar785, Rebar930
-        nCrepShrk (int): 收缩徐变特性编号（混凝土材料需要，其他材料设置为-1）
         dDmp (float): 材料阻尼比
-        params (dict): 自定义材料的参数 (E, G, Mu, ExpCoeff, UnitWeight, Density, Dmp)
 
     Returns:
         tuple (bool, str):

osis_python-0.1.8/src/pyosis/section/__init__.py

@@ -0,0 +1,7 @@
+from .common import *
+from .numeric import *
+from .param import *
+from .steel import *
+from .rebar import *
+from .rib import *
+from .io import *