Feature/add all services to gpt prompt (#213)

EstebanDalelR · baristaGeek · web-flow · commit d39664f7ad14 · 2023-08-01T17:05:59.000-04:00
* Fix logging * Add notion to settings * Add notion to app * fix newline * Remove extra character * Add page image support * fix title * fix image display * fix no token error * Filter out private messages * Allow getting less than standard results * Create getHoverData.ts * fix token passing * Fix typo * Now uses commitTitle * Add new users to Sendgrid contact list * Scrub action for app * Fixes to slack matches * Fix/remove action (#178) * Delete watermelon.yml * Change dropdown link * Change login link * Change dashboard link * small fixes * Move text writers to helpers * Fix comment editing * Export helpers * Add necessary imports * Change logging * Add non-registered user response * Earlier counting of action uses * reduce logging * Add counting to comment * Add error checking * Add check for open repos * Add error writing * Extract count markdown * Fix/typings improvements (#183) * Add typings * Fix possible nulls * Add LoginGridProps type * Fix possible null * remove breaklines * Add export * Add import * Update README.md, add title (#180) * Update README.md, add title * Update README.md * Update README.md * Update README.md (#181) * Chore/codebase typings and nulls (#185) * Allow max to be 5 * check nulls * add typings * fix possible null * Add typings * Add linear link for oauth * Feature/linear (#186) * Allow max to be 5 * Create linear.tsx * Feature/linear (#187) * Allow max to be 5 * Create linear.tsx * Update linear.tsx * Add logging * improve logging * Fix linear link * Change encoding of request * Fix body of request * Fix userquery * Save user, pass team name * remove unused code * logging * try text * Create LinearLoginLink.tsx * Try new body * Update linear.tsx * Fix logo * Create linear.svg * add content type * Add linear * try fix * Fix data matching * Fix team * Removed unused link * Fix email * Feature/team and navbar (#182) * add server-only * add client-only * Move to RSC * remove logging * fix typings * fix typings * add LoginGridProps * Fix possibly null * Add types * Check nulls * fix possible nulls * ignore errors in lightly used api * Set conditionally * Check null * check null * fix typings * fix null errors * fix null * add typings * fix props passing * Add typing * Add typing * fix typings * Fix typing errors * use nonnull assertion * Add styles * Move to app folder * Adhere to app api route * Make it non default * upgrade next-auth * restore session provider * Fixes in adapter * move auth to pages to test use * Fix login route * fix import * Pass authprovider * Added sidebar test * Add sidebar * Fix navbar, extract navbar * Fix layout * Hide elements if no session * Update Navbar.tsx * Fix layout * Make app dark * Extract form * Extract navbar * Move to app * Move layout out * Remove logging * REmove logging * Move logingrid to RSC * Remove logingrid * Add layout * Remove logging * Remove logging * Create getTeammates.ts * Create Team page * Fix heading * Delete github.tsx * Move to App router * Update README.md, add title (#180) * Update README.md, add title * Update README.md * Update README.md * Update README.md (#181) * Move to RSC * Fix Try app ui * Remove data logging * Make card details a page * Move layout to master layout * Fix type * Fix layout order * Remove billing link * log response * Move back to pages * Add search params to billing page * Create loading.tsx * Get settings on load * Adde repo owner and number to charge * Pass number from param * Force prompt * fix params * Add payment success page * Add billing link to navbar * Remove text that explains repo and seats in Card Elements * Add texts that explains purchase amount * Add linear to form (#190) * Add linear to form * Add Linear to query * Create getLinear.ts * Add linear fetching * Change query to add limit * Add logging * Fix search terms * Improve logging * Update linear.ts * Add linear to app (#192) * Create linear.ts * add no token handling * Check nulls * Fix search terms * export module * Naming fixes * manage empty results * Fix text * Fix newline * Code fixes * Fix undefined team count * Add teammates (#193) * Add button * Code cleanup * Create page.tsx * Execute request on landing * fix empty teammates * fix null teammates * add logging * better logging * Fix params * Rmove logging * Get team and copy to clipboard * paralelize requests, shorten code * send correct object * Add interaction * Add plaintext to copy * Fix url * Create loading.tsx * Check for data before render * Add catch to data fetch * Fix return * Update layout.tsx * Update loading.tsx * Update loading.tsx * Update loading.tsx * Move app link up * fix button text * Glow up * Create loading.tsx * Change email to info * Create sendTeammateInvite.ts * Add emailer form * Fix template id * Fix sending handler * Move to API call * Update sendInviteForm.tsx * Update sendTeammateInvite.ts * Cleanup * Create loading.tsx * Remove params * Feature/save gh response (#194) * Add saving query * fix randomwords * Improve logging * stringify responses * Check nulls * Fix count number in log saving * Correct wm user * Extract to function (#196) * Create addActionLog.ts * Use extracted method * Reduce file size * Remove logging * Reorg imports (#197) * Reorg imports * Update github.ts * Update github.ts * Feature/extract gh action loggin (#198) * Create addActionLog.ts * Use extracted method * Reduce file size * Remove logging * fix id for team * Fix saved string * Feature/extract gh action loggin (#200) * Create addActionLog.ts * Use extracted method * Reduce file size * Remove logging * fix id for team * Fix saved string * Add replacing of apostrophe to fix query * add \n to AI summary error (#199) * add \n to AI summary error * Update github.ts * Feature/extract gh action logging (#202) * Feature/page titles (#203) * Delete sidebar.tsx (#201) * Feature/posthog analytics (#204) * Add posthogjs * Create providers.tsx * Add posthog * Add posthognode * Create posthogTracker.ts * Add tracker to gh action * make posthog early * fix list filtering * Rename tracker * Add tracker * Add tracker * Streamline data fetching * Add tracker * Feature/confluence login (#206) * Create ConfluenceLoginLink.tsx * Add confluence * Create atlassian page * Remove primer * Add primer * change link * Fix link * fix link, text * Emergency removal of posthog * REmove all posthog instances * Correct redirect uri * better logging * Update atlassian.tsx * conditionally add pic * add logging * Add discrimination to jira and confluence * Save confluence * fix link * Fix img * debug logging * Fix query * Debug logging * change grant typ * Go back a grant type * change logging * Fix url * Some more data wrangling * fix saving * Fix image * Reorg dashboard * Add coming soon ides * Style navbar better * Make sidebar sticky, add logout button * Add workspace query * Ignore name * Remove unused code * ignore calling * try other import to release * Move email to client * Change logging * fix obj accessing * Add workspace, request emails * Add email, optimize requests * fix query * Get refresh token on login * Add confluence * Improve logging * reduce logging * Better logging * Create confluence.ts * Add confluence * Fix value * Create confluence.ts * Add logging * logging * Check if null * Fix nulls * Change how tokens are updated * Rename * Fixes to query executing * Rename action * Fixes and error handling * Fix missing param * Add offline access scope * Several fixes to tokens * Logging improvements * Delete test Api * Reduce throwing * Make all unlogged services lose title * Create watermelon.ts * Use standard type * use standard types * Use standard types * Create general case helper * Make code more readable * Print full payload in this repo * Stringify full response * Allow number to be a string, like a slack channel * Add possible body * Remove data dumping * Standardize helpers * Remove unused helpers * Add possible image element * Remove unused code * use standard response * remove logging, fix text * Fix token errors in confluence * Better responses on success and failure * Check nulls * Add max results * Add limit using amount * create StandardAPIInput * Fix type * Create OptionDropdown component * Change to max 5 * Fix code * Make it component based, add confluence * Change pricing calculation and text to * Remove component unused * Fix loading page * Update README.md (#207) * Update README.md * Update README.md * Update README.md * Update README.md * Extract types * Use standard data * Add all services to GPT, upgrade to 3.5 turbo * Feature/confluence settings (#211) * Make all unlogged services lose title * Create watermelon.ts * Use standard type * use standard types * Use standard types * Create general case helper * Make code more readable * Allow number to be a string, like a slack channel * Add possible body * Standardize helpers * Remove unused helpers * Add possible image element * Remove unused code * use standard response * remove logging, fix text * Fix token errors in confluence * Better responses on success and failure * Check nulls * Add max results * Add limit using amount * create StandardAPIInput * Fix type * Create OptionDropdown component * Change to max 5 * Fix code * Make it component based, add confluence * Remove component unused * Fix loading page * Feature/standard api responses (#209) * Make all unlogged services lose title * Create watermelon.ts * Use standard type * use standard types * Use standard types * Create general case helper * Make code more readable * Allow number to be a string, like a slack channel * Add possible body * Standardize helpers * Remove unused helpers * Add possible image element * Remove unused code * use standard response * remove logging, fix text * Fix token errors in confluence * Better responses on success and failure * Check nulls * Add max results * Add limit using amount * create StandardAPIInput * Fix type * Create OptionDropdown component * Change to max 5 * Fix code * Removed unused element * Reduce code size * Add confluence * Reduce code * Further reduce code * Remove unneeded brackets * Reduce code * Remove unused code * Fix call * Remove BETA tag * Improve prompt, return content * Change how no responses look * make code more secure * Reduce length * type fixes * Fix type * Delete conflicting file --------- Co-authored-by: baristaGeek <estebanvargas94@gmail.com>
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -25,8 +25,8 @@ export default async function RootLayout({
   children: ReactNode;
 }) {
   const session = await getServerSession(authOptions);
-  const userEmail = session?.user?.email;
-  const userName = session?.user?.name;
+  let userEmail = session?.user?.email;
+  let userName = session?.user?.name;
 
   return (
     <html lang="en" data-color-mode="dark" data-dark-theme="dark">
diff --git a/app/page.tsx b/app/page.tsx
@@ -10,8 +10,8 @@ export const metadata: Metadata = {
 };
 async function HomePage() {
   const session = await getServerSession(authOptions);
-  const userEmail = session?.user?.email;
-  const userName = session?.user?.name;
+  let userEmail = session?.user?.email;
+  let userName = session?.user?.name;
   // if not logged in, do not show anything
   const data = await getAllPublicUserData({ userEmail }).catch((e) => {
     console.error(e);
diff --git a/app/settings/loading.tsx b/app/settings/loading.tsx
@@ -19,15 +19,15 @@ async function Settings({}) {
     ConfluenceDocs: 3,
     AISummary: 1,
   };
-  function SettingsSelector({ label, value, defaultValue }) {
+  function SettingsSelector({ label }) {
     return (
       <div className="">
         <span>{label}</span>
         <select
           className="form-select"
           aria-label={label}
-          defaultValue={defaultValue}
-          value={value}
+          defaultValue={3}
+          value={3}
         ></select>
       </div>
     );
@@ -44,50 +44,21 @@ async function Settings({}) {
             </div>
           </div>
           <form>
-            <SettingsSelector
-              label="Jira Tickets"
-              value={formState.JiraTickets}
-              defaultValue={formState?.JiraTickets}
-            />
-            <SettingsSelector
-              label="Slack Messages"
-              value={formState.SlackMessages}
-              defaultValue={formState?.SlackMessages}
-            />
-            <SettingsSelector
-              label="GitHub PRs"
-              value={formState.GitHubPRs}
-              defaultValue={formState?.GitHubPRs}
-            />
-            <SettingsSelector
-              label="Notion Pages"
-              value={formState.NotionPages}
-              defaultValue={formState?.NotionPages}
-            />
-            <SettingsSelector
-              label="Linear Tickets"
-              value={formState.LinearTickets}
-              defaultValue={formState?.LinearTickets}
-            />
-            <SettingsSelector
-              label="Confluence Docs"
-              value={formState.ConfluenceDocs}
-              defaultValue={formState?.ConfluenceDocs}
-            />
+            <SettingsSelector label="Jira Tickets" />
+            <SettingsSelector label="Slack Messages" />
+            <SettingsSelector label="GitHub PRs" />
+            <SettingsSelector label="Notion Pages" />
+            <SettingsSelector label="Linear Tickets" />
+            <SettingsSelector label="Confluence Docs" />
 
             <div className="">
               <span>AI Summary: </span>
-              <select
-                className="form-select"
-                aria-label="AI Summary"
-                defaultValue={formState?.AISummary}
-                value={formState.AISummary}
-              >
+              <select className="form-select" aria-label="AI Summary" value={1}>
                 <option value={1}>Active</option>
                 <option value={0}>Inactive</option>
               </select>
             </div>
-            <button className="btn btn-primary" type="button" disabled={false}>
+            <button className="btn btn-primary" type="button" disabled={true}>
               {"Save"}
             </button>
           </form>
diff --git a/app/settings/page.tsx b/app/settings/page.tsx
@@ -11,8 +11,8 @@ export const metadata: Metadata = {
 };
 async function Settings({}) {
   const session = await getServerSession(authOptions);
-  const userEmail = session?.user?.email;
-  const userName = session?.user?.name;
+  let userEmail = session?.user?.email;
+  let userName = session?.user?.name;
   // if not logged in, do not show anything
   if (!session) return <LogInBtn />;
 
diff --git a/app/vscode-insiders/page.tsx b/app/vscode-insiders/page.tsx
@@ -11,8 +11,8 @@ export const metadata: Metadata = {
 };
 async function VSCodeInsiders() {
   const session = await getServerSession(authOptions);
-  const userEmail = session?.user?.email;
-  const userName = session?.user?.name;
+  let userEmail = session?.user?.email;
+  let userName = session?.user?.name;
   const data = await getAllPublicUserData({ userEmail });
 
   let system = "vscode-insiders";
diff --git a/app/vscode/page.tsx b/app/vscode/page.tsx
@@ -12,8 +12,8 @@ export const metadata: Metadata = {
 };
 async function VSCode() {
   const session = await getServerSession(authOptions);
-  const userEmail = session?.user?.email;
-  const userName = session?.user?.name;
+  let userEmail = session?.user?.email;
+  let userName = session?.user?.name;
   const data = await getAllPublicUserData({ userEmail });
   let system = "vscode";
   let url: string = `${system}://watermelontools.watermelon-tools?email=${
diff --git a/pages/api/actions/getContext.ts b/pages/api/actions/getContext.ts
@@ -256,18 +256,21 @@ export default async function handler(req, res) {
     }),
     getJira({
       user: user_email,
-      jira_token,
-      jira_refresh_token,
+      token: jira_token,
+      refresh_token: jira_refresh_token,
+      amount: 3,
       randomWords,
     }),
     getSlack({ title, body, slack_token, randomWords }),
   ]);
 
   const businessLogicSummary = await getOpenAISummary({
-    ghValue,
+    values: {
+      ghValue,
+      jiraValue,
+      slackValue,
+    },
     commitList,
-    jiraValue,
-    slackValue,
     title,
     body,
   });
diff --git a/pages/api/actions/github.ts b/pages/api/actions/github.ts
@@ -332,8 +332,8 @@ export default async (req, res) => {
           }),
           getJira({
             user: user_email,
-            jira_token,
-            jira_refresh_token,
+            token: jira_token,
+            refresh_token: jira_refresh_token,
             randomWords,
             amount: JiraTickets,
           }),
@@ -364,24 +364,29 @@ export default async (req, res) => {
           }),
           addActionCount({ watermelon_user }),
         ]);
-        textToWrite += `### WatermelonAI Summary (BETA) \n`;
+        textToWrite += `### WatermelonAI Summary \n`;
 
         let businessLogicSummary;
         if (AISummary) {
           businessLogicSummary = await getOpenAISummary({
-            ghValue,
             commitList,
-            jiraValue,
-            slackValue,
+            values: {
+              ghValue,
+              jiraValue,
+              confluenceValue,
+              slackValue,
+              notionValue,
+              linearValue,
+            },
             title,
             body,
           });
 
           if (businessLogicSummary) {
-            textToWrite += businessLogicSummary;
+            textToWrite += businessLogicSummary + "\n";
           } else {
             textToWrite +=
-              "Error getting summary" + businessLogicSummary.error + "\n";
+              "Error getting summary" + businessLogicSummary?.error + "\n";
           }
         } else {
           textToWrite += `AI Summary deactivated by ${userLogin} \n`;
diff --git a/types/watermelon.ts b/types/watermelon.ts
@@ -5,25 +5,27 @@ export type MarkdownRequest = {
   amount: number;
   value: StandardAPIResponse;
 };
+
 export type StandardAPIInput = {
   token: string;
   refresh_token?: string;
-  searchText: string;
+  searchText?: string;
   amount: number;
   user?: string;
   id?: string;
   owner?: string;
   repo?: string;
   randomWords?: string[];
 };
+export type StandardProcessedDataArray = {
+  title: string;
+  body?: string;
+  link?: string;
+  number?: number | string;
+  image?: string;
+}[];
 export type StandardAPIResponse = {
-  data?: {
-    title: string;
-    body?: string;
-    link?: string;
-    number?: number | string;
-    image?: string;
-  }[];
+  data?: StandardProcessedDataArray;
   fullData?: any;
   error?: string;
 };
diff --git a/utils/actions/getJira.ts b/utils/actions/getJira.ts
@@ -1,3 +1,4 @@
+import { StandardAPIInput } from "../../types/watermelon";
 import getJiraOrganization from "../../utils/db/jira/getOrganization";
 import getFreshJiraTokens from "../jira/getFreshJiraTokens";
 
@@ -46,16 +47,16 @@ async function getJiraServerInfo(jira_id, accessToken) {
 
 async function getJira({
   user,
-  jira_token,
-  jira_refresh_token,
+  token,
+  refresh_token,
   randomWords,
   amount = 3,
-}) {
-  if (!jira_token || !jira_refresh_token) return { error: "no jira token" };
+}: StandardAPIInput) {
+  if (!token || !refresh_token) return { error: "no jira token" };
   if (!user) return { error: "no user" };
 
   const newAccessTokens = await getFreshJiraTokens({
-    jira_refresh_token,
+    jira_refresh_token: refresh_token,
     user,
   });
 
@@ -65,7 +66,7 @@ async function getJira({
   if (!jira_id) return { error: "no Jira cloudId" };
 
   const cleanRandomWords = Array.from(
-    new Set(randomWords.map((word) => removeSpecialChars(word)))
+    new Set(randomWords?.map((word) => removeSpecialChars(word)))
   );
   const summaryQuery = cleanRandomWords
     .map((word) => `summary ~ "${word}"`)
diff --git a/utils/actions/getOpenAISummary.ts b/utils/actions/getOpenAISummary.ts
diff --git a/utils/actions/markdownHelpers/helper.ts b/utils/actions/markdownHelpers/helper.ts
