Merge branch 'main' into feat/ai-service/sql-pairs

wren-ai-service/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wren-ai-service"
-version = "0.13.7"
+version = "0.13.9"
 description = ""
 authors = ["Jimmy Yeh <jimmy.yeh@cannerdata.com>", "Pao Sheng Wang <david.wang@cannerdata.com>", "Aster Sun <aster.sun@cannerdata.com>"]
 license = "AGPL-3.0"

wren-ai-service/src/pipelines/generation/intent_classification.py

@@ -30,6 +30,7 @@
 - Steps to rephrase the user's question:
     - First, try to recognize adjectives in the user's question that are important to the user's intent.
     - Second, change the adjectives to more specific and clear ones that can be matched to columns in the database schema.
+    - Third, if the user's question is related to time/date, add time/date format(such as YYYY-MM-DD) in the rephrased_question output.
 - MUST use the rephrased user's question to make the intent classification.
 - MUST put the rephrased user's question in the rephrased_question output.
 - REASONING MUST be within 20 words.

wren-ui/migrations/20241226135712_remove_thread_sql.js

@@ -0,0 +1,26 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function (knex) {
+  // drop foreign key constraint before altering column type to prevent data loss
+  await knex.schema.alterTable('thread_response', (table) => {
+    table.dropForeign('thread_id');
+  });
+  await knex.schema.alterTable('thread', (table) => {
+    table.dropColumn('sql');
+  });
+  await knex.schema.alterTable('thread_response', (table) => {
+    table.foreign('thread_id').references('thread.id').onDelete('CASCADE');
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function (knex) {
+  await knex.schema.alterTable('thread', (table) => {
+    table.text('sql').nullable();
+  });
+};

wren-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wren-ui",
-  "version": "0.18.9",
+  "version": "0.18.10",
   "private": true,
   "scripts": {
     "dev": "next dev",

wren-ui/src/apollo/client/graphql/__types__.ts

@@ -257,8 +257,6 @@ export type DetailedThread = {
   __typename?: 'DetailedThread';
   id: Scalars['Int'];
   responses: Array<ThreadResponse>;
-  /** @deprecated Doesn't seem to be reasonable to put a sql in a thread */
-  sql: Scalars['String'];
 };
 
 export type Diagram = {
@@ -997,8 +995,6 @@ export type Task = {
 export type Thread = {
   __typename?: 'Thread';
   id: Scalars['Int'];
-  /** @deprecated Doesn't seem to be reasonable to put a sql in a thread */
-  sql: Scalars['String'];
   summary: Scalars['String'];
 };
 
@@ -1044,6 +1040,7 @@ export type ThreadResponseBreakdownDetail = {
 
 export type ThreadResponseChartDetail = {
   __typename?: 'ThreadResponseChartDetail';
+  adjustment?: Maybe<Scalars['Boolean']>;
   chartSchema?: Maybe<Scalars['JSON']>;
   description?: Maybe<Scalars['String']>;
   error?: Maybe<Error>;

wren-ui/src/apollo/client/graphql/home.ts

@@ -50,6 +50,7 @@ const COMMON_CHART_DETAIL = gql`
     error {
       ...CommonError
     }
+    adjustment
   }
 `;
 
@@ -144,7 +145,6 @@ export const THREAD = gql`
   query Thread($threadId: Int!) {
     thread(threadId: $threadId) {
       id
-      sql
       responses {
         ...CommonResponse
       }
@@ -180,7 +180,6 @@ export const CREATE_THREAD = gql`
   mutation CreateThread($data: CreateThreadInput!) {
     createThread(data: $data) {
       id
-      sql
     }
   }
 `;
@@ -204,7 +203,6 @@ export const UPDATE_THREAD = gql`
   ) {
     updateThread(where: $where, data: $data) {
       id
-      sql
       summary
     }
   }

wren-ui/src/apollo/server/backgrounds/chart.ts

@@ -205,6 +205,7 @@ export class ChartAdjustmentBackgroundTracker {
             error: result?.error,
             description: result?.response?.reasoning,
             chartSchema: result?.response?.chartSchema,
+            adjustment: true,
           };
           logger.debug(
             `Job ${threadResponse.id} chart status changed, updating`,

wren-ui/src/apollo/server/repositories/threadRepository.ts

@@ -17,7 +17,6 @@ export interface ThreadRecommendationQuestionResult {
 export interface Thread {
   id: number; // ID
   projectId: number; // Reference to project.id
-  sql: string; // SQL
   summary: string; // Thread summary
 
   // recommend question

wren-ui/src/apollo/server/repositories/threadResponseRepository.ts

@@ -35,6 +35,7 @@ export interface ThreadResponseChartDetail {
   error?: object;
   description?: string;
   chartSchema?: Record<string, any>;
+  adjustment?: boolean;
 }
 
 export interface ThreadResponse {

wren-ui/src/apollo/server/schema.ts

@@ -684,6 +684,7 @@ export const typeDefs = gql`
     error: Error
     description: String
     chartSchema: JSON
+    adjustment: Boolean
   }
 
   type ThreadResponse {
@@ -700,20 +701,12 @@ export const typeDefs = gql`
   # Thread only consists of basic information of a thread
   type Thread {
     id: Int!
-    sql: String!
-      @deprecated(
-        reason: "Doesn't seem to be reasonable to put a sql in a thread"
-      )
     summary: String!
   }
 
   # Detailed thread consists of thread and thread responses
   type DetailedThread {
     id: Int!
-    sql: String!
-      @deprecated(
-        reason: "Doesn't seem to be reasonable to put a sql in a thread"
-      )
     responses: [ThreadResponse!]!
   }
 

wren-ui/src/apollo/server/services/askingService.ts

@@ -575,7 +575,6 @@ export class AskingService implements IAskingService {
     const { id } = await this.projectService.getCurrentProject();
     const thread = await this.threadRepository.createOne({
       projectId: id,
-      sql: input.sql,
       summary: input.question,
     });
 
@@ -780,6 +779,7 @@ export class AskingService implements IAskingService {
         chartDetail: {
           queryId: response.queryId,
           status: ChartStatus.FETCHING,
+          adjustment: true,
         },
       },
     );
@@ -969,8 +969,6 @@ export class AskingService implements IAskingService {
     const { id } = await this.projectService.getCurrentProject();
     const thread = await this.threadRepository.createOne({
       projectId: id,
-      // todo: remove sql from thread
-      sql: view.statement,
       summary: input.question,
     });
 

wren-ui/src/components/chart/handler.ts

@@ -1,7 +1,6 @@
 import { ChartType } from '@/apollo/client/graphql/__types__';
 import { isNil, cloneDeep, uniq, sortBy, omit, isNumber } from 'lodash';
 import { Config, TopLevelSpec } from 'vega-lite';
-import { PositionFieldDef } from 'vega-lite/build/src/channeldef';
 
 enum MarkType {
   ARC = 'arc',
@@ -234,7 +233,6 @@ export default class ChartSpecHandler {
 
   private addEncoding(encoding: EncodingSpec) {
     this.encoding = encoding;
-    const { x, y } = this.getAxisDomain();
 
     // fill color by x field if AI not provide color(category) field
     if (isNil(this.encoding.color)) {
@@ -253,26 +251,6 @@ export default class ChartSpecHandler {
 
     // handle scale on bar chart
     if (this.mark.type === MarkType.BAR) {
-      if (y) {
-        this.encoding.y = {
-          ...this.encoding.y,
-          scale: {
-            domain: y,
-            nice: false,
-          },
-        };
-      }
-
-      if (x) {
-        this.encoding.x = {
-          ...this.encoding.x,
-          scale: {
-            domain: x,
-            nice: false,
-          },
-        };
-      }
-
       if ('stack' in this.encoding.y) {
         this.encoding.y.stack = this.options.stack;
       }
@@ -291,45 +269,6 @@ export default class ChartSpecHandler {
     this.addHoverHighlight(this.encoding);
   }
 
-  private getAxisDomain() {
-    const xField = this.encoding.x as PositionFieldDef<any>;
-    const yField = this.encoding.y as PositionFieldDef<any>;
-    const calculateMaxDomain = (field: PositionFieldDef<any>) => {
-      if (field?.type !== 'quantitative') return null;
-      const fieldValue = field.field;
-      const values = (this.data as any).values.map((d) => d[fieldValue]);
-
-      const maxValue = Math.max(...values);
-
-      // Get the magnitude (e.g., 1, 10, 100, 1000)
-      const magnitude = Math.pow(10, Math.floor(Math.log10(maxValue)));
-
-      // Get number between 1-10
-      const normalizedValue = maxValue / magnitude;
-      let niceNumber;
-
-      if (normalizedValue <= 1.2) niceNumber = 1.2;
-      else if (normalizedValue <= 1.5) niceNumber = 1.5;
-      else if (normalizedValue <= 2) niceNumber = 2;
-      else if (normalizedValue <= 2.5) niceNumber = 2.5;
-      else if (normalizedValue <= 3) niceNumber = 3;
-      else if (normalizedValue <= 4) niceNumber = 4;
-      else if (normalizedValue <= 5) niceNumber = 5;
-      else if (normalizedValue <= 7.5) niceNumber = 7.5;
-      else if (normalizedValue <= 8) niceNumber = 8;
-      else niceNumber = 10;
-
-      const domainMax = niceNumber * magnitude;
-      return [0, domainMax];
-    };
-    const xDomain = calculateMaxDomain(xField);
-    const yDomain = calculateMaxDomain(yField);
-    return {
-      x: xDomain,
-      y: yDomain,
-    };
-  }
-
   private addHoverHighlight(encoding: EncodingSpec) {
     const category = (
       encoding.color?.condition ? encoding.color.condition : encoding.color

wren-ui/src/components/pages/home/promptThread/ChartAnswer.tsx

@@ -96,7 +96,7 @@ export default function ChartAnswer(props: Props) {
 
   const [form] = Form.useForm();
   const { chartDetail } = threadResponse;
-  const { error, status } = chartDetail || {};
+  const { error, status, adjustment } = chartDetail || {};
 
   const [previewData, previewDataResult] = usePreviewDataMutation({
     onError: (error) => console.error(error),
@@ -203,6 +203,14 @@ export default function ChartAnswer(props: Props) {
     onResetState();
   };
 
+  const regenerateBtn = (
+    <div className="text-center mt-4">
+      <Button icon={<ReloadOutlined />} onClick={onReload}>
+        Regenerate
+      </Button>
+    </div>
+  );
+
   if (error) {
     return (
       <div className="py-6 px-4">
@@ -212,15 +220,13 @@ export default function ChartAnswer(props: Props) {
           type="error"
           showIcon
         />
-        <div className="text-center mt-4">
-          <Button icon={<ReloadOutlined />} onClick={onRegenerate}>
-            Regenerate
-          </Button>
-        </div>
+        {regenerateBtn}
       </div>
     );
   }
 
+  const chartRegenerateBtn = adjustment ? regenerateBtn : null;
+
   return (
     <StyledSkeleton
       active
@@ -230,7 +236,7 @@ export default function ChartAnswer(props: Props) {
     >
       <div className="text-md gray-10 py-6 px-4">
         {chartDetail?.description}
-        {chartSpec && (
+        {chartSpec ? (
           <ChartWrapper
             className={clsx(
               'border border-gray-4 rounded mt-4 pb-3 overflow-hidden',
@@ -277,6 +283,8 @@ export default function ChartAnswer(props: Props) {
               onReload={onReload}
             />
           </ChartWrapper>
+        ) : (
+          chartRegenerateBtn
         )}
       </div>
     </StyledSkeleton>

wren-ui/src/styles/components/chart.less

@@ -17,7 +17,8 @@
       cursor: pointer;
       width: 28px;
       height: 28px;
-      opacity: 0.2;
+      opacity: 0.4;
+      color: @gray-8;
       transition: all 0.4s ease-in;
 
       &:hover {
@@ -33,7 +34,7 @@
   .vega-embed {
     &:hover {
       summary {
-        opacity: 0.2 !important;
+        opacity: 0.4 !important;
       }
     }
 
@@ -43,6 +44,7 @@
       box-shadow: none;
       transition: all 0.4s ease-in;
       color: @gray-8;
+      opacity: 0.4 !important;
 
       &:hover {
         opacity: 1 !important;