Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: add docs for sql complete and fix re-render issue #1518

Merged
merged 3 commits into from
Nov 19, 2024
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
7 changes: 6 additions & 1 deletion docs_website/docs/integrations/add_ai_assistant.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ The AI assistant plugin is powered by LLM(Large Language Model), like ChatGPT fr

## AI Assistant Plugin

The AI Assistant plugin will allow users to do title generation, text to sql and query auto fix.
The AI Assistant plugin will allow users to do

- title generation
- text to sql
- query auto fix
- sql completion

Please follow below steps to enable AI assistant plugin:

Expand Down
7 changes: 7 additions & 0 deletions docs_website/docs/user_guide/ai_assistant.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ If your query failed, you will see ‘Auto fix’ button on the right corner of

![](/img/user_guide/sql_fix.gif)

## SQL Completion

SQL completion offers SQL code suggestions similar to GitHub Copilot while you write queries.
This feature is disabled by default. You can enable it in the Editor tab of user settings.

![](/img/user_guide/sql_complete.png)

## Search Table by Natural Language

If [vector store](../integrations/add_ai_assistant.mdx#vector-store) of the AI assistant plugin is also enabled, you'll be able to search the tables by natual language as well as keyword based search.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 2 additions & 8 deletions querybook/webapp/components/QueryEditor/BoundQueryEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useEffect, useMemo } from 'react';
import React, { useContext, useEffect, useMemo, useRef } from 'react';
import { useDispatch } from 'react-redux';

import {
Expand All @@ -7,13 +7,9 @@ import {
QueryEditor,
} from 'components/QueryEditor/QueryEditor';
import { IQueryEngine } from 'const/queryEngine';
import { SearchAndReplaceContext } from 'context/searchAndReplace';
import { useUserQueryEditorConfig } from 'hooks/redux/useUserQueryEditorConfig';
import { useForwardedRef } from 'hooks/useForwardedRef';
import {
fetchDataTableByNameIfNeeded,
fetchFunctionDocumentationIfNeeded,
} from 'redux/dataSources/action';
import { fetchDataTableByNameIfNeeded } from 'redux/dataSources/action';

export const BoundQueryEditor = React.forwardRef<
IQueryEditorHandles,
Expand All @@ -34,7 +30,6 @@ export const BoundQueryEditor = React.forwardRef<
}
>(({ options: propOptions, keyMap, engine, cellId, ...otherProps }, ref) => {
const dispatch = useDispatch();
const searchContext = useContext(SearchAndReplaceContext);
const editorRef = useForwardedRef<IQueryEditorHandles>(ref);

// Code Editor related Props
Expand Down Expand Up @@ -81,7 +76,6 @@ export const BoundQueryEditor = React.forwardRef<
getTableByName={fetchDataTable}
metastoreId={engine?.metastore_id}
language={engine?.language}
searchContext={searchContext}
cellId={cellId}
engineId={engine?.id}
sqlCompleteEnabled={sqlCompleteEnabled}
Expand Down
7 changes: 1 addition & 6 deletions querybook/webapp/components/QueryEditor/QueryEditor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,14 @@
height: 100%;
border-radius: var(--border-radius-sm);
overflow: hidden;
background-color: var(--bg-query-editor);

&.cm-theme-light {
.cm-editor {
.cm-scroller {
background-color: var(--bg-query-editor-gutter);

.cm-gutters {
background-color: var(--bg-query-editor-gutter);
}

.cm-content {
background-color: var(--bg-query-editor);
}
}
}
}
Expand Down
29 changes: 11 additions & 18 deletions querybook/webapp/components/QueryEditor/QueryEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import toast from 'react-hot-toast';
import { TDataDocMetaVariables } from 'const/datadoc';
import KeyMap from 'const/keyMap';
import { IDataTable } from 'const/metastore';
import { ISearchAndReplaceContextType } from 'context/searchAndReplace';
import { useAutoCompleteExtension } from 'hooks/queryEditor/extensions/useAutoCompleteExtension';
import { useEventsExtension } from 'hooks/queryEditor/extensions/useEventsExtension';
import { useHoverTooltipExtension } from 'hooks/queryEditor/extensions/useHoverTooltipExtension';
Expand Down Expand Up @@ -55,7 +54,6 @@ export interface IQueryEditorProps {
engineId: number;
templatedVariables?: TDataDocMetaVariables;
cellId?: number;
searchContext?: ISearchAndReplaceContextType;

fontSize?: string;
height?: 'auto' | 'full' | 'fixed';
Expand Down Expand Up @@ -109,7 +107,6 @@ export const QueryEditor: React.FC<
engineId,
cellId,
templatedVariables = [],
searchContext,

hasQueryLint,
height = 'auto',
Expand Down Expand Up @@ -270,13 +267,12 @@ export const QueryEditor: React.FC<

const searchExtension = useSearchExtension({
editorView: editorRef.current?.view,
searchContext,
cellId,
});

const eventsExtension = useEventsExtension({
onFocus: (evt) => onFocus?.(),
onBlur: (evt) => onBlur?.(),
onFocus,
onBlur,
});

const statusBarExtension = useStatusBarExtension({
Expand Down Expand Up @@ -313,9 +309,8 @@ export const QueryEditor: React.FC<
return true;
}, []);

const keyMapExtention = useKeyMapExtension({
keyMap,
keyBindings: [
const keyBindings = useMemo(
() => [
{ key: 'Tab', run: acceptCompletion },
{
key: KeyMap.queryEditor.autocomplete.key,
Expand All @@ -328,18 +323,16 @@ export const QueryEditor: React.FC<
return true;
},
},
{
key: 'Cmd-F',
run: () => {
searchContext?.showSearchAndReplace();
return true;
},
},
{
key: KeyMap.queryEditor.openTable.key,
run: openTableModalCommand,
},
],
[formatQuery, openTableModalCommand]
);
const keyMapExtention = useKeyMapExtension({
keyMap,
keyBindings,
});

const optionsExtension = useOptionsExtension({
Expand Down Expand Up @@ -367,7 +360,6 @@ export const QueryEditor: React.FC<
const extensions = useMemo(
() => [
mixedSQL(),

keyMapExtention,
statusBarExtension,
eventsExtension,
Expand Down Expand Up @@ -395,10 +387,11 @@ export const QueryEditor: React.FC<

const basicSetup = useMemo(
() => ({
drawSelection: false,
drawSelection: true,
highlightSelectionMatches: true,
searchKeymap: false,
foldGutter: false,
allowMultipleSelections: true,
}),
[]
);
Expand Down
34 changes: 23 additions & 11 deletions querybook/webapp/components/SearchAndReplace/SearchAndReplace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, {
useCallback,
useEffect,
useImperativeHandle,
useMemo,
useRef,
useState,
} from 'react';
Expand Down Expand Up @@ -68,16 +69,16 @@ export function useSearchAndReplace({

const reset = useCallback(() => setSearchState(initialSearchState), []);
const performSearch = useCallback(
// Active search happens when user is using the search input
// Passive search is when the search content is changed
(isActiveSearch: boolean = false) => {
if (!showing) {
return;
}

setSearchState((oldSearchState) => {
const searchResults = showing
? getSearchResults(
oldSearchState.searchString,
oldSearchState.searchOptions
)
: [];
const searchResults = getSearchResults(
oldSearchState.searchString,
oldSearchState.searchOptions
);

if (isActiveSearch) {
jumpToResult(
Expand Down Expand Up @@ -195,15 +196,26 @@ export function useSearchAndReplace({
setShowing(false);
}, []);

return {
searchAndReplaceContext: {
const searchAndReplaceContext = useMemo(
() => ({
searchState,
focusSearchBar,

showSearchAndReplace,
hideSearchAndReplace,
showing,
},
}),
[
searchState,
focusSearchBar,
showSearchAndReplace,
hideSearchAndReplace,
showing,
]
);

return {
searchAndReplaceContext,
searchAndReplaceProps: {
onSearchStringChange,
onReplaceStringChange,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import * as events from '@uiw/codemirror-extensions-events';
import { useMemo } from 'react';

export const useEventsExtension = ({ onFocus, onBlur }) => {
export const useEventsExtension = ({
onFocus,
onBlur,
}: {
onFocus?: () => void;
onBlur?: () => void;
}) => {
const extension = useMemo(
() =>
events.content({
focus: onFocus,
blur: onBlur,
focus: (evt) => onFocus?.(),
blur: (evt) => onBlur?.(),
}),
[onFocus, onBlur]
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,24 @@ import {
SearchQuery,
setSearchQuery,
} from '@codemirror/search';
import { EditorSelection, EditorView } from '@uiw/react-codemirror';
import { useEffect, useMemo } from 'react';
import {
EditorSelection,
EditorView,
keymap,
Prec,
} from '@uiw/react-codemirror';
import { useContext, useEffect, useMemo } from 'react';

import { ISearchAndReplaceContextType } from 'context/searchAndReplace';
import { SearchAndReplaceContext } from 'context/searchAndReplace';

export const useSearchExtension = ({
editorView,
cellId,
searchContext,
}: {
editorView: EditorView;
cellId: number;
searchContext?: ISearchAndReplaceContextType;
}) => {
const searchContext = useContext(SearchAndReplaceContext);
useEffect(() => {
if (editorView && searchContext) {
if (searchContext.showing) {
Expand All @@ -30,7 +34,7 @@ export const useSearchExtension = ({
closeSearchPanel(editorView);
}
}
}, [editorView, searchContext]);
}, [editorView, searchContext?.showing]);

const shouldHighlight = useMemo(
() =>
Expand Down Expand Up @@ -80,7 +84,23 @@ export const useSearchExtension = ({
}
}, [shouldHighlight, searchContext]);

const extension = useMemo(() => search(), []);
const extension = useMemo(
() => [
search(),
Prec.highest(
keymap.of([
{
key: 'Cmd-f',
run: () => {
searchContext?.showSearchAndReplace();
return true;
},
},
])
),
],
[]
);

return extension;
};
7 changes: 2 additions & 5 deletions querybook/webapp/hooks/queryEditor/useLint.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { TDataDocMetaVariables } from 'const/datadoc';
import { IQueryValidationResult } from 'const/queryExecution';
import { useDebounce } from 'hooks/useDebounce';
import useDeepCompareEffect from 'hooks/useDeepCompareEffect';
import { posToOffset } from 'lib/codemirror/utils';
import { getTokenAtOffset, posToOffset } from 'lib/codemirror/utils';
import { getContextSensitiveWarnings } from 'lib/sql-helper/sql-context-sensitive-linter';
import { ILinterWarning, TableToken } from 'lib/sql-helper/sql-lexer';
import { TemplatedQueryResource } from 'resource/queryExecution';
Expand Down Expand Up @@ -75,10 +75,7 @@ const queryValidationErrorsToDiagnostics = (
suggestion,
} = validationError;

const startPos = posToOffset(editorView, {
line,
ch: ch + 1,
});
const startPos = posToOffset(editorView, { line, ch });
const endPos =
endLine !== null && endCh !== null
? posToOffset(editorView, {
Expand Down
Loading