codegraphcontext 0.1.18__tar.gz → 0.1.20__tar.gz

{codegraphcontext-0.1.18/src/codegraphcontext.egg-info → codegraphcontext-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegraphcontext
-Version: 0.1.18
+Version: 0.1.20
 Summary: An MCP server that indexes local code into a graph database to provide context to AI assistants.
 Author-email: Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 License: MIT License
@@ -33,25 +33,27 @@ Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Requires-Python: >=3.12
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: neo4j>=5.15.0
 Requires-Dist: watchdog>=3.0.0
-Requires-Dist: requests>=2.31.0
 Requires-Dist: stdlibs>=2023.11.18
 Requires-Dist: typer[all]>=0.9.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: python-dotenv>=1.0.0
-Requires-Dist: tree-sitter==0.20.4
-Requires-Dist: tree-sitter-languages==1.10.2
+Requires-Dist: tree-sitter>=0.21.0
+Requires-Dist: tree-sitter-language-pack>=0.6.0
 Requires-Dist: pyyaml
 Requires-Dist: pytest
 Requires-Dist: nbformat
 Requires-Dist: nbconvert>=7.16.6
 Requires-Dist: pathspec>=0.12.1
-Requires-Dist: falkordblite>=0.1.0
+Requires-Dist: falkordblite>=0.1.0; python_version >= "3.12"
+Provides-Extra: parsing
+Requires-Dist: tree-sitter>=0.21.0; extra == "parsing"
+Requires-Dist: tree-sitter-language-pack>=0.6.0; extra == "parsing"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.4.0; extra == "dev"
 Requires-Dist: black>=23.11.0; extra == "dev"
@@ -89,7 +91,7 @@ An MCP server that indexes local code into a graph database to provide context t
 ![Using the MCP server](https://github.com/Shashankss1205/CodeGraphContext/blob/main/images/Usecase.gif)
 
 ## Project Details
-- **Version:** 0.1.17
+- **Version:** 0.1.20
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)
@@ -103,6 +105,46 @@ An MCP server that indexes local code into a graph database to provide context t
 -   **Relationship Analysis:** Query for callers, callees, class hierarchies, call chains and more.
 -   **Live Updates:** Watches local files for changes and automatically updates the graph.
 -   **Interactive Setup:** A user-friendly command-line wizard for easy setup.
+-   **Multi-Language Support:** Full support for 11 programming languages.
+-   **Flexible Database Backend:** Choose between Neo4j or FalkorDB Lite.
+
+## Supported Programming Languages
+
+CodeGraphContext provides comprehensive parsing and analysis for the following languages:
+
+- **Python** (`.py`) - Including Jupyter notebooks (`.ipynb`)
+- **JavaScript** (`.js`)
+- **TypeScript** (`.ts`)
+- **Java** (`.java`)
+- **C** (`.c`, `.h`)
+- **C++** (`.cpp`, `.cc`, `.cxx`, `.hpp`, `.hxx`)
+- **C#** (`.cs`) - Full support for classes, methods, namespaces, and inheritance
+- **Go** (`.go`)
+- **Rust** (`.rs`)
+- **Ruby** (`.rb`)
+- **PHP** (`.php`)
+
+Each language parser extracts functions, classes, methods, parameters, inheritance relationships, function calls, and imports to build a comprehensive code graph.
+
+## Database Options
+
+CodeGraphContext supports two graph database backends:
+
+### Neo4j (Default)
+- **Production-ready** and widely used graph database
+- Supports local instances (via Docker or native installation) and cloud hosting (Neo4j AuraDB)
+- Full Cypher query support for advanced graph analytics
+- Recommended for most use cases
+
+### FalkorDB Lite
+- **Lightweight** in-memory graph database
+- **No external dependencies** - runs entirely in-process
+- Available for **Python 3.12+** only
+- Perfect for quick testing and development
+- Automatically installed when using Python 3.12 or higher
+
+The `cgc setup` wizard helps you configure neo4j database backend while the falkordb database is
+supported inherently.
 
 ## Used By
 
@@ -118,20 +160,21 @@ If you’re using CodeGraphContext in your project, feel free to open a PR and a
 
 - `neo4j>=5.15.0`
 - `watchdog>=3.0.0`
-- `requests>=2.31.0`
 - `stdlibs>=2023.11.18`
 - `typer[all]>=0.9.0`
 - `rich>=13.7.0`
 - `inquirerpy>=0.3.4`
 - `python-dotenv>=1.0.0`
-- `tree-sitter==0.20.4`
-- `tree-sitter-languages==1.10.2`
+- `tree-sitter>=0.21.0`
+- `tree-sitter-language-pack>=0.6.0`
 - `pyyaml`
 - `pytest`
 - `nbformat`
 - `nbconvert>=7.16.6`
 - `pathspec>=0.12.1`
 
+**Note:** Python 3.9+ is supported, including Python 3.13 and 3.14.
+
 ## Getting Started
 
 1.  **Install:** `pip install codegraphcontext`

{codegraphcontext-0.1.18 → codegraphcontext-0.1.20}/README.md

@@ -29,7 +29,7 @@ An MCP server that indexes local code into a graph database to provide context t
 ![Using the MCP server](https://github.com/Shashankss1205/CodeGraphContext/blob/main/images/Usecase.gif)
 
 ## Project Details
-- **Version:** 0.1.17
+- **Version:** 0.1.20
 - **Authors:** Shashank Shekhar Singh <shashankshekharsingh1205@gmail.com>
 - **License:** MIT License (See [LICENSE](LICENSE) for details)
 - **Website:** [CodeGraphContext](http://codegraphcontext.vercel.app/)
@@ -43,6 +43,46 @@ An MCP server that indexes local code into a graph database to provide context t
 -   **Relationship Analysis:** Query for callers, callees, class hierarchies, call chains and more.
 -   **Live Updates:** Watches local files for changes and automatically updates the graph.
 -   **Interactive Setup:** A user-friendly command-line wizard for easy setup.
+-   **Multi-Language Support:** Full support for 11 programming languages.
+-   **Flexible Database Backend:** Choose between Neo4j or FalkorDB Lite.
+
+## Supported Programming Languages
+
+CodeGraphContext provides comprehensive parsing and analysis for the following languages:
+
+- **Python** (`.py`) - Including Jupyter notebooks (`.ipynb`)
+- **JavaScript** (`.js`)
+- **TypeScript** (`.ts`)
+- **Java** (`.java`)
+- **C** (`.c`, `.h`)
+- **C++** (`.cpp`, `.cc`, `.cxx`, `.hpp`, `.hxx`)
+- **C#** (`.cs`) - Full support for classes, methods, namespaces, and inheritance
+- **Go** (`.go`)
+- **Rust** (`.rs`)
+- **Ruby** (`.rb`)
+- **PHP** (`.php`)
+
+Each language parser extracts functions, classes, methods, parameters, inheritance relationships, function calls, and imports to build a comprehensive code graph.
+
+## Database Options
+
+CodeGraphContext supports two graph database backends:
+
+### Neo4j (Default)
+- **Production-ready** and widely used graph database
+- Supports local instances (via Docker or native installation) and cloud hosting (Neo4j AuraDB)
+- Full Cypher query support for advanced graph analytics
+- Recommended for most use cases
+
+### FalkorDB Lite
+- **Lightweight** in-memory graph database
+- **No external dependencies** - runs entirely in-process
+- Available for **Python 3.12+** only
+- Perfect for quick testing and development
+- Automatically installed when using Python 3.12 or higher
+
+The `cgc setup` wizard helps you configure neo4j database backend while the falkordb database is
+supported inherently.
 
 ## Used By
 
@@ -58,20 +98,21 @@ If you’re using CodeGraphContext in your project, feel free to open a PR and a
 
 - `neo4j>=5.15.0`
 - `watchdog>=3.0.0`
-- `requests>=2.31.0`
 - `stdlibs>=2023.11.18`
 - `typer[all]>=0.9.0`
 - `rich>=13.7.0`
 - `inquirerpy>=0.3.4`
 - `python-dotenv>=1.0.0`
-- `tree-sitter==0.20.4`
-- `tree-sitter-languages==1.10.2`
+- `tree-sitter>=0.21.0`
+- `tree-sitter-language-pack>=0.6.0`
 - `pyyaml`
 - `pytest`
 - `nbformat`
 - `nbconvert>=7.16.6`
 - `pathspec>=0.12.1`
 
+**Note:** Python 3.9+ is supported, including Python 3.13 and 3.14.
+
 ## Getting Started
 
 1.  **Install:** `pip install codegraphcontext`

{codegraphcontext-0.1.18 → codegraphcontext-0.1.20}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "codegraphcontext"
-version = "0.1.18"
+version = "0.1.20"
 description = "An MCP server that indexes local code into a graph database to provide context to AI assistants."
 authors = [{ name = "Shashank Shekhar Singh", email = "shashankshekharsingh1205@gmail.com" }]
 readme = "README.md"
 license = { file = "LICENSE" }
-requires-python = ">=3.12"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -17,20 +17,19 @@ classifiers = [
 dependencies = [
     "neo4j>=5.15.0",
     "watchdog>=3.0.0",
-    "requests>=2.31.0",
     "stdlibs>=2023.11.18",
     "typer[all]>=0.9.0",
     "rich>=13.7.0",
     "inquirerpy>=0.3.4",
     "python-dotenv>=1.0.0",
-    "tree-sitter==0.20.4",                   
-    "tree-sitter-languages==1.10.2",
+    "tree-sitter>=0.21.0",
+    "tree-sitter-language-pack>=0.6.0",
     "pyyaml",
     "pytest",
     "nbformat",
     "nbconvert>=7.16.6",
     "pathspec>=0.12.1",
-    "falkordblite>=0.1.0"
+    "falkordblite>=0.1.0; python_version >= '3.12'"
 ]
 
 [project.urls]
@@ -42,6 +41,10 @@ cgc = "codegraphcontext.cli.main:app"
 codegraphcontext = "codegraphcontext.cli.main:app"
 
 [project.optional-dependencies]
+parsing = [
+    "tree-sitter>=0.21.0",
+    "tree-sitter-language-pack>=0.6.0",
+]
 dev = [
     "pytest>=7.4.0",
     "black>=23.11.0",

{codegraphcontext-0.1.18 → codegraphcontext-0.1.20}/src/codegraphcontext/core/__init__.py

@@ -15,6 +15,9 @@ import importlib.util
 
 def _is_falkordb_available() -> bool:
     """Check if FalkorDB Lite is installed (without importing native modules)."""
+    import sys
+    if sys.version_info < (3, 12):
+        return False
     try:
         # Check for redislite/falkordb-client spec without loading it
         return importlib.util.find_spec("redislite") is not None
@@ -79,11 +82,23 @@ def get_database_manager() -> Union['DatabaseManager', 'FalkorDBManager']:
         info_logger("Using Neo4j Server (auto-detected)")
         return DatabaseManager()
 
-    raise ValueError(
-        "No database backend available.\n"
-        "Recommended: Install FalkorDB Lite ('pip install falkordblite')\n"
-        "Alternative: Run 'cgc setup' to configure Neo4j."
-    )
+    import sys
+    error_msg = "No database backend available.\n"
+    
+    if sys.version_info < (3, 12):
+        error_msg += (
+            "FalkorDB Lite is not supported on Python < 3.12.\n"
+            "You are running Python " + str(sys.version_info.major) + "." + str(sys.version_info.minor) + ".\n"
+            "Please upgrade to Python 3.12+ to use the embedded database,\n"
+            "OR run 'cgc setup' to configure an external Neo4j database."
+        )
+    else:
+        error_msg += (
+            "Recommended: Install FalkorDB Lite ('pip install falkordblite')\n"
+            "Alternative: Run 'cgc setup' to configure Neo4j."
+        )
+            
+    raise ValueError(error_msg)
 
 # For backward compatibility, export DatabaseManager
 from .database import DatabaseManager

{codegraphcontext-0.1.18 → codegraphcontext-0.1.20}/src/codegraphcontext/core/database_falkordb.py

@@ -66,6 +66,9 @@ class FalkorDBManager:
             A FalkorDB graph instance that mimics Neo4j driver interface.
         """
         if self._driver is None:
+            if sys.version_info < (3, 12):
+                raise ValueError("FalkorDB Lite is not supported on Python < 3.12.")
+
             with self._lock:
                 if self._driver is None:
                     # CRITICAL FIX: Prevent ~/.local/bin/falkordb.so from shadowing falkordb package
@@ -212,6 +215,9 @@ class FalkorDBManager:
         Tests the FalkorDB Lite connection availability.
         """
         try:
+            if sys.version_info < (3, 12):
+                return False, "FalkorDB Lite is not supported on Python < 3.12. Please upgrade or use Neo4j."
+
             import falkordb
             return True, None
         except ImportError:

{codegraphcontext-0.1.18 → codegraphcontext-0.1.20}/src/codegraphcontext/tools/graph_builder.py

@@ -10,18 +10,21 @@ from ..core.database import DatabaseManager
 from ..core.jobs import JobManager, JobStatus
 from ..utils.debug_log import debug_log, info_logger, error_logger, warning_logger
 
-# New imports for tree-sitter
+# New imports for tree-sitter (using tree-sitter-language-pack)
 from tree_sitter import Language, Parser
-from tree_sitter_languages import get_language
+from ..utils.tree_sitter_manager import get_tree_sitter_manager
 
 class TreeSitterParser:
     """A generic parser wrapper for a specific language using tree-sitter."""
 
     def __init__(self, language_name: str):
         self.language_name = language_name
-        self.language: Language = get_language(language_name)
-        self.parser = Parser()
-        self.parser.set_language(self.language)
+        self.ts_manager = get_tree_sitter_manager()
+        
+        # Get the language (cached) and create a new parser for this instance
+        self.language: Language = self.ts_manager.get_language_safe(language_name)
+        # In tree-sitter 0.25+, Parser takes language in constructor
+        self.parser = Parser(self.language)
 
         self.language_specific_parser = None
         if self.language_name == 'python':
@@ -54,6 +57,9 @@ class TreeSitterParser:
         elif self.language_name == 'c_sharp':
             from .languages.csharp import CSharpTreeSitterParser
             self.language_specific_parser = CSharpTreeSitterParser(self)
+        elif self.language_name == 'php':
+            from .languages.php import PhpTreeSitterParser
+            self.language_specific_parser = PhpTreeSitterParser(self)
 
 
     def parse(self, file_path: Path, is_dependency: bool = False, **kwargs) -> Dict:
@@ -89,7 +95,10 @@ class GraphBuilder:
             # '.h': TreeSitterParser('c'), # Need to write an algo for distinguishing C vs C++ headers
             '.java': TreeSitterParser('java'),
             '.rb': TreeSitterParser('ruby'),
-            '.cs': TreeSitterParser('c_sharp')
+            '.java': TreeSitterParser('java'),
+            '.rb': TreeSitterParser('ruby'),
+            '.cs': TreeSitterParser('c_sharp'),
+            '.php': TreeSitterParser('php')
         }
         self.create_schema()
 
@@ -147,43 +156,43 @@ class GraphBuilder:
         if '.py' in files_by_lang:
             from .languages import python as python_lang_module
             imports_map.update(python_lang_module.pre_scan_python(files_by_lang['.py'], self.parsers['.py']))
-        elif '.ipynb' in files_by_lang:
+        if '.ipynb' in files_by_lang:
             from .languages import python as python_lang_module
             imports_map.update(python_lang_module.pre_scan_python(files_by_lang['.ipynb'], self.parsers['.ipynb']))
-        elif '.js' in files_by_lang:
+        if '.js' in files_by_lang:
             from .languages import javascript as js_lang_module
             imports_map.update(js_lang_module.pre_scan_javascript(files_by_lang['.js'], self.parsers['.js']))
-        elif '.jsx' in files_by_lang:
+        if '.jsx' in files_by_lang:
             from .languages import javascript as js_lang_module
             imports_map.update(js_lang_module.pre_scan_javascript(files_by_lang['.jsx'], self.parsers['.jsx']))
-        elif '.mjs' in files_by_lang:
+        if '.mjs' in files_by_lang:
             from .languages import javascript as js_lang_module
             imports_map.update(js_lang_module.pre_scan_javascript(files_by_lang['.mjs'], self.parsers['.mjs']))
-        elif '.cjs' in files_by_lang:
+        if '.cjs' in files_by_lang:
             from .languages import javascript as js_lang_module
             imports_map.update(js_lang_module.pre_scan_javascript(files_by_lang['.cjs'], self.parsers['.cjs']))
-        elif '.go' in files_by_lang:
+        if '.go' in files_by_lang:
              from .languages import go as go_lang_module
              imports_map.update(go_lang_module.pre_scan_go(files_by_lang['.go'], self.parsers['.go']))
-        elif '.ts' in files_by_lang:
+        if '.ts' in files_by_lang:
             from .languages import typescript as ts_lang_module
             imports_map.update(ts_lang_module.pre_scan_typescript(files_by_lang['.ts'], self.parsers['.ts']))
-        elif '.tsx' in files_by_lang:
+        if '.tsx' in files_by_lang:
             from .languages import typescript as ts_lang_module
             imports_map.update(ts_lang_module.pre_scan_typescript(files_by_lang['.tsx'], self.parsers['.tsx']))
-        elif '.cpp' in files_by_lang:
+        if '.cpp' in files_by_lang:
             from .languages import cpp as cpp_lang_module
             imports_map.update(cpp_lang_module.pre_scan_cpp(files_by_lang['.cpp'], self.parsers['.cpp']))
-        elif '.h' in files_by_lang:
+        if '.h' in files_by_lang:
             from .languages import cpp as cpp_lang_module
             imports_map.update(cpp_lang_module.pre_scan_cpp(files_by_lang['.h'], self.parsers['.h']))
-        elif '.hpp' in files_by_lang:
+        if '.hpp' in files_by_lang:
             from .languages import cpp as cpp_lang_module
             imports_map.update(cpp_lang_module.pre_scan_cpp(files_by_lang['.hpp'], self.parsers['.hpp']))
-        elif '.rs' in files_by_lang:
+        if '.rs' in files_by_lang:
             from .languages import rust as rust_lang_module
             imports_map.update(rust_lang_module.pre_scan_rust(files_by_lang['.rs'], self.parsers['.rs']))
-        elif '.c' in files_by_lang:
+        if '.c' in files_by_lang:
             from .languages import c as c_lang_module
             imports_map.update(c_lang_module.pre_scan_c(files_by_lang['.c'], self.parsers['.c']))
         elif '.java' in files_by_lang:
@@ -385,7 +394,8 @@ class GraphBuilder:
     def _create_function_calls(self, session, file_data: Dict, imports_map: dict):
         """Create CALLS relationships with a unified, prioritized logic flow for all call types."""
         caller_file_path = str(Path(file_data['file_path']).resolve())
-        local_function_names = {func['name'] for func in file_data.get('functions', [])}
+        local_names = {f['name'] for f in file_data.get('functions', [])} | \
+                      {c['name'] for c in file_data.get('classes', [])}
         local_imports = {imp.get('alias') or imp['name'].split('.')[-1]: imp['name'] 
                         for imp in file_data.get('imports', [])}
         
@@ -394,40 +404,87 @@ class GraphBuilder:
             if called_name in __builtins__: continue
 
             resolved_path = None
+            full_call = call.get('full_name', called_name)
+            base_obj = full_call.split('.')[0] if '.' in full_call else None
+            lookup_name = base_obj if base_obj else called_name
+
+            # 1. Check for local context keywords/direct local names
+            if base_obj in ('self', 'this', 'super', 'super()', 'cls', '@'):
+                resolved_path = caller_file_path
+            elif lookup_name in local_names:
+                resolved_path = caller_file_path
             
-            if call.get('inferred_obj_type'):
+            # 2. Check inferred type if available
+            elif call.get('inferred_obj_type'):
                 obj_type = call['inferred_obj_type']
                 possible_paths = imports_map.get(obj_type, [])
                 if len(possible_paths) > 0:
                     resolved_path = possible_paths[0]
             
-            else:
-                lookup_name = call['full_name'].split('.')[0] if '.' in call['full_name'] else called_name
+            # 3. Check imports map with validation against local imports
+            if not resolved_path:
                 possible_paths = imports_map.get(lookup_name, [])
-
-                if lookup_name in local_function_names:
-                    resolved_path = caller_file_path
-                elif len(possible_paths) == 1:
+                if len(possible_paths) == 1:
                     resolved_path = possible_paths[0]
-                elif len(possible_paths) > 1 and lookup_name in local_imports:
-                    full_import_name = local_imports[lookup_name]
-                    for path in possible_paths:
-                        if full_import_name.replace('.', '/') in path:
-                            resolved_path = path
-                            break
+                elif len(possible_paths) > 1:
+                    if lookup_name in local_imports:
+                        full_import_name = local_imports[lookup_name]
+                        for path in possible_paths:
+                            if full_import_name.replace('.', '/') in path:
+                                resolved_path = path
+                                break
+            
+            if not resolved_path:
+                 warning_logger(f"Could not resolve call {called_name} (lookup: {lookup_name}) in {caller_file_path}")
+            # else:
+            #      info_logger(f"Resolved call {called_name} -> {resolved_path}")
             
+            # Legacy fallback block (was mis-indented)
             if not resolved_path:
-                if called_name in imports_map and imports_map[called_name]:
-                    resolved_path = imports_map[called_name][0]
+                possible_paths = imports_map.get(lookup_name, [])
+                if len(possible_paths) > 0:
+                     # Final fallback: global candidate
+                     # Check if it was imported explicitly, otherwise risky
+                     if lookup_name in local_imports:
+                         # We already tried specific matching above, but if we are here
+                         # it means we had ambiguity without matching path?
+                         pass
+                     else:
+                        # Fallback to first available if not imported? Or skip?
+                        # Original logic: resolved_path = possible_paths[0]
+                        # But wait, original code logic was:
+                        pass
+            if not resolved_path:
+                if called_name in local_names:
+                    resolved_path = caller_file_path
+                elif called_name in imports_map and imports_map[called_name]:
+                    # Check if any path in imports_map for called_name matches current file's imports
+                    candidates = imports_map[called_name]
+                    for path in candidates:
+                        for imp_name in local_imports.values():
+                            if imp_name.replace('.', '/') in path:
+                                resolved_path = path
+                                break
+                        if resolved_path: break
+                    if not resolved_path:
+                        resolved_path = candidates[0]
                 else:
                     resolved_path = caller_file_path
 
             caller_context = call.get('context')
             if caller_context and len(caller_context) == 3 and caller_context[0] is not None:
                 caller_name, _, caller_line_number = caller_context
+                # if called_name == "sumOfSquares":
+                    # print(f"DEBUG_CYPHER: caller={caller_name}, caller_line={caller_line_number}, called={called_name}, path={resolved_path}")
+
                 session.run("""
-                    MATCH (caller:Function {name: $caller_name, file_path: $caller_file_path, line_number: $caller_line_number})
-                    MATCH (called:Function {name: $called_name, file_path: $called_file_path})
+                    MATCH (caller) WHERE (caller:Function OR caller:Class) 
+                      AND caller.name = $caller_name 
+                      AND caller.file_path = $caller_file_path 
+                      AND caller.line_number = $caller_line_number
+                    MATCH (called) WHERE (called:Function OR called:Class)
+                      AND called.name = $called_name 
+                      AND called.file_path = $called_file_path
                     MERGE (caller)-[:CALLS {line_number: $line_number, args: $args, full_call_name: $full_call_name}]->(called)
                 """,
                 caller_name=caller_name,
@@ -441,7 +498,9 @@ class GraphBuilder:
             else:
                 session.run("""
                     MATCH (caller:File {path: $caller_file_path})
-                    MATCH (called:Function {name: $called_name, file_path: $called_file_path})
+                    MATCH (called) WHERE (called:Function OR called:Class)
+                      AND called.name = $called_name 
+                      AND called.file_path = $called_file_path
                     MERGE (caller)-[:CALLS {line_number: $line_number, args: $args, full_call_name: $full_call_name}]->(called)
                 """,
                 caller_file_path=caller_file_path,