temp [ci skip]

benfdking · benfdking · commit fcdf8c866dfd · 2025-05-07T18:03:51.000+01:00
diff --git a/sqlmesh/lsp/api.py b/sqlmesh/lsp/api.py
@@ -54,3 +54,10 @@ def __init__(self, **data):
                             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]]
diff --git a/sqlmesh/lsp/main.py b/sqlmesh/lsp/main.py
@@ -11,11 +11,12 @@
 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, 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
 from sqlmesh.lsp.reference import get_model_definitions_for_a_path
+from web.server.api.endpoints.lineage import model_lineage
 from web.server.api.endpoints.models import get_models
 
 
@@ -60,7 +61,13 @@ def api(ls: LanguageServer, request: ApiRequest) -> ApiResponse:
             if request.url == "/api/models":
                 response = ApiResponseGetModels(data=get_models(self.lsp_context.context))
                 return response 
-            return ApiResponse(data={})
+            elif 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
+            raise NotImplementedError(f"API request not implemented: {request.url}")
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_OPEN)
         def did_open(
diff --git a/vscode/extension/src/webviews/lineagePanel.ts b/vscode/extension/src/webviews/lineagePanel.ts
@@ -190,7 +190,6 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
   <meta http-equiv="Content-Security-Policy" content="default-src 'none'; frame-src ${externalAuthority}; connect-src ${externalAuthority}; img-src ${externalAuthority} data:; script-src 'unsafe-inline' ${externalAuthority}; style-src 'unsafe-inline' ${externalAuthority};">
 </head>
 <body>
-  ${isProduction() ? '' : `<div>${externalUrl}</div>`}
   <iframe src="${externalUrl}" style="width:100%; height:100vh;" frameborder="0" allow="clipboard-read; clipboard-write"></iframe>
 </body>
 </html>        `
diff --git a/vscode/react/src/api/instance.ts b/vscode/react/src/api/instance.ts
@@ -74,7 +74,7 @@ async function fetchAPIDevelopment<T = any, B extends object = any>(
         if (isErr(payload)) {
           reject(new Error(payload.error as string))
         } else {
-          resolve(payload.value)
+          resolve(payload.value.data)
         }
       }
     }
@@ -92,6 +92,8 @@ async function fetchAPIDevelopment<T = any, B extends object = any>(
           requestId,
           url: config.url,
           params: config.params as any,
+          data: config.data,
+          method: config.method,
         },
       }, '*')
       return
diff --git a/vscode/react/src/pages/lineage.tsx b/vscode/react/src/pages/lineage.tsx
@@ -53,12 +53,11 @@ export function LineagePage() {
 }
 
 function Lineage() {
-  const { data, isLoading: isLoadingModels } = useApiModels()
-  console.log('data', data, 'isLoadingModels', isLoadingModels)
-  if (isLoadingModels) {
+  const { data: models, isLoading: isLoadingModels } = useApiModels()
+  console.log('data', models, 'isLoadingModels', isLoadingModels)
+  if (isLoadingModels || models === undefined) {
     return <div>Loading models...</div>
   }
-  const models = data?.data
   console.log('models', models)
   const modelsRecord = models.reduce(
     (acc, model) => {
diff --git a/web/client/src/library/pages/lineage/Lineage.tsx b/web/client/src/library/pages/lineage/Lineage.tsx
@@ -20,9 +20,7 @@ export default function PageLineage(): JSX.Element {
 
   function handleClickModel(modelName: string): void {
     const model = models.get(modelName)
-
     if (isNil(model)) return
-
     navigate(EnumRoutes.LineageModels + '/' + model.name)
   }
 
diff --git a/web/server/api/endpoints/lineage.py b/web/server/api/endpoints/lineage.py
@@ -146,7 +146,7 @@ async def column_lineage(
 
 
 @router.get("/{model_name:str}")
-async def model_lineage(
+def model_lineage(
     model_name: str,
     context: Context = Depends(get_loaded_context),
 ) -> t.Dict[str, t.Set[str]]:

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ async function fetchAPIDevelopment<T = any, B extends object = any>(`
`74`	`74`	`if (isErr(payload)) {`
`75`	`75`	`reject(new Error(payload.error as string))`
`76`	`76`	`} else {`
`77`		`- resolve(payload.value)`
	`77`	`+ resolve(payload.value.data)`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -92,6 +92,8 @@ async function fetchAPIDevelopment<T = any, B extends object = any>(`
`92`	`92`	`requestId,`
`93`	`93`	`url: config.url,`
`94`	`94`	`params: config.params as any,`
	`95`	`+ data: config.data,`
	`96`	`+ method: config.method,`
`95`	`97`	`},`
`96`	`98`	`}, '*')`
`97`	`99`	`return`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,7 @@ export default function PageLineage(): JSX.Element {`
`20`	`20`
`21`	`21`	`function handleClickModel(modelName: string): void {`
`22`	`22`	`const model = models.get(modelName)`
`23`		`-`
`24`	`23`	`if (isNil(model)) return`
`25`		`-`
`26`	`24`	`navigate(EnumRoutes.LineageModels + '/' + model.name)`
`27`	`25`	`}`
`28`	`26`