temp [ci skip]

Author: benfdking

examples/sushi/models/active_customers.sql

@@ -16,4 +16,4 @@ MODEL (
 
 SELECT customer_id, zip
 FROM sushi.customers
-WHERE status = 'active'
+WHERE status = 'active'

vscode/extension/src/webviews/lineagePanel.ts

@@ -101,26 +101,28 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
                 break
               }
               default:
-                console.log('Unhandled message type: ', message)
+                console.log('Unhandled message type under vscode_callback: ', message)
             }
             break
           }
           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 requestId = message.payload.requestId
+            const response = await this.lsp.call_custom_method(
+              'sqlmesh/api',
+              payload,
+            )
+            console.log('response from lsp', response, 'with requestId', requestId)
+            webviewView.webview.postMessage({
+              key: 'query_response',
+              payload: response,
+              requestId,
             })
             break
           }
           default:
-            console.log('Unhandled message type: ', message)
+            console.log('Unhandled message type under queryRequest: ', message)
         }
       },
       undefined,
@@ -177,7 +179,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
     window.addEventListener('message', (event) => {
       console.log("message received in web view", event);
       // Only handle messages that are from the extension
-      if (event.data && event.data.key === 'vscode_send') {
+      if (event.data && event.data.key === 'vscode_send' || event.data.key === 'query_response') {
         const iframe = document.querySelector('iframe');
         if (iframe && iframe.contentWindow) {
           iframe.contentWindow.postMessage(event.data, '*');

vscode/react/src/api/instance.ts

@@ -34,32 +34,47 @@ interface FetchOptions<B extends object = any> {
   params?: Record<string, string | number | boolean | undefined | null>
 }
 
+/**
+ * A result is a value that can be either an ok or an error
+ */
+export type Result<T, E> = { ok: true; value: T } | { ok: false; error: E }
+
+/**
+ * returns true if the result is an error
+ */
+export const isErr = <T, E>(
+  result: Result<T, E>,
+): result is { ok: false; error: E } => {
+  return !result.ok
+}
+
 async function fetchAPIDevelopment<T = any, B extends object = any>(
   config: FetchOptions<B>,
   options?: Partial<FetchOptionsWithSignal>,
 ): Promise<T & ResponseWithDetail> {
   console.log('fetchAPIDevelopment', config, options)
-
   // Generate a unique ID for this request
-  const requestId = `query_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
   // Create a promise that will resolve when we get a response with matching ID
   return new Promise((resolve, reject) => {
+    const requestId = `query_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
     // Set up listener for the response
     console.log('setting up listener for response')
     const messageHandler = (event: MessageEvent) => {
+      console.log('messageHandler in listener api development', event, 'checking requestId', requestId, 'versus', event.data.requestId)
       if (
         event.data &&
-        event.data.key === 'vscode_response' &&
-        event.data.payload &&
-        event.data.payload.requestId === requestId
+        event.data.key === 'query_response' &&
+        event.data.requestId === requestId
       ) {
+        console.log('messageHandler in listener api development correct', event)
         // Remove the listener once we get our response
         window.removeEventListener('message', messageHandler)
 
-        if (event.data.payload.error) {
-          reject(new Error(event.data.payload.error))
+        const payload = event.data.payload
+        if (isErr(payload)) {
+          reject(new Error(payload.error as string))
         } else {
-          resolve(event.data.payload.data)
+          resolve(payload.value)
         }
       }
     }
@@ -128,9 +143,10 @@ export async function fetchAPIProduction<T = any, B extends object = any>(
     // Set up listener for the response
     console.log('setting up listener for response')
     const messageHandler = (event: MessageEvent) => {
+      console.log('messageHandler in listener api production', event)
       if (
         event.data &&
-        event.data.key === 'vscode_response' &&
+        event.data.key === 'query_response' &&
         event.data.payload &&
         event.data.payload.requestId === requestId
       ) {

vscode/react/src/components/graph/ModelLineage.tsx

@@ -78,6 +78,7 @@ export function ModelLineage({
   const { refetch: getModelLineage, isFetching: isFetchingModelLineage } =
     useApiModelLineage(model.name)
   const { isFetching: isFetchingModels } = useApiModels()
+  console.log('isfetchingmodels models', isFetchingModels)
 
   const [isMegringModels, setIsMergingModels] = useState(false)
   const [modelLineage, setModelLineage] = useState<

vscode/react/src/pages/lineage.tsx

@@ -23,7 +23,7 @@ export function LineagePage() {
             // Implement your focus change logic here
             break
           default:
-            console.error('Unhandled message type:', payload.key)
+            console.error('Unhandled message type in lineage page:', payload.key)
         }
       }
     }
@@ -53,12 +53,14 @@ export function LineagePage() {
 }
 
 function Lineage() {
-  const { data: models, isLoading: isLoadingModels } = useApiModels()
+  const { data, isLoading: isLoadingModels } = useApiModels()
+  console.log('data', data, 'isLoadingModels', isLoadingModels)
   if (isLoadingModels) {
     return <div>Loading models...</div>
   }
+  const models = data?.data
   console.log('models', models)
-  const modelsRecord = models?.reduce(
+  const modelsRecord = models.reduce(
     (acc, model) => {
       acc[model.name] = model
       return acc