diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..ac6621f19 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" diff --git a/LICENSE b/LICENSE index 224ed9a8c..261eeb9e9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,18 +1,3 @@ -“Commons Clause” License Condition v1.0 - -The Software is provided to you by the Licensor under the License, as defined below, subject to the following condition. - -Without limiting other conditions in the License, the grant of rights under the License will not include, and the License does not grant to you, the right to Sell the Software. - -For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software. Any license notice or attribution required by the License must also include this Commons Clause License Condition notice. - -Software: [Watermelon] - -License: [Apache 2.0 License] - -Licensor: [Watermelon Tools, Inc.] - - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/README.md b/README.md index fee74829b..796b88e9d 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Watermelon's GitHub application allows teams to contextualize pull requests with ## Installation -You can install Watermelon's GitHub Application [directly from the marketplace](https://github.com/marketplace/watermelon-context). +You can install Watermelon's GitHub Application [directly from the marketplace](https://github.com/marketplace/watermelon-copilot-for-code-review). ## Contributing diff --git a/app/(loggedIn)/loading.tsx b/app/(loggedIn)/loading.tsx index eff7c5580..1d2271e54 100644 --- a/app/(loggedIn)/loading.tsx +++ b/app/(loggedIn)/loading.tsx @@ -25,7 +25,7 @@ async function loading({}) { <> <> - +
diff --git a/app/(loggedIn)/page.tsx b/app/(loggedIn)/page.tsx index 851c1d5a0..5d266444f 100644 --- a/app/(loggedIn)/page.tsx +++ b/app/(loggedIn)/page.tsx @@ -17,85 +17,10 @@ async function HomePage({}) { console.error(e); return null; }); - const comingSoon = [ - "IntelliJ", - "Android Studio", - "AppCode", - "Aqua", - "CLion", - "DataGrip", - "DataSpell", - "GoLand", - "MPS", - "PhpStorm", - "PyCharm", - "Rider", - "RubyMine", - "RustRover", - "WebStorm", - ]; + return (
{data && } - {userEmail && ( -
-
-

- - IDEs -

-
- - -
- )}
); } diff --git a/app/(loggedIn)/team/sendInviteForm.tsx b/app/(loggedIn)/team/sendInviteForm.tsx index 718f653d0..6aea75858 100644 --- a/app/(loggedIn)/team/sendInviteForm.tsx +++ b/app/(loggedIn)/team/sendInviteForm.tsx @@ -36,7 +36,7 @@ export default function sendInviteForm({ teamName, userEmail }) {
- +
{ + failedPosthogTracking({ + url: request.url, + error: error.message, + email: req.email, + }); + return console.error("posting comment error", error); }); - await addActionLog({ - randomWords, - github, - jira, - slack, - notion, - linear, - asana, - textToWrite, - businessLogicSummary, - owner, - repo, - number, - payload: req, - count, - watermelon_user, - }); // Fetch all comments on the PR const comments = await octokit.request( "GET /repos/{owner}/{repo}/issues/{issue_number}/comments?sort=created&direction=desc", @@ -469,7 +485,9 @@ export async function POST(request: Request) { ); // Find our bot's comment let botComment = comments.data.find((comment) => { - return comment?.user?.login.includes("watermelon-context"); + return comment?.user?.login.includes( + "watermelon-copilot-for-code-review" + ); }); if (botComment?.id) { // Update the existing comment @@ -502,7 +520,7 @@ export async function POST(request: Request) { repo, owner, number, - action: req.action, + action: actionName, textToWrite, }, }); @@ -535,7 +553,7 @@ export async function POST(request: Request) { // Find our bot's comment let botComment = comments.data.find((comment) => { - return comment?.user?.login.includes("watermelon-context"); + return comment?.user?.login.includes("watermelon-copilot-for-code-review"); }); // Update the existing comment @@ -557,7 +575,7 @@ export async function POST(request: Request) { repo, owner, number, - action: req.action, + action: actionName, textToWrite, }, }); @@ -565,7 +583,7 @@ export async function POST(request: Request) { message: "success", textToWrite, }); - } else if (req.action === "created" || req.action === "edited") { + } else if (actionName === "created" || actionName === "edited") { console.log("comment keys", Object.keys(req)); const { missingParams } = validateParams(req, [ "installation", @@ -585,7 +603,7 @@ export async function POST(request: Request) { const userLogin = comment.user.login; let botComment = comment.body; if ( - userLogin === "watermelon-context[bot]" && + userLogin === "watermelon-copilot-for-code-review[bot]" && botComment.includes("WatermelonAI Summary") ) { // extract the business logic summary, it's always the first paragraph under the title @@ -623,11 +641,13 @@ export async function POST(request: Request) { repo, owner, number, - action: req.action, + action: actionName, businessLogicSummary, }, }); } + } else if (actionName === "deleted") { + sendUninstall({ emails: [req.sender.email] }); } return NextResponse.json({ message: "wat", diff --git a/app/github-app/page.ts b/app/github-app/page.ts index c049a6e0a..2cab541ff 100644 --- a/app/github-app/page.ts +++ b/app/github-app/page.ts @@ -1,4 +1,4 @@ import { redirect } from 'next/navigation'; export default async function GHApp({ params }) { - redirect('https://github.com/marketplace/watermelon-context'); + redirect('https://github.com/marketplace/watermelon-copilot-for-code-review'); } diff --git a/components/Header.tsx b/components/Header.tsx index be71c61cb..c3fad1d37 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -26,21 +26,11 @@ export default function Header({ userEmail, userToken }) {
  • GitHub App
    • -
  • - - VSCode Extension - -
    • - +
    , type: "git_platforms", }, - { - name: "Bitbucket", - dataProp: "bitbucket_data", - loginComponent: , - type: "git_platforms", - }, - { - name: "GitLab", - dataProp: "gitlab_data", - loginComponent: , - type: "git_platforms", - }, - { name: "Jira", dataProp: "jira_data", diff --git a/package.json b/package.json index f593ca123..f47583321 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "applicationinsights": "^2.5.1", "client-only": "0.0.1", "md-to-adf": "^0.6.4", - "next": "latest", + "next": "^13", "next-auth": "^4.22.1", "nodemailer": "^6.7.8", "octokit": "^2.0.9", diff --git a/public/questionsHappyTulia.png b/public/questionsHappyTulia.png deleted file mode 100644 index e0bdf204b..000000000 Binary files a/public/questionsHappyTulia.png and /dev/null differ diff --git a/utils/actions/detectConsoleLogs.ts b/utils/actions/detectConsoleLogs.ts index 299ef94cb..22dc94ee9 100644 --- a/utils/actions/detectConsoleLogs.ts +++ b/utils/actions/detectConsoleLogs.ts @@ -1,12 +1,5 @@ const { Configuration, OpenAIApi } = require("openai"); import { App } from "@octokit/app"; -import { successPosthogTracking } from "../../utils/api/posthogTracking"; -import { - failedToFetchResponse, - missingParamsResponse, -} from "../../utils/api/responses"; -import validateParams from "../../utils/api/validateParams"; -import { Octokit } from "octokit"; const configuration = new Configuration({ apiKey: process.env.OPEN_AI_KEY, @@ -17,71 +10,55 @@ const app = new App({ appId: process.env.GITHUB_APP_ID!, privateKey: process.env.GITHUB_PRIVATE_KEY!, }); - -function getAdditions(filePatch: string) { +const commentBody = `This PR contains console logs. Please review or remove them.`; +const consoleLogDetectionPrompt = `This is a list of code additions. Identify +if there's a console log or its equivalent in another programming language +such as Java, Golang, Python, C, Rust, C++, Ruby, etc. +(console.log(), println(), println!(), System.out.println(), print(), fmt.Println(), puts, and cout << "Print a String" << endl; are some examples). +If the console log or its equivalent in another language is in a code comment, don't +count it as a detected console log. For example JavaScript comments start with // or /*, +Python comments start with #. +Other console functions such as console.info() shouldn't be counted as console logs. +Ignore code comments from this analysis. +Something like 'input[type="email"]' is fine and should not be counted as a console log. +If there is a console log, return "true", else return "false". +If you return true, return a string that that has 2 values: result (true) and the line of code. +The line value, is the actual line in the file that contains the console log. +For example: true,console.log("hello world");`; + +function getLineDiffs(filePatch: string) { const additions: string[] = []; + const removals: string[] = []; // Split the patch into lines const lines = filePatch.split("\n"); - // Track if we are in a deletion block - let inDeletionBlock = false; - // Loop through lines for (let i = 0; i < lines.length; i++) { const line = lines[i]; // Check if entering a deletion block if (line.startsWith("-")) { - inDeletionBlock = true; - continue; + removals.push(line.replace("-", "").trim()); } // Check if exiting a deletion block - if (line.startsWith("+") && inDeletionBlock) { - inDeletionBlock = false; - continue; - } - - // If not in a deletion block, add lines starting with + - if (!inDeletionBlock && line.startsWith("+")) { - additions.push(line); - } - - // Delete the pluses - lines[i] = line.replace("+", ""); - - // Trim the line to delete leading spaces - lines[i] = lines[i].trim(); - - // If the line is a comment, remove it - if ( - lines[i].startsWith("#") || - lines[i].startsWith("//") || - lines[i].startsWith("/*") - ) { - lines.splice(i, 1); - i--; + if (line.startsWith("+")) { + additions.push(line.replace("+", "").trim()); } } - - return lines.join("\n"); + return { additions: additions.join("\n"), removals: removals.join("\n") }; } -function getConsoleLogPosition(filePatchAndIndividualLine: any) { - let positionInDiff = 1; - const { filePatch, individualLine } = filePatchAndIndividualLine; - - // get the position of the indiviudalLine in th filePatch +function getConsoleLogPosition({ filePatch, individualLine }) { + // Split the filePatch into lines and find the index of the line that includes individualLine const lines = filePatch.split("\n"); - for (let i = 1; i < lines.length; i++) { - if (lines[i].includes(individualLine)) { - positionInDiff = i; - break; - } - } + const zeroBasedIndex = lines.findIndex((line) => + line.includes(individualLine) + ); - return positionInDiff; + // Convert to one-based index, or return -1 if not found + return zeroBasedIndex === -1 ? 0 : zeroBasedIndex + 1; } export default async function detectConsoleLogs({ @@ -113,22 +90,24 @@ export default async function detectConsoleLogs({ } ); + function getLatestCommitHash() { + return octokit + .request("GET /repos/{owner}/{repo}/pulls/{pull_number}", { + owner, + repo, + pull_number: issue_number, + }) + .then((result) => { + return result.data.head.sha; + }) + .catch((err) => { + console.log(err); + }); + } + const latestCommitHash = await getLatestCommitHash(); + const commentPromises = diffFiles.map(async (file) => { - const additions = getAdditions(file.patch ?? ""); - - const consoleLogDetectionPrompt = `This is a list of code additions. Identify - if there's a console log or its equivalent in another programming language - such as Java, Golang, Python, C, Rust, C++, etc. - (console.log(), println(), println!(), System.out.println(), print(), fmt.Println(), and cout << "Print a String" << endl; are some examples). - If the console log or its equivalent in another language is in a code comment, don't - count it as a detected console log. For example JavaScript comments start with // or /*, - Python comments start with #. - Other console functions such as console.info() shouldn't be counted as console logs. - Ignore code comments from this analysis. - If there is a console log, return "true", else return "false". - If you return true, return a string that that has 2 values: result (true) and the line of code. - The line value, is the actual line in the file that contains the console log. - For example: true,console.log("hello world");`; + const { additions } = getLineDiffs(file.patch ?? ""); // detect if the additions contain console logs or not try { @@ -151,43 +130,33 @@ export default async function detectConsoleLogs({ if (addtionsHaveConsoleLog === "true") { const commentFileDiff = () => { + const consoleLogPosition = getConsoleLogPosition({ + filePatch: file.patch ?? "", + individualLine, + }); + return octokit - .request("GET /repos/{owner}/{repo}/pulls/{pull_number}", { - owner, - repo, - pull_number: issue_number, - }) - .then((result) => { - const latestCommitHash = result.data.head.sha; - - const consoleLogPosition = getConsoleLogPosition({ - filePatch: file.patch ?? "", - individualLine, - }); - - return octokit - .request( - "POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews", + .request( + "POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews", + { + owner, + repo, + pull_number: issue_number, + commit_id: + typeof latestCommitHash === "string" + ? latestCommitHash + : undefined, + event: "COMMENT", + path: file.filename, + comments: [ { - owner, - repo, - pull_number: issue_number, - commit_id: latestCommitHash, - event: "COMMENT", path: file.filename, - comments: [ - { - path: file.filename, - position: consoleLogPosition || 1, // comment at the beggining of the file by default - body: "This file contains at least one console log. Please remove any present.", - }, - ], - } - ) - .catch((err) => { - console.log(err); - }); - }) + position: consoleLogPosition || 1, // comment at the beggining of the file by default + body: commentBody, + }, + ], + } + ) .catch((err) => { console.log(err); }); diff --git a/utils/actions/getOpenAISummary.ts b/utils/actions/getOpenAISummary.ts index 23b05d22f..88824c7f8 100644 --- a/utils/actions/getOpenAISummary.ts +++ b/utils/actions/getOpenAISummary.ts @@ -72,7 +72,7 @@ export default async function getOpenAISummary({ try { const completion = await openai.createChatCompletion({ - model: "gpt-3.5-turbo-16k", + model: "gpt-4-1106-preview", messages: [ { role: "system", diff --git a/utils/actions/markdownHelpers/randomText.ts b/utils/actions/markdownHelpers/randomText.ts index 69b00b823..1e708babf 100644 --- a/utils/actions/markdownHelpers/randomText.ts +++ b/utils/actions/markdownHelpers/randomText.ts @@ -2,9 +2,6 @@ const randomText = () => { const textList = [ "\n[Why not invite more people to your team?](https://app.watermelontools.com/team)", "\n[Have you starred Watermelon?](https://github.com/watermelontools/watermelon)", - "\n[Try us on VSCode!](https://marketplace.visualstudio.com/items?itemName=WatermelonTools.watermelon-tools)", - "\n[Try us on VSCodium!](https://open-vsx.org/extension/WatermelonTools/watermelon-tools)", - "\n[Try us on any JetBrains IDE!](https://plugins.jetbrains.com/plugin/22720-watermelon-context)", ]; let randomChance = Math.random() * 100; diff --git a/utils/sendgrid/sendUninstall.ts b/utils/sendgrid/sendUninstall.ts new file mode 100644 index 000000000..774a45a34 --- /dev/null +++ b/utils/sendgrid/sendUninstall.ts @@ -0,0 +1,18 @@ +export default async function sendUninstall({ emails }: { emails: string[] }) { + const sgMail = require("@sendgrid/mail"); + sgMail.setApiKey(process.env.SENDGRID_API_KEY); + const msg = { + to: emails, + from: "info@watermelon.tools", + templateId: "d-21dcf37205e4479d830dbcfd35cb41d6", + }; + sgMail + .sendMultiple(msg) + .then(() => { + console.log("Email sent"); + return { success: true }; + }) + .catch((error) => { + console.error(error); + }); +}