sqlmesh 0.225.1.dev14__tar.gz → 0.225.1.dev16__tar.gz

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/PKG-INFO

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

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.225.1.dev14'
-__version_tuple__ = version_tuple = (0, 225, 1, 'dev14')
+__version__ = version = '0.225.1.dev16'
+__version_tuple__ = version_tuple = (0, 225, 1, 'dev16')
 
-__commit_id__ = commit_id = 'ga5fd07523'
+__commit_id__ = commit_id = 'g2dd01a415'

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh/core/config/loader.py

@@ -178,6 +178,7 @@ def load_config_from_paths(
 
             dbt_python_config = sqlmesh_config(
                 project_root=dbt_project_file.parent,
+                profiles_dir=kwargs.pop("profiles_dir", None),
                 dbt_profile_name=kwargs.pop("profile", None),
                 dbt_target_name=kwargs.pop("target", None),
                 variables=variables,

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh/dbt/context.py

@@ -37,6 +37,8 @@ class DbtContext:
     """Context for DBT environment"""
 
     project_root: Path = Path()
+    profiles_dir: t.Optional[Path] = None
+    """Optional override to specify the directory where profiles.yml is located, if not at the :project_root"""
     target_name: t.Optional[str] = None
     profile_name: t.Optional[str] = None
     project_schema: t.Optional[str] = None

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh/dbt/loader.py

@@ -53,10 +53,18 @@ def sqlmesh_config(
     threads: t.Optional[int] = None,
     register_comments: t.Optional[bool] = None,
     infer_state_schema_name: bool = False,
+    profiles_dir: t.Optional[Path] = None,
     **kwargs: t.Any,
 ) -> Config:
     project_root = project_root or Path()
-    context = DbtContext(project_root=project_root, profile_name=dbt_profile_name)
+    context = DbtContext(
+        project_root=project_root, profiles_dir=profiles_dir, profile_name=dbt_profile_name
+    )
+
+    # note: Profile.load() is called twice with different DbtContext's:
+    # - once here with the above DbtContext (to determine connnection / gateway config which has to be set up before everything else)
+    # - again on the SQLMesh side via GenericContext.load() -> DbtLoader._load_projects() -> Project.load() which constructs a fresh DbtContext and ignores the above one
+    # it's important to ensure that the DbtContext created within the DbtLoader uses the same project root / profiles dir that we use here
     profile = Profile.load(context, target_name=dbt_target_name)
     model_defaults = kwargs.pop("model_defaults", ModelDefaultsConfig())
     if model_defaults.dialect is None:
@@ -98,6 +106,7 @@ def sqlmesh_config(
 
     return Config(
         loader=loader,
+        loader_kwargs=dict(profiles_dir=profiles_dir),
         model_defaults=model_defaults,
         variables=variables or {},
         dbt=RootDbtConfig(infer_state_schema_name=infer_state_schema_name),
@@ -116,9 +125,12 @@ def sqlmesh_config(
 
 
 class DbtLoader(Loader):
-    def __init__(self, context: GenericContext, path: Path) -> None:
+    def __init__(
+        self, context: GenericContext, path: Path, profiles_dir: t.Optional[Path] = None
+    ) -> None:
         self._projects: t.List[Project] = []
         self._macros_max_mtime: t.Optional[float] = None
+        self._profiles_dir = profiles_dir
         super().__init__(context, path)
 
     def load(self) -> LoadedProject:
@@ -225,6 +237,7 @@ class DbtLoader(Loader):
             project = Project.load(
                 DbtContext(
                     project_root=self.config_path,
+                    profiles_dir=self._profiles_dir,
                     target_name=target_name,
                     sqlmesh_config=self.config,
                 ),

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh/dbt/profile.py

@@ -60,7 +60,7 @@ class Profile:
             if not context.profile_name:
                 raise ConfigError(f"{project_file.stem} must include project name.")
 
-        profile_filepath = cls._find_profile(context.project_root)
+        profile_filepath = cls._find_profile(context.project_root, context.profiles_dir)
         if not profile_filepath:
             raise ConfigError(f"{cls.PROFILE_FILE} not found.")
 
@@ -68,8 +68,8 @@ class Profile:
         return Profile(profile_filepath, target_name, target)
 
     @classmethod
-    def _find_profile(cls, project_root: Path) -> t.Optional[Path]:
-        dir = os.environ.get("DBT_PROFILES_DIR", "")
+    def _find_profile(cls, project_root: Path, profiles_dir: t.Optional[Path]) -> t.Optional[Path]:
+        dir = os.environ.get("DBT_PROFILES_DIR", profiles_dir or "")
         path = Path(project_root, dir, cls.PROFILE_FILE)
         if path.exists():
             return path

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh.egg-info/PKG-INFO

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

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh_dbt/cli.py

@@ -84,6 +84,16 @@ resource_type_option = click.option(
     type=click.Choice(["debug", "info", "warn", "error", "none"]),
     help="Specify the minimum severity of events that are logged to the console and the log file.",
 )
+@click.option(
+    "--profiles-dir",
+    type=click.Path(exists=True, file_okay=False, path_type=Path),
+    help="Which directory to look in for the profiles.yml file. If not set, dbt will look in the current working directory first, then HOME/.dbt/",
+)
+@click.option(
+    "--project-dir",
+    type=click.Path(exists=True, file_okay=False, path_type=Path),
+    help="Which directory to look in for the dbt_project.yml file. Default is the current working directory and its parents.",
+)
 @click.pass_context
 @cli_global_error_handler
 def dbt(
@@ -92,6 +102,8 @@ def dbt(
     target: t.Optional[str] = None,
     debug: bool = False,
     log_level: t.Optional[str] = None,
+    profiles_dir: t.Optional[Path] = None,
+    project_dir: t.Optional[Path] = None,
 ) -> None:
     """
     An ELT tool for managing your SQL transformations and data models, powered by the SQLMesh engine.
@@ -105,7 +117,8 @@ def dbt(
     # that need to be known before we attempt to load the project
     ctx.obj = functools.partial(
         create,
-        project_dir=Path.cwd(),
+        project_dir=project_dir,
+        profiles_dir=profiles_dir,
         profile=profile,
         target=target,
         debug=debug,

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/sqlmesh_dbt/operations.py

@@ -232,6 +232,7 @@ class DbtOperations:
 
 def create(
     project_dir: t.Optional[Path] = None,
+    profiles_dir: t.Optional[Path] = None,
     profile: t.Optional[str] = None,
     target: t.Optional[str] = None,
     vars: t.Optional[t.Dict[str, t.Any]] = None,
@@ -268,7 +269,11 @@ def create(
         sqlmesh_context = Context(
             paths=[project_dir],
             config_loader_kwargs=dict(
-                profile=profile, target=target, variables=vars, threads=threads
+                profile=profile,
+                target=target,
+                variables=vars,
+                threads=threads,
+                profiles_dir=profiles_dir,
             ),
             load=True,
             # DbtSelector selects based on dbt model fqn's rather than SQLMesh model names

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/tests/dbt/cli/test_global_flags.py

@@ -107,3 +107,77 @@ def test_log_level(invoke_cli: t.Callable[..., Result], create_empty_project: Em
     result = invoke_cli(["--log-level", "debug", "list"])
     assert result.exit_code == 0
     assert logging.getLogger("sqlmesh").getEffectiveLevel() == logging.DEBUG
+
+
+def test_profiles_dir(
+    invoke_cli: t.Callable[..., Result], create_empty_project: EmptyProjectCreator, tmp_path: Path
+):
+    project_dir, _ = create_empty_project(project_name="test_profiles_dir")
+
+    orig_profiles_yml = project_dir / "profiles.yml"
+    assert orig_profiles_yml.exists()
+
+    new_profiles_yml = tmp_path / "some_other_place" / "profiles.yml"
+    new_profiles_yml.parent.mkdir(parents=True)
+
+    orig_profiles_yml.rename(new_profiles_yml)
+    assert not orig_profiles_yml.exists()
+    assert new_profiles_yml.exists()
+
+    # should fail if we don't specify --profiles-dir
+    result = invoke_cli(["list"])
+    assert result.exit_code > 0, result.output
+    assert "profiles.yml not found" in result.output
+
+    # should pass if we specify --profiles-dir
+    result = invoke_cli(["--profiles-dir", str(new_profiles_yml.parent), "list"])
+    assert result.exit_code == 0, result.output
+    assert "Models in project" in result.output
+
+
+def test_project_dir(
+    invoke_cli: t.Callable[..., Result], create_empty_project: EmptyProjectCreator
+):
+    orig_project_dir, _ = create_empty_project(project_name="test_project_dir")
+
+    orig_project_yml = orig_project_dir / "dbt_project.yml"
+    assert orig_project_yml.exists()
+
+    new_project_yml = orig_project_dir / "nested" / "dbt_project.yml"
+    new_project_yml.parent.mkdir(parents=True)
+
+    orig_project_yml.rename(new_project_yml)
+    assert not orig_project_yml.exists()
+    assert new_project_yml.exists()
+
+    # should fail if we don't specify --project-dir
+    result = invoke_cli(["list"])
+    assert result.exit_code != 0, result.output
+    assert "Error:" in result.output
+
+    # should fail if the profiles.yml also doesnt exist at that --project-dir
+    result = invoke_cli(["--project-dir", str(new_project_yml.parent), "list"])
+    assert result.exit_code != 0, result.output
+    assert "profiles.yml not found" in result.output
+
+    # should pass if it can find both files, either because we specified --profiles-dir explicitly or the profiles.yml was found in --project-dir
+    result = invoke_cli(
+        [
+            "--project-dir",
+            str(new_project_yml.parent),
+            "--profiles-dir",
+            str(orig_project_dir),
+            "list",
+        ]
+    )
+    assert result.exit_code == 0, result.output
+    assert "Models in project" in result.output
+
+    orig_profiles_yml = orig_project_dir / "profiles.yml"
+    new_profiles_yml = new_project_yml.parent / "profiles.yml"
+    assert orig_profiles_yml.exists()
+    orig_profiles_yml.rename(new_profiles_yml)
+
+    result = invoke_cli(["--project-dir", str(new_project_yml.parent), "list"])
+    assert result.exit_code == 0, result.output
+    assert "Models in project" in result.output

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/LineageColumnLevel/FactoryColumn.tsx

@@ -233,7 +233,7 @@ export function FactoryColumn<
             <NodeBadge className="FactoryColumn__NodeBadge">{type}</NodeBadge>
           }
           className={cn(
-            'FactoryColumn__Metadata relative overflow-visible group',
+            'FactoryColumn__Metadata relative overflow-visible',
             isDisabledColumn && 'cursor-not-allowed',
             className,
           )}

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/LineageColumnLevel/help.ts

@@ -236,9 +236,9 @@ export function calculateColumnsHeight({
   const hasColumns = columnsCount > 0
   const columnHeight = 24 // tailwind h-6
   const columnsTopSeparator = 1
-  const columnSeparator = 1
+  const columnSeparator = 0
   const columnsContainerPadding = 4
-  const columnsPadding = 4
+  const columnsPadding = 0
   const columnsFilterHeight = hasColumnsFilter && hasColumns ? columnHeight : 0
   const columnsSeparators = columnsCount > 1 ? columnsCount - 1 : 0
 

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/LineageContext.ts

@@ -64,7 +64,6 @@ export interface LineageContextValue<
   >
   currentNodeId: TNodeID | null
   selectedNode: LineageNode<TNodeData, TNodeID> | null
-  currentNode: LineageNode<TNodeData, TNodeID> | null
 }
 
 export function getInitial<
@@ -89,7 +88,6 @@ export function getInitial<
     selectedNodeId: null,
     selectedNode: null,
     currentNodeId: null,
-    currentNode: null,
   }
 }
 

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/LineageLayout.tsx

@@ -35,14 +35,11 @@ export function LineageLayout<
   edgeTypes,
   className,
   controls,
-  nodesDraggable,
-  nodesConnectable,
   isBuildingLayout,
   useLineage,
   onNodeClick,
   onNodeDoubleClick,
   showControlOnlySelectedNodes,
-  showControlZoomToCurrentNode,
   showControlZoomToSelectedNode,
 }: {
   useLineage: LineageContextHook<
@@ -59,10 +56,7 @@ export function LineageLayout<
   nodeTypes?: NodeTypes
   edgeTypes?: EdgeTypes
   className?: string
-  nodesDraggable?: boolean
-  nodesConnectable?: boolean
   showControlOnlySelectedNodes?: boolean
-  showControlZoomToCurrentNode?: boolean
   showControlZoomToSelectedNode?: boolean
   controls?:
     | React.ReactNode
@@ -85,14 +79,11 @@ export function LineageLayout<
         <LineageLayoutBase
           nodeTypes={nodeTypes}
           edgeTypes={edgeTypes}
-          nodesDraggable={nodesDraggable}
-          nodesConnectable={nodesConnectable}
           controls={controls}
           useLineage={useLineage}
           onNodeClick={onNodeClick}
           onNodeDoubleClick={onNodeDoubleClick}
           showControlOnlySelectedNodes={showControlOnlySelectedNodes}
-          showControlZoomToCurrentNode={showControlZoomToCurrentNode}
           showControlZoomToSelectedNode={showControlZoomToSelectedNode}
         />
       </LineageLayoutContainer>

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/LineageLayoutBase.tsx

@@ -2,9 +2,7 @@ import {
   Background,
   BackgroundVariant,
   Controls,
-  type EdgeChange,
   type EdgeTypes,
-  type NodeChange,
   type NodeTypes,
   ReactFlow,
   type SetCenter,
@@ -13,14 +11,12 @@ import {
   getOutgoers,
   useReactFlow,
   useViewport,
-  applyNodeChanges,
-  applyEdgeChanges,
 } from '@xyflow/react'
 
 import '@xyflow/react/dist/style.css'
 import './Lineage.css'
 
-import { CircuitBoard, Crosshair, LocateFixed, RotateCcw } from 'lucide-react'
+import { CircuitBoard, LocateFixed, RotateCcw } from 'lucide-react'
 import React from 'react'
 
 import { type LineageContextHook } from './LineageContext'
@@ -60,13 +56,10 @@ export function LineageLayoutBase<
   edgeTypes,
   className,
   controls,
-  nodesDraggable = false,
-  nodesConnectable = false,
   useLineage,
   onNodeClick,
   onNodeDoubleClick,
   showControlOnlySelectedNodes = true,
-  showControlZoomToCurrentNode = true,
   showControlZoomToSelectedNode = true,
 }: {
   useLineage: LineageContextHook<
@@ -79,13 +72,10 @@ export function LineageLayoutBase<
     TSourceHandleID,
     TTargetHandleID
   >
-  nodesDraggable?: boolean
-  nodesConnectable?: boolean
   nodeTypes?: NodeTypes
   edgeTypes?: EdgeTypes
   className?: string
   showControlOnlySelectedNodes?: boolean
-  showControlZoomToCurrentNode?: boolean
   showControlZoomToSelectedNode?: boolean
   controls?:
     | React.ReactNode
@@ -103,74 +93,20 @@ export function LineageLayoutBase<
   const { setCenter } = useReactFlow()
 
   const {
-    currentNode,
     zoom,
-    nodes: initialNodes,
+    nodes,
     edges,
-    setEdges,
     selectedNode,
     showOnlySelectedNodes,
     selectedNodeId,
     setZoom,
-    setSelectedNodeId,
     setShowOnlySelectedNodes,
     setSelectedNodes,
     setSelectedEdges,
   } = useLineage()
 
-  const [nodes, setNodes] =
-    React.useState<LineageNode<TNodeData, TNodeID>[]>(initialNodes)
-
-  const onNodesChange = React.useCallback(
-    (changes: NodeChange<LineageNode<TNodeData, TNodeID>>[]) => {
-      setNodes(applyNodeChanges(changes, nodes))
-    },
-    [nodes],
-  )
-
-  const onEdgesChange = React.useCallback(
-    (
-      changes: EdgeChange<
-        LineageEdge<
-          TEdgeData,
-          TEdgeID,
-          TSourceID,
-          TTargetID,
-          TSourceHandleID,
-          TTargetHandleID
-        >
-      >[],
-    ) => {
-      setEdges(
-        applyEdgeChanges<
-          LineageEdge<
-            TEdgeData,
-            TEdgeID,
-            TSourceID,
-            TTargetID,
-            TSourceHandleID,
-            TTargetHandleID
-          >
-        >(changes, edges),
-      )
-    },
-    [edges],
-  )
-
   const updateZoom = React.useMemo(() => debounce(setZoom, 200), [setZoom])
 
-  const zoomToCurrentNode = React.useCallback(
-    (zoom: number = DEFAULT_ZOOM) => {
-      if (currentNode) {
-        setCenter(currentNode.position.x, currentNode.position.y, {
-          zoom,
-          duration: 0,
-        })
-      }
-    },
-    [currentNode?.position.x, currentNode?.position.y],
-  )
-
   const zoomToSelectedNode = React.useCallback(
     (zoom: number = DEFAULT_ZOOM) => {
       if (selectedNode) {
@@ -195,13 +131,13 @@ export function LineageLayoutBase<
       return Array.from(
         new Set<LineageNode<TNodeData, TNodeID>>([
           node,
-          ...getIncomers(node, initialNodes, edges)
+          ...getIncomers(node, nodes, edges)
             .map(n => getAllIncomers(n, visited))
             .flat(),
         ]),
       )
     },
-    [initialNodes, edges],
+    [nodes, edges],
   )
 
   const getAllOutgoers = React.useCallback(
@@ -216,13 +152,13 @@ export function LineageLayoutBase<
       return Array.from(
         new Set<LineageNode<TNodeData, TNodeID>>([
           node,
-          ...getOutgoers(node, initialNodes, edges)
+          ...getOutgoers(node, nodes, edges)
             .map(n => getAllOutgoers(n, visited))
             .flat(),
         ]),
       )
     },
-    [initialNodes, edges],
+    [nodes, edges],
   )
 
   const connectedNodes = React.useMemo(() => {
@@ -233,12 +169,8 @@ export function LineageLayoutBase<
       ...getAllOutgoers(selectedNode),
     ]
 
-    if (currentNode) {
-      all.push(currentNode)
-    }
-
     return all
-  }, [selectedNode, currentNode, getAllIncomers, getAllOutgoers])
+  }, [selectedNode, getAllIncomers, getAllOutgoers])
 
   const connectedEdges = React.useMemo(() => {
     return getConnectedEdges<
@@ -254,19 +186,11 @@ export function LineageLayoutBase<
     >(connectedNodes, edges)
   }, [connectedNodes, edges])
 
-  React.useEffect(() => {
-    setNodes(initialNodes)
-  }, [initialNodes])
-
   React.useEffect(() => {
     if (selectedNodeId == null) {
       setShowOnlySelectedNodes(false)
       setSelectedNodes(new Set())
       setSelectedEdges(new Set())
-    } else {
-      if (selectedNode == null) {
-        setSelectedNodeId(null)
-      }
     }
   }, [selectedNodeId, selectedNode])
 
@@ -317,17 +241,12 @@ export function LineageLayoutBase<
       edges={edges}
       nodeTypes={nodeTypes}
       edgeTypes={edgeTypes}
-      onNodesChange={onNodesChange}
-      onEdgesChange={onEdgesChange}
-      nodesDraggable={nodesDraggable}
-      nodesConnectable={nodesConnectable}
       zoomOnDoubleClick={false}
       panOnScroll={true}
       zoomOnScroll={true}
       minZoom={nodes.length > NODES_TRESHOLD ? NODES_TRESHOLD_ZOOM : MIN_ZOOM}
       maxZoom={MAX_ZOOM}
       fitView={false}
-      nodeOrigin={[0.5, 0.5]}
       onlyRenderVisibleElements
       onNodeClick={onNodeClick}
       onNodeDoubleClick={onNodeDoubleClick}
@@ -346,14 +265,6 @@ export function LineageLayoutBase<
         position="top-right"
         className="m-1 border-2 border-lineage-control-border rounded-sm overflow-hidden"
       >
-        {currentNode && showControlZoomToCurrentNode && (
-          <LineageControlButton
-            text="Zoom to current node"
-            onClick={() => zoomToCurrentNode(DEFAULT_ZOOM)}
-          >
-            <LineageControlIcon Icon={Crosshair} />
-          </LineageControlButton>
-        )}
         {selectedNodeId && (
           <>
             {showControlOnlySelectedNodes && (

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/help.ts

@@ -41,17 +41,17 @@ export function getTransformedNodes<
   adjacencyListKeys: TAdjacencyListKey[],
   lineageDetails: LineageDetails<TAdjacencyListKey, TDetailsNode>,
   transformNode: TransformNodeFn<TDetailsNode, TNodeData, TNodeID>,
+  allNodesMap?: LineageNodesMap<TNodeData, TNodeID>,
 ): LineageNodesMap<TNodeData, TNodeID> {
   const nodesCount = adjacencyListKeys.length
   const nodesMap: LineageNodesMap<TNodeData, TNodeID> = Object.create(null)
 
   for (let i = 0; i < nodesCount; i++) {
     const adjacencyListKey = adjacencyListKeys[i]
-    const encodedNodeId = toNodeID<TNodeID>(adjacencyListKey)
-    nodesMap[encodedNodeId] = transformNode(
-      encodedNodeId,
-      lineageDetails[adjacencyListKey],
-    )
+    const nodeId = toNodeID<TNodeID>(adjacencyListKey)
+    nodesMap[nodeId] =
+      allNodesMap?.[nodeId] ||
+      transformNode(nodeId, lineageDetails[adjacencyListKey])
   }
 
   return nodesMap

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/layout/dagreLayout.ts

@@ -21,6 +21,7 @@ export function buildLayout<
 >({
   edges,
   nodesMap,
+  shouldReuseExistingPosition = true,
 }: {
   edges: LineageEdge<
     TEdgeData,
@@ -31,6 +32,7 @@ export function buildLayout<
     TTargetHandleID
   >[]
   nodesMap: LineageNodesMap<TNodeData>
+  shouldReuseExistingPosition?: boolean
 }) {
   const nodes = Object.values(nodesMap)
   const nodeCount = nodes.length
@@ -46,7 +48,7 @@ export function buildLayout<
 
   g.setGraph({
     rankdir: 'LR',
-    nodesep: 0,
+    nodesep: 12,
     ranksep: 48,
     edgesep: 0,
     ranker: 'longest-path',
@@ -78,12 +80,19 @@ export function buildLayout<
     const nodeWithPosition = g.node(nodeId)
     const halfWidth = width / 2
     const halfHeight = height / 2
+    const isDefaultPosition = node.position.x === 0 && node.position.y === 0
 
     nodesMap[nodeId] = {
       ...node,
       position: {
-        x: nodeWithPosition.x - halfWidth,
-        y: nodeWithPosition.y - halfHeight,
+        x:
+          shouldReuseExistingPosition && isDefaultPosition
+            ? nodeWithPosition.x - halfWidth
+            : node.position.x,
+        y:
+          shouldReuseExistingPosition && isDefaultPosition
+            ? nodeWithPosition.y - halfHeight
+            : node.position.y,
       },
     }
   }

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/node/useNodeMetadata.tsx

@@ -4,17 +4,14 @@ import {
   useNodeConnections,
 } from '@xyflow/react'
 
-import { type LineageNode, type LineageNodeData, type NodeId } from '../utils'
+import { type LineageNodeData, type NodeId } from '../utils'
 
 export type NodeProps<TNodeData extends LineageNodeData = LineageNodeData> =
   ReactFlowNodeProps<Node<TNodeData>>
 
-export function useNodeMetadata<
-  TNodeData extends LineageNodeData = LineageNodeData,
-  TNodeID extends string = NodeId,
->(
+export function useNodeMetadata<TNodeID extends string = NodeId>(
   nodeId: TNodeID,
-  currentNode: LineageNode<TNodeData, TNodeID> | null,
+  currentNodeId: TNodeID | null,
   selectedNodeId: TNodeID | null,
   selectedNodes: Set<TNodeID>,
 ) {
@@ -29,7 +26,7 @@ export function useNodeMetadata<
 
   const leftId = targets.length > 0 ? nodeId : undefined
   const rightId = sources.length > 0 ? nodeId : undefined
-  const isCurrent = currentNode?.id === nodeId
+  const isCurrent = currentNodeId === nodeId
   const isSelected = selectedNodeId === nodeId
   const isActive = selectedNodes.has(nodeId)
 

{sqlmesh-0.225.1.dev14 → sqlmesh-0.225.1.dev16}/web/common/src/components/Lineage/stories/Lineage.stories.tsx

@@ -1,5 +1,3 @@
-import type { LineageAdjacencyList, LineageDetails } from '../utils'
-
 import { ModelLineage } from './ModelLineage'
 import type {
   BrandedLineageAdjacencyList,