Skip to content

Commit

Permalink
Merge branch 'main' into add-local-model-support
Browse files Browse the repository at this point in the history
  • Loading branch information
3coins authored Nov 17, 2023
2 parents df41a13 + 69d5712 commit 4a6c5aa
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 6 deletions.
33 changes: 31 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,37 @@

<!-- <START NEW CHANGELOG ENTRY> -->

## 2.6.0

([Full Changelog](/~https://github.com/jupyterlab/jupyter-ai/compare/@jupyter-ai/core@2.5.0...2c89d139a8205f1fcd318cfd922e1771df7564ef))

### Enhancements made

- Pydantic v1 and v2 compatibility [#466](/~https://github.com/jupyterlab/jupyter-ai/pull/466) ([@JasonWeill](/~https://github.com/JasonWeill))
- Add step to create a GPT4All cache folder to the docs [#457](/~https://github.com/jupyterlab/jupyter-ai/pull/457) ([@andrii-i](/~https://github.com/andrii-i))
- Add gpt4all local models, including an embedding provider [#454](/~https://github.com/jupyterlab/jupyter-ai/pull/454) ([@3coins](/~https://github.com/3coins))
- Copy edits for Jupyternaut messages [#439](/~https://github.com/jupyterlab/jupyter-ai/pull/439) ([@JasonWeill](/~https://github.com/JasonWeill))

### Bugs fixed

- If model_provider_id or embeddings_provider_id is not associated with models, set it to None [#459](/~https://github.com/jupyterlab/jupyter-ai/pull/459) ([@andrii-i](/~https://github.com/andrii-i))
- Add gpt4all local models, including an embedding provider [#454](/~https://github.com/jupyterlab/jupyter-ai/pull/454) ([@3coins](/~https://github.com/3coins))
- Ensure initials appear in collaborative mode [#443](/~https://github.com/jupyterlab/jupyter-ai/pull/443) ([@aychang95](/~https://github.com/aychang95))

### Documentation improvements

- Add step to create a GPT4All cache folder to the docs [#457](/~https://github.com/jupyterlab/jupyter-ai/pull/457) ([@andrii-i](/~https://github.com/andrii-i))
- Updated docs for config. [#450](/~https://github.com/jupyterlab/jupyter-ai/pull/450) ([@3coins](/~https://github.com/3coins))
- Copy edits for Jupyternaut messages [#439](/~https://github.com/jupyterlab/jupyter-ai/pull/439) ([@JasonWeill](/~https://github.com/JasonWeill))

### Contributors to this release

([GitHub contributors page for this release](/~https://github.com/jupyterlab/jupyter-ai/graphs/contributors?from=2023-11-08&to=2023-11-16&type=c))

[@3coins](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3A3coins+updated%3A2023-11-08..2023-11-16&type=Issues) | [@andrii-i](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Aandrii-i+updated%3A2023-11-08..2023-11-16&type=Issues) | [@aychang95](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Aaychang95+updated%3A2023-11-08..2023-11-16&type=Issues) | [@dlqqq](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Adlqqq+updated%3A2023-11-08..2023-11-16&type=Issues) | [@JasonWeill](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3AJasonWeill+updated%3A2023-11-08..2023-11-16&type=Issues) | [@welcome](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Awelcome+updated%3A2023-11-08..2023-11-16&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 2.5.0

([Full Changelog](/~https://github.com/jupyterlab/jupyter-ai/compare/@jupyter-ai/core@2.4.0...1fecfea6556501212ac9b7309edb7f0c98c69618))
Expand Down Expand Up @@ -31,8 +62,6 @@

[@3coins](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3A3coins+updated%3A2023-10-24..2023-11-08&type=Issues) | [@arokem](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Aarokem+updated%3A2023-10-24..2023-11-08&type=Issues) | [@dlqqq](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Adlqqq+updated%3A2023-10-24..2023-11-08&type=Issues) | [@ellisonbg](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Aellisonbg+updated%3A2023-10-24..2023-11-08&type=Issues) | [@JasonWeill](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3AJasonWeill+updated%3A2023-10-24..2023-11-08&type=Issues) | [@jtpio](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Ajtpio+updated%3A2023-10-24..2023-11-08&type=Issues) | [@krassowski](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Akrassowski+updated%3A2023-10-24..2023-11-08&type=Issues) | [@welcome](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3Awelcome+updated%3A2023-10-24..2023-11-08&type=Issues) | [@Wzixiao](/~https://github.com/search?q=repo%3Ajupyterlab%2Fjupyter-ai+involves%3AWzixiao+updated%3A2023-10-24..2023-11-08&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 2.4.0

([Full Changelog](/~https://github.com/jupyterlab/jupyter-ai/compare/@jupyter-ai/core@2.3.0...92dab10608ea090b6bd87ca5ffe9ccff7a15b449))
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useWorkspaces": true,
"version": "2.5.0",
"version": "2.6.0",
"npmClient": "yarn",
"useNx": true
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-ai/monorepo",
"version": "2.5.0",
"version": "2.6.0",
"description": "A generative AI extension for JupyterLab",
"private": true,
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/jupyter-ai-magics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-ai/magics",
"version": "2.5.0",
"version": "2.6.0",
"description": "Jupyter AI magics Python package. Not published on NPM.",
"private": true,
"homepage": "/~https://github.com/jupyterlab/jupyter-ai",
Expand Down
2 changes: 1 addition & 1 deletion packages/jupyter-ai/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupyter-ai/core",
"version": "2.5.0",
"version": "2.6.0",
"description": "A generative AI extension for JupyterLab",
"keywords": [
"jupyter",
Expand Down
14 changes: 14 additions & 0 deletions packages/jupyter-ai/src/components/chat-messages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ type ChatMessageHeaderProps = {
sx?: SxProps<Theme>;
};

type NewTabLinkProps = {
children: React.ReactNode;
href?: string;
};

export function ChatMessageHeader(props: ChatMessageHeaderProps): JSX.Element {
const collaborators = useCollaboratorsContext();

Expand Down Expand Up @@ -128,6 +133,14 @@ export function ChatMessages(props: ChatMessagesProps): JSX.Element {
}
}, [props.messages]);

function NewTabLink(props: NewTabLinkProps) {
return (
<a href={props.href ?? '#'} target="_blank" rel="noopener noreferrer">
{props.children}
</a>
);
}

return (
<Box
sx={{
Expand All @@ -149,6 +162,7 @@ export function ChatMessages(props: ChatMessagesProps): JSX.Element {
// markdown styling and then overriding any CSS to make it more compact.
className="jp-RenderedHTMLCommon jp-ai-react-markdown"
components={{
a: NewTabLink,
code: ChatCodeView
}}
remarkPlugins={[remarkMath]}
Expand Down

0 comments on commit 4a6c5aa

Please sign in to comment.