Skip to content
Closed
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 public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
window.web_version = !'%REACT_APP_BACKEND%';
window.custom_backend = '%NODE_ENV%' === 'development' && '%REACT_APP_BACKEND%';
window.meta_backend = '%REACT_APP_META_BACKEND%'
window.code_assistant_backend = '%REACT_APP_CODE_ASSISTANT_BACKEND%'
</script>
</head>
<body>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react';

import {useSendOpenTabsMutation} from '../../store/reducers/codeAssist';
import {selectQueriesHistory} from '../../store/reducers/query/query';
import {useTypedSelector} from '../../utils/hooks';

export function CodeAssistantTelemetry() {
const [sendOpenTabs] = useSendOpenTabsMutation();
const historyQueries = useTypedSelector(selectQueriesHistory);

React.useEffect(() => {
if (!historyQueries?.length) {
return;
}

const tabs = historyQueries.map((query) => ({
FileName: `query_${query.queryId}.yql`,
Text: query.queryText,
}));

sendOpenTabs(tabs);
}, [historyQueries, sendOpenTabs]);

return null;
}
12 changes: 12 additions & 0 deletions src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import throttle from 'lodash/throttle';
import type Monaco from 'monaco-editor';
import {v4 as uuidv4} from 'uuid';

import {CodeAssistantTelemetry} from '../../../../components/CodeAssistantTelemetry/CodeAssistantTelemetry';
import {MonacoEditor} from '../../../../components/MonacoEditor/MonacoEditor';
import SplitPane from '../../../../components/SplitPane';
import {registerCompletionCommands} from '../../../../services/codeCompletion';
import {useTracingLevelOptionAvailable} from '../../../../store/reducers/capabilities/hooks';
import {
goToNextQuery,
Expand Down Expand Up @@ -42,6 +44,7 @@ import {
import {useChangedQuerySettings} from '../../../../utils/hooks/useChangedQuerySettings';
import {useLastQueryExecutionSettings} from '../../../../utils/hooks/useLastQueryExecutionSettings';
import {YQL_LANGUAGE_ID} from '../../../../utils/monaco/constats';
import {getCompletionProvider} from '../../../../utils/monaco/yql/ydb.inlineCompletionProvider';
import {QUERY_ACTIONS} from '../../../../utils/query';
import type {InitialPaneState} from '../../utils/paneVisibilityToggleHelpers';
import {
Expand Down Expand Up @@ -215,6 +218,14 @@ export default function QueryEditor(props: QueryEditorProps) {
contribution.insert(input);
}
});

if (window.api.codeAssistant) {
const provider = getCompletionProvider();
if (provider) {
registerCompletionCommands(monaco, provider, editor);
}
}

initResizeHandler(editor);
initUserPrompt(editor, getLastQueryText);
editor.focus();
Expand Down Expand Up @@ -323,6 +334,7 @@ export default function QueryEditor(props: QueryEditorProps) {

return (
<div className={b()}>
{window.api.codeAssistant && <CodeAssistantTelemetry />}
<SplitPane
direction="vertical"
defaultSizePaneKey={DEFAULT_SIZE_RESULT_PANE_KEY}
Expand Down
15 changes: 13 additions & 2 deletions src/containers/Tenant/Tenant.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,24 @@ export function Tenant(props: TenantProps) {
const previousTenant = React.useRef<string>();
React.useEffect(() => {
if (previousTenant.current !== tenantName) {
const register = async () => {
const registerSuggestCompletion = async () => {
const {registerYQLCompletionItemProvider} = await import(
'../../utils/monaco/yql/yql.completionItemProvider'
);
registerYQLCompletionItemProvider(tenantName);
};
register().catch(console.error);

const registerInlineCompletion = async () => {
const {registerInlineCompletionProvider} = await import(
'../../utils/monaco/yql/ydb.inlineCompletionProvider'
);
if (window.api.codeAssistant) {
registerInlineCompletionProvider(window.api.codeAssistant);
}
};

registerSuggestCompletion().catch(console.error);
registerInlineCompletion().catch(console.error);
previousTenant.current = tenantName;
}
}, [tenantName]);
Expand Down
52 changes: 52 additions & 0 deletions src/services/api/codeAssistant.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import {codeAssistantBackend as CODE_ASSISTANT_BACKEND} from '../../store';
import type {PromptFile, Suggestions, TelemetryEvent, TelemetryOpenTabs} from '../codeCompletion';

import {BaseYdbAPI} from './base';

const ideInfo = {
Ide: 'ydb',
IdeVersion: '1',
PluginFamily: 'ydb',
PluginVersion: '0.2',
};

export class CodeAssistAPI extends BaseYdbAPI {
getPath(path: string) {
return `${CODE_ASSISTANT_BACKEND ?? ''}${path}`;
}

getCodeAssistSuggestions(data: PromptFile[]): Promise<Suggestions> {
return this.post<Suggestions>(
this.getPath('/code-assist-suggestion'),
{
Files: data,
ContextCreateType: 1,
IdeInfo: ideInfo,
},
null,
{
concurrentId: 'code-assist-suggestion',
collectRequest: false,
},
);
}

sendCodeAssistTelemetry(data: TelemetryEvent): Promise<unknown> {
return this.post(this.getPath('/code-assist-telemetry'), data, null, {
concurrentId: 'code-assist-telemetry',
collectRequest: false,
});
}

sendCodeAssistOpenTabs(data: TelemetryOpenTabs): Promise<unknown> {
return this.post(
this.getPath('/code-assist-telemetry'),
{OpenTabs: {Tabs: data, IdeInfo: ideInfo}},
null,
{
concurrentId: 'code-assist-telemetry',
collectRequest: false,
},
);
}
}
3 changes: 3 additions & 0 deletions src/services/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type {AxiosRequestConfig} from 'axios';

import {AuthAPI} from './auth';
import {CodeAssistAPI} from './codeAssistant';
import {MetaAPI} from './meta';
import {OperationAPI} from './operation';
import {PDiskAPI} from './pdisk';
Expand All @@ -22,11 +23,13 @@ export class YdbEmbeddedAPI {
vdisk: VDiskAPI;
viewer: ViewerAPI;
meta?: MetaAPI;
codeAssistant?: CodeAssistAPI;

constructor({config, webVersion}: {config: AxiosRequestConfig; webVersion?: boolean}) {
this.auth = new AuthAPI({config});
if (webVersion) {
this.meta = new MetaAPI({config});
this.codeAssistant = new CodeAssistAPI({config});
}
this.operation = new OperationAPI({config});
this.pdisk = new PDiskAPI({config});
Expand Down
Loading
Loading