sqlmesh 0.224.1.dev23__tar.gz → 0.224.1.dev24__tar.gz

{sqlmesh-0.224.1.dev23 → sqlmesh-0.224.1.dev24}/PKG-INFO

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

{sqlmesh-0.224.1.dev23 → sqlmesh-0.224.1.dev24}/sqlmesh/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.224.1.dev23'
-__version_tuple__ = version_tuple = (0, 224, 1, 'dev23')
+__version__ = version = '0.224.1.dev24'
+__version_tuple__ = version_tuple = (0, 224, 1, 'dev24')
 
-__commit_id__ = commit_id = 'g5e5e2f010'
+__commit_id__ = commit_id = 'g223422fca'

{sqlmesh-0.224.1.dev23 → sqlmesh-0.224.1.dev24}/sqlmesh.egg-info/PKG-INFO

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

{sqlmesh-0.224.1.dev23 → sqlmesh-0.224.1.dev24}/sqlmesh.egg-info/SOURCES.txt

@@ -1258,6 +1258,8 @@ web/common/src/components/Lineage/LineageContext.ts
 web/common/src/components/Lineage/LineageControlButton.tsx
 web/common/src/components/Lineage/LineageControlIcon.tsx
 web/common/src/components/Lineage/LineageLayout.tsx
+web/common/src/components/Lineage/LineageLayoutBase.tsx
+web/common/src/components/Lineage/LineageLayoutContainer.tsx
 web/common/src/components/Lineage/help.test.ts
 web/common/src/components/Lineage/help.ts
 web/common/src/components/Lineage/index.ts

{sqlmesh-0.224.1.dev23 → sqlmesh-0.224.1.dev24}/web/common/src/components/Lineage/LineageContext.ts

@@ -30,8 +30,6 @@ export interface LineageContextValue<
   setSelectedNodeId: React.Dispatch<React.SetStateAction<TNodeID | null>>
 
   // Layout
-  isBuildingLayout: boolean
-  setIsBuildingLayout: React.Dispatch<React.SetStateAction<boolean>>
   zoom: number
   setZoom: React.Dispatch<React.SetStateAction<number>>
 
@@ -66,8 +64,6 @@ export function getInitial<
     nodes: [],
     nodesMap: {},
     setNodesMap: () => {},
-    isBuildingLayout: false,
-    setIsBuildingLayout: () => {},
     currentNode: null,
   }
 }

sqlmesh-0.224.1.dev24/web/common/src/components/Lineage/LineageLayout.tsx

@@ -0,0 +1,84 @@
+import {
+  type EdgeTypes,
+  type NodeTypes,
+  ReactFlowProvider,
+  type SetCenter,
+} from '@xyflow/react'
+
+import React from 'react'
+
+import { type LineageContextHook } from './LineageContext'
+
+import {
+  type LineageEdgeData,
+  type LineageNode,
+  type LineageNodeData,
+  type NodeId,
+  type EdgeId,
+  type PortId,
+} from './utils'
+
+import { LineageLayoutBase } from './LineageLayoutBase'
+import { LineageLayoutContainer } from './LineageLayoutContainer'
+
+export function LineageLayout<
+  TNodeData extends LineageNodeData = LineageNodeData,
+  TEdgeData extends LineageEdgeData = LineageEdgeData,
+  TNodeID extends string = NodeId,
+  TEdgeID extends string = EdgeId,
+  TPortID extends string = PortId,
+>({
+  nodeTypes,
+  edgeTypes,
+  className,
+  controls,
+  nodesDraggable,
+  nodesConnectable,
+  isBuildingLayout,
+  useLineage,
+  onNodeClick,
+  onNodeDoubleClick,
+}: {
+  useLineage: LineageContextHook<
+    TNodeData,
+    TEdgeData,
+    TNodeID,
+    TEdgeID,
+    TPortID
+  >
+  isBuildingLayout?: boolean
+  nodeTypes?: NodeTypes
+  edgeTypes?: EdgeTypes
+  className?: string
+  nodesDraggable?: boolean
+  nodesConnectable?: boolean
+  controls?:
+    | React.ReactNode
+    | (({ setCenter }: { setCenter: SetCenter }) => React.ReactNode)
+  onNodeClick?: (
+    event: React.MouseEvent<Element, MouseEvent>,
+    node: LineageNode<TNodeData, TNodeID>,
+  ) => void
+  onNodeDoubleClick?: (
+    event: React.MouseEvent<Element, MouseEvent>,
+    node: LineageNode<TNodeData, TNodeID>,
+  ) => void
+}) {
+  return (
+    <ReactFlowProvider>
+      <LineageLayoutContainer isBuildingLayout={isBuildingLayout}>
+        <LineageLayoutBase
+          nodeTypes={nodeTypes}
+          edgeTypes={edgeTypes}
+          nodesDraggable={nodesDraggable}
+          nodesConnectable={nodesConnectable}
+          className={className}
+          controls={controls}
+          useLineage={useLineage}
+          onNodeClick={onNodeClick}
+          onNodeDoubleClick={onNodeDoubleClick}
+        />
+      </LineageLayoutContainer>
+    </ReactFlowProvider>
+  )
+}

sqlmesh-0.224.1.dev23/web/common/src/components/Lineage/LineageLayout.tsx → sqlmesh-0.224.1.dev24/web/common/src/components/Lineage/LineageLayoutBase.tsx

@@ -7,7 +7,6 @@ import {
   type NodeChange,
   type NodeTypes,
   ReactFlow,
-  ReactFlowProvider,
   type SetCenter,
   getConnectedEdges,
   getIncomers,
@@ -25,7 +24,6 @@ import { debounce } from 'lodash'
 import { CircuitBoard, Crosshair, LocateFixed, RotateCcw } from 'lucide-react'
 import React from 'react'
 
-import { cn } from '@/utils'
 import { type LineageContextHook } from './LineageContext'
 import { LineageControlButton } from './LineageControlButton'
 import { LineageControlIcon } from './LineageControlIcon'
@@ -44,69 +42,12 @@ import {
   ZOOM_THRESHOLD,
   type PortId,
 } from './utils'
-import { VerticalContainer } from '../VerticalContainer/VerticalContainer'
-import { MessageContainer } from '../MessageContainer/MessageContainer'
-import { LoadingContainer } from '../LoadingContainer/LoadingContainer'
 
-export function LineageLayout<
-  TNodeData extends LineageNodeData = LineageNodeData,
-  TEdgeData extends LineageEdgeData = LineageEdgeData,
-  TNodeID extends string = NodeId,
-  TEdgeID extends string = EdgeId,
-  TPortID extends string = PortId,
->({
-  nodeTypes,
-  edgeTypes,
-  className,
-  controls,
-  nodesDraggable,
-  nodesConnectable,
-  useLineage,
-  onNodeClick,
-  onNodeDoubleClick,
-}: {
-  useLineage: LineageContextHook<
-    TNodeData,
-    TEdgeData,
-    TNodeID,
-    TEdgeID,
-    TPortID
-  >
-  nodeTypes?: NodeTypes
-  edgeTypes?: EdgeTypes
-  className?: string
-  nodesDraggable?: boolean
-  nodesConnectable?: boolean
-  controls?:
-    | React.ReactNode
-    | (({ setCenter }: { setCenter: SetCenter }) => React.ReactNode)
-  onNodeClick?: (
-    event: React.MouseEvent<Element, MouseEvent>,
-    node: LineageNode<TNodeData, TNodeID>,
-  ) => void
-  onNodeDoubleClick?: (
-    event: React.MouseEvent<Element, MouseEvent>,
-    node: LineageNode<TNodeData, TNodeID>,
-  ) => void
-}) {
-  return (
-    <ReactFlowProvider>
-      <LineageLayoutBase
-        nodeTypes={nodeTypes}
-        edgeTypes={edgeTypes}
-        nodesDraggable={nodesDraggable}
-        nodesConnectable={nodesConnectable}
-        className={className}
-        controls={controls}
-        useLineage={useLineage}
-        onNodeClick={onNodeClick}
-        onNodeDoubleClick={onNodeDoubleClick}
-      />
-    </ReactFlowProvider>
-  )
-}
+import '@xyflow/react/dist/style.css'
+import './Lineage.css'
+import { cn } from '@/utils'
 
-function LineageLayoutBase<
+export function LineageLayoutBase<
   TNodeData extends LineageNodeData = LineageNodeData,
   TEdgeData extends LineageEdgeData = LineageEdgeData,
   TNodeID extends string = NodeId,
@@ -151,7 +92,6 @@ function LineageLayoutBase<
   const { setCenter } = useReactFlow()
 
   const {
-    isBuildingLayout,
     currentNode,
     zoom,
     nodes: initialNodes,
@@ -351,100 +291,77 @@ function LineageLayoutBase<
   }, [currentNode?.id, setSelectedNodeId, setCenter])
 
   return (
-    <VerticalContainer
-      data-component="LineageLayout"
-      className={cn(
-        'border-2 border-lineage-border bg-lineage-background relative h-full',
-        className,
-      )}
+    <ReactFlow<
+      LineageNode<TNodeData, TNodeID>,
+      LineageEdge<TEdgeData, TNodeID, TEdgeID, TPortID>
     >
-      {isBuildingLayout && (
-        <MessageContainer
-          className={cn('absolute inset-0 backdrop-blur-sm z-10 rounded-none')}
-        >
-          <LoadingContainer
-            isLoading={isBuildingLayout}
-            className="px-4 py-2 font-semibold shadow-lg bg-lineage-background rounded-md"
-          >
-            Building layout...
-          </LoadingContainer>
-        </MessageContainer>
+      className={cn('shrink-0', className)}
+      nodes={nodes}
+      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}
+    >
+      {zoom > ZOOM_THRESHOLD && (
+        <Background
+          id="1"
+          gap={10}
+          color="var(--color-lineage-grid-dot)"
+          variant={BackgroundVariant.Dots}
+        />
       )}
-      <ReactFlow<
-        LineageNode<TNodeData, TNodeID>,
-        LineageEdge<TEdgeData, TNodeID, TEdgeID, TPortID>
-      >
-        className="shrink-0"
-        nodes={nodes}
-        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}
+      <Controls
+        showInteractive={false}
+        showFitView={false}
+        position="top-right"
       >
-        {zoom > ZOOM_THRESHOLD && (
-          <Background
-            id="1"
-            gap={10}
-            color="var(--color-lineage-grid-dot)"
-            variant={BackgroundVariant.Dots}
-          />
+        {currentNode && (
+          <LineageControlButton
+            text="Zoom to current node"
+            onClick={() => zoomToCurrentNode(DEFAULT_ZOOM)}
+          >
+            <LineageControlIcon Icon={Crosshair} />
+          </LineageControlButton>
         )}
-        <Controls
-          showInteractive={false}
-          showFitView={false}
-          position="top-right"
-        >
-          {currentNode && (
+        {selectedNodeId && (
+          <>
             <LineageControlButton
-              text="Zoom to current node"
-              onClick={() => zoomToCurrentNode(DEFAULT_ZOOM)}
-              disabled={isBuildingLayout}
+              text={
+                showOnlySelectedNodes
+                  ? 'Rebuild with all nodes'
+                  : 'Only selected nodes'
+              }
+              onClick={() => setShowOnlySelectedNodes(!showOnlySelectedNodes)}
             >
-              <LineageControlIcon Icon={Crosshair} />
+              <LineageControlIcon
+                Icon={showOnlySelectedNodes ? RotateCcw : CircuitBoard}
+              />
             </LineageControlButton>
-          )}
-          {selectedNodeId && (
-            <>
-              <LineageControlButton
-                text={
-                  showOnlySelectedNodes
-                    ? 'Rebuild with all nodes'
-                    : 'Only selected nodes'
-                }
-                onClick={() => setShowOnlySelectedNodes(!showOnlySelectedNodes)}
-                disabled={isBuildingLayout}
-              >
-                <LineageControlIcon
-                  Icon={showOnlySelectedNodes ? RotateCcw : CircuitBoard}
-                />
-              </LineageControlButton>
-              <LineageControlButton
-                text="Zoom to selected node"
-                onClick={() => zoomToSelectedNode(DEFAULT_ZOOM)}
-                disabled={isBuildingLayout}
-              >
-                <LineageControlIcon Icon={LocateFixed} />
-              </LineageControlButton>
-            </>
-          )}
-          {controls && typeof controls === 'function'
-            ? controls({ setCenter })
-            : controls}
-        </Controls>
-      </ReactFlow>
-    </VerticalContainer>
+            <LineageControlButton
+              text="Zoom to selected node"
+              onClick={() => zoomToSelectedNode(DEFAULT_ZOOM)}
+            >
+              <LineageControlIcon Icon={LocateFixed} />
+            </LineageControlButton>
+          </>
+        )}
+        {controls && typeof controls === 'function'
+          ? controls({ setCenter })
+          : controls}
+      </Controls>
+    </ReactFlow>
   )
 }

sqlmesh-0.224.1.dev24/web/common/src/components/Lineage/LineageLayoutContainer.tsx

@@ -0,0 +1,43 @@
+import { cn } from '@/utils'
+
+import React from 'react'
+
+import { VerticalContainer } from '../VerticalContainer/VerticalContainer'
+import { MessageContainer } from '../MessageContainer/MessageContainer'
+import { LoadingContainer } from '../LoadingContainer/LoadingContainer'
+
+export function LineageLayoutContainer({
+  isBuildingLayout,
+  loadingMessage = 'Building layout...',
+  className,
+  children,
+}: {
+  isBuildingLayout?: boolean
+  loadingMessage?: string
+  className?: string
+  children: React.ReactNode
+}) {
+  return (
+    <VerticalContainer
+      data-component="LineageLayout"
+      className={cn(
+        'border-2 border-lineage-border bg-lineage-background relative h-full',
+        className,
+      )}
+    >
+      {isBuildingLayout && (
+        <MessageContainer
+          className={cn('absolute inset-0 backdrop-blur-sm z-10 rounded-none')}
+        >
+          <LoadingContainer
+            isLoading={isBuildingLayout}
+            className="px-4 py-2 font-semibold shadow-lg bg-lineage-background text-lineage-foreground rounded-md"
+          >
+            {loadingMessage}
+          </LoadingContainer>
+        </MessageContainer>
+      )}
+      {children}
+    </VerticalContainer>
+  )
+}

{sqlmesh-0.224.1.dev23 → sqlmesh-0.224.1.dev24}/web/common/src/components/Lineage/stories/ModelLineage.tsx

@@ -359,7 +359,6 @@ export const ModelLineage = ({
         selectedNodes,
         selectedEdges,
         selectedNodeId,
-        isBuildingLayout,
         zoom,
         edges,
         nodes,
@@ -372,7 +371,6 @@ export const ModelLineage = ({
         setSelectedNodes,
         setSelectedEdges,
         setSelectedNodeId,
-        setIsBuildingLayout,
         setZoom,
         setEdges,
         setNodesMap,

{sqlmesh-0.224.1.dev23 → sqlmesh-0.224.1.dev24}/web/common/src/components/VirtualList/FilterableList.tsx

@@ -58,6 +58,9 @@ export function FilterableList<TItem>({
           }
           inputSize="xs"
           className="FilterableList__Input w-full"
+          onClick={(e: React.MouseEvent<HTMLInputElement>) => {
+            e.stopPropagation()
+          }}
         />
         <Counter
           itemsLength={items.length}