chore: create upon edit if needed

ubq-testing · Sep 17, 2024 · 48349ff · 48349ff
1 parent d707c9f
commit 48349ff
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/src/adapters/supabase/helpers/embeddings.ts b/src/adapters/supabase/helpers/embeddings.ts
@@ -123,6 +123,12 @@ export class Embeddings extends Super {
       modified_at: new Date().toISOString(),
     };
 
+    const embeddingData = await this.getEmbedding(sourceId);
+
+    if (!embeddingData) {
+      return await this.createEmbedding(sourceId, type, body, metadata);
+    }
+
     const { error } = await this.supabase.from("content").update(toStore).eq("source_id", sourceId);
 
     if (error) {
@@ -136,7 +142,7 @@ export class Embeddings extends Super {
 
   async getEmbedding(sourceId: string): Promise<CommentType> {
     const { data, error } = await this.supabase.from("content").select("*").eq("source_id", sourceId).single();
-    if (error && error.message !== "No records found") {
+    if (error && error.code !== "PGRST116") {
       this.context.logger.error("Error getting comment", { err: error, sourceId });
     }
     return data;
@@ -151,7 +157,7 @@ export class Embeddings extends Super {
 
   // Working with embeddings
 
-  async findSimilarIssues(markdown: string, threshold: number, currentId: string): Promise<IssueSimilaritySearchResult[] | null> {
+  async findSimilarIssues(markdown: string, threshold: number, currentId: string): Promise<IssueSimilaritySearchResult[]> {
     const embedding = await this._embedWithVoyage(markdown);
     const { data, error } = await this.supabase.rpc("find_similar_issues", {
       current_id: currentId,
@@ -214,14 +220,10 @@ export class Embeddings extends Super {
   }
 
   private _getBody(payload: Context["payload"]) {
-    const body = [payload.issue.title];
-
     if (isIssueCommentEvent(payload)) {
-      body.push(payload.comment.body);
-    } else if (isIssueEvent(payload) && payload.issue.body) {
-      body.push(payload.issue.body);
+      return payload.comment.body;
+    } else if (isIssueEvent(payload)) {
+      return payload.issue.body;
     }
-
-    return body.join("\n\n :: ");
   }
 }
diff --git a/src/handlers/task-deduplication.ts b/src/handlers/task-deduplication.ts
@@ -20,21 +20,27 @@ export async function taskSimilaritySearch(context: Context<"issues.opened">): P
     adapters: { supabase },
     octokit,
   } = context;
-  const { payload } = context;
-  const issue = payload.issue;
-  const issueContent = issue.title + "\n" + issue.body;
+  const {
+    payload: { issue, repository },
+  } = context;
+  const similarIssues: IssueSimilaritySearchResult[] = [];
+
+  similarIssues.push(...(await supabase.embeddings.findSimilarIssues(issue.title, context.config.warningThreshold, issue.node_id)));
+  if (issue.body) {
+    similarIssues.push(...(await supabase.embeddings.findSimilarIssues(issue.body, context.config.warningThreshold, issue.node_id)));
+  }
+
+  logger.info(`Found ${similarIssues.length} similar issues`);
 
-  // Fetch all similar issues based on settings.warningThreshold
-  const similarIssues = await supabase.embeddings.findSimilarIssues(issueContent, context.config.warningThreshold, issue.node_id);
   if (similarIssues && similarIssues.length > 0) {
-    const matchIssues = similarIssues.filter((issue) => issue.similarity >= context.config.matchThreshold);
+    const matchIssues = similarIssues.filter((issue) => issue?.similarity >= context.config.matchThreshold);
 
     // Handle issues that match the MATCH_THRESHOLD (Very Similar)
     if (matchIssues.length > 0) {
       logger.info(`Similar issue which matches more than ${context.config.matchThreshold} already exists`);
       await octokit.issues.update({
-        owner: payload.repository.owner.login,
-        repo: payload.repository.name,
+        owner: repository.owner.login,
+        repo: repository.name,
         issue_number: issue.number,
         state: "closed",
         state_reason: "not_planned",

diff --git a/tests/main.test.ts b/tests/main.test.ts
@@ -57,7 +57,7 @@ describe("Plugin tests", () => {
     expect(okSpy).toHaveBeenNthCalledWith(1, "Successfully created comment!", {
       source_id: "test",
       type: "comment",
-      plaintext: `First Issue :: ${STRINGS.HELLO_WORLD}`,
+      plaintext: `${STRINGS.HELLO_WORLD}`,
       embedding: STRINGS.REMOVED_FOR_BREVITY,
       metadata: {
         authorAssociation: "OWNER",
@@ -84,7 +84,7 @@ describe("Plugin tests", () => {
     expect(okSpy).toHaveBeenNthCalledWith(1, "Successfully updated comment!", {
       source_id: "test",
       type: "comment",
-      plaintext: `First Issue :: ${STRINGS.UPDATED_MESSAGE}`,
+      plaintext: `${STRINGS.UPDATED_MESSAGE}`,
       embedding: STRINGS.REMOVED_FOR_BREVITY,
       metadata: {
         authorAssociation: "OWNER",
@@ -120,7 +120,7 @@ describe("Plugin tests", () => {
     expect(okSpy).toHaveBeenNthCalledWith(1, "Successfully created issue!", {
       source_id: "test_issue1",
       type: "task",
-      plaintext: `First Issue :: ${STRINGS.HELLO_WORLD}`,
+      plaintext: `${STRINGS.HELLO_WORLD}`,
       embedding: STRINGS.REMOVED_FOR_BREVITY,
       metadata: {
         authorAssociation: "OWNER",
@@ -145,7 +145,7 @@ describe("Plugin tests", () => {
     expect(okSpy).toHaveBeenNthCalledWith(1, "Successfully updated issue!", {
       source_id: "test_issue1",
       type: "task",
-      plaintext: `First Issue :: ${STRINGS.UPDATED_MESSAGE}`,
+      plaintext: `${STRINGS.UPDATED_MESSAGE}`,
       embedding: STRINGS.REMOVED_FOR_BREVITY,
       metadata: {
         authorAssociation: "OWNER",