Merge branch 'main' into feature/implement_copy_import_path

Author: s-kai273

.vscodeignore

@@ -1,5 +1,6 @@
 **/*.map
 **/*.analyzer.html
+**/.env
 *.vsix
 .editorconfig
 .env

package-lock.json

@@ -47,7 +47,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.94.0-20240918"
+        "vscode": "^1.95.0"
     },
     "enableTelemetry": false,
     "keywords": [
@@ -1479,6 +1479,107 @@
                 "fileMatch": "meta.yaml",
                 "url": "./schemas/conda-meta.json"
             }
+        ],
+        "languageModelTools": [
+            {
+                "name": "get_python_environment_details",
+                "displayName": "Get Python Environment Info",
+                "userDescription": "%python.languageModelTools.get_python_environment_details.userDescription%",
+                "modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. The details returned include the 1. Type of Environment (conda, venv, etec), 2. Version of Python, 3. List of all installed packages with their versions. ALWAYS call configure_python_environment before using this tool.",
+                "toolReferenceName": "pythonGetEnvironmentInfo",
+                "tags": [
+                    "enable_other_tool_configure_python_environment"
+                ],
+                "icon": "$(snake)",
+                "canBeReferencedInPrompt": true,
+                "inputSchema": {
+                    "type": "object",
+                    "properties": {
+                        "resourcePath": {
+                            "type": "string",
+                            "description": "The path to the Python file or workspace to get the environment information for."
+                        }
+                    },
+                    "required": []
+                },
+                "when": "!pythonEnvExtensionInstalled"
+            },
+            {
+                "name": "get_python_executable_details",
+                "displayName": "Get Python Executable",
+                "userDescription": "%python.languageModelTools.get_python_executable_details.userDescription%",
+                "modelDescription": "This tool will retrieve the details of the Python Environment for the specified file or workspace. ALWAYS use this tool before executing any Python command in the terminal. This tool returns the details of how to construct the fully qualified path and or command including details such as arguments required to run Python in a terminal. Note: Instead of executing `python --version` or `python -c 'import sys; print(sys.executable)'`, use this tool to get the Python executable path to replace the `python` command. E.g. instead of using `python -c 'import sys; print(sys.executable)'`, use this tool to build the command `conda run -n <env_name> -c 'import sys; print(sys.executable)'`. ALWAYS call configure_python_environment before using this tool.",
+                "toolReferenceName": "pythonExecutableCommand",
+                "tags": [
+                    "enable_other_tool_configure_python_environment"
+                ],
+                "icon": "$(terminal)",
+                "canBeReferencedInPrompt": true,
+                "inputSchema": {
+                    "type": "object",
+                    "properties": {
+                        "resourcePath": {
+                            "type": "string",
+                            "description": "The path to the Python file or workspace to get the executable information for. If not provided, the current workspace will be used. Where possible pass the path to the file or workspace."
+                        }
+                    },
+                    "required": []
+                },
+                "when": "!pythonEnvExtensionInstalled"
+            },
+            {
+                "name": "install_python_packages",
+                "displayName": "Install Python Package",
+                "userDescription": "%python.languageModelTools.install_python_packages.userDescription%",
+                "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment. ALWAYS call configure_python_environment before using this tool.",
+                "toolReferenceName": "pythonInstallPackage",
+                "tags": [
+                    "enable_other_tool_configure_python_environment"
+                ],
+                "icon": "$(package)",
+                "canBeReferencedInPrompt": true,
+                "inputSchema": {
+                    "type": "object",
+                    "properties": {
+                        "packageList": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            },
+                            "description": "The list of packages to install."
+                        },
+                        "resourcePath": {
+                            "type": "string",
+                            "description": "The path to the Python file or workspace into which the packages are installed. If not provided, the current workspace will be used. Where possible pass the path to the file or workspace."
+                        }
+                    },
+                    "required": [
+                        "packageList"
+                    ]
+                },
+                "when": "!pythonEnvExtensionInstalled"
+            },
+            {
+                "name": "configure_python_environment",
+                "displayName": "Configure Python Environment",
+                "modelDescription": "This tool configures a Python environment in the given workspace. ALWAYS Use this tool to set up the user's chosen environment and ALWAYS call this tool before using any other Python related tools.",
+                "userDescription": "%python.languageModelTools.configure_python_environment.userDescription%",
+                "toolReferenceName": "configurePythonEnvironment",
+                "tags": [],
+                "icon": "$(gear)",
+                "canBeReferencedInPrompt": true,
+                "inputSchema": {
+                    "type": "object",
+                    "properties": {
+                        "resourcePath": {
+                            "type": "string",
+                            "description": "The path to the Python file or workspace for which a Python Environment needs to be configured."
+                        }
+                    },
+                    "required": []
+                },
+                "when": "!pythonEnvExtensionInstalled"
+            }
         ]
     },
     "copilot": {
@@ -1571,7 +1672,7 @@
         "@types/sinon": "^17.0.3",
         "@types/stack-trace": "0.0.29",
         "@types/tmp": "^0.0.33",
-        "@types/vscode": "^1.93.0",
+        "@types/vscode": "^1.95.0",
         "@types/which": "^2.0.1",
         "@types/winreg": "^1.2.30",
         "@types/xml2js": "^0.4.2",

package.json

@@ -1,12 +1,16 @@
 {
     "python.command.python.startTerminalREPL.title": "Start Terminal REPL",
+    "python.languageModelTools.get_python_environment_details.userDescription": "Get information for a Python Environment, such as Type, Version, Packages, and more.",
+    "python.languageModelTools.install_python_packages.userDescription": "Installs Python packages in a Python Environment.",
+    "python.languageModelTools.get_python_executable_details.userDescription": "Get executable info for a Python Environment",
+    "python.languageModelTools.configure_python_environment.userDescription": "Configure a Python Environment for a workspace",
     "python.command.python.startNativeREPL.title": "Start Native Python REPL",
     "python.command.python.createEnvironment.title": "Create Environment...",
     "python.command.python.createNewFile.title": "New Python File",
     "python.command.python.createTerminal.title": "Create Terminal",
     "python.command.python.execInTerminal.title": "Run Python File in Terminal",
     "python.command.python.execInTerminalIcon.title": "Run Python File",
-    "python.command.python.execInDedicatedTerminal.title": "Run Python File in Dedicated Terminal", 
+    "python.command.python.execInDedicatedTerminal.title": "Run Python File in Dedicated Terminal",
     "python.command.python.setInterpreter.title": "Select Interpreter",
     "python.command.python.clearWorkspaceInterpreter.title": "Clear Workspace Interpreter Setting",
     "python.command.python.viewOutput.title": "Show Output",

package.nls.json

@@ -98,11 +98,20 @@ def run_process(args: Sequence[str], error_message: str) -> None:
         raise VenvError(error_message) from exc
 
 
+def get_win_venv_path(name: str) -> str:
+    venv_dir = CWD / name
+    # If using MSYS2 Python, the Python executable is located in the 'bin' directory.
+    if file_exists(venv_dir / "bin" / "python.exe"):
+        return os.fspath(venv_dir / "bin" / "python.exe")
+    else:
+        return os.fspath(venv_dir / "Scripts" / "python.exe")
+
+
 def get_venv_path(name: str) -> str:
     # See `venv` doc here for more details on binary location:
     # https://docs.python.org/3/library/venv.html#creating-virtual-environments
     if sys.platform == "win32":
-        return os.fspath(CWD / name / "Scripts" / "python.exe")
+        return get_win_venv_path(name)
     else:
         return os.fspath(CWD / name / "bin" / "python")
 

python_files/create_venv.py

@@ -53,13 +53,13 @@ def __str__(self):
         result = ""
         # For non-windows allow recent_command history.
         if sys.platform != "win32":
-            result = "{command_line}{command_finished}{prompt_started}{prompt}{command_start}{command_executed}".format(
+            result = "{command_executed}{command_line}{command_finished}{prompt_started}{prompt}{command_start}".format(
+                command_executed="\x1b]633;C\x07",
                 command_line="\x1b]633;E;" + str(get_last_command()) + "\x07",
                 command_finished="\x1b]633;D;" + str(exit_code) + "\x07",
                 prompt_started="\x1b]633;A\x07",
                 prompt=original_ps1,
                 command_start="\x1b]633;B\x07",
-                command_executed="\x1b]633;C\x07",
             )
         else:
             result = "{command_finished}{prompt_started}{prompt}{command_start}{command_executed}".format(

python_files/pythonrc.py

@@ -122,7 +122,7 @@ def create_gitignore(_p):
 def test_install_packages(install_type):
     importlib.reload(create_venv)
     create_venv.is_installed = lambda _x: True
-    create_venv.file_exists = lambda x: install_type in x
+    create_venv.file_exists = lambda x: install_type in str(x)
 
     pip_upgraded = False
     installing = None

python_files/tests/test_create_venv.py

@@ -17,7 +17,7 @@ def test_decoration_success():
     if sys.platform != "win32" and (not is_wsl):
         assert (
             result
-            == "\x1b]633;E;None\x07\x1b]633;D;0\x07\x1b]633;A\x07>>> \x1b]633;B\x07\x1b]633;C\x07"
+            == "\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;0\x07\x1b]633;A\x07>>> \x1b]633;B\x07"
         )
     else:
         pass
@@ -32,7 +32,7 @@ def test_decoration_failure():
     if sys.platform != "win32" and (not is_wsl):
         assert (
             result
-            == "\x1b]633;E;None\x07\x1b]633;D;1\x07\x1b]633;A\x07>>> \x1b]633;B\x07\x1b]633;C\x07"
+            == "\x1b]633;C\x07\x1b]633;E;None\x07\x1b]633;D;1\x07\x1b]633;A\x07>>> \x1b]633;B\x07"
         )
     else:
         pass

python_files/tests/test_shell_integration.py

@@ -12,8 +12,6 @@
 from types import TracebackType
 from typing import Dict, List, Optional, Set, Tuple, Type, Union
 
-from packaging.version import Version
-
 # Adds the scripts directory to the PATH as a workaround for enabling shell for test execution.
 path_var_name = "PATH" if "PATH" in os.environ else "Path"
 os.environ[path_var_name] = (
@@ -326,6 +324,13 @@ def send_run_data(raw_data, test_run_pipe):
         )
         import coverage
 
+        # insert "python_files/lib/python" into the path so packaging can be imported
+        python_files_dir = pathlib.Path(__file__).parent.parent
+        bundled_dir = pathlib.Path(python_files_dir / "lib" / "python")
+        sys.path.append(os.fspath(bundled_dir))
+
+        from packaging.version import Version
+
         coverage_version = Version(coverage.__version__)
         # only include branches if coverage version is 7.7.0 or greater (as this was when the api saves)
         if coverage_version >= Version("7.7.0"):

python_files/unittestadapter/execution.py

@@ -13,7 +13,6 @@
 from typing import TYPE_CHECKING, Any, Dict, Generator, Literal, TypedDict
 
 import pytest
-from packaging.version import Version
 
 if TYPE_CHECKING:
     from pluggy import Result
@@ -443,6 +442,13 @@ def pytest_sessionfinish(session, exitstatus):
         # load the report and build the json result to return
         import coverage
 
+        # insert "python_files/lib/python" into the path so packaging can be imported
+        python_files_dir = pathlib.Path(__file__).parent.parent
+        bundled_dir = pathlib.Path(python_files_dir / "lib" / "python")
+        sys.path.append(os.fspath(bundled_dir))
+
+        from packaging.version import Version
+
         coverage_version = Version(coverage.__version__)
         global INCLUDE_BRANCHES
         # only include branches if coverage version is 7.7.0 or greater (as this was when the api saves)