phg-vis 1.4.0__py3-none-any.whl → 1.4.2__py3-none-any.whl

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.2
 Author: PanGuoJun
 License: MIT
 """
@@ -387,7 +387,7 @@ __all__ = [
     'visualize_pipe_with_transformations',
 ]
 
-__version__ = "1.4.0"
+__version__ = "1.4.2"
 __author__ = "PanGuoJun"
 __description__ = "Python Hypergraphics Library"
 

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/pipe_string_phg.py

@@ -71,8 +71,8 @@ def world_to_local_pipe_str(world_pipe_str, start_c):
         'D': vec3(0, -1, 0)   # Down (local Y-)
     }
 
-    # Initialize local coordinate system
-    cur_c = start_c.Q()
+    # Initialize local coordinate system (coord3, not quat)
+    cur_c = start_c
     local_pipe_str = ""
 
     for i, move in enumerate(world_pipe_str):

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.dist-info → phg_vis-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phg_vis
-Version: 1.4.0
+Version: 1.4.2
 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.dist-info → phg_vis-1.4.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-phg/__init__.py,sha256=PcG3uC0eL2vY7L4cpNqE-e6Q1AjUbT4kn-18eBSNhZg,13241
-phg/ai_bridge.py,sha256=ZH4X-Sa8C3cbgeI5chi6Valsm0G1B__NrWMjy1YVbM8,5283
+phg/__init__.py,sha256=tqMl_2W5wT3huW7P9Q3i2PyaWfuxB0RiG_pUD5zc6kg,13241
+phg/ai_bridge.py,sha256=6cAewSwrruS-Sdr6ffhqYP6ti72FZz8FhkSuLHfMpSA,6671
 phg/gcu_api.py,sha256=yjCWAJPyIAL_fAdj2umX39wNmw56-LmkcmUPqt3V8DI,22957
 phg/phg_to_shader.py,sha256=rb_LnGE1Py08oz72ES5CnjyCDbjVWDU3If0cYZq4SUU,15172
-phg/pipe_string_phg.py,sha256=9YW5wewLUmyqGUnYNBYpCyk_SMS6fBfyPWTnniy6xdY,16589
+phg/pipe_string_phg.py,sha256=Dg1rhhXvnWIZqV37BsCytpxxXIOQi1XRpK_uIUE0wFA,16602
 phg/shader_render.py,sha256=ncQQHp5OMlOVeTsoIHOL2xnc6SQct7B8YRKPA-D9FlM,17278
 phg/visphg.py,sha256=TpT6icBoBmPCbCm212qKC9zft9MQ2UK2dWvmgnlupwQ,2163
-phg/web_three.py,sha256=GPftXoSUBfAMHfEAn4qapmJ1tsnfoxtKu2JiJwOBqAg,4979
+phg/web_three.py,sha256=LU6zi1kxk5ARMKV-xCo-1sKVEJCq5a2oWhJQ4lpCZEw,5086
 phg/vis/GCU.dll,sha256=k_slWZ5nOzZNi9zCe0_SKc0F7zXoLyRuRDomyirPY4I,2687488
 phg/vis/dragpad.exe,sha256=4qWG4VH1vginIGpKkBHwEBFlpTY8G6xPejeloJurNkE,51712
 phg/vis/dragpad_config.ini,sha256=MD5no-RjzzcBxyz3JWuI88qH5Q4WVivRLqk_1GE5VQY,78
@@ -18,8 +18,8 @@ phg/vis/vis.exe,sha256=9LGgETiO4lwhz_gJzdUg6gPP9EwGLT5SuLjN3wR2sso,1388032
 phg/vis/vis.ini,sha256=IjS0Av2BqresPR2oGCOoq5zliXN2wFRMK3rXcU15vKs,161
 phg/vis/zlib1.dll,sha256=oVw_r326ve3oveVZhlSiF8BloZQ6lfqXJEAhUYfMjOQ,89088
 phg/vis/imgui/main.lua,sha256=AIB5dpGrPHXuRiNW7Bg7eu5Lpi2DDcn6n4JS7OS1Hdk,4742
-phg_vis-1.4.0.dist-info/LICENSE,sha256=tDnRkJxBYPzWdfh2gArRqrUPJxQZRZHJVs68qqBHIq4,1083
-phg_vis-1.4.0.dist-info/METADATA,sha256=wHVu7Q42AzQ_jcuvhjPYHE8EaJkmIqQIRX9hBJFSUbA,19424
-phg_vis-1.4.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-phg_vis-1.4.0.dist-info/top_level.txt,sha256=5GGhpTP8yi-zTXwW2HrI-zcxKxIM_nHXhL7r0iIDE_k,4
-phg_vis-1.4.0.dist-info/RECORD,,
+phg_vis-1.4.2.dist-info/LICENSE,sha256=tDnRkJxBYPzWdfh2gArRqrUPJxQZRZHJVs68qqBHIq4,1083
+phg_vis-1.4.2.dist-info/METADATA,sha256=Y47er0A8ONwutNpML6hf5yBANW6ZxACzlSzvkUUYhP8,19424
+phg_vis-1.4.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+phg_vis-1.4.2.dist-info/top_level.txt,sha256=5GGhpTP8yi-zTXwW2HrI-zcxKxIM_nHXhL7r0iIDE_k,4
+phg_vis-1.4.2.dist-info/RECORD,,