Merge pull request #28 from jmont-dev/cleanup

Clean up warnings and unused parameters.

Makefile

@@ -1,19 +1,25 @@
 # Check if a default C++ compiler exists, otherwise use g++
 CXX ?= g++
+CXXFLAGS = -Wall -Wextra -Wpedantic
+
+CREATE_BUILD_DIR = mkdir -p build; cp -n llama.jpg build;
 
 all: examples test-cpp11 test-cpp14 test-cpp20
-examples: examples/main.cpp
+build:
 	mkdir -p build
-	$(CXX) examples/main.cpp -Iinclude -o build/examples -std=c++11 -pthread -latomic
+ifeq ($(OS),Windows_NT)
+		if not exist "build/llama.jpg" copy "llama.jpg" "build"
+else
+		cp -n llama.jpg build
+endif
+examples: build examples/main.cpp
+	$(CXX) $(CXXFLAGS) examples/main.cpp -Iinclude -o build/examples -std=c++11 -pthread -latomic
 test: test-cpp11
-test-cpp11: test/test.cpp
-	mkdir -p build
-	$(CXX) test/test.cpp -Iinclude -Itest -o build/test -std=c++11 -pthread -latomic
-test-cpp14: test/test.cpp
-	mkdir -p build
-	$(CXX) test/test.cpp -Iinclude -Itest -o build/test-cpp14 -std=c++14 -pthread -latomic
-test-cpp20: test/test.cpp
-	mkdir -p build
-	$(CXX) test/test.cpp -Iinclude -Itest -o build/test-cpp20 -std=c++2a -pthread -latomic
+test-cpp11: build test/test.cpp
+	$(CXX) $(CXXFLAGS) test/test.cpp -Iinclude -Itest -o build/test -std=c++11 -pthread -latomic
+test-cpp14: build test/test.cpp
+	$(CXX) $(CXXFLAGS) test/test.cpp -Iinclude -Itest -o build/test-cpp14 -std=c++14 -pthread -latomic
+test-cpp20: build test/test.cpp
+	$(CXX) $(CXXFLAGS) test/test.cpp -Iinclude -Itest -o build/test-cpp20 -std=c++2a -pthread -latomic
 clean:
 	rm -rf build

examples/main.cpp

@@ -62,7 +62,7 @@ int main()
 
     // Create a blob on the ollama server using the following digest
     try { ollama::create_blob("sha256:29fdb92e57cf0827ded04ae6461b5931d01fa595843f55d36f5b275a52087dd2"); std::cout << "Blob was created on Ollama server." << std::endl; }
-    catch( ollama::exception e) { std::cout << "Error when creating blob: " << e.what() << std::endl;} 
+    catch( ollama::exception& e) { std::cout << "Error when creating blob: " << e.what() << std::endl;} 
 
     // Check if a blob with the following digest exists.
     if ( ollama::blob_exists("sha256:29fdb92e57cf0827ded04ae6461b5931d01fa595843f55d36f5b275a52087dd2") ) std::cout << "Blob exists on Ollama server." << std::endl; 
@@ -95,7 +95,7 @@ int main()
     try { 
         ollama::generate("Non-existent-model", "Requesting this model will throw an error"); 
     } 
-    catch(ollama::exception e) { std::cout << e.what() << std::endl; }
+    catch(ollama::exception& e) { std::cout << e.what() << std::endl; }
 
     //Alternatively, throwing exceptions can be disabled. In this case, either emptry values or false will be returned in the event of an error.
     //ollama::allow_exceptions(false);
@@ -117,6 +117,7 @@ int main()
     // Optionally send a request to ollama to load a model into memory.
     // This will occur automatically during generation but this allows you to preload a model before using it.
     bool model_loaded = ollama::load_model("llama3:8b");
+    if (model_loaded) std::cout << "Model has been loaded";
 
     // Perform a simple generation to a string by specifying a model and a prompt. The response will be returned as one string without streaming the reply.
     std::cout << ollama::generate("llama3:8b", "Why is the sky blue?") << std::endl;

include/ollama.hpp

@@ -101,7 +101,7 @@ namespace ollama
         public:
             image(const std::string base64_sequence, bool valid = true) 
             {
-                this->base64_sequence = base64_sequence;
+                this->base64_sequence = base64_sequence; this->valid = valid;
             }
             ~image(){};
 
@@ -254,7 +254,7 @@ namespace ollama
                 (*this)["stream"] = stream;
 
                 if (options!=nullptr) (*this)["options"] = options["options"];
-                //(*this)["format"] = format; // Commented out as providing the format causes issues with some models.
+                (void)format; //(*this)["format"] = format; // Commented out as providing the format causes issues with some models.
                 (*this)["keep_alive"] = keep_alive_duration;
                 type = message_type::chat;
 
@@ -329,7 +329,7 @@ namespace ollama
                 return simple_string;               
             }
 
-            const bool has_error() const
+            bool has_error() const
             {
                 if ( json_data.contains("error") ) return true;
                 return false;                
@@ -835,7 +835,6 @@ class Ollama
     std::string get_version()
     {
         std::string version;
-        httplib::Client cli("http://localhost:11434");
 
         auto res = this->cli->Get("/api/version");
 
@@ -872,12 +871,13 @@ class Ollama
 
     private:
 
+/*
     bool send_request(const ollama::request& request, std::function<void(const ollama::response&)> on_receive_response=nullptr)
     {
 
         return true;
     }
-
+*/
 
     std::string server_url;
     httplib::Client *cli;
@@ -1040,7 +1040,7 @@ namespace ollama
         ollama.setWriteTimeout(seconds);
     }
 
-};
+}
 
 
 #endif

singleheader/ollama.hpp

@@ -34891,7 +34891,7 @@ namespace ollama
         public:
             image(const std::string base64_sequence, bool valid = true) 
             {
-                this->base64_sequence = base64_sequence;
+                this->base64_sequence = base64_sequence; this->valid = valid;
             }
             ~image(){};
 
@@ -35044,7 +35044,7 @@ namespace ollama
                 (*this)["stream"] = stream;
 
                 if (options!=nullptr) (*this)["options"] = options["options"];
-                //(*this)["format"] = format; // Commented out as providing the format causes issues with some models.
+                (void)format; //(*this)["format"] = format; // Commented out as providing the format causes issues with some models.
                 (*this)["keep_alive"] = keep_alive_duration;
                 type = message_type::chat;
 
@@ -35119,7 +35119,7 @@ namespace ollama
                 return simple_string;               
             }
 
-            const bool has_error() const
+            bool has_error() const
             {
                 if ( json_data.contains("error") ) return true;
                 return false;                
@@ -35625,7 +35625,6 @@ class Ollama
     std::string get_version()
     {
         std::string version;
-        httplib::Client cli("http://localhost:11434");
 
         auto res = this->cli->Get("/api/version");
 
@@ -35662,12 +35661,13 @@ class Ollama
 
     private:
 
+/*
     bool send_request(const ollama::request& request, std::function<void(const ollama::response&)> on_receive_response=nullptr)
     {
 
         return true;
     }
-
+*/
 
     std::string server_url;
     httplib::Client *cli;
@@ -35830,7 +35830,7 @@ namespace ollama
         ollama.setWriteTimeout(seconds);
     }
 
-};
+}
 
 
 #endif

test/test.cpp

@@ -106,7 +106,7 @@ TEST_SUITE("Ollama Tests") {
         try { 
             ollama::generate("Non-existent-model", "Requesting this model will throw an error"); 
         } 
-        catch(ollama::exception e) { exception_handled = true; }
+        catch(ollama::exception& e) { exception_handled = true; }
 
         CHECK( exception_handled );
     }