refactor: update GraphNode structure to use GraphNodeType

Author: halajohn

core/src/ten_manager/src/designer/graphs/nodes/delete.rs

@@ -11,9 +11,9 @@ use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use ten_rust::{
-    graph::{node::GraphNode, Graph},
-    pkg_info::{pkg_type::PkgType, pkg_type_and_name::PkgTypeAndName},
+use ten_rust::graph::{
+    node::{GraphNode, GraphNodeType},
+    Graph,
 };
 
 use crate::{
@@ -50,8 +50,8 @@ pub fn graph_delete_extension_node(
     // Find and remove the matching node.
     let original_nodes_len = graph.nodes.len();
     graph.nodes.retain(|node| {
-        !(node.type_and_name.pkg_type == PkgType::Extension
-            && node.type_and_name.name == pkg_name
+        !(node.type_ == GraphNodeType::Extension
+            && node.name == pkg_name
             && node.addon == addon
             && node.app == app
             && node.extension_group == extension_group)
@@ -184,10 +184,8 @@ pub async fn delete_graph_node_endpoint(
         if let Some(property) = &mut pkg_info.property {
             // Create the GraphNode we want to remove
             let node_to_remove = GraphNode {
-                type_and_name: PkgTypeAndName {
-                    pkg_type: PkgType::Extension,
-                    name: request_payload.name.to_string(),
-                },
+                type_: GraphNodeType::Extension,
+                name: request_payload.name.to_string(),
                 addon: request_payload.addon.to_string(),
                 extension_group: request_payload
                     .extension_group
@@ -208,9 +206,7 @@ pub async fn delete_graph_node_endpoint(
                 Some(&nodes_to_remove),
                 None,
             ) {
-                eprintln!(
-                    "Warning: Failed to update property.json file: {e}"
-                );
+                eprintln!("Warning: Failed to update property.json file: {e}");
             }
         }
     }

core/src/ten_manager/src/designer/graphs/nodes/get.rs

@@ -12,9 +12,7 @@ use serde::{Deserialize, Serialize};
 use ten_rust::pkg_info::get_pkg_info_for_extension_addon;
 use uuid::Uuid;
 
-use ten_rust::graph::node::GraphNode;
-use ten_rust::pkg_info::pkg_type::PkgType;
-use ten_rust::pkg_info::pkg_type_and_name::PkgTypeAndName;
+use ten_rust::graph::node::{GraphNode, GraphNodeType};
 
 use crate::designer::common::{
     get_designer_api_msg_from_pkg, get_designer_property_hashmap_from_pkg,
@@ -56,16 +54,16 @@ impl TryFrom<GraphNode> for GraphNodesSingleResponseData {
     type Error = anyhow::Error;
 
     fn try_from(node: GraphNode) -> Result<Self, Self::Error> {
-        if node.type_and_name.pkg_type != PkgType::Extension {
+        if node.type_ != GraphNodeType::Extension {
             return Err(anyhow!(
                 "Graph node '{}' is not of type 'extension'",
-                node.type_and_name.name
+                node.name
             ));
         }
 
         Ok(GraphNodesSingleResponseData {
             addon: node.addon,
-            name: node.type_and_name.name,
+            name: node.name,
             extension_group: node.extension_group,
             app: node.app,
             api: None,
@@ -78,10 +76,8 @@ impl TryFrom<GraphNode> for GraphNodesSingleResponseData {
 impl From<GraphNodesSingleResponseData> for GraphNode {
     fn from(designer_extension: GraphNodesSingleResponseData) -> Self {
         GraphNode {
-            type_and_name: PkgTypeAndName {
-                pkg_type: PkgType::Extension,
-                name: designer_extension.name,
-            },
+            type_: GraphNodeType::Extension,
+            name: designer_extension.name,
             addon: designer_extension.addon,
             extension_group: designer_extension.extension_group,
             app: designer_extension.app,
@@ -113,7 +109,8 @@ pub async fn get_graph_nodes_endpoint(
                 let error_response = ErrorResponse::from_error(
                     &err,
                     format!(
-                        "Error fetching runtime extensions for graph '{graph_id}'"
+                        "Error fetching runtime extensions for graph \
+                         '{graph_id}'"
                     )
                     .as_str(),
                 );
@@ -133,7 +130,7 @@ pub async fn get_graph_nodes_endpoint(
         if let Some(pkg_info) = pkg_info {
             resp_extensions.push(GraphNodesSingleResponseData {
                 addon: extension_graph_node.addon.clone(),
-                name: extension_graph_node.type_and_name.name.clone(),
+                name: extension_graph_node.name.clone(),
                 extension_group: extension_graph_node.extension_group.clone(),
                 app: extension_graph_node.app.clone(),
                 api: pkg_info.manifest.api.as_ref().map(|api| DesignerApi {

core/src/ten_manager/src/designer/graphs/nodes/mod.rs

@@ -17,13 +17,11 @@ use serde::{Deserialize, Serialize};
 
 use ten_rust::base_dir_pkg_info::PkgsInfoInApp;
 use ten_rust::graph::graph_info::GraphInfo;
-use ten_rust::graph::node::GraphNode;
+use ten_rust::graph::node::{GraphNode, GraphNodeType};
 use ten_rust::pkg_info::manifest::api::ManifestApiMsg;
 use ten_rust::pkg_info::manifest::api::{
     ManifestApiCmdResult, ManifestApiPropertyAttributes,
 };
-use ten_rust::pkg_info::pkg_type::PkgType;
-use ten_rust::pkg_info::pkg_type_and_name::PkgTypeAndName;
 use ten_rust::pkg_info::value_type::ValueType;
 use uuid::Uuid;
 
@@ -188,10 +186,8 @@ pub fn update_graph_node_in_property_all_fields(
     {
         // Create the graph node.
         let new_node = GraphNode {
-            type_and_name: PkgTypeAndName {
-                pkg_type: PkgType::Extension,
-                name: node_name.to_string(),
-            },
+            type_: GraphNodeType::Extension,
+            name: node_name.to_string(),
             addon: addon_name.to_string(),
             extension_group: extension_group_name.clone(),
             app: app_uri.clone(),
@@ -233,9 +229,7 @@ pub fn update_graph_node_in_property_all_fields(
                 nodes_to_remove,
                 nodes_to_modify_property,
             ) {
-                eprintln!(
-                    "Warning: Failed to update property.json file: {e}"
-                );
+                eprintln!("Warning: Failed to update property.json file: {e}");
             }
         }
     }

core/src/ten_manager/src/designer/graphs/nodes/property/update.rs

@@ -50,7 +50,7 @@ fn update_node_property_in_graph(
 ) -> Result<()> {
     // Find the node in the graph.
     let graph_node = graph_info.graph.nodes.iter_mut().find(|node| {
-        node.type_and_name.name == request_payload.name
+        node.name == request_payload.name
             && node.addon == request_payload.addon
             && node.extension_group == request_payload.extension_group
             && node.app == request_payload.app

core/src/ten_manager/src/designer/graphs/nodes/replace.rs

@@ -79,8 +79,7 @@ pub async fn replace_graph_node_endpoint(
 
     // Find the graph node in the graph.
     let graph_node = graph_info.graph.nodes.iter_mut().find(|node| {
-        node.type_and_name.name == request_payload.name
-            && node.app == request_payload.app
+        node.name == request_payload.name && node.app == request_payload.app
     });
 
     if graph_node.is_none() {

core/src/ten_manager/src/designer/graphs/update.rs

@@ -8,10 +8,8 @@ use std::sync::Arc;
 
 use actix_web::{web, HttpResponse, Responder};
 use serde::{Deserialize, Serialize};
-use ten_rust::graph::node::GraphNode;
+use ten_rust::graph::node::{GraphNode, GraphNodeType};
 use ten_rust::graph::{connection::GraphConnection, GraphExposedMessage};
-use ten_rust::pkg_info::pkg_type::PkgType;
-use ten_rust::pkg_info::pkg_type_and_name::PkgTypeAndName;
 use uuid::Uuid;
 
 use crate::{
@@ -38,10 +36,8 @@ pub struct GraphNodeForUpdate {
 impl GraphNodeForUpdate {
     fn to_graph_node(&self) -> GraphNode {
         GraphNode {
-            type_and_name: PkgTypeAndName {
-                pkg_type: PkgType::Extension,
-                name: self.name.clone(),
-            },
+            type_: GraphNodeType::Extension,
+            name: self.name.clone(),
             addon: self.addon.clone(),
             extension_group: self.extension_group.clone(),
             app: self.app.clone(),

core/src/ten_manager/src/designer/messages/compatible.rs

@@ -81,7 +81,7 @@ impl From<CompatibleExtensionAndMsg<'_>>
         GetCompatibleMsgsSingleResponseData {
             app: compatible.extension.app.clone(),
             extension_group: compatible.extension.extension_group.clone(),
-            extension: compatible.extension.type_and_name.name.clone(),
+            extension: compatible.extension.name.clone(),
             msg_type: compatible.msg_type,
             msg_direction: compatible.msg_direction,
             msg_name: compatible.msg_name,
@@ -96,7 +96,7 @@ fn get_extension_graph_node<'a>(
     extension_name: &str,
 ) -> Result<&'a GraphNode> {
     for extension in extension_graph_nodes {
-        if extension.type_and_name.name == extension_name
+        if extension.name == extension_name
             && extension.extension_group.as_ref() == extension_group.as_ref()
             && extension.app == *app
         {

core/src/ten_manager/src/graph/connections/add.rs

@@ -130,9 +130,10 @@ fn check_nodes_exist(
     dest_extension: &str,
 ) -> Result<()> {
     // Validate that source node exists.
-    let src_node_exists = graph.nodes.iter().any(|node| {
-        node.type_and_name.name == src_extension && node.app == *src_app
-    });
+    let src_node_exists = graph
+        .nodes
+        .iter()
+        .any(|node| node.name == src_extension && node.app == *src_app);
 
     if !src_node_exists {
         return Err(anyhow::anyhow!(
@@ -144,9 +145,10 @@ fn check_nodes_exist(
     }
 
     // Validate that destination node exists.
-    let dest_node_exists = graph.nodes.iter().any(|node| {
-        node.type_and_name.name == dest_extension && node.app == *dest_app
-    });
+    let dest_node_exists = graph
+        .nodes
+        .iter()
+        .any(|node| node.name == dest_extension && node.app == *dest_app);
 
     if !dest_node_exists {
         return Err(anyhow::anyhow!(

core/src/ten_manager/src/graph/nodes/add.rs

@@ -6,9 +6,9 @@
 //
 use anyhow::Result;
 
-use ten_rust::{
-    graph::{node::GraphNode, Graph},
-    pkg_info::{pkg_type::PkgType, pkg_type_and_name::PkgTypeAndName},
+use ten_rust::graph::{
+    node::{GraphNode, GraphNodeType},
+    Graph,
 };
 
 /// Checks if a node exists in the graph.
@@ -21,7 +21,7 @@ fn check_node_exist(
     let src_node_exists = graph
         .nodes
         .iter()
-        .any(|node| node.type_and_name.name == extension && node.app == *app);
+        .any(|node| node.name == extension && node.app == *app);
 
     if src_node_exists {
         return Err(anyhow::anyhow!(
@@ -50,10 +50,8 @@ pub fn graph_add_extension_node(
 
     // Create new GraphNode.
     let node = GraphNode {
-        type_and_name: PkgTypeAndName {
-            pkg_type: PkgType::Extension,
-            name: pkg_name.to_string(),
-        },
+        type_: GraphNodeType::Extension,
+        name: pkg_name.to_string(),
         addon: addon.to_string(),
         extension_group: extension_group.clone(),
         app: app.clone(),

core/src/ten_manager/src/graph/nodes/mod.rs

@@ -7,8 +7,6 @@
 pub mod add;
 pub mod validate;
 
-use std::str::FromStr;
-
 use anyhow::Result;
 use serde_json::Value;
 
@@ -181,23 +179,17 @@ fn remove_nodes_from_array(
                 // Match the type.
                 let type_match = match item_obj.get("type") {
                     Some(Value::String(item_type)) => {
-                        if let Ok(pkg_type) =
-                            ten_rust::pkg_info::pkg_type::PkgType::from_str(
-                                item_type,
-                            )
-                        {
-                            pkg_type == remove_node.type_and_name.pkg_type
-                        } else {
-                            false
-                        }
+                        // For GraphNodeType::Extension, the string is
+                        // "extension"
+                        item_type == "extension"
                     }
                     _ => false,
                 };
 
                 // Match the name.
                 let name_match = match item_obj.get("name") {
                     Some(Value::String(item_name)) => {
-                        item_name == &remove_node.type_and_name.name
+                        item_name == &remove_node.name
                     }
                     _ => false,
                 };
@@ -270,23 +262,16 @@ fn modify_node(nodes_array: &mut Vec<Value>, modify_nodes: &[GraphNode]) {
             // Match the type.
             let type_match = match node_obj.get("type") {
                 Some(Value::String(node_type)) => {
-                    if let Ok(pkg_type) =
-                        ten_rust::pkg_info::pkg_type::PkgType::from_str(
-                            node_type,
-                        )
-                    {
-                        pkg_type == modify_node.type_and_name.pkg_type
-                    } else {
-                        false
-                    }
+                    // For GraphNodeType::Extension, the string is "extension"
+                    node_type == "extension"
                 }
                 _ => false,
             };
 
             // Match the name.
             let name_match = match node_obj.get("name") {
                 Some(Value::String(node_name)) => {
-                    node_name == &modify_node.type_and_name.name
+                    node_name == &modify_node.name
                 }
                 _ => false,
             };
@@ -340,7 +325,7 @@ fn update_connections_for_removed_nodes(
     // Create a list of node identifiers to remove.
     let nodes_names_to_remove: Vec<(String, Option<String>)> = remove_nodes
         .iter()
-        .map(|node| (node.type_and_name.name.clone(), node.app.clone()))
+        .map(|node| (node.name.clone(), node.app.clone()))
         .collect();
 
     if let Some(Value::Array(connections_array)) =

core/src/ten_manager/tests/test_case/designer/graphs/nodes/delete.rs

@@ -338,8 +338,7 @@ mod tests {
         {
             // Check if the node is gone.
             let node_exists = graph_info.graph.nodes.iter().any(|node| {
-                node.type_and_name.name == "test_delete_node"
-                    && node.addon == "test_addon"
+                node.name == "test_delete_node" && node.addon == "test_addon"
             });
             assert!(!node_exists, "Node should have been deleted");
         } else {

core/src/ten_manager/tests/test_case/designer/graphs/nodes/replace.rs

@@ -265,7 +265,7 @@ mod tests {
             let graph_info = graphs_cache.get(&graph_id).unwrap();
 
             // Assuming there's at least one node in the graph.
-            graph_info.graph.nodes.first().unwrap().type_and_name.name.clone()
+            graph_info.graph.nodes.first().unwrap().name.clone()
         };
 
         // Try to replace a node with an invalid property (integer instead of
@@ -424,7 +424,7 @@ mod tests {
             let graph_info = graphs_cache.get(&graph_id).unwrap();
 
             // Assuming there's at least one node in the graph.
-            graph_info.graph.nodes.first().unwrap().type_and_name.name.clone()
+            graph_info.graph.nodes.first().unwrap().name.clone()
         };
 
         // Try to replace a node with an invalid property (integer instead of
@@ -543,7 +543,7 @@ mod tests {
 
             // Assuming there's at least one node in the graph.
             let node = graph_info.graph.nodes.first().unwrap();
-            (node.type_and_name.name.clone(), node.app.clone())
+            (node.name.clone(), node.app.clone())
         };
 
         // Store the node details we'll use for replacement.
@@ -585,9 +585,7 @@ mod tests {
             .graph
             .nodes
             .iter()
-            .find(|node| {
-                node.type_and_name.name == node_name && node.app == app_uri
-            })
+            .find(|node| node.name == node_name && node.app == app_uri)
             .unwrap();
 
         assert_eq!(updated_node.addon, new_addon);