fix: dep cycle

getzep · Dec 9, 2024 · 2ae1125 · 2ae1125
1 parent 567e72e
commit 2ae1125
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/graphiti_core/graphiti.py b/graphiti_core/graphiti.py
@@ -43,10 +43,6 @@
     get_relevant_edges,
     get_relevant_nodes,
 )
-from graphiti_core.utils import (
-    build_episodic_edges,
-    retrieve_episodes,
-)
 from graphiti_core.utils.bulk_utils import (
     RawEpisode,
     add_nodes_and_edges_bulk,
@@ -64,6 +60,7 @@
     update_community,
 )
 from graphiti_core.utils.maintenance.edge_operations import (
+    build_episodic_edges,
     dedupe_extracted_edge,
     extract_edges,
     resolve_edge_contradictions,
@@ -72,6 +69,7 @@
 from graphiti_core.utils.maintenance.graph_data_operations import (
     EPISODE_WINDOW_LEN,
     build_indices_and_constraints,
+    retrieve_episodes,
 )
 from graphiti_core.utils.maintenance.node_operations import (
     extract_nodes,

diff --git a/graphiti_core/utils/__init__.py b/graphiti_core/utils/__init__.py
@@ -1,15 +0,0 @@
-from .maintenance import (
-    build_episodic_edges,
-    clear_data,
-    extract_edges,
-    extract_nodes,
-    retrieve_episodes,
-)
-
-__all__ = [
-    'extract_edges',
-    'build_episodic_edges',
-    'extract_nodes',
-    'clear_data',
-    'retrieve_episodes',
-]

diff --git a/graphiti_core/utils/bulk_utils.py b/graphiti_core/utils/bulk_utils.py
@@ -37,15 +37,17 @@
 )
 from graphiti_core.nodes import EntityNode, EpisodeType, EpisodicNode
 from graphiti_core.search.search_utils import get_relevant_edges, get_relevant_nodes
-from graphiti_core.utils import retrieve_episodes
 from graphiti_core.utils.datetime_utils import utc_now
 from graphiti_core.utils.maintenance.edge_operations import (
     build_episodic_edges,
     dedupe_edge_list,
     dedupe_extracted_edges,
     extract_edges,
 )
-from graphiti_core.utils.maintenance.graph_data_operations import EPISODE_WINDOW_LEN
+from graphiti_core.utils.maintenance.graph_data_operations import (
+    EPISODE_WINDOW_LEN,
+    retrieve_episodes,
+)
 from graphiti_core.utils.maintenance.node_operations import (
     dedupe_extracted_nodes,
     dedupe_node_list,

diff --git a/server/graph_service/routers/ingest.py b/server/graph_service/routers/ingest.py
@@ -4,7 +4,7 @@
 
 from fastapi import APIRouter, FastAPI, status
 from graphiti_core.nodes import EpisodeType  # type: ignore
-from graphiti_core.utils import clear_data  # type: ignore
+from graphiti_core.utils.maintenance.graph_data_operations import clear_data  # type: ignore
 
 from graph_service.dto import AddEntityNodeRequest, AddMessagesRequest, Message, Result
 from graph_service.zep_graphiti import ZepGraphitiDep