more serialized classes

Author: edwardcapriolo

basic_test.cpp

@@ -17,6 +17,7 @@ class basic_test : public CppUnit::TestFixture {
   CPPUNIT_TEST( testEmpty );
   CPPUNIT_TEST( testJsonWithVariant );
   CPPUNIT_TEST( testModelSerialization );
+  CPPUNIT_TEST( toolSerializationTest );
   CPPUNIT_TEST_SUITE_END();
 public:
   void testEmpty () { int i=5; CPPUNIT_ASSERT(i==5); }
@@ -26,7 +27,7 @@ class basic_test : public CppUnit::TestFixture {
       ns::ComplexStruct comp{ "x" };
       json r = comp;
       std::cout << r.dump() << std::endl;
-      ns::ComplexStruct p2 = r.template get<ns::ComplexStruct>();
+      ns::ComplexStruct p2 = r.template get<ns::ComplexStruct>();r.template get<ns::ComplexStruct>();
 
       CPPUNIT_ASSERT("x" == std::get<std::string> (p2.id)  );
       CPPUNIT_ASSERT(r.at("id") == "x");
@@ -65,9 +66,25 @@ class basic_test : public CppUnit::TestFixture {
       a3a::request_json_params p2 = j.template get<a3a::request_json_params>();
       std::cout << "params " << p2.params << std::endl;
       std::cout << "ddf " << p2.jsonrpc.value() << std::endl;
-      //std::cout << p2.params << std::endl;
     }
+  }
 
+  void toolSerializationTest(){
+    using json = nlohmann::json;
+    a3a::tool t;
+    t = json::parse(R"({"name": "calculate_sum",
+"description": "Add two numbers together",
+"inputSchema": {
+"type": "object",
+"properties": {
+"a": { "type": "number" },
+"b": { "type": "number" }
+},
+"required": ["a", "b"]
+}
+})");
+    CPPUNIT_ASSERT(t.name == "calculate_sum");
+    std::cout << t.inputSchema.properties << std::endl;
   }
 };
 CPPUNIT_TEST_SUITE_REGISTRATION( basic_test );

mcpplusplus.cc

@@ -1,5 +1,6 @@
 #include <vector>
 #include "request.h"
+#include "mcppp.hpp"
 #include <seastar/core/seastar.hh>
 #include <seastar/core/future-util.hh>
 #include <seastar/core/app-template.hh>
@@ -22,13 +23,25 @@ using namespace seastar::httpd;
 using namespace std;
 using namespace a3a;
 
+
+
 vector<a3a::resource> list_resources(){
     a3a::resource r1 = { "file:///hobbies.txt", "my-hobbies", "a list of my hobbies one per line."};
     vector<a3a::resource> result;
     result.push_back(r1);
     return result;
 }
 
+a3a::resource_read_response read_resource(){
+    a3a::resource_read r1;
+    r1.uri =  "file:///hobbies.txt";
+    r1.text = "java\nc++\nkarate";
+    a3a::resource_read_response resp;
+    resp.contents = std::vector<a3a::resource_read>();
+    resp.contents.push_back(r1);
+    return resp;
+}
+
 void set_routes(routes& r) {
     function_handler* h3 = new function_handler([](const_req req) {
         using json = nlohmann::json;
@@ -41,6 +54,7 @@ void set_routes(routes& r) {
 int main(int argc, char** argv) {
     app_template app;
     return app.run(argc, argv, [] () -> future<int> {
+        //nice example here https://github.com/scylladb/seastar/blob/master/apps/httpd/main.cc
         auto server = new http_server("mcpplusplus");
         set_routes(server->_routes);
         co_await server->listen(seastar::make_ipv4_address({1235}));

mcppp.hpp

@@ -0,0 +1,39 @@
+#ifndef a3a_mcppp_hpp
+#define a3a_mcppp_hpp
+
+#include <seastar/core/seastar.hh>
+#include <seastar/core/future-util.hh>
+#include <seastar/core/app-template.hh>
+#include <seastar/http/routes.hh>
+#include <seastar/http/request.hh>
+#include <seastar/http/function_handlers.hh>
+#include <seastar/http/httpd.hh>
+#include <seastar/core/sleep.hh>
+#include <seastar/coroutine/all.hh>
+
+namespace a3a {
+
+using namespace std;
+using namespace seastar;
+
+class mcppp_session{
+public:
+  string id;
+};
+class mcppp {
+private:
+    std::map<string, mcppp_session> data;
+};
+
+class sharded_mcppp {
+public:
+    sharded_mcppp(seastar::distributed<mcppp>& peers) :
+    _peers(peers) {
+
+    }
+private:
+  seastar::distributed<mcppp>& _peers;
+};
+
+}
+#endif

request.h

@@ -3,10 +3,75 @@
 #include <string>
 #include "jsonifyext.hpp"
 
+
 namespace a3a {
+
   using namespace std;
   using namespace nlohmann;
 
+  string TOOLS_LIST = "tools/list";
+  string TOOLS_CALL = "tools/call";
+
+  class annotations_item {
+  public:
+    optional<string> title;
+    optional<bool> readOnlyHint;
+    optional<bool> destructiveHint;
+    optional<bool> idempotentHint;
+    optional<bool> openWorldHint;
+  };
+  NLOHMANN_JSONIFY_ALL_THINGS(annotations_item, readOnlyHint, destructiveHint, idempotentHint, openWorldHint);
+
+
+  class input_schema {
+  public:
+    string type;
+    json properties;
+    vector<string> required;
+  };
+  NLOHMANN_JSONIFY_ALL_THINGS(input_schema, type, properties, required);
+
+
+  class tool {
+  public:
+    string name;
+    optional<string> description;
+    input_schema inputSchema;
+    optional<annotations_item> annotations;
+  };
+  NLOHMANN_JSONIFY_ALL_THINGS(tool, name, description, inputSchema, annotations);
+
+  class call_tool_result {
+
+    bool isError;
+  };
+
+  class implementation {
+  public:
+    string name;
+    string version;
+  };
+  //changed class name to not clash with propert
+  class sampling_item{
+  public:
+  };
+  class root_capabilities {
+  public:
+    bool listChanged;
+  };
+  class client_capabilities{
+  public:
+    nlohmann::json experimental;
+    root_capabilities roots;
+    sampling_item sampling;
+  };
+  class initialize_reqest {
+  public:
+    string protocolVersion;
+    client_capabilities capabilities;
+    implementation clientInfo;
+  };
+
   class request{
   public:
     std::optional<string> jsonrpc;
@@ -38,6 +103,7 @@ namespace a3a {
   };
   NLOHMANN_JSONIFY_ALL_THINGS(resource, uri, name, description, mimeType);
 
+
   class resource_read {
   public:
     string uri;
@@ -46,5 +112,14 @@ namespace a3a {
     optional<string> blob; // For binary resources (base64 encoded)
   };
   NLOHMANN_JSONIFY_ALL_THINGS(resource_read, uri, mimeType, text, blob);
+
+
+  class resource_read_response {
+  public:
+    std::vector<resource_read> contents;
+
+  };
+  NLOHMANN_JSONIFY_ALL_THINGS(resource_read_response, contents);
+
 }
 #endif