refactor: move same_path_*.py to graphistry/compute/gfql/

lmeyerov · claude · lmeyerov · commit 84cb84ccb7b3 · 2026-01-01T23:57:43.000-08:00
Move same-path related files to be co-located with df_executor: - graphistry/gfql/same_path_plan.py -> graphistry/compute/gfql/same_path_plan.py - graphistry/gfql/same_path_types.py -> graphistry/compute/gfql/same_path_types.py Updates all imports across codebase (14 files). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
diff --git a/graphistry/compute/chain.py b/graphistry/compute/chain.py
@@ -12,7 +12,7 @@
 from .typing import DataFrameT
 from .util import generate_safe_column_name
 from graphistry.compute.validate.validate_schema import validate_chain_schema
-from graphistry.gfql.same_path_types import (
+from graphistry.compute.gfql.same_path_types import (
     WhereComparison,
     parse_where_json,
     where_to_json,
diff --git a/graphistry/compute/gfql/df_executor.py b/graphistry/compute/gfql/df_executor.py
@@ -19,8 +19,8 @@
 from graphistry.Plottable import Plottable
 from graphistry.compute.ast import ASTCall, ASTEdge, ASTNode, ASTObject
 from graphistry.gfql.ref.enumerator import OracleCaps, OracleResult, enumerate_chain
-from graphistry.gfql.same_path_plan import SamePathPlan, plan_same_path
-from graphistry.gfql.same_path_types import WhereComparison
+from graphistry.compute.gfql.same_path_plan import SamePathPlan, plan_same_path
+from graphistry.compute.gfql.same_path_types import WhereComparison
 from graphistry.compute.typing import DataFrameT
 
 AliasKind = Literal["node", "edge"]
diff --git a/graphistry/compute/gfql/same_path_plan.py b/graphistry/compute/gfql/same_path_plan.py
@@ -5,7 +5,7 @@
 from dataclasses import dataclass, field
 from typing import Dict, Optional, Sequence, Set
 
-from graphistry.gfql.same_path_types import WhereComparison
+from graphistry.compute.gfql.same_path_types import WhereComparison
 
 
 @dataclass
diff --git a/graphistry/compute/gfql/same_path_types.py b/graphistry/compute/gfql/same_path_types.py
diff --git a/graphistry/compute/gfql_unified.py b/graphistry/compute/gfql_unified.py
@@ -17,7 +17,7 @@
     QueryType,
     expand_policy
 )
-from graphistry.gfql.same_path_types import parse_where_json
+from graphistry.compute.gfql.same_path_types import parse_where_json
 from graphistry.compute.gfql.df_executor import (
     build_same_path_inputs,
     execute_same_path_chain,
diff --git a/graphistry/gfql/ref/enumerator.py b/graphistry/gfql/ref/enumerator.py
@@ -17,7 +17,7 @@
 from graphistry.compute.ast import ASTEdge, ASTNode, ASTObject
 from graphistry.compute.chain import Chain
 from graphistry.compute.filter_by_dict import filter_by_dict
-from graphistry.gfql.same_path_types import ComparisonOp, WhereComparison
+from graphistry.compute.gfql.same_path_types import ComparisonOp, WhereComparison
 
 
 @dataclass(frozen=True)
diff --git a/graphistry/tests/compute/test_chain_where.py b/graphistry/tests/compute/test_chain_where.py
@@ -2,7 +2,7 @@
 
 from graphistry.compute import n, e_forward
 from graphistry.compute.chain import Chain
-from graphistry.gfql.same_path_types import col, compare
+from graphistry.compute.gfql.same_path_types import col, compare
 from graphistry.tests.test_compute import CGFull
 
 
diff --git a/tests/gfql/ref/cprofile_df_executor.py b/tests/gfql/ref/cprofile_df_executor.py
@@ -12,7 +12,7 @@
 
 import graphistry
 from graphistry.compute.ast import n, e_forward
-from graphistry.gfql.same_path_types import col, compare, where_to_json
+from graphistry.compute.gfql.same_path_types import col, compare, where_to_json
 
 
 def make_graph(n_nodes: int, n_edges: int) -> Tuple[pd.DataFrame, pd.DataFrame]:
diff --git a/tests/gfql/ref/profile_df_executor.py b/tests/gfql/ref/profile_df_executor.py
@@ -14,7 +14,7 @@
 # Import the executor and test utilities
 import graphistry
 from graphistry.compute.ast import n, e_forward, e_reverse, e_undirected
-from graphistry.gfql.same_path_types import WhereComparison, StepColumnRef, col, compare, where_to_json
+from graphistry.compute.gfql.same_path_types import WhereComparison, StepColumnRef, col, compare, where_to_json
 
 
 @dataclass
diff --git a/tests/gfql/ref/test_df_executor_amplify.py b/tests/gfql/ref/test_df_executor_amplify.py
@@ -5,7 +5,7 @@
 from graphistry.Engine import Engine
 from graphistry.compute import n, e_forward, e_reverse, e_undirected, is_in
 from graphistry.compute.gfql.df_executor import execute_same_path_chain
-from graphistry.gfql.same_path_types import col, compare
+from graphistry.compute.gfql.same_path_types import col, compare
 from graphistry.tests.test_compute import CGFull
 
 # Import shared helpers - pytest auto-loads conftest.py
diff --git a/tests/gfql/ref/test_df_executor_core.py b/tests/gfql/ref/test_df_executor_core.py
@@ -14,7 +14,7 @@
 )
 from graphistry.compute.gfql_unified import gfql
 from graphistry.compute.chain import Chain
-from graphistry.gfql.same_path_types import col, compare
+from graphistry.compute.gfql.same_path_types import col, compare
 from graphistry.gfql.ref.enumerator import OracleCaps, enumerate_chain
 from graphistry.tests.test_compute import CGFull
 
diff --git a/tests/gfql/ref/test_df_executor_dimension.py b/tests/gfql/ref/test_df_executor_dimension.py
@@ -10,7 +10,7 @@
     DFSamePathExecutor,
     execute_same_path_chain,
 )
-from graphistry.gfql.same_path_types import col, compare
+from graphistry.compute.gfql.same_path_types import col, compare
 from graphistry.tests.test_compute import CGFull
 
 # Import shared helpers - pytest auto-loads conftest.py
diff --git a/tests/gfql/ref/test_df_executor_patterns.py b/tests/gfql/ref/test_df_executor_patterns.py
@@ -11,7 +11,7 @@
     DFSamePathExecutor,
     execute_same_path_chain,
 )
-from graphistry.gfql.same_path_types import col, compare
+from graphistry.compute.gfql.same_path_types import col, compare
 from graphistry.gfql.ref.enumerator import OracleCaps, enumerate_chain
 from graphistry.tests.test_compute import CGFull
 
diff --git a/tests/gfql/ref/test_ref_enumerator.py b/tests/gfql/ref/test_ref_enumerator.py
@@ -6,7 +6,7 @@
 
 from graphistry.compute import n, e_forward, e_undirected
 from graphistry.gfql.ref.enumerator import OracleCaps, enumerate_chain
-from graphistry.gfql.same_path_types import col, compare
+from graphistry.compute.gfql.same_path_types import col, compare
 
 
 def _plottable(nodes, edges):
diff --git a/tests/gfql/ref/test_same_path_plan.py b/tests/gfql/ref/test_same_path_plan.py
@@ -1,5 +1,5 @@
-from graphistry.gfql.same_path_plan import plan_same_path
-from graphistry.gfql.same_path_types import col, compare
+from graphistry.compute.gfql.same_path_plan import plan_same_path
+from graphistry.compute.gfql.same_path_types import col, compare
 
 
 def test_plan_minmax_and_bitset():

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`QueryType,`
`18`	`18`	`expand_policy`
`19`	`19`	`)`
`20`		`-from graphistry.gfql.same_path_types import parse_where_json`
	`20`	`+from graphistry.compute.gfql.same_path_types import parse_where_json`
`21`	`21`	`from graphistry.compute.gfql.df_executor import (`
`22`	`22`	`build_same_path_inputs,`
`23`	`23`	`execute_same_path_chain,`