Commit Graph

202 Commits

Author SHA1 Message Date
dependabot[bot]
426b30e9ed
Bump ruff from 0.3.4 to 0.4.1
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.3.4 to 0.4.1.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/v0.3.4...v0.4.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-19 22:30:57 +00:00
DSLstandard
dc9543ba5f
fix 'content' check on messages in chat() 2024-04-15 20:39:49 +08:00
Niko
42f9f70bae modified embeddings return annotation 2024-04-05 11:56:16 +02:00
Jeffrey Morgan
2fde317490
Update README.md 2024-04-04 18:25:24 -07:00
dependabot[bot]
7201dcbbd3
Merge pull request #107 from ollama/dependabot/pip/pytest-8.1.1 2024-03-28 16:14:51 +00:00
dependabot[bot]
dfa5b12061
Bump pytest from 7.4.4 to 8.1.1
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.4 to 8.1.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.4...8.1.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-28 00:20:49 +00:00
dependabot[bot]
f5a8ec3272
Merge pull request #106 from ollama/dependabot/pip/ruff-0.3.4 2024-03-28 00:19:36 +00:00
dependabot[bot]
3c9ba8cf2e
Bump ruff from 0.1.15 to 0.3.4
Bumps [ruff](https://github.com/astral-sh/ruff) from 0.1.15 to 0.3.4.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/v0.1.15...v0.3.4)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-27 18:02:04 +00:00
dependabot[bot]
768c559094
Merge pull request #105 from ollama/dependabot/pip/pytest-cov-5.0.0 2024-03-27 18:00:56 +00:00
dependabot[bot]
44126e5a37
Merge pull request #104 from ollama/dependabot/github_actions/actions/upload-artifact-4 2024-03-27 18:00:10 +00:00
dependabot[bot]
841595aed1
Bump pytest-cov from 4.1.0 to 5.0.0
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 4.1.0 to 5.0.0.
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-cov/compare/v4.1.0...v5.0.0)

---
updated-dependencies:
- dependency-name: pytest-cov
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-27 17:59:53 +00:00
dependabot[bot]
281e149001
Bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-27 17:59:04 +00:00
Michael Yang
9c4a87c90b
Merge pull request #103 from ollama/dependabot
add dependabot
2024-03-27 18:58:12 +01:00
Michael Yang
adcae4ce25 add dependabot 2024-03-27 10:53:32 -07:00
Michael Yang
6b351e54cf
Merge pull request #102 from ollama/deps
update dependencies
2024-03-27 18:37:41 +01:00
Michael Yang
4896b53755 update dependencies 2024-03-27 09:57:40 -07:00
SALES
e28f43f892
Update README.md
cf https://github.com/ollama/ollama-python/pull/45#issuecomment-1942447161
2024-02-16 07:02:48 +11:00
Michael Yang
fcdf5771f5
Merge pull request #58 from ollama/mxyng/python-user-agent
python user agent
2024-02-09 15:32:48 -08:00
Michael Yang
ec8bf88c2b add content-type and accept
mirrors header values set by ollama cli
2024-02-08 11:59:43 -08:00
Michael Yang
8b929ab496 python user agent
add a user agent to ollama-python requests
2024-02-08 11:17:06 -08:00
Michael Yang
eee32dda37
Merge pull request #52 from ollama/mxyng/create-example
create example
2024-02-02 12:20:50 -08:00
Michael Yang
c74dd5835d create example 2024-02-02 12:20:05 -08:00
Michael Yang
cdec2ad99e
Merge pull request #31 from ollama/keepalive
add keep_alive
2024-02-02 08:52:08 -08:00
SALES
70e376368f
Update README.md
Co-authored-by: Michael Esteban <mickel13@gmail.com>
2024-02-02 07:56:27 +11:00
Michael Yang
4a81fa43ee
Merge pull request #50 from ollama/mxyng/base64-encode-image
fix: encode base64 inputs
2024-02-01 12:21:46 -08:00
Michael Yang
98ad0d884e fix: encode base64 inputs 2024-02-01 12:12:14 -08:00
SALES
09ae36a0f9
doc(README) : add prerequisites 2024-01-31 21:13:54 +11:00
Michael Yang
c27eebc158
Merge pull request #41 from rachfop/patch-1
Update README.md
2024-01-30 14:31:17 -08:00
Patrick Rachford
46291d49a7
Update README.md
Fixes back ticks on code block.
2024-01-29 21:49:20 -08:00
Michael Yang
cf3ab807c8
Merge pull request #40 from ollama/mxyng/fix-parse-modelfile
fix parse modelfile
2024-01-29 14:12:27 -08:00
Michael Yang
8e5d431d0d fix parse modelfile
- do not add newlines while parsing
- do not add leading whitespace
2024-01-29 13:42:34 -08:00
Michael Yang
e201181d4c
Merge pull request #34 from chenxizhang/patch-1
error handling code
2024-01-29 09:54:43 -08:00
chenxizhang
c077b5d685
Update README.md
e.content should be e.error
2024-01-28 11:08:03 +08:00
Michael Yang
fbb6553e03 add keep_alive 2024-01-26 11:33:03 -08:00
Michael Yang
f618a2f448
Merge pull request #32 from ollama/update-actions
update github actions
2024-01-26 11:32:40 -08:00
Michael Yang
354f012168 update github actions 2024-01-26 11:30:36 -08:00
Michael Yang
19e7a3d9ce
Merge pull request #20 from ollama/BruceMacD-pull-example-type
fix pull example typo
2024-01-23 11:56:55 -08:00
Bruce MacDonald
9bfa1d1ecf
fix pull example typo 2024-01-22 19:03:05 -05:00
Michael Yang
2e0b2e15f0
Merge pull request #18 from jmorganca/mxyng/fix-tests
fix unit tests
2024-01-22 15:24:19 -08:00
Michael Yang
5c1df78b7d remove unused import 2024-01-22 15:23:23 -08:00
Michael Yang
c8f7d9b7d2 fix tests 2024-01-22 15:23:23 -08:00
Michael Yang
21aad8447c fix: update async stream tests 2024-01-22 15:23:23 -08:00
Michael Yang
38f68e251d
Merge pull request #19 from jmorganca/mxyng/upgrade-pillow
upgrade pillow
2024-01-22 15:22:16 -08:00
Michael Yang
fa6d8d5a9f upgrade pillow 2024-01-22 15:20:40 -08:00
Michael Yang
373a2e3759
Merge pull request #17 from jmorganca/mxyng/response-error
update response error field to match json response
2024-01-22 09:44:45 -08:00
Michael Yang
27f0dfe0ca update response error field to match json response 2024-01-22 09:41:22 -08:00
Jeffrey Morgan
467fd833f3 Use client variable name for custom client in README.md 2024-01-20 15:34:39 -05:00
Jeffrey Morgan
9c60d1569c Additional docs in README.md 2024-01-20 15:25:47 -05:00
Michael Yang
43d36489b2
Merge pull request #16 from jmorganca/ollama-host
fix: update OLLAMA_HOST parsing to match ollama CLI
2024-01-19 14:09:47 -08:00
Michael Yang
3119736eda s/base_url/host/ 2024-01-19 14:00:49 -08:00