Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions wren-ui/src/apollo/client/graphql/__types__.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export type AdjustThreadResponseInput = {
export type AdjustmentTask = {
__typename?: 'AdjustmentTask';
error?: Maybe<Error>;
invalidSql?: Maybe<Scalars['String']>;
queryId?: Maybe<Scalars['String']>;
sql?: Maybe<Scalars['String']>;
status?: Maybe<AskingTaskStatus>;
Expand Down
22 changes: 12 additions & 10 deletions wren-ui/src/apollo/client/graphql/home.generated.ts

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions wren-ui/src/apollo/client/graphql/home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ const COMMON_RESPONSE = gql`
}
sql
traceId
invalidSql
}
}

Expand Down Expand Up @@ -400,6 +401,7 @@ export const ADJUSTMENT_TASK = gql`
}
sql
traceId
invalidSql
}
}
`;
Expand Down
3 changes: 2 additions & 1 deletion wren-ui/src/apollo/server/adaptors/wrenAIAdaptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -662,13 +662,13 @@ export class WrenAIAdaptor implements IWrenAIAdaptor {
): Promise<AsyncQueryResponse> {
try {
const body = {
question: input.question,
tables: input.tables,
sql_generation_reasoning: input.sqlGenerationReasoning,
sql: input.sql,
project_id: input.projectId.toString(),
configurations: input.configurations,
};

const res = await axios.post(
`${this.wrenAIBaseEndpoint}/v1/ask-feedbacks`,
body,
Expand Down Expand Up @@ -725,6 +725,7 @@ export class WrenAIAdaptor implements IWrenAIAdaptor {
type: result.type?.toUpperCase() as AskCandidateType,
})) || [],
traceId: body.trace_id,
invalidSql: body.invalid_sql,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ export class AdjustmentBackgroundTaskTracker
tables: adjustment.payload?.retrievedTables,
sqlGenerationReasoning: adjustment.payload?.sqlGenerationReasoning,
sql: originalThreadResponse.sql,
question: originalThreadResponse.question,
});
const queryId = response.queryId;

Expand Down
2 changes: 2 additions & 0 deletions wren-ui/src/apollo/server/models/adaptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ export interface InstructionResult {

// ask feedback
export interface AskFeedbackInput {
question: string;
tables: string[];
sqlGenerationReasoning: string;
sql: string;
Expand All @@ -318,4 +319,5 @@ export interface AskFeedbackResult {
sql: string;
}>;
traceId?: string;
invalidSql?: string;
}
3 changes: 3 additions & 0 deletions wren-ui/src/apollo/server/resolvers/askingResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export interface AdjustmentTask {
error: WrenAIError | null;
sql: string;
traceId: string;
invalidSql?: string;
}

export interface AskingTask {
Expand Down Expand Up @@ -554,6 +555,7 @@ export class AskingResolver {
error: adjustmentTask?.error,
sql: adjustmentTask?.response?.[0]?.sql,
traceId: adjustmentTask?.traceId,
invalidSql: adjustmentTask?.invalidSql,
};
}

Expand Down Expand Up @@ -742,6 +744,7 @@ export class AskingResolver {
error: adjustmentTask?.error,
sql: adjustmentTask?.response?.[0]?.sql,
traceId: adjustmentTask?.traceId,
invalidSql: adjustmentTask?.invalidSql,
};
},
});
Expand Down
1 change: 1 addition & 0 deletions wren-ui/src/apollo/server/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ export const typeDefs = gql`
error: Error
sql: String
traceId: String
invalidSql: String
}

type ThreadResponse {
Expand Down