chore: tighten domain helpers

Author: lmeyerov

graphistry/compute/gfql/same_path/df_utils.py

@@ -129,8 +129,10 @@ def domain_from_values(values: Any, template: Optional[Any] = None) -> DomainT:
 
 
 def domain_intersect(left: Optional[DomainT], right: Optional[DomainT]) -> DomainT:
-    if domain_is_empty(left) or domain_is_empty(right):
+    if left is None or right is None:
         return domain_empty(left if left is not None else right)
+    if len(left) == 0 or len(right) == 0:
+        return domain_empty(left)
     if isinstance(left, pd.Index):
         return left.intersection(right)
     if _is_cudf_obj(left):
@@ -139,9 +141,9 @@ def domain_intersect(left: Optional[DomainT], right: Optional[DomainT]) -> Domai
 
 
 def domain_union(left: Optional[DomainT], right: Optional[DomainT]) -> DomainT:
-    if domain_is_empty(left):
-        return right
-    if domain_is_empty(right):
+    if left is None or len(left) == 0:
+        return right if right is not None else domain_empty(left)
+    if right is None or len(right) == 0:
         return left
     if isinstance(left, pd.Index):
         return left.union(right)
@@ -151,7 +153,9 @@ def domain_union(left: Optional[DomainT], right: Optional[DomainT]) -> DomainT:
 
 
 def domain_diff(left: Optional[DomainT], right: Optional[DomainT]) -> DomainT:
-    if domain_is_empty(left) or domain_is_empty(right):
+    if left is None or len(left) == 0:
+        return domain_empty(left)
+    if right is None or len(right) == 0:
         return left
     if isinstance(left, pd.Index):
         return left.difference(right)

graphistry/compute/hop.py

@@ -123,16 +123,18 @@ def _domain_is_empty(domain: Optional[DomainT]) -> bool:
         return domain is None or len(domain) == 0
 
     def _domain_diff(candidates: Optional[DomainT], visited: Optional[DomainT]) -> Optional[DomainT]:
-        if _domain_is_empty(candidates) or _domain_is_empty(visited):
+        if candidates is None or visited is None:
+            return candidates
+        if len(candidates) == 0 or len(visited) == 0:
             return candidates
         return candidates[~candidates.isin(visited)]
 
     def _domain_union(left: Optional[DomainT], right: Optional[DomainT]) -> Optional[DomainT]:
-        if _domain_is_empty(left):
+        if left is None or len(left) == 0:
             return right
-        if _domain_is_empty(right):
+        if right is None or len(right) == 0:
             return left
-        if engine_concrete == Engine.PANDAS and isinstance(left, pd.Index):
+        if engine_concrete == Engine.PANDAS and isinstance(left, pd.Index) and isinstance(right, pd.Index):
             return left.append(right)
         return concat([left, right], ignore_index=True)
 
@@ -297,9 +299,10 @@ def resolve_label_col(requested: Optional[str], df, default_base: str) -> Option
         base_target_nodes = g2._nodes
     else:
         base_target_nodes = concat([target_wave_front, g2._nodes], ignore_index=True, sort=False).drop_duplicates(subset=[node_col])
-        def _build_allowed_ids(
-            base_nodes: DataFrameT,
-            match_dict: Optional[dict],
+
+    def _build_allowed_ids(
+        base_nodes: DataFrameT,
+        match_dict: Optional[dict],
         match_query: Optional[str],
     ) -> Optional[DataFrameT]:
         if match_dict is None and match_query is None: