osis-python 0.5.0__tar.gz → 0.5.1__tar.gz

{osis_python-0.5.0/src/osis_python.egg-info → osis_python-0.5.1}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.5.0
+Version: 0.5.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.5.0 → osis_python-0.5.1}/src/osis_python.egg-info/SOURCES.txt

@@ -101,7 +101,7 @@ src/pyosis/thickness/manager.py
 src/pyosis/transfer/__init__.py
 src/pyosis/transfer/generator.py
 src/pyosis/transfer/matrix.py
+src/pyosis/transfer/out_to_python.py
 src/pyosis/transfer/parser.py
 src/pyosis/transfer/routes.py
-src/pyosis/transfer/split.py
-src/pyosis/transfer/sync_exec.py
+src/pyosis/transfer/split.py

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

{osis_python-0.5.0 → osis_python-0.5.1}/src/pyosis/core/apdl_sync.py

@@ -21,17 +21,24 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from ..transfer import parse_text
+from ..transfer.out_to_python import write_prep_outputs
+
 if TYPE_CHECKING:
     from .engine import OSISEngine
 
 SYNC_STATE_FILE = ".apdl_sync.json"
 
+# 默认 .out 文件名（位于项目根目录）
+DEFAULT_EXPORT_NAME = "_pyosis_sync.out"
+
 # 忽略 TIME: 行，避免时间戳导致 MD5 每次不同
 _TIME_LINE_PATTERN = re.compile(
     r"^//-+ TIME:.*//\s*$",
     re.MULTILINE | re.IGNORECASE,
 )
 
+
 @dataclass
 class ApdlSyncResult:
     """APDL 同步结果。"""
@@ -107,6 +114,49 @@ def _save_persisted_hash(state_path: Path, out_path: Path, file_hash: str) -> No
     )
 
 
+# 解析项目目录
+def _get_project_dir(engine: "OSISEngine") -> Path | None:
+    try:
+        proj_dir = engine.project.get_directory()
+    except RuntimeError:
+        return None
+    if not proj_dir:
+        return None
+    return Path(proj_dir)
+
+
+# 解析 (out_path, prep_dir)
+def _resolve_project_paths(engine: "OSISEngine") -> tuple[Path, Path]:
+    """返回 (默认 out_path, prep_dir)。prep_dir 不存在会自动创建。"""
+    proj_dir = _get_project_dir(engine)
+    if proj_dir is None:
+        raise RuntimeError("无法获取 OSIS 项目目录")
+    prep_dir = proj_dir / "py" / "prep"
+    prep_dir.mkdir(parents=True, exist_ok=True)
+    return proj_dir / DEFAULT_EXPORT_NAME, prep_dir
+
+
+# 确保 .out 文件存在
+def _ensure_out_file(
+    engine: "OSISEngine",
+    out_path: Path,
+    *,
+    force_export: bool,
+) -> Path:
+    """确保 .out 存在；不存在或 force_export 时调用 engine.export_apdl。"""
+    if out_path.is_file() and not force_export:
+        return out_path
+
+    out_path.parent.mkdir(parents=True, exist_ok=True)
+    print(f"执行 export_apdl → {out_path}")
+    engine.export_apdl(str(out_path))
+
+    if not out_path.is_file() or out_path.stat().st_size == 0:
+        raise FileNotFoundError(f"导出失败或未生成有效 .out 文件: {out_path}")
+
+    return out_path
+
+
 # 执行 APDL 同步
 def perform_apdl_sync(
     engine: "OSISEngine",
@@ -118,22 +168,14 @@ def perform_apdl_sync(
 
     无项目路径时返回 None。
     """
-    from ..transfer import parse_text
-    from ..transfer.sync_exec import (
-        get_project_dir_optional,
-        resolve_out_file,
-        resolve_project_paths,
-        write_prep_outputs,
-    )
-
-    if get_project_dir_optional(engine) is None:
+    if _get_project_dir(engine) is None:
         return None
 
     session: ApdlSessionStore = engine._apdl_session
 
-    default_out, prep_dir = resolve_project_paths(engine)
+    default_out, prep_dir = _resolve_project_paths(engine)
     out_path = Path(path) if path is not None else default_out
-    out_path = resolve_out_file(engine, out_path, force_export=force_export)
+    out_path = _ensure_out_file(engine, out_path, force_export=force_export)
 
     text = _read_out_text(out_path)
     file_hash = _text_hash(text)

{osis_python-0.5.0 → osis_python-0.5.1}/src/pyosis/core/sync_apdl_cli.py

@@ -1,4 +1,7 @@
 """OSIS 界面操作后触发 pyosis APDL 同步的 CLI 入口。
+
+仅负责触发 perform_apdl_sync；prep 模块的执行不在本模块职责范围内。
+
 用法:
     python -m pyosis.core.sync_apdl_cli
 退出码:
@@ -9,30 +12,15 @@
 from __future__ import annotations
 
 import sys
-from typing import TYPE_CHECKING
 
+from .apdl_sync import perform_apdl_sync
 from .engine import OSISEngine
 
-if TYPE_CHECKING:
-    from .apdl_sync import ApdlSyncResult
-
-
-def _print_result(result: ApdlSyncResult) -> None:
-
-    if result.changed:
-        print("命令流有变化，已重新生成并执行 prep")
-    else:
-        print("命令流未变化，已 export，未重新执行 prep")
-
-    summary = result.summary()
-    if summary:
-        print(f"摘要: {summary}")
-
-
 
 def main() -> int:
+    engine = OSISEngine()
     try:
-        result = OSISEngine().sync_apdl()
+        result = perform_apdl_sync(engine)
     except Exception as exc:
         print(f"sync_apdl 失败: {exc}", file=sys.stderr)
         return 1
@@ -41,7 +29,7 @@ def main() -> int:
         print("跳过：未获取到项目路径")
         return 0
 
-    # _print_result(result)
+    print(result.summary())
     return 0
 
 

osis_python-0.5.0/src/pyosis/transfer/sync_exec.py → osis_python-0.5.1/src/pyosis/transfer/out_to_python.py

@@ -1,29 +1,22 @@
-"""transfer 同步链路的共享工具：路径解析、写 prep、执行 prep。
+"""transfer 同步链路的纯文本处理工具：把 .out 文本转换为 pyosis prep 模块。
 
-供 apdl_sync（export → 写 prep）与 sync_test（执行 prep）使用。
+只负责文本解析与 Python 代码生成：
+    - 解析 OSIS 导出的命令流（parse_text）
+    - 按模块分桶并生成 prep 模块（_1_control.py … _10_stage.py + main.py）
 
-路径约定（与 build / apdl_sync 一致）:
-    {项目目录}/_pyosis_sync.out
-    {项目目录}/py/prep/_0_engine.py … _10_stage.py
+不负责：
+    - .out 文件的获取（export_apdl） —— 由调用方管理
+    - prep 模块的执行（import + builder 调用） —— 由调用方管理
 """
 
 from __future__ import annotations
 
-import importlib.util
-import sys
 from collections import defaultdict
-from dataclasses import dataclass
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 from pyosis.transfer.generator import generate_lines
 from pyosis.transfer.parser import ParsedCommand
 
-if TYPE_CHECKING:
-    from pyosis.core.engine import OSISEngine
-
-DEFAULT_EXPORT_NAME = "_pyosis_sync.out"
-
 # 模块文件名
 MODULE_FILES = {
     "CONTROL": "_1_control.py",
@@ -55,56 +48,6 @@ MODULE_BUILDERS = {
 MODULE_ORDER = tuple(MODULE_FILES.keys())
 
 
-@dataclass
-class ExecResult:
-    index: int
-    line: str
-    ok: bool
-    error: str
-
-# 获取项目目录
-def get_project_dir_optional(engine: OSISEngine) -> Path | None:
-    try:
-        proj_dir = engine.project.get_directory()
-    except RuntimeError:
-        return None
-    if not proj_dir:
-        return None
-    return Path(proj_dir)
-
-
-# 解析项目路径
-def resolve_project_paths(engine: OSISEngine) -> tuple[Path, Path]:
-    """返回 (out_path, prep_dir)。"""
-    proj_dir = get_project_dir_optional(engine)
-    if proj_dir is None:
-        raise RuntimeError("无法获取 OSIS 项目目录")
-    prep_dir = proj_dir / "py" / "prep"
-    prep_dir.mkdir(parents=True, exist_ok=True)
-    return proj_dir / DEFAULT_EXPORT_NAME, prep_dir
-
-
-# 解析 .out 文件
-def resolve_out_file(
-    engine: OSISEngine,
-    out_path: Path,
-    *,
-    force_export: bool = False,
-) -> Path:
-    """确保 .out 存在；不存在或 force_export 时 export_apdl。"""
-    if out_path.is_file() and not force_export:
-        return out_path
-
-    out_path.parent.mkdir(parents=True, exist_ok=True)
-    print(f"执行 export_apdl → {out_path}")
-    engine.export_apdl(str(out_path))
-
-    if not out_path.is_file() or out_path.stat().st_size == 0:
-        raise FileNotFoundError(f"导出失败或未生成有效 .out 文件: {out_path}")
-
-    return out_path
-
-
 # 按模块分桶
 def _bucket_by_module(parsed: list[ParsedCommand]) -> dict[str, list[ParsedCommand]]:
     buckets: dict[str, list[ParsedCommand]] = defaultdict(list)
@@ -132,7 +75,7 @@ def _write_prep_module(prep_dir: Path, module: str, lines: list[str]) -> Path:
     fname = MODULE_FILES[module]
     builder = MODULE_BUILDERS[module]
     empty = not lines
-    doc = f"由 pyosis.transfer.sync_exec 从 .out 自动生成: {module}"
+    doc = f"由 pyosis.transfer.out_to_python 从 .out 自动生成: {module}"
     if empty:
         doc += "（无命令）"
 
@@ -154,6 +97,7 @@ def _write_prep_module(prep_dir: Path, module: str, lines: list[str]) -> Path:
     path.write_text("\n".join(body_lines), encoding="utf-8")
     return path
 
+
 def _write_main_py(prep_dir: Path) -> Path:
     """写入 main.py：依次执行 _1_control … _10_stage。"""
     import_lines = [
@@ -164,7 +108,7 @@ def _write_main_py(prep_dir: Path) -> Path:
     call_lines = [f"    {MODULE_BUILDERS[mod]}(eng)" for mod in MODULE_ORDER]
 
     body_lines = [
-        '"""由 pyosis.transfer.sync_exec 自动生成：依次执行 prep 模块。"""',
+        '"""由 pyosis.transfer.out_to_python 自动生成：依次执行 prep 模块。"""',
         "",
         "from __future__ import annotations",
         "",
@@ -183,8 +127,9 @@ def _write_main_py(prep_dir: Path) -> Path:
     path.write_text("\n".join(body_lines), encoding="utf-8")
     return path
 
+
 def write_prep_outputs(parsed: list[ParsedCommand], prep_dir: Path) -> tuple[int, list[Path]]:
-    """写入 _0_engine.py 与 _1~_10 prep 模块，返回 (代码行数, 文件列表)。
+    """写入 _0_engine.py 与 _1~_10 prep 模块 + main.py，返回 (代码行数, 文件路径列表)。
 
     每个标准模块都会写入文件；.out 中无对应命令时生成 pass stub，避免遗留旧 prep。
     """
@@ -204,53 +149,4 @@ def write_prep_outputs(parsed: list[ParsedCommand], prep_dir: Path) -> tuple[int
         encoding="utf-8",
     )
     prep_paths.append(_write_main_py(prep_dir))
-    return code_line_count, prep_paths
-
-
-# 加载 prep 模块
-def _load_prep_module(prep_dir: Path, filename: str):
-    path = prep_dir / filename
-    if not path.is_file():
-        return None
-    spec = importlib.util.spec_from_file_location(path.stem, path)
-    mod = importlib.util.module_from_spec(spec)
-    assert spec.loader is not None
-    spec.loader.exec_module(mod)
-    return mod
-
-
-# 执行 prep 模块
-def execute_prep_modules(prep_dir: Path, engine: OSISEngine) -> list[ExecResult]:
-    """按 _1_control … _10_stage 顺序执行 prep 模块。"""
-    prep_dir = prep_dir.resolve()
-    if str(prep_dir) not in sys.path:
-        sys.path.insert(0, str(prep_dir))
-
-    results: list[ExecResult] = []
-    step = 0
-
-    for module in MODULE_ORDER:
-        fname = MODULE_FILES[module]
-        builder_name = MODULE_BUILDERS[module]
-        mod = _load_prep_module(prep_dir, fname)
-        if mod is None:
-            print(f"[SKIP] {fname} 不存在")
-            continue
-        builder = getattr(mod, builder_name, None)
-        if builder is None:
-            print(f"[SKIP] {fname} 无函数 {builder_name}")
-            continue
-
-        step += 1
-        desc = f"{fname} → {builder_name}(engine)"
-        try:
-            builder(engine)
-            results.append(ExecResult(step, desc, True, ""))
-            print(f"[OK] {step}: {desc}")
-        except Exception as exc:
-            msg = str(exc)
-            results.append(ExecResult(step, desc, False, msg))
-            print(f"[FAIL] {step}: {desc}")
-            print(f"       {msg}")
-
-    return results
+    return code_line_count, prep_paths