sqlmesh 0.225.1.dev1__tar.gz → 0.225.1.dev3__tar.gz

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/PKG-INFO

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

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/pnpm-lock.yaml

@@ -435,9 +435,6 @@ importers:
       '@types/dagre':
         specifier: 0.7.53
         version: 0.7.53
-      '@types/lodash':
-        specifier: 4.17.20
-        version: 4.17.20
       '@types/node':
         specifier: 20.11.25
         version: 20.11.25
@@ -495,9 +492,6 @@ importers:
       globals:
         specifier: 16.3.0
         version: 16.3.0
-      lodash:
-        specifier: 4.17.21
-        version: 4.17.21
       lucide-react:
         specifier: 0.542.0
         version: 0.542.0(react@18.3.1)
@@ -2662,9 +2656,6 @@ packages:
   '@types/jsonfile@6.1.4':
     resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==}
 
-  '@types/lodash@4.17.20':
-    resolution: {integrity: sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==}
-
   '@types/mdast@4.0.4':
     resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
 
@@ -7064,7 +7055,7 @@ snapshots:
       '@babel/traverse': 7.28.0
       '@babel/types': 7.28.1
       convert-source-map: 2.0.0
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -7232,7 +7223,7 @@ snapshots:
       '@babel/parser': 7.28.0
       '@babel/template': 7.27.2
       '@babel/types': 7.28.1
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -7489,7 +7480,7 @@ snapshots:
   '@eslint/config-array@0.21.0':
     dependencies:
       '@eslint/object-schema': 2.1.6
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -7503,7 +7494,7 @@ snapshots:
   '@eslint/eslintrc@3.3.1':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       espree: 10.4.0
       globals: 14.0.0
       ignore: 5.3.2
@@ -9425,8 +9416,6 @@ snapshots:
     dependencies:
       '@types/node': 20.11.25
 
-  '@types/lodash@4.17.20': {}
-
   '@types/mdast@4.0.4':
     dependencies:
       '@types/unist': 3.0.3
@@ -9502,7 +9491,7 @@ snapshots:
       '@typescript-eslint/types': 8.38.0
       '@typescript-eslint/typescript-estree': 8.38.0(typescript@5.8.3)
       '@typescript-eslint/visitor-keys': 8.38.0
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       eslint: 9.31.0(jiti@2.4.2)
       typescript: 5.8.3
     transitivePeerDependencies:
@@ -9512,7 +9501,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.38.0(typescript@5.8.3)
       '@typescript-eslint/types': 8.38.0
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
@@ -9531,7 +9520,7 @@ snapshots:
       '@typescript-eslint/types': 8.38.0
       '@typescript-eslint/typescript-estree': 8.38.0(typescript@5.8.3)
       '@typescript-eslint/utils': 8.38.0(eslint@9.31.0(jiti@2.4.2))(typescript@5.8.3)
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       eslint: 9.31.0(jiti@2.4.2)
       ts-api-utils: 2.1.0(typescript@5.8.3)
       typescript: 5.8.3
@@ -9546,7 +9535,7 @@ snapshots:
       '@typescript-eslint/tsconfig-utils': 8.38.0(typescript@5.8.3)
       '@typescript-eslint/types': 8.38.0
       '@typescript-eslint/visitor-keys': 8.38.0
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -10644,6 +10633,10 @@ snapshots:
 
   de-indent@1.0.2: {}
 
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
+
   debug@4.4.1(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
@@ -10916,7 +10909,7 @@ snapshots:
 
   esbuild-register@3.6.0(esbuild@0.25.8):
     dependencies:
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       esbuild: 0.25.8
     transitivePeerDependencies:
       - supports-color
@@ -10999,7 +10992,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       escape-string-regexp: 4.0.0
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
@@ -11410,7 +11403,7 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -11419,7 +11412,7 @@ snapshots:
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -13992,7 +13985,7 @@ snapshots:
   vite-node@3.2.4(@types/node@20.11.25)(jiti@2.4.2)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       es-module-lexer: 1.7.0
       pathe: 2.0.3
       vite: 6.3.5(@types/node@20.11.25)(jiti@2.4.2)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.0)
@@ -14042,7 +14035,7 @@ snapshots:
       '@volar/typescript': 2.4.23
       '@vue/language-core': 2.2.0(typescript@5.8.3)
       compare-versions: 6.1.1
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       kolorist: 1.8.0
       local-pkg: 1.1.1
       magic-string: 0.30.17
@@ -14108,7 +14101,7 @@ snapshots:
       '@vitest/spy': 3.2.4
       '@vitest/utils': 3.2.4
       chai: 5.2.1
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.1
       expect-type: 1.2.2
       magic-string: 0.30.17
       pathe: 2.0.3

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/sqlmesh/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.225.1.dev1'
-__version_tuple__ = version_tuple = (0, 225, 1, 'dev1')
+__version__ = version = '0.225.1.dev3'
+__version_tuple__ = version_tuple = (0, 225, 1, 'dev3')
 
-__commit_id__ = commit_id = 'g189208ecb'
+__commit_id__ = commit_id = 'g633e64e3d'

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/sqlmesh/dbt/model.py

@@ -601,7 +601,13 @@ class ModelConfig(BaseModelConfig):
                 clustered_by = []
                 for c in self.cluster_by:
                     try:
-                        clustered_by.append(d.parse_one(c, dialect=model_dialect))
+                        cluster_expr = exp.maybe_parse(
+                            c, into=exp.Cluster, prefix="CLUSTER BY", dialect=model_dialect
+                        )
+                        for expr in cluster_expr.expressions:
+                            clustered_by.append(
+                                expr.this if isinstance(expr, exp.Ordered) else expr
+                            )
                     except SqlglotError as e:
                         raise ConfigError(
                             f"Failed to parse model '{self.canonical_name(context)}' cluster_by field '{c}' in '{self.path}': {e}"

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/sqlmesh.egg-info/PKG-INFO

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

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/tests/dbt/test_transformation.py

@@ -2306,6 +2306,60 @@ def test_model_cluster_by():
     )
     assert model.to_sqlmesh(context).clustered_by == []
 
+    model = ModelConfig(
+        name="model",
+        alias="model",
+        package_name="package",
+        target_schema="test",
+        cluster_by="Bar, qux",
+        sql="SELECT * FROM baz",
+        materialized=Materialization.TABLE.value,
+    )
+    assert model.to_sqlmesh(context).clustered_by == [
+        exp.to_column('"BAR"'),
+        exp.to_column('"QUX"'),
+    ]
+
+    model = ModelConfig(
+        name="model",
+        alias="model",
+        package_name="package",
+        target_schema="test",
+        cluster_by=['"Bar,qux"'],
+        sql="SELECT * FROM baz",
+        materialized=Materialization.TABLE.value,
+    )
+    assert model.to_sqlmesh(context).clustered_by == [
+        exp.to_column('"Bar,qux"'),
+    ]
+
+    model = ModelConfig(
+        name="model",
+        alias="model",
+        package_name="package",
+        target_schema="test",
+        cluster_by='"Bar,qux"',
+        sql="SELECT * FROM baz",
+        materialized=Materialization.TABLE.value,
+    )
+    assert model.to_sqlmesh(context).clustered_by == [
+        exp.to_column('"Bar,qux"'),
+    ]
+
+    model = ModelConfig(
+        name="model",
+        alias="model",
+        package_name="package",
+        target_schema="test",
+        cluster_by=["to_date(Bar),qux"],
+        sql="SELECT * FROM baz",
+        materialized=Materialization.TABLE.value,
+    )
+    assert model.to_sqlmesh(context).clustered_by == [
+        exp.TsOrDsToDate(this=exp.to_column('"BAR"')),
+        exp.to_column('"QUX"'),
+    ]
+
 
 def test_snowflake_dynamic_table():
     context = DbtContext()

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/web/common/package.json

@@ -14,7 +14,6 @@
     "@testing-library/react": "16.3.0",
     "@testing-library/user-event": "14.6.1",
     "@types/dagre": "0.7.53",
-    "@types/lodash": "4.17.20",
     "@types/node": "20.11.25",
     "@types/react": "18.3.23",
     "@types/react-dom": "18.3.7",
@@ -34,7 +33,6 @@
     "eslint-plugin-storybook": "9.1.5",
     "fuse.js": "7.1.0",
     "globals": "16.3.0",
-    "lodash": "4.17.21",
     "lucide-react": "0.542.0",
     "playwright": "1.54.1",
     "postcss": "8.5.6",
@@ -95,7 +93,6 @@
     "dagre": "0.8.5",
     "deepmerge": "4.3.1",
     "fuse.js": "7.1.0",
-    "lodash": "4.17.21",
     "lucide-react": "0.542.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",

{sqlmesh-0.225.1.dev1 → sqlmesh-0.225.1.dev3}/web/common/src/components/Lineage/LineageColumnLevel/ColumnLevelLineageContext.ts

@@ -2,64 +2,36 @@ import React from 'react'
 
 import { type PortId } from '../utils'
 
-export type LineageColumn = {
-  source?: string | null
-  expression?: string | null
-  models: Record<string, string[]>
-}
-
-export type ColumnLevelModelConnections<
-  TAdjacencyListKey extends string,
-  TAdjacencyListColumnKey extends string,
-> = Record<TAdjacencyListKey, TAdjacencyListColumnKey[]>
-export type ColumnLevelDetails<
-  TAdjacencyListKey extends string,
-  TAdjacencyListColumnKey extends string,
-> = Omit<LineageColumn, 'models'> & {
-  models: ColumnLevelModelConnections<
-    TAdjacencyListKey,
-    TAdjacencyListColumnKey
-  >
-}
-export type ColumnLevelConnections<
-  TAdjacencyListKey extends string,
-  TAdjacencyListColumnKey extends string,
-> = Record<
-  TAdjacencyListColumnKey,
-  ColumnLevelDetails<TAdjacencyListKey, TAdjacencyListColumnKey>
->
 export type ColumnLevelLineageAdjacencyList<
   TAdjacencyListKey extends string,
   TAdjacencyListColumnKey extends string,
-> = Record<
-  TAdjacencyListKey,
-  ColumnLevelConnections<TAdjacencyListKey, TAdjacencyListColumnKey>
->
+> = {
+  [K in TAdjacencyListKey]: {
+    [C in TAdjacencyListColumnKey]: {
+      source?: string | null
+      expression?: string | null
+      models: Record<TAdjacencyListKey, TAdjacencyListColumnKey[]>
+    }
+  }
+}
 
 export type ColumnLevelLineageContextValue<
   TAdjacencyListKey extends string,
   TAdjacencyListColumnKey extends string,
   TColumnID extends string = PortId,
-> = {
-  adjacencyListColumnLevel: ColumnLevelLineageAdjacencyList<
+  TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
     TAdjacencyListKey,
     TAdjacencyListColumnKey
-  >
+  > = ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  >,
+> = {
+  adjacencyListColumnLevel: TColumnLevelLineageAdjacencyList
   selectedColumns: Set<TColumnID>
-  columnLevelLineage: Map<
-    TColumnID,
-    ColumnLevelLineageAdjacencyList<TAdjacencyListKey, TAdjacencyListColumnKey>
-  >
+  columnLevelLineage: Map<TColumnID, TColumnLevelLineageAdjacencyList>
   setColumnLevelLineage: React.Dispatch<
-    React.SetStateAction<
-      Map<
-        TColumnID,
-        ColumnLevelLineageAdjacencyList<
-          TAdjacencyListKey,
-          TAdjacencyListColumnKey
-        >
-      >
-    >
+    React.SetStateAction<Map<TColumnID, TColumnLevelLineageAdjacencyList>>
   >
   showColumns: boolean
   setShowColumns: React.Dispatch<React.SetStateAction<boolean>>
@@ -71,16 +43,17 @@ export function getColumnLevelLineageContextInitial<
   TAdjacencyListKey extends string,
   TAdjacencyListColumnKey extends string,
   TColumnID extends string = PortId,
+  TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  > = ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  >,
 >() {
   return {
-    adjacencyListColumnLevel: {},
-    columnLevelLineage: new Map<
-      TColumnID,
-      ColumnLevelLineageAdjacencyList<
-        TAdjacencyListKey,
-        TAdjacencyListColumnKey
-      >
-    >(),
+    adjacencyListColumnLevel: {} as TColumnLevelLineageAdjacencyList,
+    columnLevelLineage: new Map<TColumnID, TColumnLevelLineageAdjacencyList>(),
     setColumnLevelLineage: () => {},
     showColumns: false,
     setShowColumns: () => {},
@@ -94,8 +67,16 @@ export type ColumnLevelLineageContextHook<
   TAdjacencyListKey extends string,
   TAdjacencyListColumnKey extends string,
   TColumnID extends string = PortId,
+  TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  > = ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  >,
 > = () => ColumnLevelLineageContextValue<
   TAdjacencyListKey,
   TAdjacencyListColumnKey,
-  TColumnID
+  TColumnID,
+  TColumnLevelLineageAdjacencyList
 >

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

@@ -10,7 +10,7 @@ import React from 'react'
 import { cn } from '@/utils'
 import { NodeBadge } from '../node/NodeBadge'
 import { NodePort } from '../node/NodePort'
-import { type NodeId, type PortId } from '../utils'
+import { type NodeId, type PortHandleId, type PortId } from '../utils'
 import {
   type ColumnLevelLineageAdjacencyList,
   type ColumnLevelLineageContextHook,
@@ -28,11 +28,21 @@ export function FactoryColumn<
   TAdjacencyListColumnKey extends string,
   TNodeID extends string = NodeId,
   TColumnID extends string = PortId,
+  TLeftPortHandleId extends string = PortHandleId,
+  TRightPortHandleId extends string = PortHandleId,
+  TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  > = ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  >,
 >(
   useLineage: ColumnLevelLineageContextHook<
     TAdjacencyListKey,
     TAdjacencyListColumnKey,
-    TColumnID
+    TColumnID,
+    TColumnLevelLineageAdjacencyList
   >,
 ) {
   return React.memo(function FactoryColumn({
@@ -59,10 +69,7 @@ export function FactoryColumn<
     type: string
     description?: string | null
     className?: string
-    data?: ColumnLevelLineageAdjacencyList<
-      TAdjacencyListKey,
-      TAdjacencyListColumnKey
-    >
+    data?: TColumnLevelLineageAdjacencyList
     isFetching?: boolean
     error?: Error | null
     renderError?: (error: Error) => React.ReactNode
@@ -248,7 +255,7 @@ export function FactoryColumn<
     }
 
     return isSelectedColumn ? (
-      <NodePort
+      <NodePort<TColumnID, TNodeID, TLeftPortHandleId, TRightPortHandleId>
         id={id}
         nodeId={nodeId}
         className={cn(

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

@@ -9,28 +9,26 @@ import {
   type PortId,
   type TransformEdgeFn,
 } from '../utils'
-import {
-  type ColumnLevelConnections,
-  type ColumnLevelDetails,
-  type ColumnLevelLineageAdjacencyList,
-} from './ColumnLevelLineageContext'
+import { type ColumnLevelLineageAdjacencyList } from './ColumnLevelLineageContext'
 
 export const MAX_COLUMNS_TO_DISPLAY = 5
 
 export function getAdjacencyListKeysFromColumnLineage<
   TAdjacencyListKey extends string,
   TAdjacencyListColumnKey extends string,
->(
-  columnLineage: ColumnLevelLineageAdjacencyList<
+  TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  > = ColumnLevelLineageAdjacencyList<
     TAdjacencyListKey,
     TAdjacencyListColumnKey
   >,
-) {
+>(columnLineage: TColumnLevelLineageAdjacencyList) {
   const adjacencyListKeys = new Set<TAdjacencyListKey>()
 
   const targets = Object.entries(columnLineage) as [
     TAdjacencyListKey,
-    ColumnLevelConnections<TAdjacencyListKey, TAdjacencyListColumnKey>,
+    TColumnLevelLineageAdjacencyList[TAdjacencyListKey],
   ][]
 
   for (const [sourceModelName, targetColumns] of targets) {
@@ -38,7 +36,7 @@ export function getAdjacencyListKeysFromColumnLineage<
 
     const targetConnections = Object.entries(targetColumns) as [
       TAdjacencyListColumnKey,
-      ColumnLevelDetails<TAdjacencyListKey, TAdjacencyListColumnKey>,
+      TColumnLevelLineageAdjacencyList[TAdjacencyListKey][TAdjacencyListColumnKey],
     ][]
 
     for (const [, { models: sourceModels }] of targetConnections) {
@@ -58,32 +56,52 @@ export function getEdgesFromColumnLineage<
   TAdjacencyListColumnKey extends string,
   TEdgeData extends LineageEdgeData = LineageEdgeData,
   TEdgeID extends string = EdgeId,
-  TNodeID extends string = NodeId,
-  TPortID extends string = PortId,
+  TSourceID extends string = NodeId,
+  TTargetID extends string = NodeId,
+  TSourceHandleID extends string = PortId,
+  TTargetHandleID extends string = PortId,
+  TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  > = ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  >,
 >({
   columnLineage,
   transformEdge,
 }: {
-  columnLineage: ColumnLevelLineageAdjacencyList<
-    TAdjacencyListKey,
-    TAdjacencyListColumnKey
+  columnLineage: TColumnLevelLineageAdjacencyList
+  transformEdge: TransformEdgeFn<
+    TEdgeData,
+    TEdgeID,
+    TSourceID,
+    TTargetID,
+    TSourceHandleID,
+    TTargetHandleID
   >
-  transformEdge: TransformEdgeFn<TEdgeData, TNodeID, TEdgeID, TPortID>
 }) {
-  const edges: LineageEdge<TEdgeData, TNodeID, TEdgeID, TPortID>[] = []
-  const modelLevelEdgeIDs = new Map<TEdgeID, [TNodeID, TNodeID]>()
+  const edges: LineageEdge<
+    TEdgeData,
+    TEdgeID,
+    TSourceID,
+    TTargetID,
+    TSourceHandleID,
+    TTargetHandleID
+  >[] = []
+  const modelLevelEdgeIDs = new Map<TEdgeID, [TSourceID, TTargetID]>()
   const targets = Object.entries(columnLineage || {}) as [
     TAdjacencyListKey,
-    ColumnLevelConnections<TAdjacencyListKey, TAdjacencyListColumnKey>,
+    TColumnLevelLineageAdjacencyList[TAdjacencyListKey],
   ][]
 
   for (const [targetModelName, targetColumns] of targets) {
     const targetConnections = Object.entries(targetColumns) as [
       TAdjacencyListColumnKey,
-      ColumnLevelDetails<TAdjacencyListKey, TAdjacencyListColumnKey>,
+      TColumnLevelLineageAdjacencyList[TAdjacencyListKey][TAdjacencyListColumnKey],
     ][]
 
-    const targetNodeId = toNodeID<TNodeID>(targetModelName)
+    const targetNodeId = toNodeID<TTargetID>(targetModelName)
 
     for (const [
       targetColumnName,
@@ -95,7 +113,7 @@ export function getEdgesFromColumnLineage<
       ][]
 
       for (const [sourceModelName, sourceColumns] of sources) {
-        const sourceNodeId = toNodeID<TNodeID>(sourceModelName)
+        const sourceNodeId = toNodeID<TSourceID>(sourceModelName)
 
         modelLevelEdgeIDs.set(
           toEdgeID<TEdgeID>(sourceModelName, targetModelName),
@@ -109,11 +127,11 @@ export function getEdgesFromColumnLineage<
             targetModelName,
             targetColumnName,
           )
-          const sourceColumnId = toPortID<TPortID>(
+          const sourceColumnId = toPortID<TSourceHandleID>(
             sourceModelName,
             sourceColumnName,
           )
-          const targetColumnId = toPortID<TPortID>(
+          const targetColumnId = toPortID<TTargetHandleID>(
             targetModelName,
             targetColumnName,
           )
@@ -145,22 +163,24 @@ export function getConnectedColumnsIDs<
   TAdjacencyListKey extends string,
   TAdjacencyListColumnKey extends string,
   TColumnID extends string = PortId,
->(
-  adjacencyList: ColumnLevelLineageAdjacencyList<
+  TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
+    TAdjacencyListKey,
+    TAdjacencyListColumnKey
+  > = ColumnLevelLineageAdjacencyList<
     TAdjacencyListKey,
     TAdjacencyListColumnKey
   >,
-) {
+>(adjacencyList: TColumnLevelLineageAdjacencyList) {
   const connectedColumns = new Set<TColumnID>()
   const targets = Object.entries(adjacencyList) as [
     TAdjacencyListKey,
-    ColumnLevelConnections<TAdjacencyListKey, TAdjacencyListColumnKey>,
+    TColumnLevelLineageAdjacencyList[TAdjacencyListKey],
   ][]
 
   for (const [sourceModelName, targetColumns] of targets) {
     const targetConnections = Object.entries(targetColumns) as [
       TAdjacencyListColumnKey,
-      ColumnLevelDetails<TAdjacencyListKey, TAdjacencyListColumnKey>,
+      TColumnLevelLineageAdjacencyList[TAdjacencyListKey][TAdjacencyListColumnKey],
     ][]
 
     for (const [