Improvement: Pass along python interpreter to jedi-language-server #22466

johnhany97 · 2023-11-13T16:21:15Z

Before this PR

Overriding the Python interpreter to a different environment that isn't the current globally-activated base environment would yield no completions when Jedi is used as the underlying language server.

Example stackoverflow question hitting the same issue.

After this PR

We now pass along the interpreter path to jedi-language-server as part of the initial options under workspace.environmentPath (ref)

karthiknadig · 2023-11-13T18:53:22Z

src/client/activation/jedi/analysisOptions.ts

@@ -76,6 +79,7 @@ export class JediLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
            },
            workspace: {
                extraPaths: distinctExtraPaths,
+                environmentPath: this.interpreter?.envPath,


@karrtikr is this the right value to pass here ?

Do you mean to pass the path to the environment folder here? For eg. this carries the path to .venv folder. If that's the case this looks good, but I'm not clear on what this is supposed to carry.

It's indeed supposed to be the path to the environment. From briefly digging into the Jedi codebase, it seems to either expect the environment folder, or the bin/python executable within it.

karthiknadig · 2023-11-13T18:54:11Z

@johnhany97 Can you sign the CLA? we can't merge this without it.

karrtikr

Please create an issue corresponding to this PR that you're attempting to solve.

karrtikr · 2023-11-13T19:05:15Z

src/client/activation/jedi/analysisOptions.ts

@@ -76,6 +79,7 @@ export class JediLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
            },
            workspace: {
                extraPaths: distinctExtraPaths,
+                environmentPath: this.interpreter?.envPath,


Do you mean to pass the path to the environment folder here? For eg. this carries the path to .venv folder. If that's the case this looks good, but I'm not clear on what this is supposed to carry.

src/test/activation/jedi/jediAnalysisOptions.unit.test.ts

johnhany97 · 2023-11-14T22:49:46Z

I'll make sure to create an issue detailing the issue I saw tomorrow morning, and will sign the CLA once my company confirms I'm allowed to sign (should know by EOW). I appreciate the speedy review, and will revert back shortly.

johnhany97 · 2023-11-23T17:38:57Z

@microsoft-github-policy-service agree

karrtikr

LGTM if we are able to verify the fix works, i.e Jedi continues to work for global interpreters and environments and when switching between them.

…from upstream Merge pull request #277 from posit-dev/merge/2023.22 Merge vscode-python 2023.22 from upstream -------------------- Commit message for posit-dev/positron-python@2e3ea32: handle new upstream `deprecated` response upon parser error -------------------- Commit message for posit-dev/positron-python@d50c326: Update yarn.lock -------------------- Commit message for posit-dev/positron-python@105bf9d: Merge commit 'a0cddbdf0939729cdb82dca2d129433ad475f51e' -------------------- Commit message for microsoft/vscode-python@a0cddbd: bump-release-2023.22 (microsoft/vscode-python#22587) bump to release version 2023.22 and update package.json -------------------- Commit message for microsoft/vscode-python@5302d0e: Revert unsuccessful REPL decoration fix and disable for windows (microsoft/vscode-python#22578) Reverting microsoft/vscode-python#22572 since it is producing color decoration on weird Python REPL spot for Windows pwsh users, and disable decoration entirely for Windows pwsh users temporarily while trying to fix specific problem. Disable feature for stable. Refer: microsoft/vscode-python#22546 microsoft/vscode-python#22535 -------------------- Commit message for microsoft/vscode-python@bffc9b3: Fix shell integration decoration bug for Windows pwsh (microsoft/vscode-python#22572) Attempt to fix colorless and randomized circle decoration for Python REPL usage by Windows Powershell users. Resolves: microsoft/vscode-python#22546 microsoft/vscode-python#22535 -------------------- Commit message for microsoft/vscode-python@e1b54d0: fix no test id provided for pytest run (microsoft/vscode-python#22569) fixes microsoft/vscode-python#22567 Now if a user tries to click the "run" button a empty folder (ie a folder with no tests in it) it will just run pytest with no testIds as args and notify the user. -------------------- Commit message for microsoft/vscode-python@61fcf3a: Properly build deactivate commands for powershell (microsoft/vscode-python#22570) For microsoft/vscode-python#20950 -------------------- Commit message for microsoft/vscode-python@db6e15e: Do not throw if initializing deactivate script fails (microsoft/vscode-python#22566) For microsoft/vscode-python#20950 -------------------- Commit message for microsoft/vscode-python@caa50dc: Fix shell integration decoration for windows pwsh (microsoft/vscode-python#22560) Attempting to fix shell integration decoration glitch for windows pwsh when using Python REPL from VS Code. Resolves: microsoft/vscode-python#22546 microsoft/vscode-python#22535 -------------------- Commit message for microsoft/vscode-python@3efb54f: White space after REPL prompt (microsoft/vscode-python#22549) There should be white space after new REPL prompt that I override for purpose of shell integration. Resolves: microsoft/vscode-python#22548 -------------------- Commit message for microsoft/vscode-python@261ae66: Improvement: Pass along python interpreter to jedi-language-server (microsoft/vscode-python#22466) Fixes microsoft/vscode-python#22495 ## Before this PR Overriding the Python interpreter to a different environment that isn't the current globally-activated base environment would yield no completions when Jedi is used as the underlying language server. Example [stackoverflow question](https://stackoverflow.com/questions/62018436/vscode-intellisense-code-completion-doesnt-work-when-i-am-not-in-base-conda-e) hitting the same issue. ## After this PR We now pass along the interpreter path to jedi-language-server as part of the initial options under `workspace.environmentPath` ([ref](https://github.com/pappasam/jedi-language-server/#workspaceenvironmentpath)) -------------------- Commit message for microsoft/vscode-python@1639753: switch to conditional error message on check for UUID and port during pytest config (microsoft/vscode-python#22534) fixes microsoft/vscode-python#19857 -------------------- Commit message for microsoft/vscode-python@9a5363c: Resolve test suite discovery import errors due to path ordering (microsoft/vscode-python#22454) [Issue microsoft/vscode-python#22453](microsoft/vscode-python#22453) - Once starting to run discovery, add the projects root path to PATH at index 0 so that any further imports will use the projects root directory and not reference the incorrect directory. - Since the test suite only allows the start_dir to be one directory deep, we can conclude that if the start_dir is not "." or contains a "/", that we need to add that start_dir's parent to PATH. Otherwise, we simply add the start_dir to PATH. -------------------- Commit message for microsoft/vscode-python@eb96141: Use shell integration to denote success/failure (microsoft/vscode-python#22487) Resolves: microsoft/vscode-python#22486 Use shell integration to denote success/failure in Python REPL launched from VS Code. This would mean having the blue or red decorators based on whether or not user's command succeeded. -------------------- Commit message for microsoft/vscode-python@f6e1338: Use worker threads for fetching conda environments and interpreter related info (microsoft/vscode-python#22481) -------------------- Commit message for microsoft/vscode-python@3c552f9: Show warning and allow user to turn off smart send for deprecated Python code (microsoft/vscode-python#22353) Resolves: microsoft/vscode-python#22341 microsoft/vscode-python#22340 Showing warning message after detecting user is on Python file with deprecated Python code, and are attempting to run smart send via shift+enter action. Allow user to turn off this via workspace setting. --------- Co-authored-by: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Co-authored-by: Kartik Raj <karraj@microsoft.com> -------------------- Commit message for microsoft/vscode-python@ef983f4: Bump `vscode-tas-client` and fix tests (microsoft/vscode-python#22493) Closes microsoft/vscode-python#22461 Sinon requires the actual object definition, so we need to point it to the module file that actually has the function. -------------------- Commit message for microsoft/vscode-python@9298b2c: Bump dessant/lock-threads from 4 to 5 (microsoft/vscode-python#22474) Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 4 to 5. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/dessant/lock-threads/releases">dessant/lock-threads's releases</a>.</em></p> <blockquote> <h2>v5.0.0</h2> <p>Learn more about this release from the <a href="https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md#changelog">changelog</a>.</p> <h2>v4.0.1</h2> <p>Learn more about this release from the <a href="https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md#changelog">changelog</a>.</p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md">dessant/lock-threads's changelog</a>.</em></p> <blockquote> <h2><a href="https://github.com/dessant/lock-threads/compare/v4.0.1...v5.0.0">5.0.0</a> (2023-11-14)</h2> <h3>⚠ BREAKING CHANGES</h3> <ul> <li>Discussions are also processed by default, set the <code>process-only</code> input parameter to preserve the old behavior</li> </ul> <pre lang="yaml"><code> steps: - uses: dessant/lock-threads@v5 with: process-only: 'issues, prs' </code></pre> <ul> <li>the action now requires Node.js 20</li> </ul> <h3>Features</h3> <ul> <li>lock discussions (<a href="https://github.com/dessant/lock-threads/commit/0a0976f3ded51c88c6128dd96dd115c9f14fa764">0a0976f</a>), closes <a href="https://redirect.github.com/dessant/lock-threads/issues/25">#25</a></li> </ul> <h3>Bug Fixes</h3> <ul> <li>update dependencies (<a href="https://github.com/dessant/lock-threads/commit/5a25b54eae3e7a5580d09ef0f7cbc5b18376db67">5a25b54</a>)</li> </ul> <h3><a href="https://github.com/dessant/lock-threads/compare/v4.0.0...v4.0.1">4.0.1</a> (2023-06-12)</h3> <h3>Bug Fixes</h3> <ul> <li>retry and throttle GitHub API requests (<a href="https://github.com/dessant/lock-threads/commit/1618e91da69b9fe614fb9837ac673ea4600eb529">1618e91</a>), closes <a href="https://redirect.github.com/dessant/lock-threads/issues/35">#35</a></li> </ul> <h2><a href="https://github.com/dessant/lock-threads/compare/v3.0.0...v4.0.0">4.0.0</a> (2022-12-04)</h2> <h3>⚠ BREAKING CHANGES</h3> <ul> <li>the action now requires Node.js 16</li> </ul> <h3>Bug Fixes</h3> <ul> <li>update dependencies (<a href="https://github.com/dessant/lock-threads/commit/38e918558115222435d26c0639870cdbe3572929">38e9185</a>)</li> <li>update docs (<a href="https://github.com/dessant/lock-threads/commit/32986e26965060a85db09e98ef7e5958c961ae84">32986e2</a>)</li> </ul> <h2><a href="https://github.com/dessant/lock-threads/compare/v2.1.2...v3.0.0">3.0.0</a> (2021-09-27)</h2> <h3>⚠ BREAKING CHANGES</h3> <ul> <li>input parameter names have changed</li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/dessant/lock-threads/commit/d42e5f49803f3c4e14ffee0378e31481265dda22"><code>d42e5f4</code></a> chore(release): 5.0.0</li> <li><a href="https://github.com/dessant/lock-threads/commit/d8da6c1485cbe748b5b632f1a52cf2a52941cbf9"><code>d8da6c1</code></a> chore: update package</li> <li><a href="https://github.com/dessant/lock-threads/commit/c1eab4b45f97073a922fbd226afab0e34a70cf5f"><code>c1eab4b</code></a> chore: update workflow</li> <li><a href="https://github.com/dessant/lock-threads/commit/0a0976f3ded51c88c6128dd96dd115c9f14fa764"><code>0a0976f</code></a> feat: lock discussions</li> <li><a href="https://github.com/dessant/lock-threads/commit/53f3f0c0b9158bece84746885adc5f4bf2dd1ddc"><code>53f3f0c</code></a> chore: migrate package to ESM</li> <li><a href="https://github.com/dessant/lock-threads/commit/5a25b54eae3e7a5580d09ef0f7cbc5b18376db67"><code>5a25b54</code></a> fix: update dependencies</li> <li>See full diff in <a href="https://github.com/dessant/lock-threads/compare/v4...v5">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=dessant/lock-threads&package-manager=github_actions&previous-version=4&new-version=5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -------------------- Commit message for microsoft/vscode-python@e27185a: Use worker threads for fetching Windows Registry interpreters (microsoft/vscode-python#22479) For microsoft/vscode-python#22146 -------------------- Commit message for microsoft/vscode-python@7a4de92: Use `WorkspaceFolder.name` in addition to workspace folder's basename when resolving `${workspaceFolder:name}` syntax in settings (microsoft/vscode-python#22471) Closes microsoft/vscode-python#22452 -------------------- Commit message for microsoft/vscode-python@fbfa126: Add 3.12 to conda version list (microsoft/vscode-python#22470) -------------------- Commit message for microsoft/vscode-python@47552a3: Install requirements before toml (microsoft/vscode-python#22468) Fixes microsoft/vscode-python#22423 -------------------- Commit message for microsoft/vscode-python@a1fac81: If active editor opened is outside the editor, activate the first workspace (microsoft/vscode-python#22450) For microsoft/vscode-python#22449 -------------------- Commit message for microsoft/vscode-python@b68ddee: Support deactivating virtual environments without user intervention (microsoft/vscode-python#22405) Closes microsoft/vscode-python#22448 Adds deactivate script to `PATH` -------------------- Commit message for microsoft/vscode-python@8d174a8: Fix shell integration API reliability (microsoft/vscode-python#22446) microsoft/vscode-python#22440 It leads to terminals activating forever. -------------------- Commit message for microsoft/vscode-python@1b3c1ea: Adding `Locked` comments to walkthrough commands (microsoft/vscode-python#22432) Adds comments to lock command names for walkthrough localization. Only added Locked comments for walkthrough tiles that are in use and have commands -------------------- Commit message for microsoft/vscode-python@2fc9fea: Revert "Reliably detect whether shell integration is working" (microsoft/vscode-python#22445) Reverts microsoft/vscode-python#22440 It seems reactivating never finishes after this, although this doesn't repro when debugging the extension, have to investigate further. -------------------- Commit message for microsoft/vscode-python@f98caf6: Add consoleTitle to launch.json properties schema (microsoft/vscode-python#22406) consoleTitle is effectively an undocumented feature. pydebug accepts the config key, but vscode will report a problem because it is missing from the schema. see [this debugpy issue](microsoft/debugpy#1178) and [#13040](microsoft/vscode-python#13040) I used the phrase "console or terminal" because I noticed the name was represented on both integratedTerminal and internalConsole. I didn't test externalTerminal. --------- Co-authored-by: Luciana Abud <45497113+luabud@users.noreply.github.com> -------------------- Commit message for microsoft/vscode-python@2a976e3: Reliably detect whether shell integration is working (microsoft/vscode-python#22440) Closes microsoft/vscode-python#22439 Blocked on https://github.com/microsoft/vscode-distro/pull/822 -------------------- Commit message for microsoft/vscode-python@67b4801: Improve shell identifier on case-insensitive system (microsoft/vscode-python#22391) Use case-insensitive regex to remove `.exe` extension. See: microsoft/vscode-python#22036 (comment) -------------------- Commit message for microsoft/vscode-python@7bc45e5: Do not attempt to kill the process if it has already exited (microsoft/vscode-python#22424) Closes microsoft/vscode-python#22420 This bugs seems to have existed every since `rawProcessApi.ts` was created. `proc.killed` can be `false` even after process has exited. -------------------- Commit message for microsoft/vscode-python@f6cfa6e: Remove old code for folder support in interpreter path setting (microsoft/vscode-python#22413) Closes microsoft/vscode-python#12452 Lead-authored-by: Kartik Raj <karraj@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Co-authored-by: John H. Ayad <johnhany97@gmail.com> Co-authored-by: Wasim Lorgat <mwlorgat@gmail.com> Co-authored-by: Shane Saravia <shanesaravia@live.ca> Co-authored-by: Trysten <trysten@sleepyowl.com> Co-authored-by: JamzumSum <zzzzss990315@gmail.com> Co-authored-by: Eleanor Boyd <eleanorboyd@microsoft.com> Co-authored-by: Karthik Nadig <kanadig@microsoft.com> Co-authored-by: Pete Farland <pete.farland@posit.co> Co-authored-by: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Signed-off-by: GitHub <noreply@github.com>

johnhany97 added 2 commits November 13, 2023 16:03

Improvement: Pass along python interpreter to jedi-language-server

1fdd5f2

Test & format

243eeba

karthiknadig reviewed Nov 13, 2023

View reviewed changes

karrtikr reviewed Nov 13, 2023

View reviewed changes

karthiknadig self-assigned this Nov 14, 2023

karthiknadig added the bug Issue identified by VS Code Team member as probable bug label Nov 14, 2023

johnhany97 mentioned this pull request Nov 19, 2023

Code completion doesn't work when Jedi is used without a default activated environment #22495

Closed

johnhany97 added 2 commits November 23, 2023 17:44

Reflect actual values from feedback

091ff29

Merge branch 'main' into jayad/jedi-env

b7cd090

karthiknadig requested review from karrtikr and karthiknadig November 27, 2023 14:55

karrtikr approved these changes Nov 27, 2023

View reviewed changes

karthiknadig approved these changes Nov 28, 2023

View reviewed changes

karthiknadig merged commit 261ae66 into microsoft:main Nov 28, 2023
29 checks passed

johnhany97 deleted the jayad/jedi-env branch November 29, 2023 10:58

CoderDJJD mentioned this pull request Dec 8, 2023

Python Jedi couldn’t connect to Python Language Server #22610

Closed

karthiknadig mentioned this pull request Jan 3, 2024

Jedi InvalidPythonEnvironment error #22659

Closed

seeM mentioned this pull request Jan 31, 2024

Python: InvalidPythonEnvironment on interpreter startup posit-dev/positron#2120

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvement: Pass along python interpreter to jedi-language-server #22466

Improvement: Pass along python interpreter to jedi-language-server #22466

johnhany97 commented Nov 13, 2023 •

edited

Loading

karthiknadig Nov 13, 2023

karrtikr Nov 13, 2023

johnhany97 Nov 14, 2023

karthiknadig commented Nov 13, 2023

karrtikr left a comment

karrtikr Nov 13, 2023

johnhany97 commented Nov 14, 2023

johnhany97 commented Nov 23, 2023

karrtikr left a comment

Improvement: Pass along python interpreter to jedi-language-server #22466

Improvement: Pass along python interpreter to jedi-language-server #22466

Conversation

johnhany97 commented Nov 13, 2023 • edited Loading

Before this PR

After this PR

karthiknadig Nov 13, 2023

Choose a reason for hiding this comment

karrtikr Nov 13, 2023

Choose a reason for hiding this comment

johnhany97 Nov 14, 2023

Choose a reason for hiding this comment

karthiknadig commented Nov 13, 2023

karrtikr left a comment

Choose a reason for hiding this comment

karrtikr Nov 13, 2023

Choose a reason for hiding this comment

johnhany97 commented Nov 14, 2023

johnhany97 commented Nov 23, 2023

karrtikr left a comment

Choose a reason for hiding this comment

johnhany97 commented Nov 13, 2023 •

edited

Loading