feedback

Author: msukkari

packages/agents/reviewAgent/nodes/fetch_file_content.ts

@@ -1,4 +1,4 @@
-import { sourcebot_context, sourcebot_pr_payload } from "../types.js";
+import { sourcebot_context, sourcebot_pr_payload } from "../src/types.js";
 import { z } from "zod";
 
 // TODO: use original Sourcebot schemas instead of redefining here

packages/agents/reviewAgent/nodes/generate_pr_reviews.ts

@@ -1,5 +1,5 @@
 {
-  "name": "review-agent",
+  "name": "@sourcebot/review-agent",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -8,17 +8,6 @@
     "build": "tsc",
     "start": "node dist/app.js"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sourcebot-dev/review-agent.git"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/sourcebot-dev/review-agent/issues"
-  },
-  "homepage": "https://github.com/sourcebot-dev/review-agent#readme",
   "dependencies": {
     "@octokit/webhooks": "^13.8.2",
     "@octokit/webhooks-definitions": "octokit/webhooks",

packages/agents/reviewAgent/nodes/github_push_pr_reviews.ts

@@ -0,0 +1,40 @@
+import { sourcebot_context, sourcebot_pr_payload } from "../types.js";
+import { fileSourceResponseSchema } from "@sourcebot/web/src/features/search/schemas.js"; 
+import { base64Decode } from "@sourcebot/web/src/lib/utils.js";
+
+export const fetch_file_content = async (pr_payload: sourcebot_pr_payload, filename: string): Promise<sourcebot_context> => {
+    console.log("Executing fetch_file_content");
+
+    const repoPath = pr_payload.hostDomain + "/" + pr_payload.owner + "/" + pr_payload.repo;
+    const fileSourceRequest = {
+        fileName: filename,
+        repository: repoPath,
+    }
+    console.log(JSON.stringify(fileSourceRequest, null, 2));
+
+    const response = await fetch('http://localhost:3000/api/source', {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+            'X-Org-Domain': '~'
+        },
+        body: JSON.stringify(fileSourceRequest)
+    });
+
+    if (!response.ok) {
+        throw new Error(`Failed to fetch file content for ${filename} from ${repoPath}: ${response.statusText}`);
+    }
+
+    const responseData = await response.json();
+    const fileSourceResponse = fileSourceResponseSchema.parse(responseData);
+    const fileContent = base64Decode(fileSourceResponse.source);
+
+    const fileContentContext: sourcebot_context = {
+        type: "file_content",
+        description: `The content of the file ${filename}`,
+        context: fileContent,
+    }
+
+    console.log("Completed fetch_file_content");
+    return fileContentContext;
+}

packages/agents/reviewAgent/package.json

@@ -0,0 +1,49 @@
+import { sourcebot_pr_payload, sourcebot_diff_review, sourcebot_file_diff_review, sourcebot_context } from "../types.js";
+import { generate_diff_review_prompt } from "./generate_diff_review_prompt.js";
+import { invoke_diff_review_llm } from "./invoke_diff_review_llm.js";
+import { fetch_file_content } from "./fetch_file_content.js";
+
+export const generate_pr_reviews = async (pr_payload: sourcebot_pr_payload, rules: string[]): Promise<sourcebot_file_diff_review[]> => {
+    console.log("Executing generate_pr_reviews");
+
+    const file_diff_reviews: sourcebot_file_diff_review[] = [];
+    for (const file_diff of pr_payload.file_diffs) {
+        const reviews: sourcebot_diff_review[] = [];
+
+        for (const diff of file_diff.diffs) {
+            try {
+                const fileContentContext = await fetch_file_content(pr_payload, file_diff.to);
+                const context: sourcebot_context[] = [
+                    {
+                        type: "pr_title",
+                        description: "The title of the pull request",
+                        context: pr_payload.title,
+                    },
+                    {
+                        type: "pr_description",
+                        description: "The description of the pull request",
+                        context: pr_payload.description,
+                    },
+                    fileContentContext,
+                ];
+
+                const prompt = await generate_diff_review_prompt(diff, context, rules);
+                
+                const diffReview = await invoke_diff_review_llm(prompt, file_diff.to);
+                reviews.push(diffReview);
+            } catch (error) {
+                console.error(`Error fetching file content for ${file_diff.to}: ${error}`);
+            }
+        }
+        
+        if (reviews.length > 0) {
+            file_diff_reviews.push({
+                filename: file_diff.to,
+                reviews: reviews,
+            });
+        }
+    }
+
+    console.log("Completed generate_pr_reviews");
+    return file_diff_reviews;
+}

packages/agents/reviewAgent/app.ts renamed to packages/agents/reviewAgent/src/app.ts

@@ -6,6 +6,10 @@ import { Octokit } from "octokit";
 export const github_pr_parser = async (octokit: Octokit, payload: WebhookEventDefinition<"pull-request-opened"> | WebhookEventDefinition<"pull-request-synchronize">): Promise<sourcebot_pr_payload> => {
     console.log("Executing github_pr_parser");
 
+    if (!payload.installation) {
+        throw new Error("Installation not found in github payload");
+    }
+
     const diff = await octokit.request(payload.pull_request.patch_url);
     const parsedDiff: parse.File[] = parse(diff.data);
 

packages/agents/reviewAgent/src/nodes/fetch_file_content.ts

@@ -0,0 +1,40 @@
+import { App } from "octokit";
+import { sourcebot_pr_payload, sourcebot_file_diff_review } from "../types.js";
+
+export const github_push_pr_reviews = async (app: App, pr_payload: sourcebot_pr_payload, file_diff_reviews: sourcebot_file_diff_review[]) => {
+    console.log("Executing github_push_pr_reviews");
+
+    try {
+        const installationId = pr_payload.installation_id;
+        const installation = await app.getInstallationOctokit(installationId);
+
+        for (const file_diff_review of file_diff_reviews) {
+            for (const review of file_diff_review.reviews) {
+                try {
+                    await installation.rest.pulls.createReviewComment({
+                        owner: pr_payload.owner,
+                        repo: pr_payload.repo,
+                        pull_number: pr_payload.number,
+                        body: review.review,
+                        path: file_diff_review.filename,
+                        commit_id: pr_payload.head_sha,
+                        side: "RIGHT",
+                        ...(review.line_start === review.line_end
+                            ? { line: review.line_start }
+                            : {
+                                start_line: review.line_start,
+                                line: review.line_end,
+                                start_side: "RIGHT",
+                            }),
+                    });
+                } catch (error) {
+                    console.error(`Error pushing pr reviews for ${file_diff_review.filename}: ${error}`);
+                }
+            }
+        }
+    } catch (error) {
+        console.error(`Error pushing pr reviews: ${error}`);
+    }
+
+    console.log("Completed github_push_pr_reviews");
+}