Merge branch 'development'

Author: arieldk1212

.github/workflows/macos.yml

@@ -13,9 +13,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install and autoconf
+      - name: Install autoconf and llama.cpp
         run: |
-          brew install autoconf
+          brew install autoconf llama.cpp
 
       - name: Configure CMake & Build
         run: cmake -B build && cmake --build build --config Release

.gitignore

@@ -47,4 +47,5 @@ build
 cmake-build-debug
 .vscode
 .cache
-.env
+.env
+tests/research/qwen2.5-3b-instruct-q2_k.gguf

include/camille-agenty/agents/agent-context.h

@@ -1,43 +1,28 @@
 #ifndef AGENT_CONTEXT_H_
 #define AGENT_CONTEXT_H_
 
-#include <filesystem>
-#include <thread>
-#include <vector>
-
-#include "camille-agenty/agents/agent.h"
-#include "camille-agenty/common/http-client.h"
 #include "camille-agenty/common/json-parser.h"
-#include "camille-agenty/providers/provider.h"
+#include "camille-agenty/common/http-client.h"
 
 namespace agenty::agent {
 
-struct cloud_ctx {
-  common::json_parse* j_parser;
-};
+enum class roles : uint8_t { ASSISTANT, SYSTEM, USER, TOOL };
 
-struct llama_ctx {
-  common::json_parse* j_parser;
+struct message {
+  roles role;
+  std::string content;
 };
 
-class context {
- public:
-  explicit context(std::string url);
+enum class backend_type : uint8_t { CLOUD, LLAMA };
 
-  void pack_payload();  // form a json or some sort
-
-  void run(const std::shared_ptr<provider::provider>& provider, agent_type type);
-  void run_stream();
-  void run_batch();
-  void run_with_files(std::vector<std::filesystem::path> paths);
-
-  void decode_msg();
-
- private:
-  std::string url_;
-  std::thread thread_;
-  std::unordered_map<int, int> cache_;  // change from int
-};
+// simple apis for how to handle the logic and responses, if cloud we use http, json.. how we
+// construct the messages..
+// in llama we use custom structuring, no json, structured outputs..
+class cloud_context {};  // holds all the json args, operations for cloud via http, will also take
+                         // care of deconstructing the model struct with the hyper params, init here
+                         // the httplib client with ssl and everything
+class llama_context {
+};  // no need for json, therefore llama_context, takes also care of the model struct
 
 }  // namespace agenty::agent
 

include/camille-agenty/agents/agent-graph.h

@@ -1,16 +1,29 @@
 #ifndef AGENT_MEMORY_H_
 #define AGENT_MEMORY_H_
 
+#include <string>
+
+#include "camille-agenty/agents/agent-context.h"
+
 namespace agenty::agent {
 
-/**
- * TODO:
- * custom cache
- * init agent-graph here (state graph).
- * init here the orchestration.
- */
+struct memory_config {
+  int max_connections;
+  bool external{false};
+  std::string connection_string;
+  // alot of work here, but building the structure for the future.
+};
+
+class memory {
+ public:
+  explicit memory(
+      backend_type type);  // if llama, we create kv context memory also, in general we create a
+                           // common, with options to add db or vector db engine.
+  explicit memory(memory_config config);
 
-class memory {};
+ private:
+  std::vector<std::string> common_memory;  // if external is false we use this, if true we dont
+};
 
 }  // namespace agenty::agent
 

include/camille-agenty/agents/agent-memory.h

@@ -5,35 +5,22 @@
 #include <memory>
 #include <functional>
 
+#include "json.hpp"
+
+using json = nlohmann::json;
+
 namespace agenty::agent {
 
 struct tool_params {
   uint8_t max_retries;
 };
 
-enum class types : uint8_t { TOOL_TYPE_STRING, TOOL_TYPE_BYTES };
-
-class base_tool {
- public:
-  virtual ~base_tool() = default;
-};
-
-struct tool : public base_tool {
-  types tool_type;  // the type of data that the tool accepts
+struct tool {
   tool_params params;
   std::string tool_name;
+  std::string tool_schema;
   std::string tool_description;
-  std::function<void()> tool;
-};
-
-class custom_tool {
- public:
-  explicit custom_tool(std::function<void()> func);
-  custom_tool(const custom_tool& custom_tool);
-  custom_tool(custom_tool&& custom_tool) noexcept;
-
- private:
-  std::unique_ptr<tool> tool_;
+  json tool_schema_json;
 };
 
 }  // namespace agenty::agent