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

Integrate Ollama #107

Closed
wants to merge 14 commits into from
Closed

Integrate Ollama #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c1c878
Changelog
hejny Sep 1, 2024
afb2f49
Merge branch 'feature/foreach-command' into integration/ollama
hejny Sep 2, 2024
2f8547e
📖 Make Promptbook library
hejny Sep 2, 2024
487710f
📖 Convert samples .ptbk.md -> .ptbk.json
hejny Sep 2, 2024
625bf62
0.70.0-0
hejny Sep 2, 2024
89b3ea6
🆚 Update version in config
hejny Sep 2, 2024
1ca4620
📦 Generating packages
hejny Sep 2, 2024
8a9025e
📖 Make Promptbook library
hejny Sep 2, 2024
f99b946
📖 Convert samples .ptbk.md -> .ptbk.json
hejny Sep 2, 2024
3719ea4
0.70.0-1
hejny Sep 2, 2024
4343b67
🆚 Update version in config
hejny Sep 2, 2024
b6de9dc
📦 Generating packages
hejny Sep 2, 2024
e493b11
⏫ Update promptbook to version 0.70.0-1 in samples
hejny Sep 2, 2024
0c209b5
Merge branch 'feature/foreach-command' into integration/ollama
hejny Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,13 @@ Command `FOREACH`
- Allow to parse CSVs via `CsvFormatDefinition`
- Change `ListFormatDefinition` -> `TextFormatDefinition`

### `0.70.0` _(2024-09-)_

Support for local models - integrate [Ollama](https://ollama.com/)

- !!!!!! Make new package `@promptbook/ollama`
- !!!!!! Add `OllamaExecutionTools` exported from `@promptbook/ollama`

## In prepare

### `0..0` _(2024-0-)_
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "promptbook",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/anthropic-claude/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/anthropic-claude",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/anthropic-claude.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"@anthropic-ai/sdk": "0.26.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/azure-openai/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/azure-openai",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/azure-openai.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"@azure/openai": "1.0.0-beta.12",
Expand Down
4 changes: 2 additions & 2 deletions packages/browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/browser",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/browser.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"spacetrim": "0.11.39"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/cli",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/core",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/execute-javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/execute-javascript",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/execute-javascript.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"prettier": "2.8.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/fake-llm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/fake-llm",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/fake-llm.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"lorem-ipsum": "2.0.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/langtail/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/langtail",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/langtail.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"colors": "1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/markdown-utils",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/node",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/node.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"colors": "1.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/openai/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/openai",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/openai.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"colors": "1.4.0",
Expand Down
34 changes: 17 additions & 17 deletions packages/promptbook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "promptbook",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -48,23 +48,23 @@
}
],
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"@promptbook/anthropic-claude": "0.69.0-20",
"@promptbook/azure-openai": "0.69.0-20",
"@promptbook/browser": "0.69.0-20",
"@promptbook/cli": "0.69.0-20",
"@promptbook/core": "0.69.0-20",
"@promptbook/execute-javascript": "0.69.0-20",
"@promptbook/fake-llm": "0.69.0-20",
"@promptbook/langtail": "0.69.0-20",
"@promptbook/markdown-utils": "0.69.0-20",
"@promptbook/node": "0.69.0-20",
"@promptbook/openai": "0.69.0-20",
"@promptbook/remote-client": "0.69.0-20",
"@promptbook/remote-server": "0.69.0-20",
"@promptbook/types": "0.69.0-20",
"@promptbook/utils": "0.69.0-20"
"@promptbook/anthropic-claude": "0.70.0-1",
"@promptbook/azure-openai": "0.70.0-1",
"@promptbook/browser": "0.70.0-1",
"@promptbook/cli": "0.70.0-1",
"@promptbook/core": "0.70.0-1",
"@promptbook/execute-javascript": "0.70.0-1",
"@promptbook/fake-llm": "0.70.0-1",
"@promptbook/langtail": "0.70.0-1",
"@promptbook/markdown-utils": "0.70.0-1",
"@promptbook/node": "0.70.0-1",
"@promptbook/openai": "0.70.0-1",
"@promptbook/remote-client": "0.70.0-1",
"@promptbook/remote-server": "0.70.0-1",
"@promptbook/types": "0.70.0-1",
"@promptbook/utils": "0.70.0-1"
}
}
6 changes: 3 additions & 3 deletions packages/ptbk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ptbk",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -48,9 +48,9 @@
}
],
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"promptbook": "0.69.0-20"
"promptbook": "0.70.0-1"
}
}
4 changes: 2 additions & 2 deletions packages/remote-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/remote-client",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/remote-client.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"socket.io-client": "4.7.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/remote-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/remote-server",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -51,7 +51,7 @@
"module": "./esm/index.es.js",
"typings": "./esm/typings/src/_packages/remote-server.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
},
"dependencies": {
"colors": "1.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/types",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -49,6 +49,6 @@
],
"typings": "./esm/typings/src/_packages/types.index.d.ts",
"peerDependencies": {
"@promptbook/core": "0.69.0-20"
"@promptbook/core": "0.70.0-1"
}
}
2 changes: 1 addition & 1 deletion packages/utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@promptbook/utils",
"version": "0.69.0-20",
"version": "0.70.0-1",
"description": "Supercharge your use of large language models",
"private": false,
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion samples/pipelines/10-single.ptbk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"preparations": [
{
"id": 1,
"promptbookVersion": "0.69.0-20",
"promptbookVersion": "0.70.0-1",
"usage": {
"price": {
"value": 0.004962
Expand Down
2 changes: 1 addition & 1 deletion samples/pipelines/11-picking-model.ptbk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"preparations": [
{
"id": 1,
"promptbookVersion": "0.69.0-20",
"promptbookVersion": "0.70.0-1",
"usage": {
"price": {
"value": 0.0047940000000000005
Expand Down
2 changes: 1 addition & 1 deletion samples/pipelines/20-two.ptbk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"preparations": [
{
"id": 1,
"promptbookVersion": "0.69.0-20",
"promptbookVersion": "0.70.0-1",
"usage": {
"price": {
"value": 0.004962
Expand Down
2 changes: 1 addition & 1 deletion src/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { string_semantic_version } from './types/typeAliases';
/**
* The version of the Promptbook library
*/
export const PROMPTBOOK_VERSION: string_promptbook_version = '0.69.0-20';
export const PROMPTBOOK_VERSION: string_promptbook_version = '0.70.0-1';

export type string_promptbook_version = string_semantic_version;
// TODO:[main] !!!! List here all the versions and annotate + put into script
2 changes: 2 additions & 0 deletions src/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,8 @@
0.68.0-5
0.68.0
0.69.0-0
0.70.0-0
0.70.0-1
0.69.0-1
0.69.0-2
0.69.0-3
Expand Down