Merge pull request #162 from Integration-Automation/dev

Dev

Author: JE-Chen

.github/workflows/dev_python3_10.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   build_dev_version:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/dev_python3_11.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   build_dev_version:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/dev_python3_9.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   build_dev_version:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/stable_python3_10.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   build_stable_version:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/stable_python3_11.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   build_stable_version:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/stable_python3_9.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   build_stable_version:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v3

.gitignore

@@ -116,6 +116,9 @@ dmypy.json
 # User setting
 **/.jeditor
 
+# AI config
+**/.ai_config.json
+
 .idea/misc.xml
 /.idea
 .idea/misc.xml

dev.toml

@@ -6,15 +6,16 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor_dev"
-version = "0.0.224"
+version = "0.0.226"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]
 description = "JEditor is basic but powerful editor include GPT"
 requires-python = ">=3.9"
 license-files = ["LICENSE"]
 dependencies = [
-    "PySide6==6.9.0", "qt-material", "yapf", "frontengine", "pycodestyle", "jedi", "qtconsole"
+    "PySide6==6.9.0", "qt-material", "yapf", "frontengine", "pycodestyle", "jedi",
+    "qtconsole", "langchain_openai", "langchain", "pydantic"
 ]
 classifiers = [
     "Programming Language :: Python :: 3.9",

je_editor/pyside_ui/code/code_process/code_exec.py

@@ -111,7 +111,7 @@ def exec_code(self, exec_file_name, exec_prefix: Union[str, list] = None) -> Non
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 stdin=subprocess.PIPE,
-                shell=True
+                shell=False
             )
             self.still_run_program = True
             # program output message queue thread

je_editor/pyside_ui/code/shell_process/shell_exec.py

@@ -44,8 +44,8 @@ def __init__(
         self.read_program_output_from_thread = None
         self.main_window: EditorWidget = main_window
         self.compiler_path = None
-        self.code_result: [QTextEdit, None] = None
-        self.timer: [QTimer, None] = None
+        self.code_result: Union[QTextEdit, None] = None
+        self.timer: Union[QTimer, None] = None
         self.still_run_shell: bool = True
         self.process = None
         self.run_output_queue: queue = queue.Queue()
@@ -157,7 +157,7 @@ def process_run_over(self):
         if self.after_done_function is not None:
             self.after_done_function()
 
-    # exit program change run flag to false and clean read thread and queue and process
+    # exit program change runs flag to false and clean read thread and queue and process
     def exit_program(self) -> None:
         jeditor_logger.info("ShellManager exit_program")
         self.still_run_shell = False