temp [ci skip]

Author: benfdking

sqlmesh/lsp/api.py

@@ -18,7 +18,7 @@ class ApiRequest(PydanticModel):
     Request to call the SQLMesh API.
     This is a generic request that can be used to call any API endpoint.
     """
-    request_id: str
+    requestId: str
     url: str
     method: t.Optional[str] = "GET"
     params: t.Optional[t.Dict[str, t.Any]] = None
@@ -31,4 +31,4 @@ class ApiResponse(PydanticModel):
     This is a generic response that can be used to return data from any API endpoint.
     """
 
-    data: t.Dict[str, t.Any]
+    data: t.Union[t.Dict[str, t.Any], t.List[t.Any]]

sqlmesh/lsp/main.py

@@ -16,6 +16,7 @@
 from sqlmesh.lsp.context import LSPContext
 from sqlmesh.lsp.custom import ALL_MODELS_FEATURE, AllModelsRequest, AllModelsResponse
 from sqlmesh.lsp.reference import get_model_definitions_for_a_path
+from web.server.api.endpoints.models import get_models
 
 
 class SQLMeshLanguageServer:
@@ -52,12 +53,13 @@ def all_models(
                 return get_sql_completions(None, params.textDocument.uri)
 
         @self.server.feature(API_FEATURE)
-        def api(ls: LanguageServer, params: any) -> ApiResponse:
-            ls.log_trace(f"API call: {params}")
-            request = ApiRequest(**params)
-            # TODO Implement this
-            ls.log_trace(f"API call: {request.url} {request.method} {request.params} {request.body}")
-            return ApiResponse(data={})
+        def api(ls: LanguageServer, request: ApiRequest) -> t.Dict[str, t.Any]:
+            if self.lsp_context is None:
+                return ApiResponse(data={})
+            if request.url == "/api/models":
+                response = ApiResponse(data=get_models(self.lsp_context.context))
+                return response.model_dump(mode='json')
+            return ApiResponse(data={}).model_dump(mode='json')
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_OPEN)
         def did_open(

vscode/bus/src/callbacks.ts

@@ -2,6 +2,12 @@ export type Callback = {
   openFile: {
     path: string
   }
+  queryRequest: {
+    requestId: string
+    url: string
+    params: Record<string, string>
+    body: Record<string, any>
+  }
 }
 
 /**

vscode/extension/src/extension.ts

@@ -7,7 +7,6 @@ import {
 } from './utilities/common/vscodeapi'
 import {
   registerLogger,
-  traceError,
   traceInfo,
   traceVerbose,
 } from './utilities/common/log'
@@ -28,7 +27,6 @@ import { WebServer } from './web-server/server'
 import { LineagePanel } from './webviews/lineagePanel'
 
 let lspClient: LSPClient | undefined
-let webServer: WebServer | undefined
 
 // This method is called when your extension is activated
 // Your extension is activated the very first time the command is executed
@@ -58,8 +56,6 @@ export async function activate(context: vscode.ExtensionContext) {
   )
   traceInfo('Authentication provider registered')
 
-  webServer = new WebServer(webServerOutputChannel)
-
   context.subscriptions.push(
     vscode.commands.registerCommand('sqlmesh.signin', signIn(authProvider)),
   )
@@ -100,11 +96,7 @@ export async function activate(context: vscode.ExtensionContext) {
   }
 
   // Register the webview
-  const lineagePanel = new LineagePanel(
-    context.extensionUri,
-    webServer,
-    lspClient,
-  )
+  const lineagePanel = new LineagePanel(context.extensionUri, lspClient)
   context.subscriptions.push(
     vscode.window.registerWebviewViewProvider(
       LineagePanel.viewType,
@@ -113,13 +105,6 @@ export async function activate(context: vscode.ExtensionContext) {
   )
 
   const restart = async () => {
-    if (webServer) {
-      webServer.stop()
-      const startResult = await webServer.start()
-      if (isErr(startResult)) {
-        traceError('Failed to start web server', startResult.error)
-      }
-    }
     if (lspClient) {
       traceVerbose('Restarting LSP client')
       const restartResult = await lspClient.restart()
@@ -149,7 +134,4 @@ export async function deactivate() {
   if (lspClient) {
     await lspClient.dispose()
   }
-  if (webServer) {
-    webServer.stop()
-  }
 }

vscode/extension/src/webviews/lineagePanel.ts

@@ -12,7 +12,6 @@ import {
 } from 'vscode'
 import { isProduction } from '../utilities/isDev'
 import { getWorkspaceFolders } from '../utilities/common/vscodeapi'
-import { WebServer } from '../web-server/server'
 import { LSPClient } from '../lsp/lsp'
 
 export class LineagePanel implements WebviewViewProvider, Disposable {
@@ -24,9 +23,8 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
 
   private _disposables: Disposable[] = []
 
-  public constructor(extensionUri: Uri, webServer: WebServer, lsp: LSPClient) {
+  public constructor(extensionUri: Uri, lsp: LSPClient) {
     this._extensionUri = extensionUri
-    this.webServer = webServer
     this.lsp = lsp
 
     if (this.panel) {
@@ -86,7 +84,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
             const payload: CallbackEvent = message.payload
             // Handle callback events from the iframe
             switch (payload.key) {
-              case 'openFile':
+              case 'openFile': {
                 console.log('opening file ', payload.payload.path)
                 const workspaceFolders = getWorkspaceFolders()
                 if (workspaceFolders.length != 1) {
@@ -101,18 +99,23 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
                 const document = await workspace.openTextDocument(fullPath)
                 await window.showTextDocument(document)
                 break
+              }
               default:
-                console.log(`Unhandled message type in key: ${message.key}`)
+                console.log('Unhandled message type: ', message)
             }
             break
           }
-          case 'query_request': {
+          case 'queryRequest': {
+            console.log('queryRequest', message.payload)
             const payload = message.payload
-            const response = this.lsp.call_custom_method('sqlmesh/api', payload)
-            console.log('response from lsp', response)
-            webviewView.webview.postMessage({
-              key: 'query_response',
-              payload: response,
+            const response = this.lsp.call_custom_method(
+                  'sqlmesh/api',
+                  payload,
+                )
+                console.log('response from lsp', response)
+                webviewView.webview.postMessage({
+                  key: 'query_response',
+                  payload: response,
             })
             break
           }

vscode/react/src/api/instance.ts

@@ -72,7 +72,7 @@ async function fetchAPIDevelopment<T = any, B extends object = any>(
     if (window.parent !== window) {
       console.log('posting message to parent iframe')
       window.parent.postMessage({
-        key: 'query_request',
+        key: 'queryRequest',
         payload: {
           requestId,
           url: config.url,