Update both version

* Fix JupyterLab widget and thread
* Rename Logger and log file
* Add multi language words

Author: JE-Chen

.gitignore

@@ -149,4 +149,5 @@ dmypy.json
 .jeditor
 **/.jeditor
 **/user_setting.*
-bing_cookies.*
+bing_cookies.*
+**/output

dev.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pybreeze_dev"
-version = "1.0.8"
+version = "1.0.10"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]

…eze_ui/extend_multi_language/__init__.py …breeze/extend_multi_language/__init__.pypybreeze/pybreeze_ui/extend_multi_language/__init__.py renamed to pybreeze/extend_multi_language/__init__.py pybreeze/pybreeze_ui/extend_multi_language/__init__.py renamed to pybreeze/extend_multi_language/__init__.py

@@ -270,5 +270,11 @@ def update_english_word_dict():
             "skills_response_label": "Response:",
             "skills_missing_input": "Please enter API URL and Prompt",
             "skills_generating": "Generating...",
+            # JupyterLab GUI
+            "jupyterlab_init": "Initializing...",
+            "jupyterlab_downloading": "Downloading...",
+            "jupyterlab_loading": "Loading...",
+            "jupyterlab_timeout": "JupyterLab Timeout",
+            "jupyterlab_init_failed": "JupyterLab init failed",
         }
     )

…/extend_multi_language/extend_english.py …/extend_multi_language/extend_english.pypybreeze/pybreeze_ui/extend_multi_language/extend_english.py renamed to pybreeze/extend_multi_language/extend_english.py pybreeze/pybreeze_ui/extend_multi_language/extend_english.py renamed to pybreeze/extend_multi_language/extend_english.py

@@ -270,5 +270,11 @@ def update_traditional_chinese_word_dict():
             "skills_response_label": "回傳結果:",
             "skills_missing_input": "請輸入 API URL 和 Prompt",
             "skills_generating": "產生中...",
+            # JupyterLab GUI
+            "jupyterlab_init": "初始化中...",
+            "jupyterlab_downloading": "下載中...",
+            "jupyterlab_loading": "載入中...",
+            "jupyterlab_timeout": "JupyterLab 啟動超時",
+            "jupyterlab_init_failed": "JupyterLab 啟動失敗",
         }
     )

…i_language/extend_traditional_chinese.py …i_language/extend_traditional_chinese.pypybreeze/pybreeze_ui/extend_multi_language/extend_traditional_chinese.py renamed to pybreeze/extend_multi_language/extend_traditional_chinese.py pybreeze/pybreeze_ui/extend_multi_language/extend_traditional_chinese.py renamed to pybreeze/extend_multi_language/extend_traditional_chinese.py

@@ -0,0 +1,8 @@
+from pybreeze.extend_multi_language.extend_english import update_english_word_dict
+from pybreeze.extend_multi_language.extend_traditional_chinese import \
+    update_traditional_chinese_word_dict
+
+
+def update_language_dict():
+    update_traditional_chinese_word_dict()
+    update_english_word_dict()

pybreeze/extend_multi_language/update_language_dict.py

@@ -4,17 +4,15 @@
 from pathlib import Path
 from typing import List, Dict, Type
 
-from pybreeze.utils.logging.logger import pybreeze_logger
-
 environ["LOCUST_SKIP_MONKEY_PATCH"] = "1"
 
 from PySide6.QtCore import QTimer, QCoreApplication
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QApplication, QWidget, QSystemTrayIcon
+from PySide6.QtWidgets import QApplication, QWidget
 from je_editor import EditorMain, language_wrapper
 from qt_material import apply_stylesheet
 
-from pybreeze.pybreeze_ui.extend_multi_language.update_language_dict import update_language_dict
+from pybreeze.extend_multi_language.update_language_dict import update_language_dict
 from pybreeze.pybreeze_ui.menu.build_menubar import add_menu_to_menubar
 from pybreeze.pybreeze_ui.syntax.syntax_extend import \
     syntax_extend_package

pybreeze/pybreeze_ui/editor_main/main_ui.py

@@ -1,8 +1,14 @@
+import os
 import socket
 import subprocess
 import sys
-from PySide6.QtCore import QThread, Signal
 import time
+import traceback
+
+from PySide6.QtCore import QThread, Signal
+from je_editor import language_wrapper
+
+from pybreeze.utils.logging.logger import pybreeze_logger
 
 
 def find_free_port():
@@ -13,41 +19,93 @@ def find_free_port():
     return port
 
 
-class JupyterServerThread(QThread):
-    server_ready = Signal(str)
+def get_venv_python():
+    # 如果在 venv 中
+    if hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
+        return sys.executable
+
+    # 嘗試從常見位置找 venv
+    possible_paths = [
+        os.path.join(os.getcwd(), "venv", "Scripts", "python.exe"),
+        os.path.join(os.getcwd(), ".venv", "Scripts", "python.exe"),
+    ]
 
-    def __init__(self):
-        super().__init__()
-        self.process = None
+    for path in possible_paths:
+        if os.path.exists(path):
+            return path
+
+    raise RuntimeError("找不到 venv 的 python.exe")
+
+
+def is_jupyter_installed(python_exe):
+    result = subprocess.run(
+        [python_exe, "-m", "pip", "show", "jupyterlab"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE
+    )
+    return result.returncode == 0
+
+
+class JupyterLauncherThread(QThread):
+    server_ready = Signal(str)
+    status_update = Signal(str)
+    error_occurred = Signal(str)
 
     def run(self):
-        port = find_free_port()
-
-        cmd = [
-            sys.executable,
-            "-m",
-            "jupyterlab",
-            "--no-browser",
-            f"--ServerApp.port={port}",
-            "--ServerApp.token=",
-            "--ServerApp.password=",
-            "--ServerApp.allow_origin=*",
-            "--ServerApp.disable_check_xsrf=True",
-        ]
-
-        self.process = subprocess.Popen(cmd)
-
-        # 輪詢 port，直到可連
-        while True:
-            try:
-                s = socket.create_connection(("localhost", port), timeout=0.5)
-                s.close()
-                break
-            except OSError:
-                time.sleep(0.1)
-
-        # Server ready，發射 signal
-        self.server_ready.emit(f"http://localhost:{port}/lab")
+        try:
+            python_exe = get_venv_python()
+
+            if not is_jupyter_installed(python_exe):
+                self.status_update.emit(language_wrapper.language_word_dict.get("jupyterlab_downloading"))
+
+                result = subprocess.run([
+                    python_exe,
+                    "-m",
+                    "pip",
+                    "install",
+                    "jupyterlab",
+                    "-U"
+                ], capture_output=True, text=True)
+
+                if result.returncode != 0:
+                    raise RuntimeError(result.stderr)
+
+            self.status_update.emit(language_wrapper.language_word_dict.get("jupyterlab_loading"))
+
+            port = find_free_port()
+
+            self.process = subprocess.Popen([
+                python_exe,
+                "-m",
+                "jupyterlab",
+                "--no-browser",
+                f"--ServerApp.port={port}",
+                "--ServerApp.token=",
+                "--ServerApp.password=",
+                "--ServerApp.allow_origin=*",
+                "--ServerApp.disable_check_xsrf=True",
+            ], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+
+            start_time = time.time()
+
+            while True:
+                if time.time() - start_time > 30:
+                    raise TimeoutError("JupyterLab 啟動超時")
+
+                try:
+                    s = socket.create_connection(("localhost", port), timeout=0.5)
+                    s.close()
+                    break
+                except OSError:
+                    time.sleep(0.2)
+
+            self.server_ready.emit(f"http://localhost:{port}/lab")
+
+        except Exception:
+            err = traceback.format_exc()
+            print(err)
+            self.error_occurred.emit(err)
+            pybreeze_logger.info(err)
 
     def stop(self):
         if self.process:

pybreeze/pybreeze_ui/extend_multi_language/update_language_dict.py

@@ -2,9 +2,11 @@
 
 from PySide6.QtCore import QUrl
 from PySide6.QtWebEngineWidgets import QWebEngineView
-from PySide6.QtWidgets import QApplication, QVBoxLayout, QWidget
+from PySide6.QtWidgets import QApplication, QVBoxLayout, QWidget, QLabel
+from je_editor import language_wrapper
 
-from pybreeze.pybreeze_ui.jupyter_lab_gui.jupyer_lab_thread import JupyterServerThread
+from pybreeze.pybreeze_ui.jupyter_lab_gui.jupyer_lab_thread import JupyterLauncherThread
+from pybreeze.utils.logging.logger import pybreeze_logger
 
 
 class JupyterLabWidget(QWidget):
@@ -14,45 +16,48 @@ def __init__(self):
 
         layout = QVBoxLayout(self)
 
+        self.status_label = QLabel(language_wrapper.language_word_dict.get("jupyterlab_init"))
+        layout.addWidget(self.status_label)
+
         self.browser = QWebEngineView()
+        self.browser.hide()
         layout.addWidget(self.browser)
 
-        # 啟動 Jupyter server thread
-        self.thread = JupyterServerThread()
+        self.thread = JupyterLauncherThread()
+        self.thread.status_update.connect(self.update_status)
         self.thread.server_ready.connect(self.load_lab)
+        self.thread.error_occurred.connect(self.show_error)
         self.thread.start()
 
-    def load_lab(self, url: str):
-        """Load JupyterLab URL into WebEngine"""
-
-        if not url:
-            print("Invalid JupyterLab URL")
-            return
-
-        print("JupyterLab running at:", url)
+    def update_status(self, text):
+        self.status_label.setText(text)
 
-        qurl = QUrl(url)
+    def load_lab(self, url):
+        if self.status_label:
+            self.status_label.setParent(None)
+            self.status_label.deleteLater()
+            self.status_label = None
 
-        if not qurl.isValid():
-            print("Invalid QUrl:", url)
-            return
+        self.browser.setUrl(QUrl(url))
+        self.browser.show()
 
-        self.browser.setUrl(qurl)
+    def show_error(self, msg):
+        self.status_label.setText(language_wrapper.language_word_dict.get("jupyterlab_init_failed"))
+        print(msg)
+        pybreeze_logger.info(msg)
 
     def closeEvent(self, event):
-
-        if hasattr(self, "thread") and self.thread.isRunning():
+        if self.thread.isRunning():
             self.thread.stop()
             self.thread.quit()
             self.thread.wait()
-
         event.accept()
 
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)
 
     win = JupyterLabWidget()
-    win.show()
+    win.showMaximized()
 
     sys.exit(app.exec())