realtimex-deeptutor 0.5.0.post6__py3-none-any.whl → 0.5.0.post8__py3-none-any.whl

{realtimex_deeptutor-0.5.0.post6.dist-info → realtimex_deeptutor-0.5.0.post8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: realtimex-deeptutor
-Version: 0.5.0.post6
+Version: 0.5.0.post8
 Summary: RealTimeX DeepTutor - Intelligent learning companion with multi-agent collaboration and LightRAG
 License: Apache-2.0
 Requires-Python: >=3.10

{realtimex_deeptutor-0.5.0.post6.dist-info → realtimex_deeptutor-0.5.0.post8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 realtimex_deeptutor/__init__.py,sha256=sSfuCLjJa6BnayszcU4azNl_sr1OzuKgLP10BAtdoh8,1567
-realtimex_deeptutor-0.5.0.post6.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+realtimex_deeptutor-0.5.0.post8.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
 scripts/__init__.py,sha256=mxMsCbci-Qon3qWU1JIi93-tYlHAy0NIUbDRmAPVcg0,54
 scripts/audit_prompts.py,sha256=Ltuk7tvsjpKhiobVbYq1volgVFKiVLgSTaE_Is4MGaM,5651
 scripts/check_install.py,sha256=GbApEcDLJ6r0QmYrCVHAFCOK4wolpSLwL3eBRmmD3og,13929
@@ -7,7 +7,7 @@ scripts/generate_roster.py,sha256=COsJ12bvZ5W9TI-wAvKpknKBgHr9uQTvJ_JCz2gVMVo,12
 scripts/install_all.py,sha256=u-A3eLhk1ua_KCjz8WZMkrVNJN6QdYs7NhGOcsm-Mks,23875
 scripts/migrate_kb.py,sha256=uyJgplkJag35rT2RrwSiT37__gpB4TiA0xh5uVcWIa4,19667
 scripts/start.py,sha256=EYbyjryor0DN_WcxQMSkKWCboM9UjMkv61fWhLyv63I,30300
-scripts/start_web.py,sha256=aZ5nqH-h2F6I_tAsY-_uy56jIS5ZJt8Fsjw0OHjEYGc,29755
+scripts/start_web.py,sha256=ZND4cNGYKpd52hygA2HFJFFiB1IGJoFAgP1mBXUNURA,34796
 scripts/sync_prompts_from_en.py,sha256=TkBSFilYSwnwo0a3cgRnJ84i02zByAIW12N3ePzBwE8,4677
 src/__init__.py,sha256=UNw3C20mbskiQF3rK3HhjglrG8snhfuiVthc5UsoHX0,1046
 src/agents/__init__.py,sha256=IPhP4RZnCH2kcUDBkdKHO_ciVdyWnuHUCG2flG5Ydcw,885
@@ -289,8 +289,8 @@ src/utils/error_utils.py,sha256=ME_9q-DlmxFl-Xvv3ETPZE_iP705x6MXiuAREgWYsjM,2262
 src/utils/json_parser.py,sha256=M_KfrsrNvQPSiFvpKHQV79Aj85_MEcLVc6hnKzvTV58,3243
 src/utils/realtimex.py,sha256=vs7fAEnJJ4zpAyyBn-7vUmGWiiQvpTWQCRgax1MLTDw,9769
 src/utils/network/circuit_breaker.py,sha256=BtjogK5R3tG8fuJniS5-PJKZMtwD5P2SkP2JFiQ9sRA,2722
-realtimex_deeptutor-0.5.0.post6.dist-info/METADATA,sha256=ZHgtwKQVopSxjI2xUxf27e-HiHVkrPtObk6b35e2zlk,58304
-realtimex_deeptutor-0.5.0.post6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-realtimex_deeptutor-0.5.0.post6.dist-info/entry_points.txt,sha256=slNAzwRLUpqiMtDRZBQIkXbU2vGMHL_om6-o19gYdh8,134
-realtimex_deeptutor-0.5.0.post6.dist-info/top_level.txt,sha256=zUAd6V7jDYhdL7bvg2S38YCM-gVhvd36WqkjxrT-02I,32
-realtimex_deeptutor-0.5.0.post6.dist-info/RECORD,,
+realtimex_deeptutor-0.5.0.post8.dist-info/METADATA,sha256=UZu0J6h0x9m5V-Rn1_dOZYA0FPdgWSm2Na8eKkmeUxQ,58304
+realtimex_deeptutor-0.5.0.post8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+realtimex_deeptutor-0.5.0.post8.dist-info/entry_points.txt,sha256=slNAzwRLUpqiMtDRZBQIkXbU2vGMHL_om6-o19gYdh8,134
+realtimex_deeptutor-0.5.0.post8.dist-info/top_level.txt,sha256=zUAd6V7jDYhdL7bvg2S38YCM-gVhvd36WqkjxrT-02I,32
+realtimex_deeptutor-0.5.0.post8.dist-info/RECORD,,

scripts/start_web.py

@@ -20,6 +20,80 @@ if hasattr(sys.stdout, "reconfigure"):
     sys.stdout.reconfigure(line_buffering=True)
 
 
+class ExecutableResolver:
+    """
+    Resolves bundled executables (uvx, uv, npx) to their actual paths.
+    Ported from ExecutableResolver.js
+    """
+
+    def __init__(self):
+        self._resources_root = None
+
+    def get_resources_root(self) -> Path | None:
+        """
+        Get the resources root directory (~/.realtimex.ai)
+        Returns path to resources root or None if not found
+        """
+        if self._resources_root:
+            return self._resources_root
+
+        try:
+            home = Path.home()
+            self._resources_root = home / ".realtimex.ai"
+            return self._resources_root
+        except Exception as e:
+            print_flush(f"⚠️ [ExecutableResolver] Failed to resolve resources directory: {e}")
+            return None
+
+    def resolve_from_candidates(
+        self, env_var: str | None, candidates: list[Path | str]
+    ) -> str | None:
+        """
+        Find a valid executable from a list of candidate paths
+        """
+        search_paths = []
+        if env_var:
+            search_paths.append(Path(env_var))
+
+        search_paths.extend([Path(c) for c in candidates])
+
+        for candidate in search_paths:
+            if not candidate:
+                continue
+            try:
+                if candidate.exists() and candidate.is_file():
+                    return str(candidate)
+            except Exception:
+                pass
+        return None
+
+    def resolve_npx(self) -> str | None:
+        """
+        Resolve npx to bundled executable
+        """
+        resources_dir = self.get_resources_root()
+        if not resources_dir:
+            return None
+
+        node_version = os.environ.get("REALTIMEX_NPX_NODE_VERSION", "v22.16.0")
+        home = Path.home()
+
+        candidates = [
+            # User's NVM installation (most common case)
+            home / ".nvm" / "versions" / "node" / node_version / "bin" / "npx",
+            # NVM-installed node in resources dir (bundled)
+            resources_dir / ".nvm" / "versions" / "node" / node_version / "bin" / "npx",
+            # Windows NVM
+            Path("C:/nvm") / node_version / "npx.cmd",
+            # Bundled in Resources
+            resources_dir / "Resources" / "envs" / "Scripts" / "npx.cmd",
+        ]
+
+        return self.resolve_from_candidates(
+            env_var=os.environ.get("REALTIMEX_NPX_PATH"), candidates=candidates
+        )
+
+
 def print_flush(*args, **kwargs):
     """Print with flush=True by default"""
     kwargs.setdefault("flush", True)
@@ -69,6 +143,103 @@ else:
         return False
 
 
+def find_pid_by_port(port: int) -> int | None:
+    """
+    Find PID using a port with multiple fallback methods.
+    Returns PID or None if not found.
+    """
+    if os.name == "nt":
+        # Windows: use netstat
+        try:
+            result = subprocess.run(
+                ["netstat", "-ano"],
+                capture_output=True,
+                text=True,
+                timeout=5,
+            )
+            for line in result.stdout.splitlines():
+                if f":{port}" in line and "LISTENING" in line:
+                    parts = line.split()
+                    if parts:
+                        try:
+                            return int(parts[-1])
+                        except ValueError:
+                            pass
+        except Exception:
+            pass
+        return None
+
+    # Unix: Try strategies in order: lsof -> ss -> netstat
+
+    # Strategy 1: lsof (standard)
+    try:
+        result = subprocess.run(
+            ["lsof", "-ti", f":{port}"],
+            capture_output=True,
+            text=True,
+            timeout=5,
+        )
+        if result.returncode == 0 and result.stdout.strip():
+            try:
+                # May return multiple PIDs, take the first one
+                return int(result.stdout.strip().split()[0])
+            except (ValueError, IndexError):
+                pass
+    except FileNotFoundError:
+        pass  # lsof not installed
+    except Exception:
+        pass
+
+    # Strategy 2: ss (modern Linux)
+    try:
+        # ss -lptn 'sport = :8001'
+        result = subprocess.run(
+            ["ss", "-lptn", f"sport = :{port}"],
+            capture_output=True,
+            text=True,
+            timeout=5,
+        )
+        if result.returncode == 0:
+            # Output format: Users:(("python",pid=1234,fd=3))
+            output = result.stdout
+            if f":{port}" in output and "pid=" in output:
+                import re
+
+                match = re.search(r"pid=(\d+)", output)
+                if match:
+                    return int(match.group(1))
+    except FileNotFoundError:
+        pass  # ss not installed
+    except Exception:
+        pass
+
+    # Strategy 3: netstat (legacy Unix)
+    try:
+        # netstat -nlp | grep :8001
+        p1 = subprocess.Popen(
+            ["netstat", "-nlp"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
+        )
+        p2 = subprocess.Popen(
+            ["grep", f":{port}"], stdin=p1.stdout, stdout=subprocess.PIPE, text=True
+        )
+        if p1.stdout:
+            p1.stdout.close()
+        output, _ = p2.communicate(timeout=5)
+
+        if output:
+            # Expected: tcp 0 0 0.0.0.0:8001 0.0.0.0:* LISTEN 1234/python
+            parts = output.split()
+            for part in parts:
+                if "/" in part and part.split("/")[0].isdigit():
+                    return int(part.split("/")[0])
+    except FileNotFoundError:
+        pass
+    except Exception:
+        pass
+
+    return None
+
+
 def check_port_in_use(port: int) -> tuple[bool, int | None]:
     """
     Check if a port is in use and return the PID of the process using it.
@@ -103,42 +274,7 @@ def check_port_in_use(port: int) -> tuple[bool, int | None]:
             pass
 
     # Port is in use (connection succeeded), try to find the PID
-    pid = None
-    try:
-        if os.name == "nt":
-            # Windows: use netstat
-            result = subprocess.run(
-                ["netstat", "-ano"],
-                capture_output=True,
-                text=True,
-                timeout=5,
-            )
-            for line in result.stdout.splitlines():
-                if f":{port}" in line and "LISTENING" in line:
-                    parts = line.split()
-                    if parts:
-                        try:
-                            pid = int(parts[-1])
-                            break
-                        except ValueError:
-                            pass
-        else:
-            # Unix: use lsof
-            result = subprocess.run(
-                ["lsof", "-ti", f":{port}"],
-                capture_output=True,
-                text=True,
-                timeout=5,
-            )
-            if result.returncode == 0 and result.stdout.strip():
-                # May return multiple PIDs, take the first one
-                try:
-                    pid = int(result.stdout.strip().split()[0])
-                except (ValueError, IndexError):
-                    pass
-    except Exception:
-        pass
-
+    pid = find_pid_by_port(port)
     return True, pid
 
 
@@ -159,7 +295,11 @@ def kill_process_on_port(port: int, force: bool = False) -> bool:
 
     if pid is None:
         print_flush(f"⚠️  Port {port} is in use but couldn't identify the process")
-        return False
+        # Retry detection once with slightly longer delay just in case
+        time.sleep(1)
+        _, pid = check_port_in_use(port)
+        if pid is None:
+            return False
 
     print_flush(f"   Stopping process {pid} on port {port}...")
 
@@ -167,21 +307,35 @@ def kill_process_on_port(port: int, force: bool = False) -> bool:
         if os.name == "nt":
             subprocess.run(["taskkill", "/F", "/PID", str(pid)], check=True, capture_output=True)
         else:
-            sig = signal.SIGKILL if force else signal.SIGTERM
-            os.kill(pid, sig)
+            # Try to kill the process group first (handles child processes)
+            try:
+                pgid = os.getpgid(pid)
+                sig = signal.SIGKILL if force else signal.SIGTERM
+                os.killpg(pgid, sig)
+            except (ProcessLookupError, PermissionError):
+                # Fallbck to simple kill if PGID fails
+                sig = signal.SIGKILL if force else signal.SIGTERM
+                os.kill(pid, sig)
+
             # Wait a moment for process to terminate
             time.sleep(0.5)
             # Check if still running, force kill if needed
             if not force:
                 try:
                     os.kill(pid, 0)  # Check if process exists
-                    os.kill(pid, signal.SIGKILL)
+                    # If still alive, Force Kill
+                    print_flush(f"   Process {pid} still alive, force killing...")
+                    try:
+                        pgid = os.getpgid(pid)
+                        os.killpg(pgid, signal.SIGKILL)
+                    except:
+                        os.kill(pid, signal.SIGKILL)
                     time.sleep(0.3)
                 except ProcessLookupError:
                     pass  # Process already terminated
 
         # Verify port is now free
-        time.sleep(0.3)
+        time.sleep(0.5)
         in_use, _ = check_port_in_use(port)
         if not in_use:
             print_flush(f"✅ Port {port} is now free")
@@ -625,7 +779,9 @@ def _start_frontend_npx(frontend_port, backend_port):
     """Start frontend using published package via npx (production mode)"""
 
     # Check if npx is available
-    npx_path = shutil.which("npx")
+    resolver = ExecutableResolver()
+    npx_path = resolver.resolve_npx() or shutil.which("npx")
+
     if not npx_path:
         print_flush("❌ Error: 'npx' command not found!")
         print_flush("   Please install Node.js and npm first.")
@@ -653,7 +809,7 @@ def _start_frontend_npx(frontend_port, backend_port):
     if os.name == "nt":
         env["PYTHONLEGACYWINDOWSSTDIO"] = "0"
 
-    npx_cmd = shutil.which("npx") or "npx"
+    npx_cmd = npx_path or "npx"
 
     # Process group configuration
     popen_kwargs = {