[292] Move StarNode to DistributedAlgorithmNode directory

src/distributed_algorithm_node/BUILD

@@ -1,27 +1,46 @@
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
-    name = "distributed_algorithm_node_lib",
-    srcs = [
-      "DistributedAlgorithmNode.cc",
-      "LeadershipBroker.cc",
-      "MessageBroker.cc",
-      "Message.cc",
-    ],
-    hdrs = [
-      "DistributedAlgorithmNode.h",
-      "LeadershipBroker.h",
-      "MessageBroker.h",
-      "Message.h",
-    ],
-    includes = ["."],
-    alwayslink = 1,
-    linkstatic = 1,
-    features = ["fully_static_link"],
-    deps = [
-        "@com_github_singnet_das_proto//:atom_space_node_cc_grpc",
-        "@com_github_grpc_grpc//:grpc++",
-        "@com_github_grpc_grpc//:grpc++_reflection",
-        "//commons:commons_lib"
-    ],
+  name = "distributed_algorithm_node_lib",
+  includes = ["."],
+  alwayslink = 1,
+  linkstatic = 1,
+  features = ["fully_static_link"],
+  deps = [
+    ":distributed_algorithm_node",
+    ":star_node"
+  ]
+)
+
+cc_library(
+  name = "distributed_algorithm_node",
+  srcs = [
+    "DistributedAlgorithmNode.cc",
+    "LeadershipBroker.cc",
+    "MessageBroker.cc",
+    "Message.cc",
+  ],
+  hdrs = [
+    "DistributedAlgorithmNode.h",
+    "LeadershipBroker.h",
+    "MessageBroker.h",
+    "Message.h",
+  ],
+  deps = [
+    "@com_github_singnet_das_proto//:atom_space_node_cc_grpc",
+    "@com_github_grpc_grpc//:grpc++",
+    "@com_github_grpc_grpc//:grpc++_reflection",
+    "//commons:commons_lib"
+  ],
+)
+
+
+cc_library(
+  name = "star_node",
+  srcs = ["StarNode.cc"],
+  hdrs = ["StarNode.h"],
+  includes = ["."],
+  deps = [
+    "//distributed_algorithm_node:distributed_algorithm_node",
+  ],
 )

src/hyperon_das_node/hyperon_das_node_ext.cc

@@ -8,6 +8,7 @@
 #include "distributed_algorithm_node/Message.h"
 #include "distributed_algorithm_node/MessageBroker.h"
 #include "distributed_algorithm_node/LeadershipBroker.h"
+#include "distributed_algorithm_node/StarNode.h"
 
 namespace nb = nanobind;
 using namespace nb::literals; // Enables use of literal "_a" for named arguments
@@ -45,7 +46,7 @@ class MessageFactoryTrampoline : public MessageFactory {
 class DistributedAlgorithmNodeTrampoline : public DistributedAlgorithmNode {
 public:
   // Defines a trampoline for the BaseClass
-  // Since we are overriding 3 methods in Python, thon
+  // Since we are overriding 3 methods in Python
   NB_TRAMPOLINE(DistributedAlgorithmNode, 3);
   MessagePtr message_factory(string &command, vector<string> &args) override {
     // Allows Python to override a non pure virtual method
@@ -58,6 +59,21 @@ class DistributedAlgorithmNodeTrampoline : public DistributedAlgorithmNode {
     NB_OVERRIDE_PURE(cast_leadership_vote);
   };
 };
+
+class StarNodeTrampoline : public StarNode {
+public:
+  NB_TRAMPOLINE(StarNode, 3);
+  MessagePtr message_factory(string &command, vector<string> &args) override {
+    // Allows Python to override a non pure virtual method
+    NB_OVERRIDE(message_factory, command, args);
+  };
+  void node_joined_network(const string &node_id) override {
+    NB_OVERRIDE_PURE(node_joined_network, node_id);
+  };
+  string cast_leadership_vote() override {
+    NB_OVERRIDE_PURE(cast_leadership_vote);
+  };
+};
 // ****************************************************************************
 
 // Create the Python module 'hyperon_das_node_ext'
@@ -104,4 +120,9 @@ NB_MODULE(hyperon_das_node_ext, m) {
            "node_id"_a)
       .def("cast_leadership_vote", &DistributedAlgorithmNode::cast_leadership_vote)
       .def("message_factory", &DistributedAlgorithmNode::message_factory);
+  nb::class_<StarNode, DistributedAlgorithmNode>(m, "StarNode")
+      .def(nb::init<string, MessageBrokerType>(),
+           "node_id"_a, "messaging_backend"_a = MessageBrokerType::GRPC)
+      .def(nb::init<string, string, MessageBrokerType>(),
+           "node_id"_a, "server_id"_a, "messaging_backend"_a = MessageBrokerType::GRPC);
 }

src/inference_agent/BUILD

@@ -25,7 +25,7 @@ cc_library(
   srcs = ["distributed_inference_control_agent_node.cc"],
   hdrs = ["distributed_inference_control_agent_node.h"],
   deps = [
-    "//query_engine:star_node",
+    "//distributed_algorithm_node:star_node",
   ],
 )
 
@@ -46,7 +46,6 @@ cc_library(
   deps = [
     "//commons:commons_lib",
     "//link_creation_agent:link_creation_agent_lib",
-    "//query_engine:star_node",
     "//distributed_algorithm_node:distributed_algorithm_node_lib"
   ],
 )

src/link_creation_agent/BUILD

@@ -31,7 +31,6 @@ cc_library(
   srcs = ["das_agent_node.cc"],
   hdrs = ["das_agent_node.h", "queue.h"],
   deps = [
-    "//query_engine:star_node",
     "//distributed_algorithm_node:distributed_algorithm_node_lib",
   ],
 )
@@ -57,7 +56,7 @@ cc_library(
   srcs = ["link_creation_agent_node.cc"],
   hdrs = ["link_creation_agent_node.h", "dummy_message.h", "queue.h"],
   deps = [
-    "//query_engine:star_node"
+    "//distributed_algorithm_node:star_node"
   ],
 )
 

src/query_engine/BUILD

@@ -21,7 +21,7 @@ cc_library(
         ":handles_answer",
         ":query_answer",
         ":query_node",
-        ":star_node",
+        "//distributed_algorithm_node:star_node",
         "//query_engine/query_element:query_element_lib",
         "//query_engine/answer_processor:answer_processor_lib",
         "//attention_broker:attention_broker_server_lib",
@@ -98,13 +98,3 @@ cc_library(
     "//distributed_algorithm_node:distributed_algorithm_node_lib",
   ],
 )
-
-cc_library(
-  name = "star_node",
-  srcs = ["StarNode.cc"],
-  hdrs = ["StarNode.h"],
-  includes = ["."],
-  deps = [
-    "//distributed_algorithm_node:distributed_algorithm_node_lib",
-  ],
-)

src/tests/python/unit/BUILD

@@ -171,3 +171,13 @@ py_test(
         "//hyperon_das:utils",
     ],
 )
+
+py_test(
+    name = "test_star_node",
+    size = "small",
+    srcs = ["test_star_node.py"],
+    deps = [
+        "//hyperon_das_node:hyperon_das_node",
+    ],
+)
+

src/tests/python/unit/test_star_node.py

@@ -0,0 +1,37 @@
+from unittest import TestCase
+
+from hyperon_das_node import StarNode
+
+
+class TestStarNode(TestCase):
+    def test_star_node(self):
+        self.server_id: str = "localhost:35700"
+        self.client1_id: str = "localhost:35701"
+        self.client2_id: str = "localhost:35702"
+
+        self.server = StarNode(node_id=self.server_id)
+        self.client1 = StarNode(node_id=self.client1_id, server_id=self.server_id)
+        self.client2 = StarNode(node_id=self.client2_id, server_id=self.server_id)
+
+        # Test id assignment
+        self.assertEqual(self.server.node_id(), self.server_id)
+        self.assertEqual(self.client1.node_id(), self.client1_id)
+        self.assertEqual(self.client2.node_id(), self.client2_id)
+
+        # Server should be leader
+        self.assertTrue(self.server.has_leader())
+        self.assertTrue(self.client1.has_leader())
+        self.assertTrue(self.client2.has_leader())
+
+        self.assertTrue(self.server.is_leader())
+        self.assertFalse(self.client1.is_leader())
+        self.assertFalse(self.client2.is_leader())
+
+        self.assertEqual(self.server.leader_id(), self.server_id)
+        self.assertEqual(self.client1.leader_id(), self.server_id)
+        self.assertEqual(self.client2.leader_id(), self.server_id)
+
+        # Test id assignment
+        self.assertEqual(self.server.node_id(), self.server_id)
+        self.assertEqual(self.client1.node_id(), self.client1_id)
+        self.assertEqual(self.client2.node_id(), self.client2_id)