cmake changes, static library, no executable

Author: arieldk1212

CMakeLists.txt

@@ -1,17 +1,12 @@
 cmake_minimum_required(VERSION 3.15)
-project(camille-agenty VERSION 0.1.0 LANGUAGES CXX)
+project(camille-agenty LANGUAGES CXX VERSION 1.1.1)
 
 set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_INCLUDE_CURRENT_DIR)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-option(ENABLE_LOGGING "Enable Development Environment Logging" ON)
-
-set(LLAMA_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 set(LLAMA_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(LLAMA_BUILD_SERVER OFF CACHE BOOL "" FORCE)
+set(LLAMA_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 
 add_subdirectory(vendor/llama.cpp)
 

include/camille-agenty/agent/agent.h

@@ -10,6 +10,8 @@
 
 #include "tools/tools-base.h"
 
+namespace agenty::agent {
+
 /**
  * @todo
  1. create client interface for multiple providers (provider: qwen -> qwen client & qwen models)
@@ -94,4 +96,6 @@ class agent {
   void run_async();
 };
 
+};  // namespace agenty::agent
+
 #endif

include/camille-agenty/clients/qwen/qwen-client.h

@@ -1,8 +1,12 @@
 #ifndef QWEN_CLIENT_H_
 #define QWEN_CLIENT_H_
 
-#include "clients/client.h"
+#include "camille-agenty/client/client.h"
 
-class qwen_client : public client {};
+namespace agenty::client::qwen {
+
+class qwen_client {};
+
+};  // namespace agenty::client::qwen
 
 #endif

include/camille-agenty/http/http-client.h

@@ -19,12 +19,12 @@ struct http_post {
 };
 
 struct client {
-  static httplib::Result get(const std::string& url, const std::string& path);
+  static httplib::Result get(const std::string& url, const std::string& path = "/");
 
   static httplib::Result post(const std::string& url,
                               const std::string& path,
                               const std::string& body,
-                              const std::string& content_type);
+                              const std::string& content_type = "text/plain");
 };
 
 };  // namespace agenty::http_client

include/camille-agenty/providers/provider.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-namespace agenty::providers {
+namespace agenty::provider {
 
 class provider_config {
   /**
@@ -37,6 +37,6 @@ class provider {
   virtual provider_config generate_config() = 0;
 };
 
-};  // namespace agenty::providers
+};  // namespace agenty::provider
 
 #endif

include/camille-agenty/providers/qwen/qwen-provider.h

@@ -1,9 +1,9 @@
 #ifndef QWEN_PROVIDER_H_
 #define QWEN_PROVIDER_H_
 
-#include "providers/provider.h"
+#include "camille-agenty/provider/provider.h"
 
-namespace agenty::providers::qwen {
+namespace agenty::provider::qwen {
 
 class qwen_provider : public provider {
  public:
@@ -12,6 +12,6 @@ class qwen_provider : public provider {
  private:
 };
 
-};  // namespace agenty::providers::qwen
+}  // namespace agenty::provider::qwen
 
 #endif

src/CMakeLists.txt

@@ -1,22 +1,19 @@
-set(SOURCES
-    camille-agenty.cpp
-
+add_library(agenty STATIC 
     common/log.cpp
-
     http/http-client.cpp
 )
 
-add_library(agenty STATIC ${SOURCES})
+target_include_directories(agenty SYSTEM PRIVATE 
+    ${CMAKE_CURRENT_SOURCE_DIR}/../vendor
+    ${CMAKE_CURRENT_SOURCE_DIR}/../vendor/llama.cpp/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../vendor/llama.cpp/ggml/include
+)
 
 target_include_directories(agenty PUBLIC 
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include/camille-agenty
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../vendor
 )
 
-if (ENABLE_LOGGING)
-  target_compile_definitions(agenty PUBLIC LOGGING=1)
-endif()
-
-add_executable(camille-agenty ${SOURCES})
+# target_link_libraries(agenty PRIVATE llama)
 
-target_link_libraries(camille-agenty PRIVATE agenty)
+target_compile_features(agenty PUBLIC cxx_std_23)

src/camille-agenty.cpp

@@ -1,7 +1,7 @@
 #include <mutex>
 #include <print>
 
-#include "common/log.h"
+#include "camille-agenty/common/log.h"
 
 namespace agenty::common::log {
 
@@ -51,8 +51,8 @@ void log::add(log_entry& entry) {
         buffer_.resize(BUFFER_SIZE * 2);
       }
 
-      entry.timestamp = ts_micro() - timestamp;
-      buffer_.push_back(entry);
+      // entry.timestamp = ts_micro() - timestamp;
+      // buffer_.push_back(entry);
 
       condv_.notify_one();
     }

src/common/log.cpp

@@ -1,4 +1,4 @@
-#include "http/http-client.h"
+#include "camille-agenty/http/http-client.h"
 
 namespace agenty::http_client {
 
@@ -15,14 +15,14 @@ httplib::Result http_post::operator()(const std::string& url,
   return client.Post(path, body, content_type);
 }
 
-httplib::Result client::get(const std::string& url, const std::string& path = "/") {
+httplib::Result client::get(const std::string& url, const std::string& path) {
   return http_get()(url, path);
 }
 
 httplib::Result client::post(const std::string& url,
                              const std::string& path,
                              const std::string& body,
-                             const std::string& content_type = "text/plain") {
+                             const std::string& content_type) {
   return http_post()(url, path, body, content_type);
 }