clean up more AI output

pkg/argo_client/applications.go

@@ -19,6 +19,8 @@ import (
 
 var tracer = otel.Tracer("pkg/argo_client")
 
+var ErrNoVersionFound = errors.New("no kubernetes version found")
+
 // GetApplicationByName takes a context and a name, then queries the Argo Application client to retrieve the Application with the specified name.
 // It returns the found Application and any error encountered during the process.
 // If successful, the Application client connection is closed before returning.
@@ -72,6 +74,11 @@ func (argo *ArgoClient) GetKubernetesVersionByApplication(ctx context.Context, a
 	// cleanup trailing "+"
 	version = strings.TrimSuffix(version, "+")
 
+	version = strings.TrimSpace(version)
+	if version == "" {
+		return "", ErrNoVersionFound
+	}
+
 	return version, nil
 }
 

pkg/checks/diff/ai_summary.go

@@ -1,6 +1,7 @@
 package diff
 
 import (
+	"regexp"
 	"strings"
 
 	"github.com/rs/zerolog/log"
@@ -44,13 +45,28 @@ func aiDiffSummary(ctx context.Context, mrNote *msg.Message, cfg config.ServerCo
 	mrNote.AddToAppMessage(ctx, name, cr)
 }
 
+var codeBlockBegin = regexp.MustCompile("^```(\\w+)")
+
 func cleanUpAiSummary(aiSummary string) string {
 	aiSummary = strings.TrimSpace(aiSummary)
 
 	// occasionally the model thinks it should wrap it in a code block.
 	// comments do not need this, as they are already rendered as markdown.
-	aiSummary = strings.TrimPrefix(aiSummary, "```markdown")
-	aiSummary = strings.TrimSuffix(aiSummary, "```")
+	for {
+		newSummary := aiSummary
+
+		newSummary = codeBlockBegin.ReplaceAllString(newSummary, "")
+		newSummary = strings.TrimPrefix(newSummary, "#***")
+		newSummary = strings.TrimSuffix(newSummary, "```")
+		newSummary = strings.TrimSuffix(newSummary, "#***")
+		newSummary = strings.TrimSpace(newSummary)
+
+		if newSummary == aiSummary {
+			break
+		}
+
+		aiSummary = newSummary
+	}
 
 	return strings.TrimSpace(aiSummary)
 }

pkg/checks/diff/ai_summary_test.go

@@ -30,4 +30,12 @@ func TestCleanUpAiSummary(t *testing.T) {
 		actual := cleanUpAiSummary(input)
 		assert.Equal(t, expected, actual)
 	})
+
+	t.Run("weird prefix and suffix", func(t *testing.T) {
+		input := "```plaintext\n#***\n- Added environment variables FF_TIMESTAMPS and FF_SCRIPT_SECTIONS\n#***"
+		expected := "- Added environment variables FF_TIMESTAMPS and FF_SCRIPT_SECTIONS"
+
+		actual := cleanUpAiSummary(input)
+		assert.Equal(t, expected, actual)
+	})
 }