-
Notifications
You must be signed in to change notification settings - Fork 39
Adding support to Azure API #8
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.
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
Merged
Changes from 4 commits
Commits
Show all changes
78 commits
Select commit
Hold shift + click to select a range
a32e681
Adding support to Azure API
ccd6961
merge main
ccreutzi 26b1272
parameterize getApiKeyFromNvpOrEnv, allowing different env variables …
ccreutzi 8bd236b
get basic Azure connection working
ccreutzi e009e86
even smaller timeout; failed to throw an error in GitHub once
ccreutzi a6b8d51
add ollamaChat class
ccreutzi 4304636
CI setup for ollama
ccreutzi 61a5152
typos
ccreutzi 9914a55
disable verySmallTimeOutErrors test points, since they are flaky
ccreutzi cd9bbe2
Updated README.md for Azure and Ollama
ccreutzi 8a2ea28
Remove GPT specific penalties from ollamaChat
ccreutzi dde7d95
Implement TopProbabilityNum and StopSequences for ollamaChat
ccreutzi 8d351a2
increase default timeout to 120 seconds for ollamaChat
ccreutzi e229935
add TailFreeSampling_Z, add comment about currently unsupported ollam…
ccreutzi b67f5ef
new static method ollamaChat.models
ccreutzi bcf4d85
update API versions, following https://learn.microsoft.com/en-us/azur…
ccreutzi e51f5eb
typo in help header
ccreutzi 08a8549
add azureChat and ollamaChat to functionSignatures.json
ccreutzi 410a87b
Make StreamFun work with ollamaChat and azureChat
ccreutzi 6b830a2
remove unused defaults, for more realistic coverage numbers
ccreutzi c349a58
Add test that azureChat with Seed fixes result
ccreutzi 0815bdf
try telling codecov to not worry about test files
ccreutzi e8a900d
also ignore errorMessageCatalog.m in codecov, since almost all of it …
ccreutzi a2d65cd
ignore examples/data/* just like data/*
ccreutzi 5851aca
Merge branch 'main' into AzureAPI
ccreutzi 88f054b
remove disabled timeout tests
ccreutzi 5ed246d
Add explanatory comment for missing key test.
ccreutzi 3bd2208
changed wording as requested
ccreutzi beb41a5
simplify comment
ccreutzi 8d50886
spell Ollama with a capital O
ccreutzi 1a5ebb9
Fix capitalization: APIKey, by MathWorks naming standards.
ccreutzi 72dca78
Codecov has problems with uploaded coverage. Try not using plus signs.
ccreutzi 3639020
add unit tests for edge cases and errors in responseStreamer
ccreutzi a2b893a
Add test point for function calls
ccreutzi 0dd0e91
CI setup stores the API key in a different variable
ccreutzi 5d2fd99
for better coverage, run tools test through streaming API
ccreutzi 4ae0248
Function calling on Azure.
ccreutzi 735416b
Throw server errors as errors
ccreutzi 95f2f13
For CI, add `$OPENAI_API_KEY` such that `openAIChat` works
ccreutzi 492fefc
Short error messages for bad endpoints
ccreutzi 3000dc4
Nicer help headers
ccreutzi 0973f11
typos
ccreutzi 238e11a
Rename openAIMessages to messageHistory
ccreutzi 101cb59
Add openAIMessages fallback for backward compatibility
ccreutzi e095802
Modify chatbot example to use Ollama
ccreutzi f680fb5
Merge branch 'main' into AzureAPI
ccreutzi 7e81d37
minimal and complete test for the backward compatibility function
ccreutzi 2611327
Avoid bogus json
ccreutzi 16a3833
Improve ollamaChat tab completion
ccreutzi b33dad5
Remove unused error ID
ccreutzi cdf0971
add test for Ollama chatbot example
ccreutzi 3abfae4
mark trademarks
ccreutzi d577d36
Include ._* in .gitignore
ccreutzi 466460d
Rename `TopProbabilityMass` → `TopP`, `TopProbabilityNum` → `TopK`
ccreutzi 24059e9
Take properties out of `ollamaChat` that do not apply: Tools and API key
ccreutzi 632ac22
Merge branch 'main' into AzureAPI
ccreutzi d5eb25d
Only drop `:latest` from model list
ccreutzi 6108d0f
ollamaChat.models should never return <missing>
ccreutzi 5200776
fix indentations changed by renaming `TopProbabilityMass` to `TopP`
ccreutzi 32547fb
accept char and cellstr input for generate
ccreutzi 4bd315c
split README.md by backend
ccreutzi fa9f06e
`FunctionNames` should only exist for connectors with tools
ccreutzi 8336cbb
Fix link typo
ccreutzi 0543e3e
Fix typo: This is not using OpenAI
ccreutzi 3ebc529
update tests to expect correct errors
ccreutzi 71f88a9
tabs to spaces
ccreutzi 949fe42
`openAIImages` should derive from `needsAPIKey`
ccreutzi 09b8662
test `NumCompletions`
ccreutzi a360f89
Ollama does not support `NumCompletions`
ccreutzi 348fb67
`azureChat` should get endpoint and deployment from env
ccreutzi 4fb866c
clean up comments
ccreutzi e29e65c
move error text to catalogue
ccreutzi b4eb44a
Reorder test points for maintainability
ccreutzi 757f260
Add a streaming example for `ollamaChat`
ccreutzi 56e6aaf
Log Ollama version during CI
ccreutzi f6a9106
Add Seed test to tollamaChat.m
ccreutzi 392749f
Use message from error catalog
ccreutzi 1ac24ff
Disable flaky test points
ccreutzi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+5.75 KB
examples/ProcessGeneratedTextInRealTimeByUsingOllamaInStreamingMode.mlx
Binary file not shown.
ccreutzi marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,11 +61,6 @@ | |
% | ||
% SystemPrompt - System prompt. | ||
|
||
% Ollama model properties not exposed: | ||
% repeat_last_n, repeat_penalty - could not find an example where they made a difference | ||
% mirostat, mirostat_eta, mirostat_tau - looking for the best API design | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we document this somewhere internal so we don't forget about it? |
||
|
||
|
||
% Copyright 2024 The MathWorks, Inc. | ||
|
||
properties | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about: "To ensure that the JSON for StopSequences has a non-scalar array (is a non-scalar array?), create a two-element array if a scalar is passed."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, in JSON, a one-element array is still an array and would be fine. MATLAB's
jsonencode
just doesn't create"stop": ["foo"]
as we need it to. But we can make it produce"stop": ["foo","foo"]
instead.