improve prompt and handling completion

Author: ravilushqa

cmd/review/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"os/signal"
@@ -64,9 +65,9 @@ func run(ctx context.Context) error {
 			continue
 		}
 
-		if len(patch) > 4096 {
+		if len(patch) > 3000 {
 			fmt.Println("Patch is too long, truncating")
-			patch = fmt.Sprintf("%s...", patch[:4093])
+			patch = fmt.Sprintf("%s...", patch[:3000])
 		}
 		completion, err := openAIClient.ChatCompletion(ctx, []openai.ChatCompletionMessage{
 			{
@@ -87,10 +88,9 @@ func run(ctx context.Context) error {
 			fmt.Println("Completion:", completion)
 		}
 
-		review := Review{}
-		err = json.Unmarshal([]byte(completion), &review)
+		review, err := extractJSON(completion)
 		if err != nil {
-			fmt.Println("Error unmarshalling completion:", err)
+			fmt.Println("Error extracting JSON:", err)
 			continue
 		}
 
@@ -124,9 +124,8 @@ func run(ctx context.Context) error {
 }
 
 type Review struct {
-	Quality     Quality `json:"quality"`
-	Explanation string  `json:"explanation"`
-	Issues      []struct {
+	Quality Quality `json:"quality"`
+	Issues  []struct {
 		Type        string `json:"type"`
 		Line        int    `json:"line"`
 		Description string `json:"description"`
@@ -140,3 +139,39 @@ const (
 	Bad     Quality = "bad"
 	Neutral Quality = "neutral"
 )
+
+func extractJSON(input string) (*Review, error) {
+	var jsonObj *Review
+
+	// find the start and end positions of the JSON object
+	start := 0
+	end := len(input)
+	for i, c := range input {
+		if c == '{' {
+			start = i
+			break
+		}
+		if i == len(input)-1 {
+			return nil, errors.New("invalid JSON object")
+		}
+	}
+	for i := len(input) - 1; i >= 0; i-- {
+		if input[i] == '}' {
+			end = i + 1
+			break
+		}
+
+		if i == 0 {
+			return nil, errors.New("invalid JSON object")
+		}
+	}
+
+	// extract the JSON object from the input
+	jsonStr := input[start:end]
+	err := json.Unmarshal([]byte(jsonStr), &jsonObj)
+	if err != nil {
+		return nil, errors.New("invalid JSON object")
+	}
+
+	return jsonObj, nil
+}

openai/assets/review.txt

@@ -5,27 +5,18 @@ GOALS:
 
 1. Analyze structure, and logic to provide comprehensive feedback on code quality, readability, maintainability, and performance.
 2. Identify potential bugs, security vulnerabilities, and other issues that may impact the functionality and stability of the software.
-3. Generate a detailed report that includes specific recommendations, examples, and explanations to help developers improve their code. If context is not enough mark it as good. You should only respond in JSON format as described below
+3. Possible quality values: good, bad, neutral. If quality is good, issues should be empty.
+4. Generate a json report in specific format to help developers improve their code. If context is not enough quality is good. You should only respond in JSON format as described below
 Response Format:
 ```
 {
     "quality": "good",
-    "explanation": "Your code is well-structured and has no obvious issues.",
     "issues": [
         {
             "type": "bug",
             "line": 10,
             "description": "You are missing a semicolon at the end of the line."
-        },
-        {
-            "type": "performance",
-            "line": 20,
-            "description": "You should use a StringBuilder instead of a String to improve performance."
         }
     ]
 }
 ```
-4. Rules:
-Possible quality values: good, bad, neutral
-Possible issue types: bug, security, performance, readability, maintainability, other
-If quality is good, issues should be empty.