sqlmesh 0.192.1.dev3__tar.gz → 0.192.2__tar.gz

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.192.1.dev3
+Version: 0.192.2
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License
@@ -233,7 +233,7 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot[rs]~=26.27.0
+Requires-Dist: sqlglot[rs]~=26.27.1
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "requests",
     "rich[jupyter]",
     "ruamel.yaml",
-    "sqlglot[rs]~=26.27.0",
+    "sqlglot[rs]~=26.27.1",
     "tenacity",
     "time-machine",
     "json-stream"
@@ -273,6 +273,7 @@ retry_delay = 10
 select = [
     "F401",
     "RET505",
+    "T100",
 ]
 extend-select = ["TID"]
 

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/sqlmesh/_version.py

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

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/sqlmesh/lsp/main.py

@@ -294,32 +294,6 @@ class SQLMeshLanguageServer:
                     SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(diagnostics),
                 )
 
-        @self.server.feature(types.TEXT_DOCUMENT_DID_CHANGE)
-        def did_change(ls: LanguageServer, params: types.DidChangeTextDocumentParams) -> None:
-            if self.lsp_context is None:
-                current_path = Path.cwd()
-                self._ensure_context_in_folder(current_path)
-                if self.lsp_context is None:
-                    ls.log_trace("No context found after did_change")
-                    return
-
-            uri = URI(params.text_document.uri)
-            context = self._context_get_or_load(uri)
-
-            models = context.map[uri.to_path()]
-            if models is None or not isinstance(models, ModelTarget):
-                return
-
-            # Get diagnostics from context (which handles caching)
-            diagnostics = context.lint_model(uri)
-
-            # Only publish diagnostics if client doesn't support pull diagnostics
-            if not self.client_supports_pull_diagnostics:
-                ls.publish_diagnostics(
-                    params.text_document.uri,
-                    SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(diagnostics),
-                )
-
         @self.server.feature(types.TEXT_DOCUMENT_DID_SAVE)
         def did_save(ls: LanguageServer, params: types.DidSaveTextDocumentParams) -> None:
             uri = URI(params.text_document.uri)
@@ -753,15 +727,19 @@ class SQLMeshLanguageServer:
 
         loaded = False
         # Ascend directories to look for config
-        while path.parents and not loaded:
+        current_dir = path.parent  # Start from the file's parent directory
+        while current_dir.parents and not loaded:
             for ext in ("py", "yml", "yaml"):
-                config_path = path / f"config.{ext}"
+                config_path = current_dir / f"config.{ext}"
                 if config_path.exists():
-                    if self._create_lsp_context([path]):
+                    if self._create_lsp_context([current_dir]):
                         loaded = True
                         # Re-check context for the document now that it's loaded
                         return self._ensure_context_for_document(document_uri)
-            path = path.parent
+            # Check if we've reached the filesystem root to prevent infinite loops
+            if current_dir == current_dir.parent:
+                break
+            current_dir = current_dir.parent
 
         # If still no context found, try the workspace folders
         if not loaded:

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.192.1.dev3
+Version: 0.192.2
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License
@@ -233,7 +233,7 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot[rs]~=26.27.0
+Requires-Dist: sqlglot[rs]~=26.27.1
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/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
@@ -741,7 +742,12 @@ vscode/extension/tests/go_to_definition.spec.ts
 vscode/extension/tests/hints.spec.ts
 vscode/extension/tests/lineage.spec.ts
 vscode/extension/tests/render.spec.ts
+vscode/extension/tests/tcloud.spec.ts
 vscode/extension/tests/utils.ts
+vscode/extension/tests/tcloud/README.md
+vscode/extension/tests/tcloud/pyproject.toml
+vscode/extension/tests/tcloud/mock_tcloud/__init__.py
+vscode/extension/tests/tcloud/mock_tcloud/cli.py
 vscode/react/.cta.json
 vscode/react/.gitignore
 vscode/react/index.html

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/sqlmesh.egg-info/requires.txt

@@ -12,7 +12,7 @@ pydantic>=2.0.0
 requests
 rich[jupyter]
 ruamel.yaml
-sqlglot[rs]~=26.27.0
+sqlglot[rs]~=26.27.1
 tenacity
 time-machine
 json-stream

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/tooling/vscode/extensions.json

@@ -5,6 +5,8 @@
     "dbaeumer.vscode-eslint",
     "amodio.tsl-problem-matcher",
     "ms-vscode.extension-test-runner",
-    "ms-playwright.playwright"
+    "ms-playwright.playwright",
+    "esbenp.prettier-vscode",
+    "charliermarsh.ruff"
   ]
 }

{sqlmesh-0.192.1.dev3 → sqlmesh-0.192.2}/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.1.dev3 → sqlmesh-0.192.2}/vscode/extension/src/utilities/sqlmesh/sqlmesh.ts

@@ -147,51 +147,69 @@ export const installSqlmeshEnterprise = async (
   return ok(true)
 }
 
+let installationLock: Promise<Result<boolean, ErrorType>> | undefined = undefined
+
 /**
  * Checks if sqlmesh enterprise is installed and updated. If not, it will install it.
  * This will also create a progress message in vscode in order to inform the user that sqlmesh enterprise is being installed.
+ * Uses a lock mechanism to prevent parallel executions.
  *
  * @returns A Result indicating whether sqlmesh enterprise was installed in the call.
  */
 export const ensureSqlmeshEnterpriseInstalled = async (): Promise<
   Result<boolean, ErrorType>
 > => {
-  traceInfo('Ensuring sqlmesh enterprise is installed')
-  const isInstalled = await isSqlmeshEnterpriseInstalled()
-  if (isErr(isInstalled)) {
-    return isInstalled
-  }
-  if (isInstalled.value) {
-    traceInfo('Sqlmesh enterprise is installed')
-    return ok(false)
+  // If there's an ongoing installation, wait for it to complete
+  if (installationLock) {
+    return installationLock
   }
-  traceInfo('Sqlmesh enterprise is not installed, installing...')
-  const abortController = new AbortController()
-  const installResult = await window.withProgress(
-    {
-      location: ProgressLocation.Notification,
-      title: 'Installing sqlmesh enterprise...',
-      cancellable: true,
-    },
-    async (progress, token) => {
-      // Connect the cancellation token to our abort controller
-      token.onCancellationRequested(() => {
-        abortController.abort()
-        traceInfo('Sqlmesh enterprise installation cancelled')
-        window.showInformationMessage('Installation cancelled')
-      })
-      progress.report({ message: 'Installing sqlmesh enterprise...' })
-      const result = await installSqlmeshEnterprise(abortController)
-      if (isErr(result)) {
-        return result
+
+  // Create a new lock
+  installationLock = (async () => {
+    try {
+      traceInfo('Ensuring sqlmesh enterprise is installed')
+      const isInstalled = await isSqlmeshEnterpriseInstalled()
+      if (isErr(isInstalled)) {
+        return isInstalled
+      }
+      if (isInstalled.value) {
+        traceInfo('Sqlmesh enterprise is installed')
+        return ok(false)
+      }
+      traceInfo('Sqlmesh enterprise is not installed, installing...')
+      const abortController = new AbortController()
+      const installResult = await window.withProgress(
+        {
+          location: ProgressLocation.Notification,
+          title: 'SQLMesh',
+          cancellable: true,
+        },
+        async (progress, token) => {
+          // Connect the cancellation token to our abort controller
+          token.onCancellationRequested(() => {
+            abortController.abort()
+            traceInfo('Sqlmesh enterprise installation cancelled')
+            window.showInformationMessage('Installation cancelled')
+          })
+          progress.report({ message: 'Installing enterprise python package...' })
+          const result = await installSqlmeshEnterprise(abortController)
+          if (isErr(result)) {
+            return result
+          }
+          return ok(true)
+        },
+      )
+      if (isErr(installResult)) {
+        return installResult
       }
       return ok(true)
-    },
-  )
-  if (isErr(installResult)) {
-    return installResult
-  }
-  return ok(true)
+    } finally {
+      // Clear the lock when done
+      installationLock = undefined
+    }
+  })()
+
+  return installationLock
 }
 
 /**
@@ -269,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,
@@ -366,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)) {
@@ -382,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,
@@ -393,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,
@@ -401,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.1.dev3 → sqlmesh-0.192.2}/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/vscode/extension/tests/bad_setup.spec.ts

@@ -0,0 +1,113 @@
+import { expect, test } from '@playwright/test'
+import fs from 'fs-extra'
+import os from 'os'
+import path from 'path'
+import {
+  createVirtualEnvironment,
+  openLineageView,
+  pipInstall,
+  REPO_ROOT,
+  startVSCode,
+  SUSHI_SOURCE_PATH,
+} from './utils'
+
+test('missing LSP dependencies shows install prompt', async ({}, testInfo) => {
+  testInfo.setTimeout(120_000) // 2 minutes for venv creation and package installation
+  const tempDir = await fs.mkdtemp(
+    path.join(os.tmpdir(), 'vscode-test-tcloud-'),
+  )
+  const pythonEnvDir = path.join(tempDir, '.venv')
+  const pythonDetails = await createVirtualEnvironment(pythonEnvDir)
+  const custom_materializations = path.join(
+    REPO_ROOT,
+    'examples',
+    'custom_materializations',
+  )
+  const sqlmeshWithExtras = `${REPO_ROOT}[bigquery]`
+  await pipInstall(pythonDetails, [sqlmeshWithExtras, custom_materializations])
+
+  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 },
+    )
+
+    // Start VS Code
+    const { window, close } = await startVSCode(tempDir)
+
+    // Open a SQL file to trigger SQLMesh activation
+    // Wait for the models folder to be visible
+    await window.waitForSelector('text=models')
+
+    // Click on the models folder
+    await window
+      .getByRole('treeitem', { name: 'models', exact: true })
+      .locator('a')
+      .click()
+
+    // Open the top_waiters model
+    await window
+      .getByRole('treeitem', { name: 'customers.sql', exact: true })
+      .locator('a')
+      .click()
+
+    // Wait for the message to show that LSP extras need to be installed
+    await window.waitForSelector('text=LSP dependencies missing')
+    expect(await window.locator('text=Install').count()).toBeGreaterThanOrEqual(
+      1,
+    )
+
+    await close()
+  } finally {
+    // Clean up
+    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.1.dev3 → sqlmesh-0.192.2}/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')