sqlmesh 0.192.2.dev4__tar.gz → 0.192.2.dev6__tar.gz

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.192.2.dev4
+Version: 0.192.2.dev6
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.192.2.dev4'
-__version_tuple__ = version_tuple = (0, 192, 2, 'dev4')
+__version__ = version = '0.192.2.dev6'
+__version_tuple__ = version_tuple = (0, 192, 2, 'dev6')

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.192.2.dev4
+Version: 0.192.2.dev6
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/sqlmesh.egg-info/SOURCES.txt

@@ -733,6 +733,7 @@ vscode/extension/src/utilities/common/utilities.ts
 vscode/extension/src/utilities/common/vscodeapi.ts
 vscode/extension/src/utilities/sqlmesh/sqlmesh.ts
 vscode/extension/src/webviews/lineagePanel.ts
+vscode/extension/tests/bad_setup.spec.ts
 vscode/extension/tests/completions.spec.ts
 vscode/extension/tests/diagnostics.spec.ts
 vscode/extension/tests/find_references.spec.ts
@@ -740,7 +741,6 @@ vscode/extension/tests/format.spec.ts
 vscode/extension/tests/go_to_definition.spec.ts
 vscode/extension/tests/hints.spec.ts
 vscode/extension/tests/lineage.spec.ts
-vscode/extension/tests/no_lsp.spec.ts
 vscode/extension/tests/render.spec.ts
 vscode/extension/tests/tcloud.spec.ts
 vscode/extension/tests/utils.ts

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/vscode/extension/src/utilities/errors.ts

@@ -9,6 +9,7 @@ import { traceInfo } from './common/log'
 export type ErrorType =
   | ErrorTypeGeneric
   | { type: 'not_signed_in' }
+  | { type: 'sqlmesh_not_found' }
   | { type: 'sqlmesh_lsp_not_found' }
   // tcloud_bin_not_found is used when the tcloud executable is not found. This is likely to happen if the user
   // opens a project that has a `tcloud.yaml` file but doesn't have tcloud installed.
@@ -85,6 +86,8 @@ export async function handleError(
       return
     case 'not_signed_in':
       return handleNotSignedInError(authProvider)
+    case 'sqlmesh_not_found':
+      return handleSqlmeshNotFoundError()
     case 'sqlmesh_lsp_not_found':
       return handleSqlmeshLspNotFoundError()
     case 'sqlmesh_lsp_dependencies_missing':
@@ -118,6 +121,14 @@ const handleNotSignedInError = async (
   }
 }
 
+/**
+ * Handles the case where the sqlmesh executable is not found.
+ */
+const handleSqlmeshNotFoundError = async (): Promise<void> => {
+  traceInfo('handleSqlmeshNotFoundError')
+  await window.showErrorMessage('SQLMesh not found, please check installation')
+}
+
 /**
  * Handles the case where the sqlmesh_lsp is not found.
  */

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/vscode/extension/src/utilities/sqlmesh/sqlmesh.ts

@@ -287,6 +287,12 @@ export const sqlmeshExec = async (): Promise<
       args: [],
     })
   } else {
+    const exists = await doesExecutableExist(sqlmesh)
+    if (!exists) {
+      return err({
+        type: 'sqlmesh_not_found',
+      })
+    }
     return ok({
       bin: sqlmesh,
       workspacePath,
@@ -384,15 +390,17 @@ export const sqlmeshLspExec = async (): Promise<
           type: 'not_signed_in',
         })
       }
+      const exists = await doesExecutableExist(sqlmeshLSP)
+      if (!exists) {
+        return err({
+          type: 'sqlmesh_lsp_not_found',
+        })
+      }
       const ensured = await ensureSqlmeshEnterpriseInstalled()
       if (isErr(ensured)) {
         return ensured
       }
     }
-    const ensuredDependencies = await ensureSqlmeshLspDependenciesInstalled()
-    if (isErr(ensuredDependencies)) {
-      return ensuredDependencies
-    }
     const binPath = path.join(interpreterDetails.binPath!, sqlmeshLSP)
     traceLog(`Bin path: ${binPath}`)
     if (!fs.existsSync(binPath)) {
@@ -400,6 +408,10 @@ export const sqlmeshLspExec = async (): Promise<
         type: 'sqlmesh_lsp_not_found',
       })
     }
+    const ensuredDependencies = await ensureSqlmeshLspDependenciesInstalled()
+    if (isErr(ensuredDependencies)) {
+      return ensuredDependencies
+    }
     return ok({
       bin: binPath,
       workspacePath,
@@ -411,6 +423,12 @@ export const sqlmeshLspExec = async (): Promise<
       args: [],
     })
   } else {
+    const exists = await doesExecutableExist(sqlmeshLSP)
+    if (!exists) {
+      return err({
+        type: 'sqlmesh_lsp_not_found',
+      })
+    }
     return ok({
       bin: sqlmeshLSP,
       workspacePath,
@@ -419,3 +437,18 @@ export const sqlmeshLspExec = async (): Promise<
     })
   }
 }
+
+async function doesExecutableExist(executable: string): Promise<boolean> {
+  const command = process.platform === 'win32' ? 'where.exe' : 'which'
+  traceLog(`Checking if ${executable} exists with ${command}`)
+  try {
+    const result = await execAsync(command, [executable])
+    traceLog(`Checked if ${executable} exists with ${command}, with result ${result.exitCode}`)
+    const exists = result.exitCode === 0
+    traceLog(`Checked if ${executable} exists with ${command}, with result ${exists}`)
+    return exists
+  } catch {
+    traceLog(`Checked if ${executable} exists with ${command}, errored, returning false`)
+    return false
+  }
+}

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/vscode/extension/src/webviews/lineagePanel.ts

@@ -16,37 +16,42 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
 
   private panel: WebviewView | undefined
   private lsp: LSPClient
-  private _extensionUri: Uri
+  private readonly extensionUri: Uri
+
+  private disposables: Disposable[] = []
 
   public constructor(extensionUri: Uri, lsp: LSPClient) {
-    this._extensionUri = extensionUri
+    this.extensionUri = extensionUri
     this.lsp = lsp
 
     if (this.panel) {
       this.panel.webview.html = this.getHTML(this.panel.webview)
     }
 
-    workspace.onDidSaveTextDocument(document => {
-      this.panel?.webview.postMessage({
-        key: 'vscode_send',
-        payload: {
-          key: 'savedFile',
-          payload: { fileUri: document.uri.toString() },
-        },
-      })
-    })
-
-    window.onDidChangeActiveTextEditor(editor => {
-      if (editor) {
+    this.disposables.push(
+      workspace.onDidSaveTextDocument(document => {
         this.panel?.webview.postMessage({
           key: 'vscode_send',
           payload: {
-            key: 'changeFocusOnFile',
-            payload: { path: editor.document.uri.toString() },
+            key: 'savedFile',
+            payload: { fileUri: document.uri.toString() },
           },
         })
-      }
-    })
+      }),
+    )
+    this.disposables.push(
+      window.onDidChangeActiveTextEditor(editor => {
+        if (editor) {
+          this.panel?.webview.postMessage({
+            key: 'vscode_send',
+            payload: {
+              key: 'changeFocusOnFile',
+              payload: { path: editor.document.uri.toString() },
+            },
+          })
+        }
+      }),
+    )
   }
 
   public resolveWebviewView(webviewView: WebviewView) {
@@ -58,12 +63,12 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
     webviewView.webview.options = {
       // Allow scripts in the webview
       enableScripts: true,
-      localResourceRoots: [this._extensionUri],
+      localResourceRoots: [this.extensionUri],
     }
 
     // Set content options for external URL access
     // Set up message listener for events from the iframe
-    webviewView.webview.onDidReceiveMessage(
+    const disposable = webviewView.webview.onDidReceiveMessage(
       async request => {
         if (!request) {
           return
@@ -99,7 +104,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
                     result: response,
                   },
                 }
-                webviewView.webview.postMessage(responseCallback)
+                await webviewView.webview.postMessage(responseCallback)
                 break
               }
               case 'get_active_file': {
@@ -113,7 +118,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
                     },
                   },
                 }
-                webviewView.webview.postMessage(responseCallback)
+                await webviewView.webview.postMessage(responseCallback)
                 break
               }
               default: {
@@ -132,21 +137,22 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
       undefined,
       [],
     )
+    this.disposables.push(disposable)
     webviewView.webview.html = this.getHTML(webviewView.webview)
   }
 
   private getHTML(panel: Webview) {
     const cssUri = panel.asWebviewUri(
-      Uri.joinPath(this._extensionUri, 'src_react', 'assets', 'index.css'),
+      Uri.joinPath(this.extensionUri, 'src_react', 'assets', 'index.css'),
     )
     const jsUri = panel.asWebviewUri(
-      Uri.joinPath(this._extensionUri, 'src_react', 'assets', 'index.js'),
+      Uri.joinPath(this.extensionUri, 'src_react', 'assets', 'index.js'),
     )
     const faviconUri = panel.asWebviewUri(
-      Uri.joinPath(this._extensionUri, 'src_react', 'favicon.ico'),
+      Uri.joinPath(this.extensionUri, 'src_react', 'favicon.ico'),
     )
     const logoUri = panel.asWebviewUri(
-      Uri.joinPath(this._extensionUri, 'src_react', 'logo192.png'),
+      Uri.joinPath(this.extensionUri, 'src_react', 'logo192.png'),
     )
 
     // Handle query requests from the React app
@@ -179,5 +185,9 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
     // WebviewView doesn't have a dispose method
     // We can clear references
     this.panel = undefined
+    this.disposables.forEach(disposable => {
+      disposable.dispose()
+    })
+    this.disposables = []
   }
 }

sqlmesh-0.192.2.dev4/vscode/extension/tests/no_lsp.spec.ts → sqlmesh-0.192.2.dev6/vscode/extension/tests/bad_setup.spec.ts

@@ -4,6 +4,7 @@ import os from 'os'
 import path from 'path'
 import {
   createVirtualEnvironment,
+  openLineageView,
   pipInstall,
   REPO_ROOT,
   startVSCode,
@@ -72,3 +73,41 @@ test('missing LSP dependencies shows install prompt', async ({}, testInfo) => {
     await fs.remove(tempDir)
   }
 })
+
+test('lineage, no sqlmesh found', async ({}) => {
+  const tempDir = await fs.mkdtemp(
+    path.join(os.tmpdir(), 'vscode-test-tcloud-'),
+  )
+  const pythonEnvDir = path.join(tempDir, '.venv')
+  const pythonDetails = await createVirtualEnvironment(pythonEnvDir)
+
+  try {
+    // Copy sushi project
+    await fs.copy(SUSHI_SOURCE_PATH, tempDir)
+
+    // Configure VS Code settings to use our Python environment
+    const settings = {
+      'python.defaultInterpreterPath': pythonDetails.pythonPath,
+      'sqlmesh.environmentPath': pythonEnvDir,
+    }
+    await fs.ensureDir(path.join(tempDir, '.vscode'))
+    await fs.writeJson(
+      path.join(tempDir, '.vscode', 'settings.json'),
+      settings,
+      { spaces: 2 },
+    )
+
+    const { window, close } = await startVSCode(tempDir)
+
+    // Open lineage view
+    await openLineageView(window)
+
+    // Assert shows that sqlmesh is not installed
+    await window.waitForSelector('text=SQLMesh LSP not found')
+
+    await close()
+  } finally {
+    // Clean up
+    await fs.remove(tempDir)
+  }
+})

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/vscode/extension/tests/lineage.spec.ts

@@ -2,19 +2,14 @@ import { test, expect, Page } from '@playwright/test'
 import path from 'path'
 import fs from 'fs-extra'
 import os from 'os'
-import { startVSCode, SUSHI_SOURCE_PATH } from './utils'
+import { openLineageView, startVSCode, SUSHI_SOURCE_PATH } from './utils'
 import { writeFileSync } from 'fs'
 
 /**
  * Helper function to launch VS Code and test lineage with given project path config
  */
 async function testLineageWithProjectPath(window: Page): Promise<void> {
-  // Trigger lineage command
-  await window.keyboard.press(
-    process.platform === 'darwin' ? 'Meta+Shift+P' : 'Control+Shift+P',
-  )
-  await window.keyboard.type('Lineage: Focus On View')
-  await window.keyboard.press('Enter')
+  await openLineageView(window)
 
   // Wait for "Loaded SQLMesh context" text to appear
   const loadedContextText = window.locator('text=Loaded SQLMesh context')

{sqlmesh-0.192.2.dev4 → sqlmesh-0.192.2.dev6}/vscode/extension/tests/utils.ts

@@ -137,3 +137,25 @@ export const pipInstall = async (
     throw new Error(`Failed to install package: ${stderr}`)
   }
 }
+
+/**
+ * Open the lineage view in the given window.
+ */
+export const openLineageView = async (window: Page): Promise<void> => {
+  await window.keyboard.press(
+    process.platform === 'darwin' ? 'Meta+Shift+P' : 'Control+Shift+P',
+  )
+  await window.keyboard.type('Lineage: Focus On View')
+  await window.keyboard.press('Enter')
+}
+
+/**
+ * Restart the SQLMesh servers
+ */
+export const restartSqlmeshServers = async (window: Page): Promise<void> => {
+  await window.keyboard.press(
+    process.platform === 'darwin' ? 'Meta+Shift+P' : 'Control+Shift+P',
+  )
+  await window.keyboard.type('Restart SQLMesh servers')
+  await window.keyboard.press('Enter')
+}