review comments

Signed-off-by: Huamin Chen <[email protected]>

Author: rootfs

src/semantic-router/pkg/connectivity/mcp/http_client.go

@@ -13,7 +13,11 @@ import (
 )
 
 const (
-	// MCPProtocolVersion is the MCP protocol version supported by this implementation
+	// MCPProtocolVersion is the MCP protocol version supported by this implementation.
+	// This version is defined by the Model Context Protocol specification and must match
+	// the version expected by MCP servers. The version "2024-11-05" represents the current
+	// stable MCP specification release. This is not derived from mcp-go as the library
+	// does not export a version constant; instead, it's specified by the protocol itself.
 	MCPProtocolVersion = "2024-11-05"
 	// MCPClientVersion is the version of this MCP client implementation
 	MCPClientVersion = "1.0.0"

src/semantic-router/pkg/utils/classification/mcp_classifier.go

@@ -18,8 +18,8 @@ import (
 
 const (
 	// DefaultMCPThreshold is the default confidence threshold for MCP classification.
-	// A value of 0.5 is commonly used as it represents a neutral cutoff for binary or probabilistic classification,
-	// meaning predictions with confidence above 50% are considered positive. Adjust as needed for your use case.
+	// For multi-class classification, a value of 0.5 means that a predicted class must have more than 50% confidence
+	// to be selected. Adjust this threshold as needed for your use case.
 	DefaultMCPThreshold = 0.5
 )
 
@@ -222,8 +222,7 @@ func createMCPCategoryInference(initializer MCPCategoryInitializer) MCPCategoryI
 // IsMCPCategoryEnabled checks if MCP-based category classification is properly configured
 func (c *Classifier) IsMCPCategoryEnabled() bool {
 	return c.Config.Classifier.MCPCategoryModel.Enabled &&
-		c.Config.Classifier.MCPCategoryModel.ToolName != "" &&
-		c.mcpCategoryInitializer != nil
+		c.Config.Classifier.MCPCategoryModel.ToolName != ""
 }
 
 // initializeMCPCategoryClassifier initializes the MCP category classification model
@@ -232,6 +231,10 @@ func (c *Classifier) initializeMCPCategoryClassifier() error {
 		return fmt.Errorf("MCP category classification is not properly configured")
 	}
 
+	if c.mcpCategoryInitializer == nil {
+		return fmt.Errorf("MCP category initializer is not set")
+	}
+
 	if err := c.mcpCategoryInitializer.Init(c.Config); err != nil {
 		return fmt.Errorf("failed to initialize MCP category classifier: %w", err)
 	}
@@ -246,6 +249,10 @@ func (c *Classifier) classifyCategoryMCP(text string) (string, float64, error) {
 		return "", 0.0, fmt.Errorf("MCP category classification is not properly configured")
 	}
 
+	if c.mcpCategoryInference == nil {
+		return "", 0.0, fmt.Errorf("MCP category inference is not initialized")
+	}
+
 	// Create context with timeout
 	ctx := context.Background()
 	if c.Config.Classifier.MCPCategoryModel.TimeoutSeconds > 0 {
@@ -302,6 +309,10 @@ func (c *Classifier) classifyCategoryWithEntropyMCP(text string) (string, float6
 		return "", 0.0, entropy.ReasoningDecision{}, fmt.Errorf("MCP category classification is not properly configured")
 	}
 
+	if c.mcpCategoryInference == nil {
+		return "", 0.0, entropy.ReasoningDecision{}, fmt.Errorf("MCP category inference is not initialized")
+	}
+
 	// Create context with timeout
 	ctx := context.Background()
 	if c.Config.Classifier.MCPCategoryModel.TimeoutSeconds > 0 {

src/semantic-router/pkg/utils/classification/mcp_classifier_test.go

@@ -330,10 +330,9 @@ var _ = Describe("Classifier MCP Methods", func() {
 			Expect(classifier.IsMCPCategoryEnabled()).To(BeFalse())
 		})
 
-		It("should return false when initializer is nil", func() {
-			classifier.mcpCategoryInitializer = nil
-			Expect(classifier.IsMCPCategoryEnabled()).To(BeFalse())
-		})
+		// Note: IsMCPCategoryEnabled now only checks configuration, not runtime state.
+		// Runtime checks (like initializer != nil) are handled separately in the actual
+		// classification methods to maintain separation of concerns.
 	})
 
 	Describe("classifyCategoryMCP", func() {
@@ -473,6 +472,15 @@ var _ = Describe("Classifier MCP Methods", func() {
 				Expect(err.Error()).To(ContainSubstring("not properly configured"))
 			})
 		})
+
+		Context("when initializer is nil", func() {
+			It("should return error", func() {
+				classifier.mcpCategoryInitializer = nil
+				err := classifier.initializeMCPCategoryClassifier()
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("initializer is not set"))
+			})
+		})
 	})
 })