121 Commits

Author SHA1 Message Date
Amith Koujalgi
65a9d52615 updated readme 2023-12-01 09:47:44 +05:30
Amith Koujalgi
459de83fbd
Update README.md 2023-12-01 09:45:37 +05:30
Amith Koujalgi
298cc8acf5 updated readme 2023-11-17 14:52:32 +05:30
Amith Koujalgi
c59badd1c9 updated readme 2023-11-17 14:52:14 +05:30
Amith Koujalgi
6e8976a7c7 updated readme 2023-11-17 14:49:43 +05:30
Amith Koujalgi
9d6fbab0e5 updated readme 2023-11-17 14:45:05 +05:30
Amith Koujalgi
fdd732fd71 mvn release test 2023-11-17 10:46:35 +05:30
Amith Koujalgi
a71a865b9e mvn release test 2023-11-17 10:45:06 +05:30
Amith Koujalgi
c3809e830b mvn release test 2023-11-17 10:32:15 +05:30
Amith Koujalgi
9581dc3357 mvn release test 2023-11-17 10:28:51 +05:30
Amith Koujalgi
6bcdab27f3 mvn release test 2023-11-17 08:59:34 +05:30
Amith Koujalgi
e71034142d mvn release test 2023-11-17 08:57:28 +05:30
Amith Koujalgi
11377610bd mvn release test 2023-11-17 08:48:50 +05:30
Amith Koujalgi
f29851e323 mvn release test 2023-11-17 08:47:31 +05:30
Amith Koujalgi
a5c6ba5558 Updated ask and askAsync responses to include responseTime parameter 2023-11-16 00:50:56 +05:30
Amith Koujalgi
79f69c1620 Merge remote-tracking branch 'origin/main' 2023-11-16 00:49:12 +05:30
Amith Koujalgi
7579bbbc59 Updated ask and askAsync responses to include responseTime parameter 2023-11-16 00:48:59 +05:30
Amith Koujalgi
5c17bf7bb4
Merge pull request #6 from mgmacleod/missing-system-property
Added a `system` property to prevent `Unrecognized field "system"` when calling `OllamaApi.getModelDetails`
2023-11-14 23:22:03 +05:30
Matthew MacLeod
04e942f1f9 Added a system property to prevent Unrecognized field "system" when calling OllamaApi.getModelDetails 2023-11-14 10:25:04 -05:00
Amith Koujalgi
3a43d3e95c Added GH action workflow for PR create 2023-11-13 12:25:40 +05:30
Amith Koujalgi
dc2b73a72d added test cases for more APIs 2023-11-13 12:15:06 +05:30
Amith Koujalgi
c5f3bb5d31 - updated non-primitives Long and Boolean to primitive types 2023-11-13 11:45:53 +05:30
Amith Koujalgi
7da4a7ffd4 - updated Java version to 11.
- replaced Apache HTTP client code with `Java.net.http.HttpClient`
2023-11-13 11:32:53 +05:30
Amith Koujalgi
d2f405dc64 - removed returning JSON string from toString methods of POJOs
- moved the code to get the `ObjectMapper` instance to `Utils` so that any changes to ObjectMapper could be handled at one place.
- removed duplicate ObjectMapper instantiation code
2023-11-13 00:47:47 +05:30
Amith Koujalgi
0d6af4b4a5
Merge pull request #5 from reckart/bugfix/4-evalCount-in-response-from-ollama-cannot-be-parsed
Issue #4: evalCount in response from ollama cannot be parsed.

Thanks @reckart! I had actually made some updates for the `OllamaResponseModel` class to ignore the unknown fields but somehow had missed the `eval_count`.

About your third point,
> Configure JSON mapping to ignore unknown fields to avoid errors in case ollama expands its response

I believe this would take care of unknown fields and we do not have to explicitly mark the fields to be ignored: df9b9af063/src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java (L40-L41)
2023-11-13 00:14:55 +05:30
Richard Eckart de Castilho
e2a8be42e0 Issue #4: evalCount in response from ollama cannot be parsed
- Change `eval_count` identify in Java code to more appropriate `evalCount`
- Change `evalCount` to `eval_count` in the JSON mapping
- Configure JSON mapping to ignore unknown fields to avoid errors in case ollama expands its response
2023-11-12 19:36:27 +01:00
Amith Koujalgi
df9b9af063 Updated askAsync API to use OutputStream.write instead of DataOutputStream.writeBytes 2023-11-12 23:53:36 +05:30
Amith Koujalgi
7c4b17454b Handled ignorable JSON fields of Ollama response 2023-11-12 23:33:22 +05:30
Amith Koujalgi
3a45746a63 add missing import of EmbeddingResponse 2023-11-12 23:24:05 +05:30
Amith Koujalgi
dd911029d6
Merge pull request #3 from reckart/bugfix/2-Certain-requests-fail-with-a-400-Bad-Request
Thanks for the fix!
2023-11-12 23:21:42 +05:30
Richard Eckart de Castilho
84386cf539 Issue #2: Certain requests fail with a 400 Bad Request
- writeBytes(String) does not work properly with Unicode characters and may produce invalid UTF-8 - replacing it with an alternative call that converts the JSON string to a proper UTF-8 byte array representation and sends that
2023-11-12 18:42:34 +01:00
Amith Koujalgi
4f70d1ee80 Updated readme 2023-11-12 23:06:06 +05:30
Amith Koujalgi
7933154462 Added generateEmbeddings API 2023-11-12 21:14:54 +05:30
Amith Koujalgi
e78609727e Added generateEmbeddings API 2023-11-12 20:23:21 +05:30
Amith Koujalgi
48acf921e8 Updated models with @JsonProperty to have Java-naming conventions for attributes 2023-11-12 20:00:44 +05:30
Amith Koujalgi
5c5463b764 Fix for logback as a transitive dependency.
- updated pom.xml to have logback-classic in test scope.
- moved logback.xml from src/main/resources to src/test/resources
2023-11-12 19:48:40 +05:30
Amith Koujalgi
6678cd3f69 - replaced GSON with Jackson
- Updated readme
- general cleanup
2023-11-09 12:56:45 +05:30
Amith Koujalgi
1f28e61234 Updated readme 2023-11-09 11:55:00 +05:30
Amith Koujalgi
2bdf0cc638 Updated readme 2023-11-09 00:51:19 +05:30
Amith Koujalgi
c1c3e4902a updated setVerbose 2023-11-09 00:31:13 +05:30
Amith Koujalgi
bc31a5f92a Updated readme 2023-11-09 00:27:43 +05:30
Amith Koujalgi
d50e30f147 - Added verbose param to OllamaAPI
- Setup logback logging
- Updated readme
2023-11-09 00:26:03 +05:30
Amith Koujalgi
98a98d3276 updated Readme 2023-11-08 21:22:40 +05:30
Amith Koujalgi
0c91db1d03 updated Readme 2023-11-08 14:49:58 +05:30
Amith Koujalgi
5a916a4e9f updated Readme 2023-11-08 14:38:29 +05:30
Amith Koujalgi
dbda21459b updated Readme 2023-11-08 14:36:02 +05:30
Amith Koujalgi
0f8edcd4c2 updated Readme 2023-11-08 14:35:10 +05:30
Amith Koujalgi
384c2cf041 added Javadocs 2023-11-08 14:28:37 +05:30
Amith Koujalgi
c379e94571 added Javadocs 2023-11-08 14:27:50 +05:30
Amith Koujalgi
bf0a1e2160 init 2023-11-08 14:09:31 +05:30