Refactor effort configuration and remove test expansions; update command line flags and options for improved clarity

Author: pelikhan

cmd/generate/effort.go

@@ -7,7 +7,6 @@ type EffortConfiguration struct {
 	TestGenerations           *int `json:"testGenerations,omitempty"`
 	TestsPerRule              *int `json:"testsPerRule,omitempty"`
 	RunsPerTest               *int `json:"runsPerTest,omitempty"`
-	TestExpansions            *int `json:"testExpansions,omitempty"`
 	MaxRules                  *int `json:"maxRules,omitempty"`
 	MaxRulesPerTestGeneration *int `json:"maxRulesPerTestGeneration,omitempty"`
 	MaxTestsToRun             *int `json:"maxTestsToRun,omitempty"`
@@ -17,19 +16,8 @@ type EffortConfiguration struct {
 // Based on the reference TypeScript implementation in constants.mts
 func GetEffortConfiguration(effort string) *EffortConfiguration {
 	switch effort {
-	case EffortMin:
-		return &EffortConfiguration{
-			TestGenerations:           util.Ptr(1),
-			TestsPerRule:              util.Ptr(1),
-			RunsPerTest:               util.Ptr(1),
-			TestExpansions:            util.Ptr(0),
-			MaxRules:                  util.Ptr(6),
-			MaxRulesPerTestGeneration: util.Ptr(100),
-			MaxTestsToRun:             util.Ptr(10),
-		}
 	case EffortLow:
 		return &EffortConfiguration{
-			TestExpansions:            util.Ptr(0),
 			TestGenerations:           util.Ptr(1),
 			MaxRules:                  util.Ptr(3),
 			TestsPerRule:              util.Ptr(2),
@@ -39,7 +27,6 @@ func GetEffortConfiguration(effort string) *EffortConfiguration {
 		}
 	case EffortMedium:
 		return &EffortConfiguration{
-			TestExpansions:            util.Ptr(0),
 			MaxRules:                  util.Ptr(20),
 			TestsPerRule:              util.Ptr(3),
 			RunsPerTest:               util.Ptr(1),
@@ -48,7 +35,6 @@ func GetEffortConfiguration(effort string) *EffortConfiguration {
 		}
 	case EffortHigh:
 		return &EffortConfiguration{
-			TestExpansions:            util.Ptr(1),
 			MaxRules:                  util.Ptr(50),
 			MaxRulesPerTestGeneration: util.Ptr(2),
 			TestGenerations:           util.Ptr(2),
@@ -79,9 +65,6 @@ func ApplyEffortConfiguration(options *PromptPexOptions, effort string) {
 	if config.RunsPerTest != nil && options.RunsPerTest == nil {
 		options.RunsPerTest = config.RunsPerTest
 	}
-	if config.TestExpansions != nil && options.TestExpansions == nil {
-		options.TestExpansions = config.TestExpansions
-	}
 	if config.MaxRules != nil && options.MaxRules == nil {
 		options.MaxRules = config.MaxRules
 	}

cmd/generate/export.go

@@ -1,85 +1,12 @@
 package generate
 
 import (
-	"encoding/json"
 	"fmt"
 	"regexp"
 	"strings"
-
-	"github.com/github/gh-models/pkg/prompt"
 )
 
-// toGitHubModelsPrompt converts PromptPex context to GitHub Models format
-func (h *generateCommandHandler) toGitHubModelsPrompt(modelID string, context *PromptPexContext) (*prompt.File, error) {
-	// Resolve model name (simplified - in real implementation would use LLM client)
-	resolvedModel := modelID
-	if modelID == "evals" {
-		resolvedModel = "gpt-4o" // Default model for evals
-	}
-
-	// Convert messages from the prompt file
-	var messages []prompt.Message
-	if context.Prompt != nil {
-		messages = context.Prompt.Messages
-	}
-
-	// Convert test data
-	var testData []prompt.TestDataItem
-	// Extract template variables from prompt content to determine allowed fields
-	allowedFields := h.extractTemplateVariables(context)
-
-	for _, test := range context.Tests {
-		// Skip empty test inputs
-		if strings.TrimSpace(test.TestInput) == "" {
-			h.cfg.WriteToOut(fmt.Sprintf("Warning: Skipping test with empty input (scenario: %s)", getTestScenario(test)))
-			continue
-		}
-
-		item := prompt.TestDataItem{}
-
-		// Parse test input if it's JSON
-		if strings.HasPrefix(test.TestInput, "{") {
-			var inputMap map[string]interface{}
-			if err := json.Unmarshal([]byte(test.TestInput), &inputMap); err == nil {
-				// Use the parsed JSON as individual fields, only including template variables
-				for k, v := range inputMap {
-					if allowedFields[k] {
-						item[k] = v
-					} else {
-						h.cfg.WriteToOut(fmt.Sprintf("Warning: Skipping field '%s' (not a template variable) in test data", k))
-					}
-				}
-			} else {
-				h.cfg.WriteToOut(fmt.Sprintf("Failed to parse test input as JSON: %v. Using as plain text input.", err))
-				// Fall back to single input field
-				item["input"] = test.TestInput
-			}
-		} else {
-			// Simple text input
-			item["input"] = test.TestInput
-		}
-
-		// Add expected output if available (groundtruth)
-		if test.Groundtruth != nil {
-			item["expected"] = *test.Groundtruth
-		}
-
-		// Add reasoning if available
-		if test.Reasoning != nil {
-			item["reasoning"] = *test.Reasoning
-		}
-
-		testData = append(testData, item)
-	}
-
-	// Create model parameters
-	var modelParams prompt.ModelParameters
-	if h.options.Temperature != nil {
-		modelParams = prompt.ModelParameters{
-			Temperature: h.options.Temperature,
-		}
-	}
-
+/*
 	// Create the base evaluator using rules
 	evaluators := []prompt.Evaluator{
 		{
@@ -101,23 +28,8 @@ func (h *generateCommandHandler) toGitHubModelsPrompt(modelID string, context *P
 		},
 	}
 
-	// Create the prompt file structure
-	promptFile := &prompt.File{
-		Model:           resolvedModel,
-		ModelParameters: modelParams,
-		Messages:        messages,
-		TestData:        testData,
-		Evaluators:      evaluators,
-	}
-
-	// Set name and description from the original prompt if available
-	if context.Prompt != nil {
-		promptFile.Name = context.Prompt.Name
-		promptFile.Description = context.Prompt.Description
-	}
 
-	return promptFile, nil
-}
+*/
 
 // generateRulesEvaluatorSystemPrompt generates the system prompt for rules evaluation
 func (h *generateCommandHandler) generateRulesEvaluatorSystemPrompt(context *PromptPexContext) string {