phg-vis 1.4.0__tar.gz → 1.4.1__tar.gz

{phg_vis-1.4.0/phg_vis.egg-info → phg_vis-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phg_vis
-Version: 1.4.0
+Version: 1.4.1
 Summary: A package for the PHG modeling language and 3D visualization tool.
 Home-page: https://github.com/panguojun/Coordinate-System
 Author: romeosoft

{phg_vis-1.4.0 → phg_vis-1.4.1}/phg/__init__.py

@@ -11,7 +11,7 @@ Main Features:
 - Multiple pipe visualization support
 - Real-time and image rendering capabilities
 
-Version: 1.4.0
+Version: 1.4.1
 Author: PanGuoJun
 License: MIT
 """
@@ -387,7 +387,7 @@ __all__ = [
     'visualize_pipe_with_transformations',
 ]
 
-__version__ = "1.4.0"
+__version__ = "1.4.1"
 __author__ = "PanGuoJun"
 __description__ = "Python Hypergraphics Library"
 

{phg_vis-1.4.0 → phg_vis-1.4.1}/phg/ai_bridge.py

@@ -4,6 +4,8 @@ AI bridge for PHG (DGE++ parser -> normalized PHG -> vis.exe / web).
 
 from __future__ import annotations
 
+import importlib
+import importlib.util
 import json
 import os
 import subprocess
@@ -15,6 +17,8 @@ from .visphg import vis as _vis, image as _image
 from .web_three import write_three_view_html
 
 DEFAULT_AI_ROOT = r"C:\Users\18858\Documents\_AILab\DGE++\PHG"
+_AI_MODULE = None
+_AI_MODULE_ROOT = None
 
 
 def resolve_ai_root(ai_root: Optional[str] = None) -> str:
@@ -40,6 +44,33 @@ def _run_ai_cli(args: List[str], ai_root: Optional[str] = None, timeout: int = 1
     )
 
 
+def _load_ai_module(ai_root: Optional[str] = None):
+    global _AI_MODULE, _AI_MODULE_ROOT
+    root = resolve_ai_root(ai_root)
+    if _AI_MODULE is not None and _AI_MODULE_ROOT == root:
+        return _AI_MODULE
+
+    pkg_dir = os.path.join(root, "phg")
+    init_path = os.path.join(pkg_dir, "__init__.py")
+    if not os.path.isfile(init_path):
+        raise FileNotFoundError(f"AI PHG package not found: {init_path}")
+
+    spec = importlib.util.spec_from_file_location(
+        "phg_ai",
+        init_path,
+        submodule_search_locations=[pkg_dir],
+    )
+    if spec is None or spec.loader is None:
+        raise ImportError("Failed to load AI PHG package")
+
+    module = importlib.util.module_from_spec(spec)
+    sys.modules["phg_ai"] = module
+    spec.loader.exec_module(module)
+    _AI_MODULE = module
+    _AI_MODULE_ROOT = root
+    return module
+
+
 def _write_temp_phg(script: str) -> str:
     fd, path = tempfile.mkstemp(suffix=".phg")
     os.close(fd)
@@ -56,11 +87,22 @@ def dump_scene(script: str, ai_root: Optional[str] = None) -> Dict[str, Any]:
     fd, json_path = tempfile.mkstemp(suffix=".json")
     os.close(fd)
     try:
-        proc = _run_ai_cli(["dump", phg_path, "--out", json_path], ai_root=ai_root)
-        if proc.returncode != 0:
-            raise RuntimeError(proc.stderr.strip() or proc.stdout.strip() or "AI dump failed")
-        with open(json_path, "r", encoding="utf-8") as f:
-            return json.load(f)
+        try:
+            ai = _load_ai_module(ai_root)
+            engine_mod = importlib.import_module("phg_ai.engine")
+            engine = engine_mod.Engine()
+            engine.run(script)
+            if "setup" not in engine.calls:
+                engine.setup()
+            if "draw" not in engine.calls:
+                engine.draw()
+            return engine._scene_to_dict(engine.scene.root)
+        except Exception:
+            proc = _run_ai_cli(["dump", phg_path, "--out", json_path], ai_root=ai_root)
+            if proc.returncode != 0:
+                raise RuntimeError(proc.stderr.strip() or proc.stdout.strip() or "AI dump failed")
+            with open(json_path, "r", encoding="utf-8") as f:
+                return json.load(f)
     finally:
         for p in (phg_path, json_path):
             try:
@@ -146,16 +188,18 @@ def image_ai(script: str, filename: str = "shot.png", ai_root: Optional[str] = N
 
 
 def export_ai_obj(script: str, out_obj: str, ai_root: Optional[str] = None) -> str:
-    phg_path = _write_temp_phg(script)
     try:
-        proc = _run_ai_cli(["export", phg_path, "--out", out_obj], ai_root=ai_root)
-        if proc.returncode != 0:
-            raise RuntimeError(proc.stderr.strip() or proc.stdout.strip() or "AI export failed")
+        ai = _load_ai_module(ai_root)
+        engine_mod = importlib.import_module("phg_ai.engine")
+        engine = engine_mod.Engine()
+        engine.run(script)
+        if "setup" not in engine.calls:
+            engine.setup()
+        if "draw" not in engine.calls:
+            engine.draw()
+        engine.export_obj(out_obj)
     finally:
-        try:
-            os.remove(phg_path)
-        except OSError:
-            pass
+        pass
     return out_obj
 
 

{phg_vis-1.4.0 → phg_vis-1.4.1}/phg/web_three.py

@@ -67,10 +67,18 @@ def write_three_view_html(obj_path: str, out_html: str, title: str = "PHG Web Vi
     <div>OBJ: {html.escape(os.path.basename(obj_path))}</div>
     <div>Controls: LMB rotate, RMB pan, wheel zoom</div>
   </div>
+  <script type="importmap">
+    {{
+      "imports": {{
+        "three": "https://cdn.jsdelivr.net/npm/three@0.160.0/build/three.module.js",
+        "three/addons/": "https://cdn.jsdelivr.net/npm/three@0.160.0/examples/jsm/"
+      }}
+    }}
+  </script>
   <script type="module">
-    import * as THREE from "https://cdn.jsdelivr.net/npm/three@0.160.0/build/three.module.js";
-    import {{ OrbitControls }} from "https://cdn.jsdelivr.net/npm/three@0.160.0/examples/jsm/controls/OrbitControls.js";
-    import {{ OBJLoader }} from "https://cdn.jsdelivr.net/npm/three@0.160.0/examples/jsm/loaders/OBJLoader.js";
+    import * as THREE from "three";
+    import {{ OrbitControls }} from "three/addons/controls/OrbitControls.js";
+    import {{ OBJLoader }} from "three/addons/loaders/OBJLoader.js";
 
     const container = document.getElementById("app");
     const scene = new THREE.Scene();

{phg_vis-1.4.0 → phg_vis-1.4.1/phg_vis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phg_vis
-Version: 1.4.0
+Version: 1.4.1
 Summary: A package for the PHG modeling language and 3D visualization tool.
 Home-page: https://github.com/panguojun/Coordinate-System
 Author: romeosoft

{phg_vis-1.4.0 → phg_vis-1.4.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='phg_vis', 
-    version='1.4.0', 
+    version='1.4.1', 
     packages=find_packages(),
     include_package_data=True,
     description='A package for the PHG modeling language and 3D visualization tool.',