Pull and Merge

apps/billing/src/lib/db-marketing/schemas/entries.ts

@@ -1,8 +1,8 @@
-import { index, int, mysqlTable, text, timestamp, varchar } from "drizzle-orm/mysql-core";
-import { searchQueries } from "./searchQuery";
 import { relations } from "drizzle-orm";
+import { index, int, mysqlTable, text, timestamp, varchar } from "drizzle-orm/mysql-core";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import type { z } from "zod";
+import { searchQueries } from "./searchQuery";
 import { sections } from "./sections";
 
 export const entries = mysqlTable(

apps/billing/src/lib/db-marketing/schemas/evals.ts

@@ -1,8 +1,8 @@
-import { mysqlTable, int, timestamp, mysqlEnum, text, index } from "drizzle-orm/mysql-core";
+import { relations } from "drizzle-orm";
+import { index, int, mysqlEnum, mysqlTable, text, timestamp } from "drizzle-orm/mysql-core";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import { z } from "zod";
 import { entries } from "./entries";
-import { relations } from "drizzle-orm";
 
 export const evalTypes = ["technical", "seo", "editorial"] as const;
 export type EvalType = (typeof evalTypes)[number];

apps/billing/src/lib/db-marketing/schemas/firecrawl.ts

@@ -1,4 +1,4 @@
-import { relations, sql } from "drizzle-orm";
+import { relations } from "drizzle-orm";
 import {
   boolean,
   index,
@@ -9,10 +9,10 @@ import {
   unique,
   varchar,
 } from "drizzle-orm/mysql-core";
-import { serperOrganicResults } from "./serper";
-import { searchQueries } from "./searchQuery";
 import { createInsertSchema } from "drizzle-zod";
 import type { z } from "zod";
+import { searchQueries } from "./searchQuery";
+import { serperOrganicResults } from "./serper";
 
 export const firecrawlResponses = mysqlTable(
   "firecrawl_responses",

apps/billing/src/lib/db-marketing/schemas/keywords.ts

@@ -1,10 +1,10 @@
 import { relations } from "drizzle-orm";
 import { index, int, mysqlTable, timestamp, unique, varchar } from "drizzle-orm/mysql-core";
-import { searchQueries } from "./searchQuery";
-import { serperOrganicResults } from "./serper";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import type { z } from "zod";
+import { searchQueries } from "./searchQuery";
 import { sectionsToKeywords } from "./sections";
+import { serperOrganicResults } from "./serper";
 
 export const keywords = mysqlTable(
   "keywords",

apps/billing/src/lib/db-marketing/schemas/searchQuery.ts

@@ -10,9 +10,9 @@ import {
 } from "drizzle-orm/mysql-core";
 import { createInsertSchema } from "drizzle-zod";
 import type { z } from "zod";
-import { serperSearchResponses } from "./serper";
-import { firecrawlResponses } from "./firecrawl";
 import { entries } from "./entries";
+import { firecrawlResponses } from "./firecrawl";
+import { serperSearchResponses } from "./serper";
 
 export const searchQueries = mysqlTable(
   "search_queries",

apps/billing/src/lib/db-marketing/schemas/sections.ts

@@ -1,19 +1,17 @@
+import { relations } from "drizzle-orm";
 import {
+  int,
+  mysqlEnum,
   mysqlTable,
-  varchar,
+  primaryKey,
   text,
   timestamp,
-  int,
-  primaryKey,
-  mysqlEnum,
-  index,
-  unique,
+  varchar,
 } from "drizzle-orm/mysql-core";
-import { relations } from "drizzle-orm";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
-import { keywords } from "./keywords";
 import type { z } from "zod";
 import { entries } from "./entries";
+import { keywords } from "./keywords";
 
 export const sections = mysqlTable("sections", {
   id: int("id").primaryKey().autoincrement(),

apps/billing/src/lib/db-marketing/schemas/serper.ts

@@ -2,8 +2,8 @@ import { relations } from "drizzle-orm";
 import { index, int, json, mysqlTable, text, timestamp, varchar } from "drizzle-orm/mysql-core";
 import { createSelectSchema } from "drizzle-zod";
 import type { z } from "zod";
-import { searchQueries } from "./searchQuery";
 import { firecrawlResponses } from "./firecrawl";
+import { searchQueries } from "./searchQuery";
 
 // Main SearchResponse table
 export const serperSearchResponses = mysqlTable(

apps/billing/src/lib/firecrawl.ts

@@ -1,20 +1,10 @@
 import { db } from "@/lib/db-marketing/client";
-import {
-  firecrawlResponses,
-  firecrawlResponses,
-  keywords,
-  serperOrganicResults,
-  serperSearchResponses,
-} from "@/lib/db-marketing/schemas";
-import { THREE } from "@/trigger/glossary/keyword-research";
-import FirecrawlApp from "@mendable/firecrawl-js";
-import { and, desc, eq, inArray, isNotNull, lte, sql } from "drizzle-orm";
-import { getOrCreateSearchResponse } from "./serper";
-import { generateObject, generateText } from "ai";
-import { openai } from "@ai-sdk/openai";
-import { z } from "zod";
-import { keywordResearchSystemPrompt } from "./keywords";
+import { firecrawlResponses, serperOrganicResults } from "@/lib/db-marketing/schemas";
 import type { CacheStrategy } from "@/trigger/glossary/_generate-glossary-entry";
+import { openai } from "@ai-sdk/openai";
+import FirecrawlApp from "@mendable/firecrawl-js";
+import { generateText } from "ai";
+import { eq } from "drizzle-orm";
 
 const firecrawl = new FirecrawlApp({
   apiKey: process.env.FIRECRAWL_API_KEY!,
@@ -170,7 +160,9 @@ Accurately and concisely summarize the content from the page that ranks #${
 - Mention the types of content included, such as images, tables, code snippets, etc.
 - Cite the term the content is ranking for and its position in the SERP.`;
 
-  const prompt = `Summarize the following content for the term "${connectTo.term}" that's ranking #${serperResult?.position ?? "unknown"}:
+  const prompt = `Summarize the following content for the term "${
+    connectTo.term
+  }" that's ranking #${serperResult?.position ?? "unknown"}:
 =======
 ${firecrawlResponse.markdown}
 =======`;

apps/billing/src/lib/keywords.ts

@@ -1,12 +1,12 @@
+import { openai } from "@ai-sdk/openai";
+import { generateObject } from "ai";
 import { sql } from "drizzle-orm";
 import { and } from "drizzle-orm";
 import { inArray } from "drizzle-orm";
 import { eq } from "drizzle-orm";
+import { z } from "zod";
 import { db } from "./db-marketing/client";
 import { firecrawlResponses, keywords, serperSearchResponses } from "./db-marketing/schemas";
-import { z } from "zod";
-import { openai } from "@ai-sdk/openai";
-import { generateObject } from "ai";
 
 export const keywordResearchSystemPrompt = `
 You are an SEO Expert & Content Writer specializing in creating technical content for Developer Tools that are highly SEO optimized.

apps/billing/src/lib/search-query.ts

@@ -3,7 +3,7 @@ import { openai } from "@ai-sdk/openai";
 import { generateObject } from "ai";
 import { eq, sql } from "drizzle-orm";
 
-import { insertSearchQuerySchema, searchQueries, entries } from "@/lib/db-marketing/schemas";
+import { entries, insertSearchQuerySchema, searchQueries } from "@/lib/db-marketing/schemas";
 
 export async function getOrCreateSearchQuery(args: { term: string }) {
   const { term } = args;

apps/billing/src/trigger/glossary/_generate-glossary-entry.ts

@@ -1,13 +1,13 @@
+import { db } from "@/lib/db-marketing/client";
+import { entries } from "@/lib/db-marketing/schemas";
 import { task } from "@trigger.dev/sdk/v3";
-import { keywordResearchTask } from "./keyword-research";
-import { generateOutlineTask } from "./generate-outline";
-import { draftSectionsTask } from "./draft-sections";
-import { seoMetaTagsTask } from "./seo-meta-tags";
-import { createPrTask } from "./create-pr";
 import { AbortTaskRunError } from "@trigger.dev/sdk/v3";
-import { db } from "@/lib/db-marketing/client";
 import { eq } from "drizzle-orm";
-import { entries } from "@/lib/db-marketing/schemas";
+import { createPrTask } from "./create-pr";
+import { draftSectionsTask } from "./draft-sections";
+import { generateOutlineTask } from "./generate-outline";
+import { keywordResearchTask } from "./keyword-research";
+import { seoMetaTagsTask } from "./seo-meta-tags";
 
 export type CacheStrategy = "revalidate" | "stale";
 /**

apps/billing/src/trigger/glossary/create-pr.ts

@@ -1,7 +1,7 @@
-import { AbortTaskRunError, task } from "@trigger.dev/sdk/v3";
-import { Octokit } from "@octokit/rest";
 import { db } from "@/lib/db-marketing/client";
 import { entries } from "@/lib/db-marketing/schemas";
+import { Octokit } from "@octokit/rest";
+import { AbortTaskRunError, task } from "@trigger.dev/sdk/v3";
 import { eq } from "drizzle-orm";
 import type { CacheStrategy } from "./_generate-glossary-entry";
 

apps/billing/src/trigger/glossary/draft-sections.ts

@@ -1,12 +1,12 @@
 import { db } from "@/lib/db-marketing/client";
 import {
-  type sectionContentTypes,
+  type SelectEntry,
   entries,
   firecrawlResponses,
   type keywords,
+  type sectionContentTypes,
   type sections,
   type sectionsToKeywords,
-  type SelectEntry,
 } from "@/lib/db-marketing/schemas";
 import { openai } from "@ai-sdk/openai";
 import { AbortTaskRunError, task } from "@trigger.dev/sdk/v3";

apps/billing/src/trigger/glossary/evals.ts

@@ -1,17 +1,14 @@
 import { db } from "@/lib/db-marketing/client";
+import { entries } from "@/lib/db-marketing/schemas";
 import {
-  evals,
-  evalTypes,
   type EvalType,
+  evals,
   ratingsSchema,
   recommendationsSchema,
-  type Recommendations,
 } from "@/lib/db-marketing/schemas/evals";
-import { entries } from "@/lib/db-marketing/schemas";
 import { openai } from "@ai-sdk/openai";
-import { generateObject } from "ai";
-import { z } from "zod";
 import { AbortTaskRunError, task } from "@trigger.dev/sdk/v3";
+import { generateObject } from "ai";
 import { eq } from "drizzle-orm";
 import type { CacheStrategy } from "./_generate-glossary-entry";
 

apps/billing/src/trigger/glossary/generate-outline.ts

@@ -1,7 +1,7 @@
 import { db } from "@/lib/db-marketing/client";
 import {
+  type SelectKeywords,
   entries,
-  type FirecrawlResponse,
   firecrawlResponses,
   insertSectionContentTypeSchema,
   insertSectionSchema,
@@ -10,18 +10,17 @@ import {
   sectionContentTypes,
   sections,
   sectionsToKeywords,
-  type SelectKeywords,
   selectKeywordsSchema,
 } from "@/lib/db-marketing/schemas";
+import type { Keyword } from "@/lib/db-marketing/schemas/keywords";
+import { getOrCreateSummary } from "@/lib/firecrawl";
 import { openai } from "@ai-sdk/openai";
 import { AbortTaskRunError, task } from "@trigger.dev/sdk/v3";
 import { generateObject } from "ai";
 import { and, eq, or } from "drizzle-orm";
 import { z } from "zod";
 import type { CacheStrategy } from "./_generate-glossary-entry";
-import { getOrCreateSummary } from "@/lib/firecrawl";
-import type { Keyword } from "@/lib/db-marketing/schemas/keywords";
-import { performTechnicalEvalTask, performSEOEvalTask, performEditorialEvalTask } from "./evals";
+import { performEditorialEvalTask, performSEOEvalTask, performTechnicalEvalTask } from "./evals";
 
 // TODO: this task is a bit flake-y still
 // - split up into smaller tasks,  and/or

apps/billing/src/trigger/glossary/keyword-research.ts

@@ -1,13 +1,13 @@
 import { db } from "@/lib/db-marketing/client";
 import { keywords } from "@/lib/db-marketing/schemas";
+import { getOrCreateFirecrawlResponse } from "@/lib/firecrawl";
 import { AbortTaskRunError, task } from "@trigger.dev/sdk/v3";
 import { sql } from "drizzle-orm";
 import { inArray } from "drizzle-orm";
 import { and, eq } from "drizzle-orm";
+import { getOrCreateKeywordsFromHeaders, getOrCreateKeywordsFromTitles } from "../../lib/keywords";
 import { getOrCreateSearchQuery } from "../../lib/search-query";
 import { getOrCreateSearchResponse } from "../../lib/serper";
-import { getOrCreateKeywordsFromHeaders, getOrCreateKeywordsFromTitles } from "../../lib/keywords";
-import { getOrCreateFirecrawlResponse } from "@/lib/firecrawl";
 import type { CacheStrategy } from "./_generate-glossary-entry";
 
 export const THREE = 3;

apps/billing/src/trigger/glossary/seo-meta-tags.ts

@@ -1,11 +1,10 @@
-import { Trigger } from "@trigger.dev/sdk";
-import { z } from "zod";
-import { eq, and, or } from "drizzle-orm";
-import { keywords, firecrawlResponses, entries } from "../../lib/db-marketing/schemas";
-import { task } from "@trigger.dev/sdk/v3";
 import { db } from "@/lib/db-marketing/client";
-import { generateObject, generateText } from "ai";
 import { openai } from "@ai-sdk/openai";
+import { task } from "@trigger.dev/sdk/v3";
+import { generateObject } from "ai";
+import { and, eq, or } from "drizzle-orm";
+import { z } from "zod";
+import { entries, firecrawlResponses, keywords } from "../../lib/db-marketing/schemas";
 import type { CacheStrategy } from "./_generate-glossary-entry";
 
 // Define the job