fix: monaco-ghost

Author: astandrik

package-lock.json

@@ -28,7 +28,7 @@
     "@hookform/resolvers": "^3.10.0",
     "@reduxjs/toolkit": "^2.5.0",
     "@tanstack/react-table": "^8.20.6",
-    "@ydb-platform/monaco-ghost": "^0.1.10",
+    "@ydb-platform/monaco-ghost": "^0.1.11",
     "axios": "^1.7.9",
     "axios-retry": "^4.5.0",
     "colord": "^2.9.3",

package.json

@@ -3,8 +3,8 @@ import React from 'react';
 import type {AcceptEvent, DeclineEvent, IgnoreEvent, PromptFile} from '@ydb-platform/monaco-ghost';
 import type Monaco from 'monaco-editor';
 
-import type {TelemetryOpenTabs} from '../../../../services/api/codeAssist';
 import {codeAssistApi} from '../../../../store/reducers/codeAssist/codeAssist';
+import type {TelemetryOpenTabs} from '../../../../types/api/codeAssist';
 import {AUTOCOMPLETE_ON_ENTER, ENABLE_AUTOCOMPLETE} from '../../../../utils/constants';
 import {useSetting} from '../../../../utils/hooks';
 
@@ -44,11 +44,9 @@ export function useCodeAssist() {
     const [sendUserQueriesData] = codeAssistApi.useLazySendUserQueriesDataQuery();
 
     const getCodeAssistSuggestions = React.useCallback(
-        async (prompt: PromptFile[]) => {
+        async (promptFiles: PromptFile[]) => {
             try {
-                const {items} = await sendCodeAssistPrompt(prompt).unwrap();
-
-                return {items};
+                return sendCodeAssistPrompt(promptFiles).unwrap();
             } catch {
                 return {items: []};
             }
@@ -59,7 +57,7 @@ export function useCodeAssist() {
     const onCompletionAccept = React.useCallback(
         async (event: AcceptEvent) => {
             try {
-                return await acceptSuggestion(event).unwrap();
+                return acceptSuggestion(event).unwrap();
             } catch {
                 return {items: []};
             }
@@ -70,7 +68,7 @@ export function useCodeAssist() {
     const onCompletionDecline = React.useCallback(
         async (event: DeclineEvent) => {
             try {
-                return await discardSuggestion(event).unwrap();
+                return discardSuggestion(event).unwrap();
             } catch {
                 return {items: []};
             }
@@ -81,7 +79,7 @@ export function useCodeAssist() {
     const onCompletionIgnore = React.useCallback(
         async (event: IgnoreEvent) => {
             try {
-                return await ignoreSuggestion(event).unwrap();
+                return ignoreSuggestion(event).unwrap();
             } catch {
                 return {items: []};
             }
@@ -96,7 +94,7 @@ export function useCodeAssist() {
                 Text: query.text,
             }));
             try {
-                return await sendUserQueriesData(preparedData).unwrap();
+                return sendUserQueriesData(preparedData).unwrap();
             } catch {
                 return {items: []};
             }

src/containers/Tenant/Query/QueryEditor/helpers.ts

@@ -1,6 +1,12 @@
 import type {PromptFile, Suggestions} from '@ydb-platform/monaco-ghost';
 
 import {codeAssistBackend as CODE_ASSISTANT_BACKEND} from '../../store';
+import type {
+    CodeAssistSuggestionsFiles,
+    CodeAssistSuggestionsResponse,
+    TelemetryEvent,
+    TelemetryOpenTabs,
+} from '../../types/api/codeAssist';
 
 import {BaseYdbAPI} from './base';
 const ideInfo = {
@@ -10,49 +16,41 @@ const ideInfo = {
     PluginVersion: '0.2',
 };
 
-interface AcceptSuggestionEvent {
-    Accepted: {
-        RequestId: string;
-        Timestamp: number;
-        AcceptedText: string;
-        ConvertedText: string;
-    };
-}
-interface DiscardSuggestionEvent {
-    Discarded: {
-        RequestId: string;
-        Timestamp: number;
-        DiscardReason: 'OnCancel';
-        DiscardedText: string;
-        CacheHitCount: number;
-    };
-}
-interface IgnoreSuggestionEvent {
-    Ignored: {
-        RequestId: string;
-        Timestamp: number;
-        IgnoredText: string;
-    };
+function prepareCodeAssistPrompt(promptFiles: PromptFile[]): CodeAssistSuggestionsFiles {
+    return promptFiles.map((file) => ({
+        Fragments: file.fragments.map((fragment) => ({
+            Text: fragment.text,
+            Start: {
+                Ln: fragment.start.lineNumber,
+                Col: fragment.start.column,
+            },
+            End: {
+                Ln: fragment.end.lineNumber,
+                Col: fragment.end.column,
+            },
+        })),
+        Cursor: {
+            Ln: file.cursorPostion.lineNumber,
+            Col: file.cursorPostion.column,
+        },
+        Path: `${file.path}.yql`,
+    }));
 }
 
-type OpenTab = {
-    FileName: string;
-    Text: string;
-};
-
-export type TelemetryOpenTabs = OpenTab[];
-
-export type TelemetryEvent = AcceptSuggestionEvent | DiscardSuggestionEvent | IgnoreSuggestionEvent;
+// In the future code assist api will be provided to ydb-ui component explicitly by consumer service.
+// Current solution is temporary and aimed to satisfy internal puproses.
 export class CodeAssistAPI extends BaseYdbAPI {
     getPath(path: string) {
         return `${CODE_ASSISTANT_BACKEND ?? ''}${path}`;
     }
 
-    getCodeAssistSuggestions(data: PromptFile[]) {
-        return this.post<Suggestions>(
+    async getCodeAssistSuggestions(data: PromptFile[]): Promise<Suggestions> {
+        const request: CodeAssistSuggestionsFiles = prepareCodeAssistPrompt(data);
+
+        const response = await this.post<CodeAssistSuggestionsResponse>(
             this.getPath('/code-assist-suggestion'),
             {
-                Files: data,
+                Files: request,
                 ContextCreateType: 1,
                 IdeInfo: ideInfo,
             },
@@ -62,6 +60,11 @@ export class CodeAssistAPI extends BaseYdbAPI {
                 collectRequest: false,
             },
         );
+
+        return {
+            items: response.Suggests.map((suggestion) => suggestion.Text),
+            requestId: response.RequestId,
+        };
     }
 
     sendCodeAssistTelemetry(data: TelemetryEvent) {

src/services/api/codeAssist.ts

@@ -6,16 +6,17 @@ import type {
     Suggestions,
 } from '@ydb-platform/monaco-ghost';
 
-import type {TelemetryOpenTabs} from '../../../services/api/codeAssist';
+import type {TelemetryOpenTabs} from '../../../types/api/codeAssist';
 import {api} from '../api';
 
 export const codeAssistApi = api.injectEndpoints({
     endpoints: (builder) => ({
         getCodeAssistSuggestions: builder.query<Suggestions, PromptFile[]>({
-            queryFn: async (prompt: PromptFile[]) => {
+            queryFn: async (promptFiles: PromptFile[]) => {
                 try {
                     if (window.api.codeAssist) {
-                        const data = await window.api.codeAssist.getCodeAssistSuggestions(prompt);
+                        const data =
+                            await window.api.codeAssist.getCodeAssistSuggestions(promptFiles);
                         return {data};
                     } else {
                         throw new Error('Method is not implemented.');

src/store/reducers/codeAssist/codeAssist.ts

@@ -0,0 +1,57 @@
+interface AcceptSuggestionEvent {
+    Accepted: {
+        RequestId: string;
+        Timestamp: number;
+        AcceptedText: string;
+        ConvertedText: string;
+    };
+}
+interface DiscardSuggestionEvent {
+    Discarded: {
+        RequestId: string;
+        Timestamp: number;
+        DiscardReason: 'OnCancel';
+        DiscardedText: string;
+        CacheHitCount: number;
+    };
+}
+interface IgnoreSuggestionEvent {
+    Ignored: {
+        RequestId: string;
+        Timestamp: number;
+        IgnoredText: string;
+    };
+}
+
+type OpenTab = {
+    FileName: string;
+    Text: string;
+};
+
+interface Position {
+    Ln: number;
+    Col: number;
+}
+
+interface Fragment {
+    Text: string;
+    Start: Position;
+    End: Position;
+}
+
+interface File {
+    Fragments: Fragment[];
+    Cursor: Position;
+    Path: string;
+}
+
+export type CodeAssistSuggestionsFiles = File[];
+
+export type CodeAssistSuggestionsResponse = {
+    RequestId: string;
+    Suggests: {Text: string}[];
+};
+
+export type TelemetryOpenTabs = OpenTab[];
+
+export type TelemetryEvent = AcceptSuggestionEvent | DiscardSuggestionEvent | IgnoreSuggestionEvent;