osis-python 0.3.3__tar.gz → 0.3.6__tar.gz

{osis_python-0.3.3/src/osis_python.egg-info → osis_python-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.3.3
+Version: 0.3.6
 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.3 → osis_python-0.3.6/src/osis_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.3.3
+Version: 0.3.6
 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.3 → osis_python-0.3.6}/src/pyosis/__init__.py

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

{osis_python-0.3.3 → osis_python-0.3.6}/src/pyosis/boundary/manager.py

@@ -529,6 +529,13 @@ class BoundaryGroupManager:
         ok, err = osis_boundary_group(name, "d")
         if not ok:
             raise RuntimeError(f"删除边界组 {name} 失败: {err}")
+        
+    def rename(self, old_name, new_name) -> None:
+        """修改边界组名"""
+        ok, err = osis_boundary_group(old_name, "m", [new_name])
+        if not ok:
+            raise RuntimeError(f"修改边界组名  {old_name} -> {new_name} 失败:  失败: {err}")
+        return self.get(new_name)
 
     # ── 查询 ──────────────────────────────────
     

{osis_python-0.3.3 → osis_python-0.3.6}/src/pyosis/core/client.py

@@ -1,3 +1,4 @@
+import os
 import requests
 import json
 from requests.adapters import HTTPAdapter
@@ -24,7 +25,7 @@ session.mount("http://", adapter)
 session.mount("https://", adapter)  # 如果你后续用HTTPS
 
 # ========== 通用客户端函数（复用连接池） ==========
-def osis_client(func_name: str, payload: dict) -> dict:
+def osis_client(func_name: str, payload: dict, base_url=None) -> dict:
     """
     通用 OSIS 接口客户端（复用连接池，高效批量调用）
     Args:
@@ -33,7 +34,8 @@ def osis_client(func_name: str, payload: dict) -> dict:
     Returns:
         异常时返回 (False, 错误信息)
     """
-    url = f"http://localhost:8080/{func_name}"
+    base_url = base_url or os.environ.get("OSIS_URL", "http://localhost:18080")
+    url = f"{base_url}/{func_name}"
 
     try:
         response = session.post(
@@ -53,18 +55,15 @@ def osis_client(func_name: str, payload: dict) -> dict:
         # 接口不存在
         if response.status_code == 404:
             return {"success": False, "error": f"接口不存在: {func_name}"}
-        # 200
-        # if response.ok:
-        return data if data is not None else {"success": False, "error": f"接口不存在: {func_name}" }
 
-        # 500
-        # # 500：[false, "命令流中……"]
-        # if isinstance(data, list) and len(data) >= 2 and data[0] is False:
-        #     return False, str(data[1])
+        if response.ok:  # 200-299
+            if data is not None:
+                return data
+            return {"success": False, "error": f"接口返回空数据: {func_name}"}
+
+        # 其他错误状态码 (500, 502, etc.)
+        return {"success": False, "error": f"HTTP {response.status_code}: {response.text[:200]}"}
 
-        # 无结构化 body 时退回文本 / 状态码
-        # detail = response.text.strip() if response.text else ""
-        # return {"success": False, "error": detail if detail else f"HTTP {response.status_code}"}# False, detail if detail else f"HTTP {response.status_code}"
 
     except requests.RequestException as e:
         return {"success": False, "error": f"调用失败: {str(e)}"}

{osis_python-0.3.3 → osis_python-0.3.6}/src/pyosis/core/command.py

@@ -12,27 +12,6 @@ from typing import Dict, Any, Tuple, Literal, Optional
 # 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 信号才会执行暂存包括当前的所有命令流。
-
-#     Returns:
-#         tuple (bool, str, Any): 是否成功，失败原因，其他结果数据
-#     '''
-# #     # 自动判断模式：非空默认暂存，为空默认执行
-# #     if mode is None:
-# #         mode = "stash" if strCmd else "exec"
-    
-#     e = OSISEngine.GetInstance()
-#     return e.OSIS_Run(strCmd, mode)
-
 # def _log(text, filename="pyosis.log"):
 #     """简单的日志函数"""
 #     timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -54,83 +33,58 @@ def osis_run(strCmd: str="", mode: Literal["stash", "exec"]="exec") -> tuple[boo
     """
     response = osis_client("OSIS_Run", locals())
     return response['success'], response['error']
-    # # 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秒间隔）的代码追加到同一文件，
-    超过1秒则创建新文件
-    
-    Args:
-        text: 要记录的代码行
-        log_dir: 日志文件夹路径
-    Returns:
-        目标文件路径
-    """
-    # 创建日志目录
-    if not os.path.exists(log_dir):
-        os.makedirs(log_dir)
-        files = []
-    else:
-        # 获取所有文件（排除子目录）
-        files = [os.path.join(log_dir, f) for f in os.listdir(log_dir) 
-                if os.path.isfile(os.path.join(log_dir, f))]
-    
-    current_time = datetime.datetime.now()
-    target_file = None
-    is_new_file = True
+    ...
+# def _log(text, log_dir="pyosis_logs"):
+#     """
+#     同一轮执行（<1秒间隔）的代码追加到同一文件，
+#     超过1秒则创建新文件
     
-    # 查找最近修改的文件
-    if files:
-        latest_file = max(files, key=os.path.getmtime)
-        mtime = datetime.datetime.fromtimestamp(os.path.getmtime(latest_file))
+#     Args:
+#         text: 要记录的代码行
+#         log_dir: 日志文件夹路径
+#     Returns:
+#         目标文件路径
+#     """
+#     # 创建日志目录
+#     if not os.path.exists(log_dir):
+#         os.makedirs(log_dir)
+#         files = []
+#     else:
+#         # 获取所有文件（排除子目录）
+#         files = [os.path.join(log_dir, f) for f in os.listdir(log_dir) 
+#                 if os.path.isfile(os.path.join(log_dir, f))]
+    
+#     current_time = datetime.datetime.now()
+#     target_file = None
+#     is_new_file = True
+    
+#     # 查找最近修改的文件
+#     if files:
+#         latest_file = max(files, key=os.path.getmtime)
+#         mtime = datetime.datetime.fromtimestamp(os.path.getmtime(latest_file))
         
-        # 如果小于1秒，追加到该文件
-        if (current_time - mtime).total_seconds() < 1.0:
-            target_file = latest_file
-            is_new_file = False
+#         # 如果小于1秒，追加到该文件
+#         if (current_time - mtime).total_seconds() < 1.0:
+#             target_file = latest_file
+#             is_new_file = False
     
-    # 需要创建新文件
-    if is_new_file:
-        timestamp = current_time.strftime("%Y%m%d_%H%M%S_%f")[:-3]  # 毫秒级
-        target_file = os.path.join(log_dir, f"session_{timestamp}.txt")
+#     # 需要创建新文件
+#     if is_new_file:
+#         timestamp = current_time.strftime("%Y%m%d_%H%M%S_%f")[:-3]  # 毫秒级
+#         target_file = os.path.join(log_dir, f"session_{timestamp}.txt")
     
-    with open(target_file, 'a', encoding='utf-8') as f:
-        f.write(f"{text}\n")
+#     with open(target_file, 'a', encoding='utf-8') as f:
+#         f.write(f"{text}\n")
     
-    return target_file
+#     return target_file
 
-def _tmp(text, tmp_file="tmp.tmp", clear=False):        # 运行时临时信息
-    if clear:
-        os.remove(tmp_file)
-    with open(tmp_file, "a+", encoding="utf-8") as f:
-        f.write(text)
+# def _tmp(text, tmp_file="tmp.tmp", clear=False):        # 运行时临时信息
+#     if clear:
+#         os.remove(tmp_file)
+#     with open(tmp_file, "a+", encoding="utf-8") as f:
+#         f.write(text)
 
 class OSISFunctionRegistry:
     """
@@ -242,7 +196,7 @@ class OSISFunctionRegistry:
     
     def _execute_command(self, cmd) -> Tuple[bool, str, Any]:
         """执行命令（发送到软件）"""
-        _log(cmd)
+        # _log(cmd)
         result = osis_run(cmd, "exec")
         isok, error, *rest = result
         return result

{osis_python-0.3.3 → osis_python-0.3.6}/src/pyosis/core/engine.py

@@ -206,7 +206,7 @@ class OSISEngine:
     # 通用操作（直接暴露 general 和 core 的函数）
     # ──────────────────────────────────────────
 
-    def run(self, cmd: str = "") -> tuple[bool, str]:
+    def run(self, cmd: str = "") -> None:
         """执行 OSIS 命令流
 
         Args:
@@ -244,7 +244,7 @@ class OSISEngine:
         if not ok:
             raise RuntimeError(f"清屏失败: {err}")
 
-    def matrix(self, name: str, data: Any) -> tuple[bool, str]:
+    def matrix(self, name: str, data: Any) -> str:
         """定义矩阵（用于自定义截面等）
 
         Args:
@@ -257,6 +257,7 @@ class OSISEngine:
         ok, err = osis_matrix(name, data)
         if not ok:
             raise RuntimeError(f"定义失败: {err}")
+        return name
 
     def output_result_for_calc_book(self) -> dict:
         """输出计算书所需结果"""

{osis_python-0.3.3 → osis_python-0.3.6}/src/pyosis/dynamic/__init__.py

@@ -9,4 +9,4 @@ from .seismic import (
     osis_rspec_anal_del,
     osis_rspec_anal_mod,
 )
-from .manager import DynamicManager, dynamic_manager, LoadToMassItem, SpectrumData
+from .manager import DynamicManager, dynamic_manager