fix: Make sure "enabled" is set correctly in resource updates (#1589)

* fix: Make sure "enabled" is set correctly in resource udpates

Without this, the update will always fail because creation of the return
object will raise a validation error.

Branch: FixResourceUpdate

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>

* fix: Make sure the DB tool has lazily evaluated before copying it

Branch: FixResourceUpdate

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>

---------

Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>

Author: gabe-l-hart

mcpgateway/services/resource_service.py

@@ -257,6 +257,7 @@ def _convert_resource_to_read(self, resource: DbResource) -> ResourceRead:
         resource_dict["created_at"] = getattr(resource, "created_at", resource_dict.get("created_at"))
         resource_dict["updated_at"] = getattr(resource, "updated_at", resource_dict.get("updated_at"))
         resource_dict["is_active"] = getattr(resource, "is_active", resource_dict.get("is_active"))
+        resource_dict["enabled"] = getattr(resource, "enabled", resource_dict.get("enabled"))
 
         # Compute aggregated metrics from the resource's metrics list.
         total = len(resource.metrics) if hasattr(resource, "metrics") and resource.metrics is not None else 0

mcpgateway/services/tool_service.py

@@ -366,6 +366,12 @@ def _convert_tool_to_read(self, tool: DbTool, include_metrics: bool = True) -> T
         Returns:
             ToolRead: The Pydantic model representing the tool, including aggregated metrics and new fields.
         """
+        # NOTE: This serves two purposes:
+        #   1. It determines whether to decode auth (used later)
+        #   2. It forces the tool object to lazily evaluate (required before copy)
+        auth_type_set = tool.auth_type and tool.auth_value
+
+        # Copy the dict from the tool
         tool_dict = tool.__dict__.copy()
         tool_dict.pop("_sa_instance_state", None)
 
@@ -377,7 +383,7 @@ def _convert_tool_to_read(self, tool: DbTool, include_metrics: bool = True) -> T
         tool_dict["annotations"] = tool.annotations or {}
 
         # Only decode auth if auth_type is set
-        if tool.auth_type and tool.auth_value:
+        if auth_type_set:
             decoded_auth_value = decode_auth(tool.auth_value)
             if tool.auth_type == "basic":
                 decoded_bytes = base64.b64decode(decoded_auth_value["Authorization"].split("Basic ")[1])