Fix circular import

pyproject.toml

@@ -7,7 +7,7 @@ packages=["ragdaemon"]
 
 [project]
 name = "ragdaemon"
-version = "0.4.6"
+version = "0.4.7"
 description = "Generate and render a call graph for a Python project."
 readme = "README.md"
 dependencies = [

ragdaemon/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.6"
+__version__ = "0.4.7"

ragdaemon/annotators/diff.py

@@ -7,7 +7,13 @@
 from ragdaemon.get_paths import get_git_root_for_path
 from ragdaemon.graph import KnowledgeGraph
 from ragdaemon.errors import RagdaemonError
-from ragdaemon.utils import get_document, hash_str, parse_path_ref, truncate
+from ragdaemon.utils import (
+    get_document,
+    hash_str,
+    parse_diff_id,
+    parse_path_ref,
+    truncate,
+)
 
 
 def get_chunks_from_diff(id: str, diff: str) -> dict[str, str]:
@@ -53,15 +59,6 @@ def get_chunks_from_diff(id: str, diff: str) -> dict[str, str]:
     return chunks
 
 
-def parse_diff_id(id: str) -> tuple[str, Path | None, set[int] | None]:
-    if ":" in id:
-        diff_ref, path_ref = id.split(":", 1)
-        path, lines = parse_path_ref(path_ref)
-    else:
-        diff_ref, path, lines = id, None, None
-    return diff_ref, path, lines
-
-
 class Diff(Annotator):
     name: str = "diff"
 

ragdaemon/context.py

@@ -6,11 +6,10 @@
 from typing import Any, Dict, Optional, Union
 
 from dict2xml import dict2xml
-from ragdaemon.annotators.diff import parse_diff_id
 from ragdaemon.database import Database
 from ragdaemon.errors import RagdaemonError
 from ragdaemon.graph import KnowledgeGraph
-from ragdaemon.utils import get_document, hash_str, parse_path_ref
+from ragdaemon.utils import get_document, hash_str, parse_diff_id, parse_path_ref
 
 NestedStrDict = Union[str, Dict[str, "NestedStrDict"]]
 

ragdaemon/utils.py

@@ -86,6 +86,15 @@ def parse_path_ref(ref: str) -> tuple[Path, set[int] | None]:
     return Path(path_str), lines
 
 
+def parse_diff_id(id: str) -> tuple[str, Path | None, set[int] | None]:
+    if ":" in id:
+        diff_ref, path_ref = id.split(":", 1)
+        path, lines = parse_path_ref(path_ref)
+    else:
+        diff_ref, path, lines = id, None, None
+    return diff_ref, path, lines
+
+
 def get_document(ref: str, cwd: Path, type: str = "file") -> str:
     if type == "diff":
         if ":" in ref: