Merge branch 'main' into don/diplomatic-mink

Author: DonJayamanne

.vscodeignore

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

package.json

@@ -1534,7 +1534,7 @@
                 "when": "false"
             },
             {
-                "name": "python_install_package",
+                "name": "install_python_package",
                 "displayName": "Install Python Package",
                 "userDescription": "%python.languageModelTools.python_install_package.userDescription%",
                 "modelDescription": "Installs Python packages in the given workspace. Use this tool to install packages in the user's chosen environment.",

python_files/unittestadapter/execution.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/vscode_pytest/__init__.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)

src/client/chat/installPackagesTool.ts

@@ -26,7 +26,7 @@ export interface IInstallPackageArgs {
 }
 
 export class InstallPackagesTool implements LanguageModelTool<IInstallPackageArgs> {
-    public static readonly toolName = 'python_install_package';
+    public static readonly toolName = 'install_python_package';
     constructor(
         private readonly api: PythonExtension['environments'],
         private readonly serviceContainer: IServiceContainer,