Autocomplete frontend fixes #583

dlqqq · 2024-01-16T19:02:50Z

Description

I've structured this branch to be easy to review; reviewers should be able to follow this branch commit-by-commit.

Removes duplicate definition of plugin
Renames a lot of variables to be more similar to their function / type
- inlineCompletionProvider (plugin) => completionPlugin
- jupyternautStatus (plugin) => statusItemPlugin
- IJupyternautStatus (token + interface) => IJaiStatusItem
- I removed the references to Jupyternaut because that plugin is not specific to Jupyternaut. Its functional purpose is to serve as a status item for Jupyter AI.
Fix issue where users are not able to edit settings on a fresh installation

Have the autocomplete feature (but not the plugin) disabled by default

dlqqq · 2024-01-17T01:54:20Z

@krassowski I suddenly ran into some issues while developing my branch. I'm not sure that it's due to any code change from my end however, since none of my console.log() statements are reached when I add them to the completion plugin source (completions/provider.ts), even at the top-level scope. 🤔

Specifically, I'm seeing this error in the console, which occurs before completionPlugin.activate() is called:

When I try bumping the version of @jupyterlab/completer to 4.1.0-beta.0, I am no longer able to build the project:

Just wanted to check in to see if you knew a quick fix for this. No pressure though; I can figure this out myself tomorrow.

dlqqq · 2024-01-17T18:11:40Z

I've tried fixing my dependencies by using only JupyterLab v4.1.0-beta.0 packages (referencing the staging manifest in jupyterlab/staging/package.json to get the correct versions). This should work, but Webpack still keeps thinking that I have jupyterlab==4.0.* installed locally:

krassowski · 2024-01-17T18:14:50Z

What version do you see in help menu -> about?

dlqqq · 2024-01-17T18:40:43Z

v4.1.0b0 🤔

dlqqq · 2024-01-17T19:52:56Z

I've pushed the work that I've gotten done so far. Given that I still don't have an explanation for why I'm unable to build this branch now, I admit that it may just be an error with my recent code changes, and that the warnings may be unrelated.

I have to take a quick break to patch the Cohere provider and then cut a patch release. Will be back tomorrow. 👋

krassowski

I pulled your changes and was able to build both ff197cf and cfa8144 (after installing langchain-community dependency) without an issue. The former worked well, but cfa8144 introduces a bug because you are attempting to load the settings for @jupyterlab/completer-extension:inline-completer too early, which results in:

jupyterlab/completer-extension:inline-completer has no transformers yet

error.

As for your build issue, I suspect that you either:

have some stale artefacts in packages/jupyter-ai/jupyter_ai/labextension/static/
have a broken state in node_modules (e.g. due to interrupted install or such).

Force-removing them followed by clean install and build will likely help, but if not I would then recommend trying in a new clean environment.

packages/jupyter-ai/src/completions/plugin.ts

dlqqq · 2024-01-18T18:19:18Z

@krassowski I was actually able to build the branch as of the latest commit yesterday, but I misspoke because I was really tired that afternoon. My comment was in reference to the console warnings I am still seeing but now appear to be unrelated.

I replied to your explanation above for why this branch is failing at runtime, let's continue the discussion there. 🤗

packages/jupyter-ai/src/completions/plugin.ts

dlqqq · 2024-01-19T19:02:07Z

@krassowski

This PR is ready for review. Here's a quick demo video of what it looks like.

Screen.Recording.2024-01-19.at.10.51.19.AM.mov

packages/jupyter-ai/package.json

dlqqq · 2024-01-19T19:21:38Z

Once this is merged, I will rebase the autocomplete branch and do a final review. If everything looks good, I'll merge and cut a pre-release. 👍

krassowski

Some tiny suggestions

packages/jupyter-ai/src/completions/plugin.ts

packages/jupyter-ai/package.json

packages/jupyter-ai/src/components/statusbar-item.tsx

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

dlqqq · 2024-01-19T20:51:36Z

@krassowski Thanks for the edits! I addressed your comments above. 👍

krassowski

Thank you @dlqqq!

* remove duplicate definition of inline completion provider * rename completion variables, plugins, token to be more accurate * abbreviate JupyterAIInlineProvider => JaiInlineProvider * bump @jupyterlab/completer and typescript * WIP: fix Jupyter AI completion settings * Fix issues with settings population * read from settings directly instead of using a cache * disable Jupyter AI completion by default * improve completion plugin menu items * revert unnecessary edits to package manifest * Update packages/jupyter-ai/src/components/statusbar-item.tsx Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com> * tweak wording --------- Co-authored-by: krassowski <5832902+krassowski@users.noreply.github.com>

* Inline code completions (#465) * Draft inline completions implementation (server side) * Implement inline completion provider (front) * Add default debounce delay and error handling (front) * Add `gpt-3.5-turbo-instruct` because text- models are deprecated. OpenAI specifically recommends using `gpt-3.5-turbo-instruct` in favour of text-davinci, text-ada, etc. See: https://platform.openai.com/docs/deprecations/ * Improve/fix prompt template and add simple post-processing * Handle missing `registerInlineProvider`, handle no model in name * Remove IPython mention to avoid confusing languages * Disable suggestions in markdown, move language logic * Remove unused background and clip path from jupyternaut * Implement toggling the AI completer via statusbar item also adds the icon for provider re-using jupyternaut icon * Implement streaming support * Translate ipython to python for models, remove log * Move `BaseLLMHandler` to `/completions` rename to `LLMHandlerMixin` * Move frontend completions code to `/completions` * Make `IStatusBar` required for now, lint * Simplify inline completion backend (#553) * do not import from pydantic directly * refactor inline completion backend * Autocomplete frontend fixes (#583) * remove duplicate definition of inline completion provider * rename completion variables, plugins, token to be more accurate * abbreviate JupyterAIInlineProvider => JaiInlineProvider * bump @jupyterlab/completer and typescript * WIP: fix Jupyter AI completion settings * Fix issues with settings population * read from settings directly instead of using a cache * disable Jupyter AI completion by default * improve completion plugin menu items * revert unnecessary edits to package manifest * Update packages/jupyter-ai/src/components/statusbar-item.tsx Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com> * tweak wording --------- Co-authored-by: krassowski <5832902+krassowski@users.noreply.github.com> --------- Co-authored-by: David L. Qiu <david@qiu.dev>

krassowski · 2024-01-21T13:57:36Z

packages/jupyter-ai/src/completions/plugin.ts

+          ? `Disable completions in ${displayName(language)}`
+          : 'Disable completions in <language> files';


Ah, this switch gave me confusion as a user. All other UI elements in JupyterLab use positive mode.

* Inline code completions (jupyterlab#465) * Draft inline completions implementation (server side) * Implement inline completion provider (front) * Add default debounce delay and error handling (front) * Add `gpt-3.5-turbo-instruct` because text- models are deprecated. OpenAI specifically recommends using `gpt-3.5-turbo-instruct` in favour of text-davinci, text-ada, etc. See: https://platform.openai.com/docs/deprecations/ * Improve/fix prompt template and add simple post-processing * Handle missing `registerInlineProvider`, handle no model in name * Remove IPython mention to avoid confusing languages * Disable suggestions in markdown, move language logic * Remove unused background and clip path from jupyternaut * Implement toggling the AI completer via statusbar item also adds the icon for provider re-using jupyternaut icon * Implement streaming support * Translate ipython to python for models, remove log * Move `BaseLLMHandler` to `/completions` rename to `LLMHandlerMixin` * Move frontend completions code to `/completions` * Make `IStatusBar` required for now, lint * Simplify inline completion backend (jupyterlab#553) * do not import from pydantic directly * refactor inline completion backend * Autocomplete frontend fixes (jupyterlab#583) * remove duplicate definition of inline completion provider * rename completion variables, plugins, token to be more accurate * abbreviate JupyterAIInlineProvider => JaiInlineProvider * bump @jupyterlab/completer and typescript * WIP: fix Jupyter AI completion settings * Fix issues with settings population * read from settings directly instead of using a cache * disable Jupyter AI completion by default * improve completion plugin menu items * revert unnecessary edits to package manifest * Update packages/jupyter-ai/src/components/statusbar-item.tsx Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com> * tweak wording --------- Co-authored-by: krassowski <5832902+krassowski@users.noreply.github.com> --------- Co-authored-by: David L. Qiu <david@qiu.dev>

dlqqq added 2 commits January 11, 2024 09:15

remove duplicate definition of inline completion provider

d7033dd

rename completion variables, plugins, token to be more accurate

3948cae

dlqqq added bug Something isn't working enhancement New feature or request labels Jan 16, 2024

abbreviate JupyterAIInlineProvider => JaiInlineProvider

ff197cf

bump @jupyterlab/completer and typescript

a8dd79c

WIP: fix Jupyter AI completion settings

cfa8144

krassowski reviewed Jan 18, 2024

View reviewed changes

packages/jupyter-ai/src/completions/plugin.ts Outdated Show resolved Hide resolved

Fix issues with settings population

897ec12

krassowski reviewed Jan 19, 2024

View reviewed changes

packages/jupyter-ai/src/completions/plugin.ts Outdated Show resolved Hide resolved

dlqqq added 3 commits January 19, 2024 10:25

read from settings directly instead of using a cache

b38e149

disable Jupyter AI completion by default

aad63dd

improve completion plugin menu items

9a4d43f

dlqqq changed the title ~~[WIP] Autocomplete frontend fixes~~ Autocomplete frontend fixes Jan 19, 2024

dlqqq marked this pull request as ready for review January 19, 2024 19:03

krassowski reviewed Jan 19, 2024

View reviewed changes

packages/jupyter-ai/package.json Show resolved Hide resolved

revert unnecessary edits to package manifest

07827f6

dlqqq force-pushed the autocomplete-frontend-tweaks branch from ee7b9cd to 07827f6 Compare January 19, 2024 19:11

krassowski reviewed Jan 19, 2024

View reviewed changes

dlqqq and others added 2 commits January 19, 2024 12:47

Update packages/jupyter-ai/src/components/statusbar-item.tsx

77d7017

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

tweak wording

a168433

krassowski approved these changes Jan 19, 2024

View reviewed changes

dlqqq merged commit 476c7d2 into jupyterlab:autocomplete Jan 19, 2024
8 checks passed

krassowski reviewed Jan 21, 2024

View reviewed changes

dlqqq mentioned this pull request Jan 30, 2024

Inline completion support #582

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Autocomplete frontend fixes #583

Autocomplete frontend fixes #583

dlqqq commented Jan 16, 2024 •

edited

Loading

dlqqq commented Jan 17, 2024 •

edited

Loading

dlqqq commented Jan 17, 2024

krassowski commented Jan 17, 2024

dlqqq commented Jan 17, 2024

dlqqq commented Jan 17, 2024

krassowski left a comment

dlqqq commented Jan 18, 2024

dlqqq commented Jan 19, 2024

dlqqq commented Jan 19, 2024

krassowski left a comment

dlqqq commented Jan 19, 2024

krassowski left a comment

krassowski Jan 21, 2024

		? `Disable completions in ${displayName(language)}`
		: 'Disable completions in <language> files';

Autocomplete frontend fixes #583

Autocomplete frontend fixes #583

Conversation

dlqqq commented Jan 16, 2024 • edited Loading

Description

dlqqq commented Jan 17, 2024 • edited Loading

dlqqq commented Jan 17, 2024

krassowski commented Jan 17, 2024

dlqqq commented Jan 17, 2024

dlqqq commented Jan 17, 2024

krassowski left a comment

Choose a reason for hiding this comment

dlqqq commented Jan 18, 2024

dlqqq commented Jan 19, 2024

dlqqq commented Jan 19, 2024

krassowski left a comment

Choose a reason for hiding this comment

dlqqq commented Jan 19, 2024

krassowski left a comment

Choose a reason for hiding this comment

krassowski Jan 21, 2024

Choose a reason for hiding this comment

dlqqq commented Jan 16, 2024 •

edited

Loading

dlqqq commented Jan 17, 2024 •

edited

Loading