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

Add support for context in generate endpoint #23

Merged
merged 2 commits into from
Aug 18, 2024
Merged

Add support for context in generate endpoint #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de8114
Add support for context in generate endpoint.
jmont-dev Aug 17, 2024
de85c5b
Add singleheader and tests for generation with context.
jmont-dev Aug 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
26 changes: 25 additions & 1 deletion include/ollama.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,13 @@ class Ollama
Ollama(): Ollama("http://localhost:11434") {}
~Ollama() { delete this->cli; }

ollama::response generate(const std::string& model,const std::string& prompt, const ollama::response& context, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, false, images);
if ( context.as_json().contains("context") ) request["context"] = context.as_json()["context"];
return generate(request);
}

ollama::response generate(const std::string& model,const std::string& prompt, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, false, images);
Expand Down Expand Up @@ -411,6 +418,13 @@ class Ollama
return response;
}

bool generate(const std::string& model,const std::string& prompt, ollama::response& context, std::function<void(const ollama::response&)> on_receive_token, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, true, images);
if ( context.as_json().contains("context") ) request["context"] = context.as_json()["context"];
return generate(request, on_receive_token);
}

bool generate(const std::string& model,const std::string& prompt, std::function<void(const ollama::response&)> on_receive_token, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, true, images);
Expand Down Expand Up @@ -850,11 +864,16 @@ namespace ollama
ollama.setServerURL(server_url);
}

inline ollama::response generate(const std::string& model,const std::string& prompt,const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
inline ollama::response generate(const std::string& model, const std::string& prompt, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
return ollama.generate(model, prompt, options, images);
}

ollama::response generate(const std::string& model,const std::string& prompt, const ollama::response& context, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
return ollama.generate(model, prompt, context, options, images);
}

inline ollama::response generate(const ollama::request& request)
{
return ollama.generate(request);
Expand All @@ -865,6 +884,11 @@ namespace ollama
return ollama.generate(model, prompt, on_receive_response, options, images);
}

inline bool generate(const std::string& model,const std::string& prompt, ollama::response& context, std::function<void(const ollama::response&)> on_receive_response, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
return ollama.generate(model, prompt, context, on_receive_response, options, images);
}

inline bool generate(ollama::request& request, std::function<void(const ollama::response&)> on_receive_response)
{
return ollama.generate(request, on_receive_response);
Expand Down
26 changes: 25 additions & 1 deletion singleheader/ollama.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35171,6 +35171,13 @@ class Ollama
Ollama(): Ollama("http://localhost:11434") {}
~Ollama() { delete this->cli; }

ollama::response generate(const std::string& model,const std::string& prompt, const ollama::response& context, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, false, images);
if ( context.as_json().contains("context") ) request["context"] = context.as_json()["context"];
return generate(request);
}

ollama::response generate(const std::string& model,const std::string& prompt, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, false, images);
Expand Down Expand Up @@ -35201,6 +35208,13 @@ class Ollama
return response;
}

bool generate(const std::string& model,const std::string& prompt, ollama::response& context, std::function<void(const ollama::response&)> on_receive_token, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, true, images);
if ( context.as_json().contains("context") ) request["context"] = context.as_json()["context"];
return generate(request, on_receive_token);
}

bool generate(const std::string& model,const std::string& prompt, std::function<void(const ollama::response&)> on_receive_token, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
ollama::request request(model, prompt, options, true, images);
Expand Down Expand Up @@ -35640,11 +35654,16 @@ namespace ollama
ollama.setServerURL(server_url);
}

inline ollama::response generate(const std::string& model,const std::string& prompt,const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
inline ollama::response generate(const std::string& model, const std::string& prompt, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
return ollama.generate(model, prompt, options, images);
}

ollama::response generate(const std::string& model,const std::string& prompt, const ollama::response& context, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
return ollama.generate(model, prompt, context, options, images);
}

inline ollama::response generate(const ollama::request& request)
{
return ollama.generate(request);
Expand All @@ -35655,6 +35674,11 @@ namespace ollama
return ollama.generate(model, prompt, on_receive_response, options, images);
}

inline bool generate(const std::string& model,const std::string& prompt, ollama::response& context, std::function<void(const ollama::response&)> on_receive_response, const json& options=nullptr, const std::vector<std::string>& images=std::vector<std::string>())
{
return ollama.generate(model, prompt, context, on_receive_response, options, images);
}

inline bool generate(ollama::request& request, std::function<void(const ollama::response&)> on_receive_response)
{
return ollama.generate(request, on_receive_response);
Expand Down
18 changes: 18 additions & 0 deletions test/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ TEST_SUITE("Ollama Tests") {
CHECK( response.as_json().contains("response") == true );
}

TEST_CASE("Generation with Context") {

ollama::response context = ollama::generate(test_model, "Why is the sky blue?", options);

ollama::response response = ollama::generate(test_model, "Tell me more about this.", context, options);

CHECK( response.as_json().contains("response") == true );
}

std::atomic<bool> done{false};
std::string streamed_response;
Expand All @@ -130,6 +138,16 @@ TEST_SUITE("Ollama Tests") {
CHECK( streamed_response != "" );
}

TEST_CASE("Streaming Generation with Context") {

ollama::response context = ollama::generate(test_model, "Why is the sky blue?", options);

std::function<void(const ollama::response&)> response_callback = on_receive_response;
ollama::generate(test_model, "Tell me more about this.", context, response_callback, options);

CHECK( streamed_response!="" );
}

TEST_CASE("Non-Singleton Generation") {

Ollama my_ollama_server("http://localhost:11434");
Expand Down