remove tanstack; introduce getmodels;

Author: themisvaltinos

sqlmesh/lsp/custom.py

@@ -175,3 +175,32 @@ class GetEnvironmentsResponse(CustomMethodResponseBaseClass):
     environments: t.Dict[str, EnvironmentInfo]
     pinned_environments: t.Set[str]
     default_target_environment: str
+
+
+GET_MODELS_FEATURE = "sqlmesh/get_models"
+
+
+class GetModelsRequest(CustomMethodRequestBaseClass):
+    """
+    Request to get all models available for table diff.
+    """
+
+    pass
+
+
+class ModelInfo(PydanticModel):
+    """
+    Information about a model for table diff.
+    """
+
+    name: str
+    fqn: str
+    description: t.Optional[str] = None
+
+
+class GetModelsResponse(CustomMethodResponseBaseClass):
+    """
+    Response containing all models available for table diff.
+    """
+
+    models: t.List[ModelInfo]

sqlmesh/lsp/main.py

@@ -37,6 +37,7 @@
     SUPPORTED_METHODS_FEATURE,
     FORMAT_PROJECT_FEATURE,
     GET_ENVIRONMENTS_FEATURE,
+    GET_MODELS_FEATURE,
     AllModelsRequest,
     AllModelsResponse,
     AllModelsForRenderRequest,
@@ -52,6 +53,9 @@
     GetEnvironmentsRequest,
     GetEnvironmentsResponse,
     EnvironmentInfo,
+    GetModelsRequest,
+    GetModelsResponse,
+    ModelInfo,
 )
 from sqlmesh.lsp.hints import get_hints
 from sqlmesh.lsp.reference import (
@@ -130,6 +134,7 @@ def __init__(
             SUPPORTED_METHODS_FEATURE: self._custom_supported_methods,
             FORMAT_PROJECT_FEATURE: self._custom_format_project,
             GET_ENVIRONMENTS_FEATURE: self._custom_get_environments,
+            GET_MODELS_FEATURE: self._custom_get_models,
         }
 
         # Register LSP features (e.g., formatting, hover, etc.)
@@ -195,24 +200,6 @@ def _custom_get_environments(
                     plan_id=env.plan_id or "",
                 )
 
-            # Add prod if not present (mirroring web/server/api/endpoints/environments.py)
-            if c.PROD not in environments:
-                environments[c.PROD] = EnvironmentInfo(
-                    name=c.PROD,
-                    snapshots=[],
-                    start_at=str(to_timestamp(c.EPOCH)),
-                    plan_id="",
-                )
-
-            # Add default target environment if not present
-            if context.context.config.default_target_environment not in environments:
-                environments[context.context.config.default_target_environment] = EnvironmentInfo(
-                    name=context.context.config.default_target_environment,
-                    snapshots=[],
-                    start_at=str(to_timestamp(c.EPOCH)),
-                    plan_id="",
-                )
-
             return GetEnvironmentsResponse(
                 environments=environments,
                 pinned_environments=context.context.config.pinned_environments,
@@ -227,6 +214,30 @@ def _custom_get_environments(
                 default_target_environment="",
             )
 
+    def _custom_get_models(
+        self, ls: LanguageServer, params: GetModelsRequest
+    ) -> GetModelsResponse:
+        """Get all models available for table diff."""
+        try:
+            context = self._context_get_or_load()
+            models = [
+                ModelInfo(
+                    name=model.name,
+                    fqn=model.fqn,
+                    description=model.description,
+                )
+                for model in context.context.models.values()
+                # Filter for models that are suitable for table diff
+                if model._path is not None  # Has a file path
+            ]
+            return GetModelsResponse(models=models)
+        except Exception as e:
+            ls.log_trace(f"Error getting table diff models: {e}")
+            return GetModelsResponse(
+                response_error=str(e),
+                models=[],
+            )
+
     def _custom_api(
         self, ls: LanguageServer, request: ApiRequest
     ) -> t.Union[

vscode/extension/src/commands/tableDiff.ts

@@ -26,8 +26,8 @@ export function showTableDiff(
     if (!activeEditor) {
       // No active editor, show a list of all models
       const allModelsResult = await lspClient.call_custom_method(
-        'sqlmesh/all_models',
-        { textDocument: { uri: '' } },
+        'sqlmesh/get_models',
+        {},
       )
 
       if (isErr(allModelsResult)) {
@@ -38,22 +38,22 @@ export function showTableDiff(
       }
 
       if (
-        !allModelsResult.value.model_completions ||
-        allModelsResult.value.model_completions.length === 0
+        !allModelsResult.value.models ||
+        allModelsResult.value.models.length === 0
       ) {
         vscode.window.showInformationMessage('No models found in the project')
         return
       }
 
       // Let user choose from all models
-      const items = allModelsResult.value.model_completions.map(
+      const items = (allModelsResult.value.models as any[]).map(
         (model: any) => ({
           label: model.name,
-          description: model.name,
+          description: model.fqn,
           detail: model.description ? model.description : undefined,
           model: {
             name: model.name,
-            fqn: model.name,
+            fqn: model.fqn,
             description: model.description,
           },
         }),
@@ -353,8 +353,8 @@ export function showTableDiff(
               }
               case 'get_all_models': {
                 const allModelsResult = await lspClient.call_custom_method(
-                  'sqlmesh/all_models',
-                  { textDocument: { uri: '' } },
+                  'sqlmesh/get_models',
+                  {},
                 )
 
                 let responseCallback: CallbackEvent
@@ -378,7 +378,7 @@ export function showTableDiff(
                         ok: true,
                         value: {
                           ok: true,
-                          models: allModelsResult.value.model_completions || [],
+                          models: allModelsResult.value.models || [],
                         },
                       },
                     },

vscode/extension/src/lsp/custom.ts

@@ -33,6 +33,7 @@ export type CustomLSPMethods =
   | SupportedMethodsMethod
   | FormatProjectMethod
   | GetEnvironmentsMethod
+  | GetTableDiffModelsMethod
 
 interface AllModelsRequest {
   textDocument: {
@@ -42,20 +43,9 @@ interface AllModelsRequest {
 
 interface AllModelsResponse extends BaseResponse {
   models: string[]
-  model_completions: ModelCompletion[]
   keywords: string[]
-  macros: MacroCompletion[]
 }
 
-interface ModelCompletion {
-  name: string
-  description?: string
-}
-
-interface MacroCompletion {
-  name: string
-  description?: string
-}
 
 export interface AbstractAPICallRequest {
   endpoint: string
@@ -146,3 +136,22 @@ interface EnvironmentInfo {
   start_at: string
   plan_id: string
 }
+
+export interface GetTableDiffModelsMethod {
+  method: 'sqlmesh/get_models'
+  request: GetModelsRequest
+  response: GetModelsResponse
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+interface GetModelsRequest {}
+
+interface GetModelsResponse extends BaseResponse {
+  models: ModelInfo[]
+}
+
+interface ModelInfo {
+  name: string
+  fqn: string
+  description: string | null | undefined
+}

vscode/react/src/main.tsx

@@ -1,52 +1,37 @@
 import { StrictMode } from 'react'
 import ReactDOM from 'react-dom/client'
-import { RouterProvider, createRouter } from '@tanstack/react-router'
-
-// Import the generated route tree
-import { routeTree } from './routeTree.gen'
-
 import reportWebVitals from './reportWebVitals.ts'
 import { EventBusProvider } from './hooks/eventBus.tsx'
+import { TableDiffPage } from './pages/tablediff.tsx'
+import { LineagePage } from './pages/lineage.tsx'
 
-// Detect panel type and set initial route
+// Detect panel type
 declare global {
   interface Window {
     __SQLMESH_PANEL_TYPE__?: string
   }
 }
 
 const panelType = window.__SQLMESH_PANEL_TYPE__ || 'lineage'
-const initialRoute = panelType === 'tablediff' ? '/tablediff' : '/lineage'
-
-// Create a new router instance
-const router = createRouter({
-  routeTree,
-  context: {},
-  defaultPreload: 'intent',
-  scrollRestoration: true,
-  defaultStructuralSharing: true,
-  defaultPreloadStaleTime: 0,
-})
 
-// Register the router instance for type safety
-declare module '@tanstack/react-router' {
-  interface Register {
-    router: typeof router
+// component selector
+function App() {
+  if (panelType === 'tablediff') {
+    return <TableDiffPage />
   }
+
+  return <LineagePage />
 }
 
 // Render the app
 const rootElement = document.getElementById('app')
 if (rootElement && !rootElement.innerHTML) {
   const root = ReactDOM.createRoot(rootElement)
 
-  // Navigate to the correct initial route based on panel type
-  router.navigate({ to: initialRoute })
-
   root.render(
     <StrictMode>
       <EventBusProvider>
-        <RouterProvider router={router} />
+        <App />
       </EventBusProvider>
     </StrictMode>,
   )