Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add local llm support with ollama #157

Merged
merged 26 commits into from
Mar 25, 2024
Merged

add local llm support with ollama #157

merged 26 commits into from
Mar 25, 2024

Conversation

leilabb
Copy link
Contributor

@leilabb leilabb commented Mar 14, 2024 •
edited
Loading

Left to do:

  • --STARTED-- Zod validation: at least one API (ollama url or open AI) needs to be filled in app/settings/teams AND app/settings/teams/new
  • URL Validation - verify that user inputs an actual URL in the fields on app/settings/teams AND app/settings/teams/new

leilabb and others added 15 commits January 12, 2024 14:20
@leilabb
add key perk to landing page (#107)
9d9ba72 
* add key perk to landing page

* fix spelling
@leilabb @tonioriol
98-clarify-copy-when-creating-a-team
37f8a60 
* modify copy when creating a new team

* add missing env to gh action/workflow

---------

Co-authored-by: Toni Oriol <[email protected]>
@leilabb
104-change-the-word-fork-it-to-clone-including-icon
b8032f3 
* Change 'fork' to 'clone' and change icon

* Change copy of modal after clicking 'Clone'

* replace fork with clone
@tonioriol
add missing env vars to example
ce0b05d
@eriklindgren
Create dependabot.yml
1d5d352
@dependabot
Bump vite from 4.3.9 to 4.5.2 (#112)
de85015 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.3.9 to 4.5.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@eriklindgren
Update dependabot.yml
3366c6b 
Include GitHub Actions version updates.
@dependabot
Bump actions/checkout from 2 to 4 (#123)
1495c89 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump actions/setup-node from 2 to 4 (#122)
15eaa95 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v2...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@eriklindgren
Upgrade to node 20
6898977
@eriklindgren
Run tests on push to dev
0a78d74
@dependabot @tonioriol
Bump axios, openai and postmark (#113)
f38e2bf 
* Bump axios, openai and postmark

Bumps [axios](https://github.com/axios/axios) to 1.6.5 and updates ancestor dependencies [axios](https://github.com/axios/axios), [openai](https://github.com/openai/openai-node) and [postmark](https://github.com/ActiveCampaign/postmark.js). These dependencies need to be updated together.


Updates `axios` from 0.25.0 to 1.6.5
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v0.25.0...v1.6.5)

Updates `openai` from 3.3.0 to 4.25.0
- [Release notes](https://github.com/openai/openai-node/releases)
- [Changelog](https://github.com/openai/openai-node/blob/master/CHANGELOG.md)
- [Commits](openai/openai-node@v3.3.0...v4.25.0)

Updates `postmark` from 3.0.19 to 4.0.2
- [Release notes](https://github.com/ActiveCampaign/postmark.js/releases)
- [Changelog](https://github.com/ActiveCampaign/postmark.js/blob/main/CHANGELOG.md)
- [Commits](ActiveCampaign/postmark.js@3.0.19...4.0.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
- dependency-name: openai
  dependency-type: direct:production
- dependency-name: postmark
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* update to openai@4 fixes

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Toni Oriol <[email protected]>
@leilabb
99 group chat history by monthyear (#111)
1411633 
* add grouping to chats

* add last 30 days group

* add last year group

* refactor time functions

* change function name

* change func name

* add tests + new grouping function

* refactoring

* add grouping to all chats ever made

* add code fix

* change function name

* change type name

* refactor

* style code

* add tests

* catch future dates¨

* add final fixes
@tonioriol
Setup test db (#132)
65bdb9a 
* add test db in compose and gh actions

* add test db setup script

* move cleanDatabase to a helper file

* rm unused test

* adjustments to make it work

* remove header param from playwright and add NODE_ENV=test in gh test action

Also adjust DATABASE_URL in env example

* install browsers with deps

* fix seeds
@leilabb
add local llm support with ollama
40c8eae
@render Render
Copy link

render bot commented Mar 14, 2024

Your Render PR Server URL is https://taco-dev-prototyp-se-pr-157.onrender.com.

Follow its progress at https://dashboard.render.com/web/srv-cnpcuv7sc6pc73b2qq6g.

@leilabb leilabb marked this pull request as ready for review March 15, 2024 13:06
tonioriol
tonioriol requested changes Mar 19, 2024
View reviewed changes
Copy link
Contributor

@tonioriol tonioriol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some suggestions and comments but other than that really good work Leila!

package.json Outdated
@@ -37,6 +37,7 @@
"@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.59.11",
"autoprefixer": "^10.4.14",
"axios": "^1.6.7",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for this in the end. So it can be removed.

src/routes/app/settings/teams/[id]/+page.server.ts Outdated
message: 'Invalid OpenAI API key format',
}
),
ollamaBaseUrl: z.string(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ollamaBaseUrl: z.string(),
ollamaBaseUrl: z.string().url(),

src/routes/app/settings/teams/new/+page.server.ts Outdated
message: "Invalid OpenAI API key format",
}),
openAiApiKey: z.string().optional(),
ollamaBaseUrl: z.string().optional(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could use the same validation rules as in the updateTeamDetails

src/routes/app/settings/teams/new/+page.server.ts
code: z.ZodIssueCode.custom,
message: 'Please provide an API Key or Ollama Url',
})
}
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this could be used in updateTeamDetails also.

@tonioriol tonioriol merged commit 62b97c9 into dev Mar 25, 2024
1 check failed
@tonioriol tonioriol deleted the 147-support-local-llms-through-ollama branch March 25, 2024 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonioriol tonioriol tonioriol approved these changes

@eriklindgren eriklindgren Awaiting requested review from eriklindgren

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@leilabb @tonioriol @eriklindgren