alpha build, MVP for github & bitbucket cloud platforms

Author: rostilos

src/main/java/org/perpectiveteam/plugins/aisummarize/AiSummarizePlugin.java

@@ -5,8 +5,13 @@
 
 import org.perpectiveteam.plugins.aisummarize.config.AiSummarizeConfig;
 import org.perpectiveteam.plugins.aisummarize.hooks.PostJobInScanner;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.ALMClientFactory;
+import org.perpectiveteam.plugins.aisummarize.pullrequest.PostAnalysisIssueVisitor;
+import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.bitbucket.cloud.BitbucketCloudClientFactory;
+import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.bitbucket.cloud.BitbucketConfiguration;
+import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.bitbucket.cloud.HttpClientBuilderFactory;
 import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.github.GitHubClientFactory;
+import org.perpectiveteam.plugins.aisummarize.summarize.SummarizeExecutorFactory;
+import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.ALMClientFactory;
 import org.sonar.api.Plugin;
 import org.sonar.api.PropertyType;
 import org.sonar.api.SonarQubeSide;
@@ -27,6 +32,9 @@ public String getName() {
 
     @Override
     public void load(CoreExtension.Context context) {
+        if (SonarQubeSide.COMPUTE_ENGINE == context.getRuntime().getSonarQubeSide()) {
+            context.addExtensions(PostAnalysisIssueVisitor.class);
+        }
         // Not used currently
     }
 
@@ -42,6 +50,10 @@ private List<Object> getExtensions() {
                 ALMClientFactory.class,
                 PostJobInScanner.class,
                 GitHubClientFactory.class,
+                BitbucketConfiguration.class,
+                HttpClientBuilderFactory.class,
+                BitbucketCloudClientFactory.class,
+                SummarizeExecutorFactory.class,
 
                 PropertyDefinition.builder(AiSummarizeConfig.FILE_LIMIT)
                         .name("File Limit")

src/main/java/org/perpectiveteam/plugins/aisummarize/ai/AIPromptBuilder.java

@@ -3,7 +3,6 @@
 import java.util.List;
 
 import org.perpectiveteam.plugins.aisummarize.pullrequest.dtobuilder.FileDiff;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.dtobuilder.LineChange;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
@@ -15,13 +14,23 @@ public String buildPrompt(List<FileDiff> fileDiffs) {
         //TODO: Allow to define prompt and enabled data from the admin panel (e.g. by templating).
         LOG.info("Building AI prompt for {} files", fileDiffs.size());
         StringBuilder sb = new StringBuilder();
-        sb.append("Analyze the following code changes across multiple files.\n");
-        sb.append("For each file, summarize the change, explain the intent, and identify any potential risks.Keep in mind the peculiarities of Magento 2 platform.\n");
+        sb.append("Please review the following code below:\n");
+        sb.append("Consider:\n" +
+                "1. Code quality and adherence to best practices\n" +
+                "2. Potential bugs or edge cases\n" +
+                "3. Performance optimizations\n" +
+                "4. Readability and maintainability\n" +
+                "5. Any security concerns\n" +
+                "Suggest improvements and explain your reasoning for each suggestion.\n.");
         sb.append("Provide a summary in markdown markup.\n");
 
         int validFileCount = 0;
         for (FileDiff fileDiff : fileDiffs) {
-            if (fileDiff.filePath.isEmpty() || fileDiff.rawContent.isEmpty() || fileDiff.changes.isEmpty()) {
+            if(fileDiff.rawContent == null || fileDiff.filePath.isEmpty() || fileDiff.rawContent.isEmpty()) {
+                fileDiff.rawContent = "There is no previous version, probably a new file";
+                LOG.debug("Missing previous file version for: " + fileDiff.filePath);
+            }
+            if (fileDiff.filePath.isEmpty() || fileDiff.changes.isEmpty()) {
                 LOG.debug("Skipping file with missing data: {}", fileDiff.filePath);
                 continue;
             }
@@ -34,14 +43,9 @@ public String buildPrompt(List<FileDiff> fileDiffs) {
             sb.append(fileDiff.rawContent).append("\n");
             sb.append("-----\n\n");
 
-            sb.append("Diff:\n");
+            sb.append("Patch:\n");
             sb.append("-----\n");
-            for (LineChange change : fileDiff.changes) {
-                sb.append("old line: ").append(change.oldLineNumber)
-                  .append(" new line: ").append(change.newLineNumber)
-                  .append(" ").append(change.type)
-                  .append(": ").append(change.content).append("\n");
-            }
+            sb.append(fileDiff.changes).append("\n");
             sb.append("-----\n\n");
         }
 

src/main/java/org/perpectiveteam/plugins/aisummarize/ai/connector/providers/OpenAIConnector.java

@@ -44,7 +44,7 @@ public String getCompletion(String prompt) {
 
             ObjectMapper mapper = new ObjectMapper();
             ObjectNode payload = mapper.createObjectNode();
-            payload.put("model", "nvidia/llama-3.1-nemotron-ultra-253b-v1:free");
+            payload.put("model", "deepseek/deepseek-prover-v2:free");
             payload.put("temperature", 0.7);
 
             ArrayNode messages = payload.putArray("messages");

src/main/java/org/perpectiveteam/plugins/aisummarize/hooks/PostJobInScanner.java

@@ -1,19 +1,11 @@
 package org.perpectiveteam.plugins.aisummarize.hooks;
 
-import java.util.List;
 import java.util.Optional;
 
-import org.perpectiveteam.plugins.aisummarize.config.AiSummarizeConfig;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.AnalysisDetails;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.PostAnalysisIssueVisitor;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.PullRequestDiffFetcher;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.ALMClient;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.ALMClientFactory;
-import org.perpectiveteam.plugins.aisummarize.pullrequest.dtobuilder.PullRequestDiff;
-import org.perpectiveteam.plugins.aisummarize.summarize.SummarizeWithAI;
+import org.perpectiveteam.plugins.aisummarize.summarize.SummarizeExecutor;
+import org.perpectiveteam.plugins.aisummarize.summarize.SummarizeExecutorFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.ce.posttask.Branch;
 import org.sonar.api.ce.posttask.PostProjectAnalysisTask;
 import org.sonar.api.config.Configuration;
 import org.sonar.db.DbClient;
@@ -25,19 +17,20 @@ public class PostJobInScanner implements PostProjectAnalysisTask {
     private static final Logger LOGGER = LoggerFactory.getLogger(PostJobInScanner.class);
 
     private final DbClient dbClient;
-    private final PostAnalysisIssueVisitor postAnalysisIssueVisitor;
+    //private final PostAnalysisIssueVisitor postAnalysisIssueVisitor;
     private final Configuration configuration;
-    private final ALMClientFactory almClientFactory;
+    private final SummarizeExecutorFactory summarizeExecutorFactory;
 
     public PostJobInScanner(
             DbClient dbClient,
             Configuration configuration,
-            ALMClientFactory almClientFactory
+            SummarizeExecutorFactory summarizeExecutorFactory
+            //PostAnalysisIssueVisitor postAnalysisIssueVisitor
     ) {
-        this.postAnalysisIssueVisitor = new PostAnalysisIssueVisitor();
+        //this.postAnalysisIssueVisitor = postAnalysisIssueVisitor;
         this.dbClient = dbClient;
         this.configuration = configuration;
-        this.almClientFactory = almClientFactory;
+        this.summarizeExecutorFactory = summarizeExecutorFactory;
     }
 
     @Override
@@ -46,19 +39,6 @@ public void finished(Context context) {
         LOGGER.info("PostJobInScanner.finished method called");
         ProjectAnalysis projectAnalysis = context.getProjectAnalysis();
 
-        Optional<Branch> optionalPullRequest =
-                projectAnalysis.getBranch().filter(branch -> Branch.Type.PULL_REQUEST == branch.getType());
-        if (optionalPullRequest.isEmpty()) {
-            LOGGER.trace("Current analysis is not for a Pull Request. Task being skipped");
-            return;
-        }
-
-        Optional<String> optionalPullRequestId = optionalPullRequest.get().getName();
-        if (optionalPullRequestId.isEmpty()) {
-            LOGGER.warn("No pull request ID has been submitted with the Pull Request. Analysis will be skipped");
-            return;
-        }
-
         ProjectAlmSettingDto projectAlmSettingDto;
         Optional<AlmSettingDto> optionalAlmSettingDto;
         try (DbSession dbSession = dbClient.openSession(false)) {
@@ -89,28 +69,10 @@ public void finished(Context context) {
         }
 
         try {
-            AiSummarizeConfig aiConfig = new AiSummarizeConfig(configuration);
-            String prNumber = optionalPullRequestId.get();
-
-            ALMClient almClient = almClientFactory.createClient(currentAlmId, almSettingDto, projectAlmSettingDto);
-
-            PullRequestDiff pullRequestDiff = new PullRequestDiffFetcher(almClient)
-                    .fetchDiff(prNumber);
-
-            SummarizeWithAI summarizer = new SummarizeWithAI(prNumber, aiConfig);
-
-            String summary = summarizer.execute(pullRequestDiff);
-            LOGGER.info("AI summarization completed successfully");
-            LOGGER.info("Summary: {}", summary);
-
-            //TODO: add SQ issues to prompt
-            AnalysisDetails analysisDetails =
-                    new AnalysisDetails(optionalPullRequestId.get(), postAnalysisIssueVisitor.getIssues(), projectAnalysis);
-
-            almClient.postSummaryIssue(prNumber, summary);
-
+            SummarizeExecutor summarizeExecutor = summarizeExecutorFactory.createExecutor(currentAlmId, almSettingDto, projectAnalysis, projectAlmSettingDto);
+            summarizeExecutor.analyzeAndSummarize();
 
-            // TODO: Store the summary in SonarQube or send it as a report to the ALM platform
+            // TODO: Store the summary in SonarQube (?)
         } catch (Exception e) {
             LOGGER.error("Error during AI summarization", e);
         }

src/main/java/org/perpectiveteam/plugins/aisummarize/pullrequest/PatchParser.java

@@ -1,5 +1,6 @@
 package org.perpectiveteam.plugins.aisummarize.pullrequest;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.perpectiveteam.plugins.aisummarize.pullrequest.almclient.ALMClient;
@@ -17,9 +18,9 @@ public PullRequestDiffFetcher(ALMClient almClient) {
         this.almClient = almClient;
     }
 
-    public PullRequestDiff fetchDiff(String pullRequestNumber) {
-        LOG.info("Fetching PR diff for PR #{}", pullRequestNumber);
-        List<FileDiff> files = almClient.fetchPullRequestFilesDiff(pullRequestNumber);
+    public PullRequestDiff fetchDiff() throws IOException {
+        LOG.info("Fetching PR diff for PR #{}", almClient.getPrNumber());
+        List<FileDiff> files = almClient.fetchPullRequestFilesDiff();
         LOG.info("Fetched {} files from PR", files.size());
 
         PullRequestDiff diff = new PullRequestDiff();

src/main/java/org/perpectiveteam/plugins/aisummarize/pullrequest/PullRequestDiffFetcher.java

@@ -1,10 +1,12 @@
 package org.perpectiveteam.plugins.aisummarize.pullrequest.almclient;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.perpectiveteam.plugins.aisummarize.pullrequest.dtobuilder.FileDiff;
 
 public interface ALMClient {
-    List<FileDiff> fetchPullRequestFilesDiff(String pullRequestNumber);
-    void postSummaryIssue(String prNumber, String comment);
+    List<FileDiff> fetchPullRequestFilesDiff() throws IOException;
+    void postSummaryIssue(String comment) throws IOException;
+    String getPrNumber();
 }

src/main/java/org/perpectiveteam/plugins/aisummarize/pullrequest/almclient/ALMClient.java

@@ -2,6 +2,7 @@
 
 import org.perpectiveteam.plugins.aisummarize.config.AiSummarizeConfig;
 import org.sonar.api.ce.ComputeEngineSide;
+import org.sonar.api.ce.posttask.PostProjectAnalysisTask.ProjectAnalysis;
 import org.sonar.api.server.ServerSide;
 import org.sonar.db.alm.setting.AlmSettingDto;
 import org.sonar.db.alm.setting.ALM;
@@ -16,9 +17,8 @@
 @ServerSide
 @ComputeEngineSide
 public class ALMClientFactory {
-    //TODO: log issues
-    //private static final Logger LOG = Loggers.get(ALMClientFactory.class);
     private final AiSummarizeConfig config;
+
     @Autowired
     public ALMClientFactory(List<ALMClientFactoryDelegate> delegates, AiSummarizeConfig config) {
         this.delegateMap = delegates.stream().collect(Collectors.toMap(ALMClientFactoryDelegate::getAlm, d -> d));
@@ -28,13 +28,18 @@ public ALMClientFactory(List<ALMClientFactoryDelegate> delegates, AiSummarizeCon
 
     private final Map<ALM, ALMClientFactoryDelegate> delegateMap;
 
-    public ALMClient createClient(String currentAlmId, AlmSettingDto almSettingDto, ProjectAlmSettingDto projectAlmSettingDto) throws IOException {
+    public ALMClient createClient(
+            String currentAlmId,
+            AlmSettingDto almSettingDto,
+            ProjectAnalysis projectAnalysis,
+            ProjectAlmSettingDto projectAlmSettingDto
+    ) throws IOException {
         ALM alm = ALM.fromId(currentAlmId);
         int fileLimit = config.getFileLimit();
         ALMClientFactoryDelegate delegate = delegateMap.get(alm);
         if (delegate == null) {
             throw new IllegalArgumentException("No factory for ALM: " + currentAlmId);
         }
-        return delegate.createClient(almSettingDto, projectAlmSettingDto, fileLimit);
+        return delegate.createClient(almSettingDto, projectAlmSettingDto, projectAnalysis, fileLimit);
     }
 }

src/main/java/org/perpectiveteam/plugins/aisummarize/pullrequest/almclient/ALMClientFactory.java

@@ -1,5 +1,6 @@
 package org.perpectiveteam.plugins.aisummarize.pullrequest.almclient;
 
+import org.sonar.api.ce.posttask.PostProjectAnalysisTask.ProjectAnalysis;
 import org.sonar.db.alm.setting.ALM;
 import org.sonar.db.alm.setting.AlmSettingDto;
 import org.sonar.db.alm.setting.ProjectAlmSettingDto;
@@ -9,5 +10,10 @@
 public interface ALMClientFactoryDelegate {
     ALM getAlm();
 
-    ALMClient createClient(AlmSettingDto almSettingDto, ProjectAlmSettingDto projectAlmSettingDto, int fileLimit) throws IOException;
+    ALMClient createClient(
+            AlmSettingDto almSettingDto,
+            ProjectAlmSettingDto projectAlmSettingDto,
+            ProjectAnalysis projectAnalysis,
+            int fileLimit
+    ) throws IOException;
 }