temp [ci skip]

Author: benfdking

examples/sushi/models/latest_order.sql

@@ -12,4 +12,3 @@ MODEL (
 SELECT id, customer_id, start_ts, end_ts, event_date
 FROM sushi.orders
 ORDER BY event_date DESC LIMIT 1
-

sqlmesh/lsp/api.py

@@ -19,6 +19,7 @@ class ApiRequest(PydanticModel):
     Request to call the SQLMesh API.
     This is a generic request that can be used to call any API endpoint.
     """
+
     requestId: str
     url: str
     method: t.Optional[str] = "GET"
@@ -41,23 +42,29 @@ class ApiResponseGetModels(ApiResponse):
     Response from the SQLMesh API for the get_models endpoint.
     Specifies the data type more precisely as a list of models.
     """
+
     data: t.List[Model]
-    
+
     def __init__(self, **data):
         # Convert datetime objects to strings before passing to parent constructor
         if "data" in data and isinstance(data["data"], list):
             for model in data["data"]:
                 if hasattr(model, "details") and model.details:
                     # Convert datetime fields to None or string to avoid serialization issues
                     for field in ["stamp", "start", "cron_prev", "cron_next"]:
-                        if hasattr(model.details, field) and getattr(model.details, field) is not None:
+                        if (
+                            hasattr(model.details, field)
+                            and getattr(model.details, field) is not None
+                        ):
                             setattr(model.details, field, None)
-        
+
         super().__init__(**data)
 
+
 class ApiResponseGetLineage(ApiResponse):
     """
     Response from the SQLMesh API for the get_lineage endpoint.
     Specifies the data type more precisely as a list of models.
     """
+
     data: t.Dict[str, t.List[str]]

sqlmesh/lsp/main.py

@@ -11,7 +11,13 @@
 from sqlmesh._version import __version__
 from sqlmesh.core.context import Context
 from sqlmesh.core.linter.definition import AnnotatedRuleViolation
-from sqlmesh.lsp.api import API_FEATURE, ApiRequest, ApiResponse, ApiResponseGetLineage, ApiResponseGetModels
+from sqlmesh.lsp.api import (
+    API_FEATURE,
+    ApiRequest,
+    ApiResponse,
+    ApiResponseGetLineage,
+    ApiResponseGetModels,
+)
 from sqlmesh.lsp.completions import get_sql_completions
 from sqlmesh.lsp.context import LSPContext
 from sqlmesh.lsp.custom import ALL_MODELS_FEATURE, AllModelsRequest, AllModelsResponse
@@ -44,9 +50,7 @@ def _register_features(self) -> None:
         """Register LSP features on the internal LanguageServer instance."""
 
         @self.server.feature(ALL_MODELS_FEATURE)
-        def all_models(
-            ls: LanguageServer, params: AllModelsRequest
-        ) -> AllModelsResponse:
+        def all_models(ls: LanguageServer, params: AllModelsRequest) -> AllModelsResponse:
             try:
                 context = self._context_get_or_load(params.textDocument.uri)
                 return get_sql_completions(context, params.textDocument.uri)
@@ -60,19 +64,16 @@ def api(ls: LanguageServer, request: ApiRequest) -> ApiResponse:
                 return ApiResponse(data={})
             if request.url == "/api/models":
                 response = ApiResponseGetModels(data=get_models(self.lsp_context.context))
-                return response 
-            elif request.url.startswith("/api/lineage"):
+                return response
+            if request.url.startswith("/api/lineage"):
                 name = request.url.split("/")[-1]
                 lineage = model_lineage(name, self.lsp_context.context)
                 non_set_lineage = {k: v for k, v in lineage.items() if v is not None}
-                response = ApiResponseGetLineage(data=non_set_lineage)
-                return response
+                return ApiResponseGetLineage(data=non_set_lineage)
             raise NotImplementedError(f"API request not implemented: {request.url}")
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_OPEN)
-        def did_open(
-            ls: LanguageServer, params: types.DidOpenTextDocumentParams
-        ) -> None:
+        def did_open(ls: LanguageServer, params: types.DidOpenTextDocumentParams) -> None:
             context = self._context_get_or_load(params.text_document.uri)
             if self.lint_cache.get(params.text_document.uri) is not None:
                 ls.publish_diagnostics(
@@ -97,9 +98,7 @@ def did_open(
             )
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_CHANGE)
-        def did_change(
-            ls: LanguageServer, params: types.DidChangeTextDocumentParams
-        ) -> None:
+        def did_change(ls: LanguageServer, params: types.DidChangeTextDocumentParams) -> None:
             context = self._context_get_or_load(params.text_document.uri)
             models = context.map[params.text_document.uri]
             if models is None:
@@ -116,9 +115,7 @@ def did_change(
             )
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_SAVE)
-        def did_save(
-            ls: LanguageServer, params: types.DidSaveTextDocumentParams
-        ) -> None:
+        def did_save(ls: LanguageServer, params: types.DidSaveTextDocumentParams) -> None:
             context = self._context_get_or_load(params.text_document.uri)
             models = context.map[params.text_document.uri]
             if models is None:
@@ -143,9 +140,7 @@ def formatting(
                 self._ensure_context_for_document(params.text_document.uri)
                 document = ls.workspace.get_document(params.text_document.uri)
                 if self.lsp_context is None:
-                    raise RuntimeError(
-                        f"No context found for document: {document.path}"
-                    )
+                    raise RuntimeError(f"No context found for document: {document.path}")
 
                 # Perform formatting using the loaded context
                 self.lsp_context.context.format(paths=(Path(document.path),))
@@ -159,9 +154,7 @@ def formatting(
                             start=types.Position(line=0, character=0),
                             end=types.Position(
                                 line=len(document.lines),
-                                character=len(document.lines[-1])
-                                if document.lines
-                                else 0,
+                                character=len(document.lines[-1]) if document.lines else 0,
                             ),
                         ),
                         new_text=new_text,
@@ -180,9 +173,7 @@ def goto_definition(
                 self._ensure_context_for_document(params.text_document.uri)
                 document = ls.workspace.get_document(params.text_document.uri)
                 if self.lsp_context is None:
-                    raise RuntimeError(
-                        f"No context found for document: {document.path}"
-                    )
+                    raise RuntimeError(f"No context found for document: {document.path}")
 
                 references = get_model_definitions_for_a_path(
                     self.lsp_context, params.text_document.uri
@@ -207,9 +198,7 @@ def goto_definition(
                 ]
 
             except Exception as e:
-                ls.show_message(
-                    f"Error getting references: {e}", types.MessageType.Error
-                )
+                ls.show_message(f"Error getting references: {e}", types.MessageType.Error)
                 return []
 
     def _context_get_or_load(self, document_uri: str) -> LSPContext:
@@ -284,9 +273,7 @@ def _diagnostics_to_lsp_diagnostics(
     ) -> t.List[types.Diagnostic]:
         lsp_diagnostics: t.List[types.Diagnostic] = []
         for diagnostic in diagnostics:
-            lsp_diagnostic = SQLMeshLanguageServer._diagnostic_to_lsp_diagnostic(
-                diagnostic
-            )
+            lsp_diagnostic = SQLMeshLanguageServer._diagnostic_to_lsp_diagnostic(diagnostic)
             if lsp_diagnostic is not None:
                 lsp_diagnostics.append(lsp_diagnostic)
         return lsp_diagnostics

vscode/extension/src/extension.ts

@@ -12,11 +12,7 @@ import { AuthenticationProviderTobikoCloud } from './auth/auth'
 import { signOut } from './commands/signout'
 import { signIn } from './commands/signin'
 import { signInSpecifyFlow } from './commands/signinSpecifyFlow'
-<<<<<<< HEAD
 import { isErr } from '@bus/result'
-=======
-import { isErr } from '../../bus/src/result'
->>>>>>> 7a972d4e (temp [ci skip])
 import {
   handleNotSginedInError,
   handleSqlmeshLspNotFoundError,

vscode/react/src/api/index.ts

@@ -70,7 +70,6 @@ export function useApiModelLineage(
   return useQuery({
     queryKey: ['/api/lineage', modelName],
     queryFn: async ({ signal }) => {
-      console.log('use api model lineage', modelName)
       return await modelLineageApiLineageModelNameGet(modelName, { signal })
     },
   })

vscode/react/src/api/instance.ts

@@ -52,21 +52,17 @@ 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
   // 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 === '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)
 
@@ -81,11 +77,9 @@ async function fetchAPIDevelopment<T = any, B extends object = any>(
 
     // Add the listener
     window.addEventListener('message', messageHandler)
-    console.log('added listener to window')
 
     // If we're in an iframe, we need to post the message to the parent window
     if (window.parent !== window) {
-      console.log('posting message to parent iframe')
       window.parent.postMessage({
         key: 'queryRequest',
         payload: {
@@ -136,16 +130,12 @@ export async function fetchAPIProduction<T = any, B extends object = any>(
   config: FetchOptions<B>,
   options?: Partial<FetchOptionsWithSignal>,
 ): Promise<T & ResponseWithDetail> {
-  console.log('fetchAPIProduction', 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) => {
     // 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 === 'query_response' &&
@@ -170,7 +160,6 @@ export async function fetchAPIProduction<T = any, B extends object = any>(
     // Send the message to VSCode with the query parameters and request ID
     // @ts-ignore
     const vscode = getVSCodeAPI()
-    console.log('vscode to send message', vscode)
     vscode.postMessage({
       key: 'query_request',
       payload: {
@@ -180,7 +169,6 @@ export async function fetchAPIProduction<T = any, B extends object = any>(
         queryParams: config.params as any,
       },
     })
-    console.log('sent message to vscode')
 
     // Set a timeout to prevent hanging promises
     setTimeout(() => {

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

@@ -92,8 +92,6 @@ export default function ModelNode({
     (e: React.MouseEvent) => {
       e.stopPropagation()
       if (handleClickModel) {
-        console.log('handleClickModel', id)
-        console.log('handleClickModel', models)
         handleClickModel(id)
       }
     },
@@ -149,8 +147,6 @@ export default function ModelNode({
   // isFalse(isModelUnknown)
   const shouldDisableColumns = isFalse(isModelSQL)
 
-  console.log('showcolumns', showColumns)
-
   return (
     <div
       onMouseEnter={() => setIsMouseOver(true)}

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

@@ -143,7 +143,7 @@ export default function LineageFlowProvider({
     {},
   )
   const [withColumns, setWithColumns] = useState(showColumns)
-  const [mainNode, setMainNode] = useState<string>()
+  const [mainNode, setMainNode] = useState<string | undefined>()
   const [manuallySelectedColumn, setManuallySelectedColumn] =
     useState<[ModelSQLMeshModel, Column]>()
   const [activeEdges, setActiveEdges] = useState<ActiveEdges>(new Map())

vscode/react/src/pages/lineage.tsx

@@ -54,11 +54,9 @@ export function LineagePage() {
 
 function Lineage() {
   const { data: models, isLoading: isLoadingModels } = useApiModels()
-  console.log('data', models, 'isLoadingModels', isLoadingModels)
   if (isLoadingModels || models === undefined) {
     return <div>Loading models...</div>
   }
-  console.log('models', models)
   const modelsRecord = models.reduce(
     (acc, model) => {
       acc[model.name] = model
@@ -97,7 +95,6 @@ export function LineageComponentFromWeb({
     console.log(error)
   }
 
-  console.log('models inside', models)
   const model = models[selectedModel]
 
   return (
@@ -118,18 +115,24 @@ export function LineageComponentFromWeb({
 
 export function UpdateLineageFocus({ children }: { children: React.ReactNode }) {
   const lineageFlow = useLineageFlow()
-
+  
   React.useEffect(() => {
     const handleMessage = (event: MessageEvent) => {
+      console.log('handleMessage in lineage page', event)
       // Ensure the message is from VSCode
       if (event.data && event.data.key === 'vscode_send') {
         const payload = event.data.payload
         switch (payload.key) {
           case 'changeFocusOnFile':
             console.log('Changing focus to file:', payload.payload.path)
+            lineageFlow.setMainNode('"memory"."sushi"."customers"')
+            // Add a small delay to ensure the state update is processed
+            setTimeout(() => {
+              console.log('Delayed state update confirmation')
+            }, 1000)
+            console.log('set main node', lineageFlow.mainNode)
             // Implement your focus change logic here
             // TODO NEED TO PASS THE FQN of the model not the path 
-            lineageFlow.setMainNode(payload.payload.path)
             break
           default:
             console.error('Unhandled message type in lineage page:', payload.key)

vscode/react/src/style/variants.ts

@@ -21,31 +21,3 @@ export const EnumVariant = {
 } as const
 
 export type Variant = (typeof EnumVariant)[keyof typeof EnumVariant]
-
-
-interface Model {
-  test: string
-}
-
-Model.do_something(model)
-const do_something = (model: Model) => {
-  model.test = 'test'
-}
-
-vscpde.postMessage()
-
-class ModelClass {
-  test: string
-
-  constructor(test: string) {
-    this.test = test
-  }
-
-  static do_something(model: Model) {
-    model.test = 'test'
-  }
-
-  do_something() {
-    this.test = 'test'
-  }
-}