sqlmesh 0.199.1.dev20__tar.gz → 0.199.1.dev22__tar.gz

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/PKG-INFO

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

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.199.1.dev20'
-__version_tuple__ = version_tuple = (0, 199, 1, 'dev20')
+__version__ = version = '0.199.1.dev22'
+__version_tuple__ = version_tuple = (0, 199, 1, 'dev22')

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/sqlmesh/core/config/connection.py

@@ -277,7 +277,7 @@ class BaseDuckDBConnectionConfig(ConnectionConfig):
     catalogs: t.Optional[t.Dict[str, t.Union[str, DuckDBAttachOptions]]] = None
     extensions: t.List[t.Union[str, t.Dict[str, t.Any]]] = []
     connector_config: t.Dict[str, t.Any] = {}
-    secrets: t.List[t.Dict[str, t.Any]] = []
+    secrets: t.Union[t.List[t.Dict[str, t.Any]], t.Dict[str, t.Dict[str, t.Any]]] = []
     filesystems: t.List[t.Dict[str, t.Any]] = []
 
     concurrent_tasks: int = 1
@@ -362,14 +362,22 @@ class BaseDuckDBConnectionConfig(ConnectionConfig):
                         "More info: https://duckdb.org/docs/stable/extensions/httpfs/s3api_legacy_authentication.html"
                     )
                 else:
-                    for secrets in self.secrets:
+                    if isinstance(self.secrets, list):
+                        secrets_items = [(secret_dict, "") for secret_dict in self.secrets]
+                    else:
+                        secrets_items = [
+                            (secret_dict, secret_name)
+                            for secret_name, secret_dict in self.secrets.items()
+                        ]
+
+                    for secret_dict, secret_name in secrets_items:
                         secret_settings: t.List[str] = []
-                        for field, setting in secrets.items():
+                        for field, setting in secret_dict.items():
                             secret_settings.append(f"{field} '{setting}'")
                         if secret_settings:
                             secret_clause = ", ".join(secret_settings)
                             try:
-                                cursor.execute(f"CREATE SECRET ({secret_clause});")
+                                cursor.execute(f"CREATE SECRET {secret_name} ({secret_clause});")
                             except Exception as e:
                                 raise ConfigError(f"Failed to create secret: {e}")
 

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/sqlmesh.egg-info/PKG-INFO

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

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/sqlmesh.egg-info/SOURCES.txt

@@ -833,6 +833,7 @@ vscode/react/src/components/graph/ModelLineage.tsx
 vscode/react/src/components/graph/ModelNode.tsx
 vscode/react/src/components/graph/ModelNodeHeaderHandles.tsx
 vscode/react/src/components/graph/SettingsControl.tsx
+vscode/react/src/components/graph/constants.ts
 vscode/react/src/components/graph/context.tsx
 vscode/react/src/components/graph/help.ts
 vscode/react/src/components/graph/types.ts

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/tests/core/test_connection_config.py

@@ -4,7 +4,7 @@ import typing as t
 
 import pytest
 from _pytest.fixtures import FixtureRequest
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
 
 from sqlmesh.core.config.connection import (
     BigQueryConnectionConfig,
@@ -455,6 +455,110 @@ def test_duckdb(make_config):
     assert not config.is_recommended_for_state_sync
 
 
+@patch("duckdb.connect")
+def test_duckdb_multiple_secrets(mock_connect, make_config):
+    """Test that multiple secrets are correctly converted to CREATE SECRET SQL statements."""
+    mock_cursor = MagicMock()
+    mock_connection = MagicMock()
+    mock_connection.cursor.return_value = mock_cursor
+    mock_connection.execute = mock_cursor.execute
+    mock_connect.return_value = mock_connection
+
+    # Create config with 2 secrets
+    config = make_config(
+        type="duckdb",
+        secrets=[
+            {
+                "type": "s3",
+                "region": "us-east-1",
+                "key_id": "my_aws_key",
+                "secret": "my_aws_secret",
+            },
+            {
+                "type": "azure",
+                "account_name": "myaccount",
+                "account_key": "myaccountkey",
+            },
+        ],
+    )
+
+    assert isinstance(config, DuckDBConnectionConfig)
+    assert len(config.secrets) == 2
+
+    # Create cursor which triggers _cursor_init
+    cursor = config.create_engine_adapter().cursor
+
+    execute_calls = [call[0][0] for call in mock_cursor.execute.call_args_list]
+    create_secret_calls = [call for call in execute_calls if call.startswith("CREATE SECRET")]
+
+    # Should have exactly 2 CREATE SECRET calls
+    assert len(create_secret_calls) == 2
+
+    # Verify the SQL for the first secret (S3)
+    assert (
+        create_secret_calls[0]
+        == "CREATE SECRET  (type 's3', region 'us-east-1', key_id 'my_aws_key', secret 'my_aws_secret');"
+    )
+
+    # Verify the SQL for the second secret (Azure)
+    assert (
+        create_secret_calls[1]
+        == "CREATE SECRET  (type 'azure', account_name 'myaccount', account_key 'myaccountkey');"
+    )
+
+
+@patch("duckdb.connect")
+def test_duckdb_named_secrets(mock_connect, make_config):
+    """Test that named secrets are correctly converted to CREATE SECRET SQL statements."""
+    mock_cursor = MagicMock()
+    mock_connection = MagicMock()
+    mock_connection.cursor.return_value = mock_cursor
+    mock_connection.execute = mock_cursor.execute
+    mock_connect.return_value = mock_connection
+
+    # Create config with named secrets using dictionary format
+    config = make_config(
+        type="duckdb",
+        secrets={
+            "my_s3_secret": {
+                "type": "s3",
+                "region": "us-east-1",
+                "key_id": "my_aws_key",
+                "secret": "my_aws_secret",
+            },
+            "my_azure_secret": {
+                "type": "azure",
+                "account_name": "myaccount",
+                "account_key": "myaccountkey",
+            },
+        },
+    )
+
+    assert isinstance(config, DuckDBConnectionConfig)
+    assert len(config.secrets) == 2
+
+    # Create cursor which triggers _cursor_init
+    cursor = config.create_engine_adapter().cursor
+
+    execute_calls = [call[0][0] for call in mock_cursor.execute.call_args_list]
+    create_secret_calls = [call for call in execute_calls if call.startswith("CREATE SECRET")]
+
+    # Should have exactly 2 CREATE SECRET calls
+    assert len(create_secret_calls) == 2
+
+    # Verify the SQL for the first secret (S3) includes the secret name
+    assert (
+        create_secret_calls[0]
+        == "CREATE SECRET my_s3_secret (type 's3', region 'us-east-1', key_id 'my_aws_key', secret 'my_aws_secret');"
+    )
+
+    # Verify the SQL for the second secret (Azure) includes the secret name
+    assert (
+        create_secret_calls[1]
+        == "CREATE SECRET my_azure_secret (type 'azure', account_name 'myaccount', account_key 'myaccountkey');"
+    )
+
+
 @pytest.mark.parametrize(
     "kwargs1, kwargs2, shared_adapter",
     [

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/vscode/react/src/components/graph/ModelColumns.tsx

@@ -10,7 +10,7 @@ import {
   isNotNil,
   truncate,
 } from '@/utils/index'
-import { EnumSide, toID, type Side } from './types'
+import { toID, type PartialColumnHandleId, type Side } from './types'
 import { NoSymbolIcon } from '@heroicons/react/24/solid'
 import { ClockIcon, ExclamationCircleIcon } from '@heroicons/react/24/outline'
 import clsx from 'clsx'
@@ -38,7 +38,7 @@ export function ModelColumns({
   columns,
   disabled,
   className,
-  limit = 5,
+  limit,
   withHandles = false,
   withDescription = true,
   maxHeight = '50vh',
@@ -47,7 +47,7 @@ export function ModelColumns({
   columns: Column[]
   disabled?: boolean
   className?: string
-  limit?: number
+  limit: number
   withHandles?: boolean
   withDescription?: boolean
   maxHeight?: string
@@ -125,7 +125,7 @@ export function ModelColumns({
   }
 
   const isSelectManually = useCallback(
-    function isSelectManually(columnName: string): boolean {
+    function isSelectManually(columnName: ColumnName): boolean {
       if (isNil(manuallySelectedColumn)) return false
 
       const [selectedModel, selectedColumn] = manuallySelectedColumn
@@ -138,12 +138,10 @@ export function ModelColumns({
   )
 
   const removeEdges = useCallback(
-    function removeEdges(columnId: string): void {
+    function removeEdges(columnId: PartialColumnHandleId): void {
       const visited = new Set<string>()
 
-      removeActiveEdges(
-        walk(columnId, EnumSide.Left).concat(walk(columnId, EnumSide.Right)),
-      )
+      removeActiveEdges(walk(columnId, 'left').concat(walk(columnId, 'right')))
 
       if (connections.size === 0 && isNotNil(lineageCache)) {
         setLineage(lineageCache)
@@ -164,12 +162,12 @@ export function ModelColumns({
         return edges
           .map(edge =>
             [
-              side === EnumSide.Left
-                ? [toID(EnumSide.Left, id), toID(EnumSide.Right, edge)]
-                : [toID(EnumSide.Left, edge), toID(EnumSide.Right, id)],
+              side === 'left'
+                ? [toID('left', id), toID('right', edge)]
+                : [toID('left', edge), toID('right', id)],
             ].concat(walk(edge, side)),
           )
-          .flat() as Array<[string, string]>
+          .flat() as Array<[PartialColumnHandleId, PartialColumnHandleId]>
       }
     },
     [removeActiveEdges, connections],
@@ -324,8 +322,8 @@ function ModelColumn({
   withHandles = false,
   withDescription = true,
 }: {
-  id: string
-  nodeId: string
+  id: PartialColumnHandleId
+  nodeId: ModelEncodedFQN
   column: Column
   disabled?: boolean
   isActive?: boolean
@@ -337,7 +335,7 @@ function ModelColumn({
   updateColumnLineage: (
     lineage: ColumnLineageApiLineageModelNameColumnNameGet200,
   ) => void
-  removeEdges: (columnId: string) => void
+  removeEdges: (columnId: PartialColumnHandleId) => void
   selectManually?: React.Dispatch<
     React.SetStateAction<
       [ModelSQLMeshModel<InitialSQLMeshModel>, Column] | undefined
@@ -454,8 +452,8 @@ function ColumnHandles({
   children,
   className,
 }: {
-  nodeId: string
-  id: string
+  nodeId: ModelEncodedFQN
+  id: PartialColumnHandleId
   children: React.ReactNode
   className?: string
   hasLeft?: boolean
@@ -482,7 +480,7 @@ function ColumnHandles({
       {hasLeft && (
         <Handle
           type="target"
-          id={toID(EnumSide.Left, id)}
+          id={toID('left', id)}
           position={Position.Left}
           isConnectable={false}
           className="w-2 h-2 rounded-full"
@@ -492,7 +490,7 @@ function ColumnHandles({
       {hasRight && (
         <Handle
           type="source"
-          id={toID(EnumSide.Right, id)}
+          id={toID('right', id)}
           position={Position.Right}
           isConnectable={false}
           className="w-2 h-2 rounded-full"
@@ -510,19 +508,13 @@ function ColumnDisplay({
   disabled = false,
   withDescription = true,
 }: {
-  columnName: string
+  columnName: ColumnName
   columnType: string
   columnDescription?: ColumnDescription
   disabled?: boolean
   withDescription?: boolean
   className?: string
 }): JSX.Element {
-  let decodedColumnName = columnName
-
-  try {
-    decodedColumnName = decodeURI(columnName)
-  } catch {}
-
   return (
     <div
       className={clsx(
@@ -533,7 +525,7 @@ function ColumnDisplay({
     >
       <div className="w-full flex justify-between items-center">
         <span
-          title={decodedColumnName}
+          title={columnName}
           className={clsx('flex items-center', disabled && 'opacity-50')}
         >
           {disabled && (
@@ -542,7 +534,7 @@ function ColumnDisplay({
               className="w-3 h-3 mr-2"
             />
           )}
-          {truncate(decodedColumnName, 50, 20)}
+          {truncate(columnName, 50, 20)}
         </span>
         <span
           title={columnType}

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/vscode/react/src/components/graph/ModelNode.tsx

@@ -9,6 +9,8 @@ import { ModelNodeHeaderHandles } from './ModelNodeHeaderHandles'
 import { ModelColumns } from './ModelColumns'
 import { fromAPIColumn, type Column } from '@/domain/column'
 import { decode, type ModelEncodedFQN } from '@/domain/models'
+import { toKeys } from './types'
+import { MAX_VISIBLE_COLUMNS } from './constants'
 
 export const EnumLineageNodeModelType = {
   ...ModelType,
@@ -57,33 +59,24 @@ export default function ModelNode({
     const model = modelsArray.find((m: Model) => m.fqn === decodedId)
     const modelColumns = model?.columns?.map(fromAPIColumn) ?? []
 
-    Object.keys(lineage[decodedId]?.columns ?? {}).forEach((column: string) => {
-      const found = modelColumns.find(({ name }: any) => {
-        try {
-          return name === decodeURI(column)
-        } catch {
-          return name === column
-        }
-      })
-
+    toKeys(lineage[decodedId]?.columns ?? {}).forEach(column => {
+      const found = modelColumns.find(({ name }) => name === column)
       if (isNil(found)) {
         modelColumns.push(
           fromAPIColumn({ name: column, type: EnumColumnType.UNKNOWN }),
         )
       }
     })
-
-    modelColumns.forEach((column: any) => {
+    return modelColumns.map(column => {
       let columnType = column.type ?? EnumColumnType.UNKNOWN
-
       if (columnType.startsWith(EnumColumnType.STRUCT)) {
         columnType = EnumColumnType.STRUCT
       }
-
-      column.type = columnType
+      return {
+        ...column,
+        type: columnType,
+      }
     })
-
-    return modelColumns
   }, [id, models, lineage])
 
   const highlightedNodeModels = useMemo(
@@ -136,7 +129,7 @@ export default function ModelNode({
   // Ensure nodeData.type is a valid LineageNodeModelType
   const nodeType: LineageNodeModelType = Object.values(
     EnumLineageNodeModelType,
-  ).includes(nodeData.type as any)
+  ).includes(nodeData.type)
     ? (nodeData.type as LineageNodeModelType)
     : EnumLineageNodeModelType.unknown
 
@@ -222,12 +215,13 @@ export default function ModelNode({
             ? undefined
             : handleSelect
         }
-        count={hasHighlightedNodes ? undefined : columns.length}
+        numberOfColumns={columns.length}
       />
       {showColumns && (
         <ModelColumns
           className="nowheel rounded-b-lg bg-theme-lighter text-xs"
           nodeId={id}
+          limit={MAX_VISIBLE_COLUMNS}
           columns={columns}
           disabled={shouldDisableColumns}
           withHandles={true}

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/vscode/react/src/components/graph/ModelNodeHeaderHandles.tsx

@@ -3,10 +3,11 @@ import { Handle, Position } from 'reactflow'
 import 'reactflow/dist/base.css'
 import { getModelNodeTypeTitle } from './help'
 import { isNotNil, truncate } from '@/utils/index'
-import { EnumSide, toID } from './types'
+import { toID } from './types'
 import { ArrowRightCircleIcon } from '@heroicons/react/24/solid'
 import clsx from 'clsx'
 import { type LineageNodeModelType } from './ModelNode'
+import type { ModelEncodedFQN } from '@/domain/models'
 
 export function ModelNodeHeaderHandles({
   id,
@@ -17,16 +18,16 @@ export function ModelNodeHeaderHandles({
   isDraggable = false,
   label,
   type,
-  count,
+  numberOfColumns,
   handleClick,
   handleSelect,
 }: {
-  id: string
+  id: ModelEncodedFQN
   label: string
   type?: LineageNodeModelType
   hasLeft?: boolean
   hasRight?: boolean
-  count?: number
+  numberOfColumns?: number
   className?: string
   isSelected?: boolean
   isDraggable?: boolean
@@ -38,7 +39,7 @@ export function ModelNodeHeaderHandles({
       {hasLeft && (
         <Handle
           type="target"
-          id={toID(EnumSide.Left, id)}
+          id={toID('left', id)}
           position={Position.Left}
           isConnectable={false}
           className="-ml-2 border rounded-full overflow-hidden border-current"
@@ -87,9 +88,9 @@ export function ModelNodeHeaderHandles({
           >
             {truncate(decodeURI(label), 50, 20)}
           </span>
-          {isNotNil(count) && (
+          {isNotNil(numberOfColumns) && (
             <span className="flex justify-between ml-2 mr-1 px-2 rounded-full bg-neutral-10">
-              {count}
+              {numberOfColumns}
             </span>
           )}
         </span>
@@ -97,7 +98,7 @@ export function ModelNodeHeaderHandles({
       {hasRight && (
         <Handle
           type="source"
-          id={toID(EnumSide.Right, id)}
+          id={toID('right', id)}
           position={Position.Right}
           isConnectable={false}
           className="-mr-2 border rounded-full overflow-hidden border-current"

sqlmesh-0.199.1.dev22/vscode/react/src/components/graph/constants.ts

@@ -0,0 +1,16 @@
+/**
+ * Space between nodes.
+ */
+export const NODE_BALANCE_SPACE = 64
+/**
+ * Height of a column line.
+ */
+export const COLUMN_LINE_HEIGHT = 24
+/**
+ * Assumed width of a character.
+ */
+export const CHAR_WIDTH = 8
+/**
+ * Maximum number of columns that can be visible in a node.
+ */
+export const MAX_VISIBLE_COLUMNS = 5

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/vscode/react/src/components/graph/context.tsx

@@ -6,7 +6,6 @@ import {
   useMemo,
 } from 'react'
 import { getNodeMap, hasActiveEdge, hasActiveEdgeConnector } from './help'
-import { EnumSide } from './types'
 import { type Node } from 'reactflow'
 import type { Lineage } from '@/domain/lineage'
 import type { ModelSQLMeshModel } from '@/domain/sqlmesh-model'
@@ -14,6 +13,8 @@ import type { Column } from '@/domain/column'
 import type { ModelEncodedFQN, ModelName } from '@/domain/models'
 import type { ColumnName } from '@/domain/column'
 import type { Model } from '@/api/client'
+import { toID, toKeys } from './types'
+import type { ConnectedNode } from '@/workers/lineage'
 
 export interface Connections {
   left: string[]
@@ -22,18 +23,18 @@ export interface Connections {
 export type ActiveColumns = Map<string, { ins: string[]; outs: string[] }>
 export type ActiveEdges = Map<string, Array<[string, string]>>
 export type ActiveNodes = Set<ModelEncodedFQN>
-export type SelectedNodes = Set<string>
+export type SelectedNodes = Set<ModelEncodedFQN>
 export type HighlightedNodes = Record<string, string[]>
 
 interface LineageFlow {
   lineage: Record<string, Lineage>
   lineageCache?: Record<string, Lineage>
   mainNode?: ModelEncodedFQN
-  connectedNodes: Set<string>
+  connectedNodes: Set<ModelEncodedFQN>
   activeEdges: ActiveEdges
   activeNodes: ActiveNodes
   selectedNodes: SelectedNodes
-  selectedEdges: any[]
+  selectedEdges: ConnectedNode[]
   models: Record<ModelName, ModelSQLMeshModel>
   unknownModels: Set<ModelEncodedFQN>
   connections: Map<string, Connections>
@@ -44,7 +45,7 @@ interface LineageFlow {
   withSecondary: boolean
   manuallySelectedColumn?: [ModelSQLMeshModel, Column]
   highlightedNodes: HighlightedNodes
-  nodesMap: Record<string, Node>
+  nodesMap: Record<ModelEncodedFQN, Node>
   setHighlightedNodes: React.Dispatch<React.SetStateAction<HighlightedNodes>>
   setActiveNodes: React.Dispatch<React.SetStateAction<ActiveNodes>>
   setWithConnected: React.Dispatch<React.SetStateAction<boolean>>
@@ -64,7 +65,7 @@ interface LineageFlow {
   setLineageCache: React.Dispatch<
     React.SetStateAction<Record<string, Lineage> | undefined>
   >
-  handleClickModel?: (modelName: string) => void
+  handleClickModel?: (modelName: ModelEncodedFQN) => void
   handleError?: (error: any) => void
   setManuallySelectedColumn: React.Dispatch<
     React.SetStateAction<[ModelSQLMeshModel, Column] | undefined>
@@ -130,7 +131,7 @@ export default function LineageFlowProvider({
   models,
 }: {
   children: React.ReactNode
-  handleClickModel?: (modelName: string) => void
+  handleClickModel?: (modelName: ModelEncodedFQN) => void
   handleError?: (error: any) => void
   showColumns?: boolean
   showConnected?: boolean
@@ -142,9 +143,9 @@ export default function LineageFlowProvider({
   const [lineageCache, setLineageCache] = useState<
     Record<string, Lineage> | undefined
   >(undefined)
-  const [nodesConnections, setNodeConnections] = useState<Record<string, any>>(
-    {},
-  )
+  const [nodesConnections, setNodeConnections] = useState<
+    Record<ModelEncodedFQN, any>
+  >({})
   const [withColumns, setWithColumns] = useState(showColumns)
   const [mainNode, setMainNode] = useState<ModelEncodedFQN | undefined>()
   const [manuallySelectedColumn, setManuallySelectedColumn] =
@@ -248,9 +249,8 @@ export default function LineageFlowProvider({
       modelName: ModelEncodedFQN,
       columnName: ColumnName,
     ): boolean {
-      const leftConnector = [EnumSide.Left, modelName, columnName].join('__')
-      const rightConnector = [EnumSide.Right, modelName, columnName].join('__')
-
+      const leftConnector = toID('left', modelName, columnName)
+      const rightConnector = toID('right', modelName, columnName)
       return (
         hasActiveEdgeConnector(activeEdges, leftConnector) ||
         hasActiveEdgeConnector(activeEdges, rightConnector)
@@ -259,8 +259,8 @@ export default function LineageFlowProvider({
     [checkActiveEdge, activeEdges],
   )
 
-  const connectedNodes: Set<string> = useMemo(
-    () => new Set(Object.keys(nodesConnections)),
+  const connectedNodes = useMemo(
+    () => new Set(toKeys(nodesConnections)),
     [nodesConnections],
   )
 

{sqlmesh-0.199.1.dev20 → sqlmesh-0.199.1.dev22}/vscode/react/src/components/graph/help.ts

@@ -9,7 +9,7 @@ import {
 import { type LineageColumn } from '@/api/client'
 import { Position, type Edge, type Node, type XYPosition } from 'reactflow'
 import { type ActiveEdges, type Connections } from './context'
-import { EnumSide, toID, toKeys } from './types'
+import { toID, toKeys } from './types'
 import {
   EnumLineageNodeModelType,
   type LineageNodeModelType,
@@ -19,23 +19,12 @@ import type { ConnectedNode } from '@/workers/lineage'
 import { encode, type ModelEncodedFQN, type ModelURI } from '@/domain/models'
 import type { Column, ColumnName } from '@/domain/column'
 import type { ModelSQLMeshModel } from '@/domain/sqlmesh-model'
-
-/**
- * Space between nodes.
- */
-const NODE_BALANCE_SPACE = 64
-/**
- * Height of a column line.
- */
-const COLUMN_LINE_HEIGHT = 24
-/**
- * Assumed width of a character.
- */
-const CHAR_WIDTH = 8
-/**
- * Maximum number of columns that can be visible in a node.
- */
-const MAX_VISIBLE_COLUMNS = 5
+import {
+  CHAR_WIDTH,
+  COLUMN_LINE_HEIGHT,
+  MAX_VISIBLE_COLUMNS,
+  NODE_BALANCE_SPACE,
+} from './constants'
 
 export interface GraphNodeData {
   label: string
@@ -125,17 +114,8 @@ export function getEdges(
         if (isNil(sourceColumns)) continue
 
         for (const sourceColumnName of sourceColumns) {
-          const sourceHandler = toID(
-            EnumSide.Right,
-            sourceModelName,
-            sourceColumnName,
-          )
-          const targetHandler = toID(
-            EnumSide.Left,
-            targetModelName,
-            targetColumnName,
-          )
-
+          const sourceHandler = toID('right', sourceModelName, sourceColumnName)
+          const targetHandler = toID('left', targetModelName, targetColumnName)
           outputEdges.push(
             createGraphEdge(
               sourceModelName,
@@ -460,14 +440,14 @@ export function mergeConnections(
           // And right bucket contains references to all targets (left handlers)
           connectionsModelSource.left.forEach(id => {
             activeEdges.push([
-              toID(EnumSide.Left, modelColumnIdSource),
-              toID(EnumSide.Right, id),
+              toID('left', modelColumnIdSource),
+              toID('right', id),
             ])
           })
           connectionsModelSource.right.forEach(id => {
             activeEdges.push([
-              toID(EnumSide.Left, id),
-              toID(EnumSide.Right, modelColumnIdSource),
+              toID('left', id),
+              toID('right', modelColumnIdSource),
             ])
           })
         })