codegraphcontext 0.4.10__py3-none-any.whl → 0.4.11__py3-none-any.whl

codegraphcontext/cli/config_manager.py

@@ -30,6 +30,7 @@ DEFAULT_CONFIG = {
     "DEFAULT_DATABASE": "falkordb",
     "FALKORDB_PATH": str(CONFIG_DIR / "global" / "db" / "falkordb"),
     "FALKORDB_SOCKET_PATH": str(CONFIG_DIR / "global" / "db" / "falkordb.sock"),
+    "LADYBUGDB_PATH": str(CONFIG_DIR / "global" / "db" / "ladybugdb"),
     "INDEX_VARIABLES": "true",
     "ALLOW_DB_DELETION": "false",
     "DEBUG_LOGS": "false",
@@ -65,9 +66,10 @@ DEFAULT_CONFIG = {
 
 # Configuration key descriptions
 CONFIG_DESCRIPTIONS = {
-    "DEFAULT_DATABASE": "Default database backend (neo4j|falkordb|kuzudb|nornic)",
+    "DEFAULT_DATABASE": "Default database backend (neo4j|falkordb|falkordb-remote|kuzudb|nornic|ladybugdb)",
     "FALKORDB_PATH": "Path to FalkorDB database file",
     "FALKORDB_SOCKET_PATH": "Path to FalkorDB Unix socket",
+    "LADYBUGDB_PATH": "Path to LadybugDB database directory",
     "INDEX_VARIABLES": "Index variable nodes in the graph (lighter graph if false)",
     "ALLOW_DB_DELETION": "Allow full database deletion commands",
     "DEBUG_LOGS": "Enable debug logging (for development/troubleshooting)",
@@ -125,7 +127,7 @@ CONFIG_DESCRIPTIONS = {
 
 # Valid values for each config key
 CONFIG_VALIDATORS = {
-    "DEFAULT_DATABASE": ["neo4j", "falkordb", "falkordb-remote", "kuzudb", "nornic"],
+    "DEFAULT_DATABASE": ["neo4j", "falkordb", "falkordb-remote", "kuzudb", "nornic", "ladybugdb"],
     "INDEX_VARIABLES": ["true", "false"],
     "ALLOW_DB_DELETION": ["true", "false"],
     "DEBUG_LOGS": ["true", "false"],
@@ -445,7 +447,7 @@ def validate_config_value(key: str, value: str) -> tuple[bool, Optional[str]]:
         except Exception as e:
             return False, f"Cannot create log directory: {e}"
     
-    if key in ("FALKORDB_PATH", "FALKORDB_SOCKET_PATH"):
+    if key in ("FALKORDB_PATH", "FALKORDB_SOCKET_PATH", "LADYBUGDB_PATH"):
         # Validate path is writable
         db_path = Path(normalize_config_path(value, absolute=True))
         try:

codegraphcontext/core/cgc_bundle.py

@@ -280,8 +280,15 @@ class CGCBundle:
                                 if hasattr(node, attr):
                                     repo[attr] = getattr(node, attr)
                     
-                    metadata["repo"] = repo.get('name', str(repo_path))
-                    metadata["repo_path"] = repo.get('path')
+                    metadata["repo"] = repo.get('name', str(repo_path.name if repo_path else 'unknown'))
+                    # Clean up absolute path prefix to keep it relative
+                    meta_path = repo.get('path', '')
+                    if repo_path and meta_path.startswith(str(repo_path.resolve())):
+                        repo_str = str(repo_path.resolve())
+                        rel = meta_path[len(repo_str):].lstrip('/')
+                        metadata["repo_path"] = "./" + rel if rel else "."
+                    else:
+                        metadata["repo_path"] = meta_path
                     metadata["is_dependency"] = repo.get('is_dependency', False)
             else:
                 # All repositories
@@ -410,6 +417,14 @@ class CGCBundle:
                         elif hasattr(node, 'properties'):
                             node_dict = dict(node.properties)
                     
+                    # Clean up absolute path prefix to keep it relative
+                    if repo_path:
+                        repo_str = str(repo_path.resolve())
+                        for key, val in list(node_dict.items()):
+                            if isinstance(val, str) and val.startswith(repo_str):
+                                rel = val[len(repo_str):].lstrip('/')
+                                node_dict[key] = "./" + rel if rel else "."
+                    
                     node_dict['_labels'] = labels
                     
                     # Store internal ID for reference
@@ -480,6 +495,14 @@ class CGCBundle:
                         elif hasattr(rel, 'properties'):
                             rel_props = dict(rel.properties)
                     
+                    # Clean up absolute path prefix inside edge properties
+                    if repo_path:
+                        repo_str = str(repo_path.resolve())
+                        for key, val in list(rel_props.items()):
+                            if isinstance(val, str) and val.startswith(repo_str):
+                                rel = val[len(repo_str):].lstrip('/')
+                                rel_props[key] = "./" + rel if rel else "."
+                    
                     # Create edge representation
                     edge_dict = {
                         'from': from_id,

codegraphcontext/tools/indexing/resolution/calls.py

@@ -800,7 +800,11 @@ def resolve_function_call(
                 )
                 for cand in filtered_candidates:
                     cand_arity = function_arg_count(cand)
-                    if cand_arity is None or not any(function_arg_count(existing) == cand_arity for existing in method_candidates_by_hierarchy):
+                    if cand_arity is None or not any(
+                        function_arg_count(existing) == cand_arity
+                        and function_arg_types(existing) == function_arg_types(cand)
+                        for existing in method_candidates_by_hierarchy
+                    ):
                         method_candidates_by_hierarchy.append(cand)
 
             if not fallback_method_owner_path and method_name in class_method_names.get(current, set()):
@@ -817,7 +821,11 @@ def resolve_function_call(
             if extension_candidates:
                 for cand in extension_candidates:
                     cand_arity = function_arg_count(cand)
-                    if cand_arity is None or not any(function_arg_count(existing) == cand_arity for existing in extension_candidates_by_hierarchy):
+                    if cand_arity is None or not any(
+                        function_arg_count(existing) == cand_arity
+                        and function_arg_types(existing) == function_arg_types(cand)
+                        for existing in extension_candidates_by_hierarchy
+                    ):
                         extension_candidates_by_hierarchy.append(cand)
 
             for base_name in global_class_bases.get(current, []):
@@ -962,7 +970,11 @@ def resolve_function_call(
             resolved_called_context,
         ) = method_target_for_type(receiver_type, called_name)
         if resolved_path:
-            resolution_tier = 4
+            fqn = (local_imports.get(receiver_type) if local_imports else None) or (receiver_type if "." in receiver_type else None)
+            if fqn and len(imports_map.get(fqn, [])) == 1:
+                resolution_tier = 3
+            else:
+                resolution_tier = 4
         else:
             receiver_resolution_failed = True
 
@@ -994,7 +1006,11 @@ def resolve_function_call(
             resolved_called_context,
         ) = method_target_for_type(implicit_type, called_name)
         if resolved_path:
-            resolution_tier = 4
+            fqn = (local_imports.get(call["implicit_receiver_type"]) if local_imports else None) or (implicit_type if "." in implicit_type else None)
+            if fqn and len(imports_map.get(fqn, [])) == 1:
+                resolution_tier = 3
+            else:
+                resolution_tier = 4
         elif unresolved_overloaded_callable_reference or unresolved_overloaded_method:
             record_skip(
                 "unresolved_overloaded_callable_reference"
@@ -1064,7 +1080,23 @@ def resolve_function_call(
         possible_paths = imports_map.get(receiver_type_for_path, []) if receiver_type_for_path else []
         if possible_paths:
             resolved_path = possible_paths[0]
-            resolution_tier = 4
+            raw_receiver_type = (
+                extension_receiver_type
+                or call.get("inferred_obj_type")
+                or call.get("implicit_receiver_type")
+            )
+            fqn = None
+            if raw_receiver_type:
+                raw_receiver_type = strip_type_modifiers(raw_receiver_type)
+                if local_imports and raw_receiver_type in local_imports:
+                    fqn = local_imports[raw_receiver_type]
+                elif "." in raw_receiver_type:
+                    fqn = raw_receiver_type
+            
+            if fqn and len(imports_map.get(fqn, [])) == 1:
+                resolution_tier = 3
+            else:
+                resolution_tier = 4
             receiver_resolution_failed = False
 
     if not resolved_path and receiver_resolution_failed:
@@ -1620,7 +1652,10 @@ def build_function_call_groups(
             and class_data.get("end_line") is not None
             and class_data["line_number"] <= line_number <= class_data["end_line"]
         ]
-        if not companion_objects or func.get("context") not in {
+        func_context = func.get("context")
+        if isinstance(func_context, tuple) and len(func_context) > 0:
+            func_context = func_context[0]
+        if not companion_objects or func_context not in {
             companion.get("name") for companion in companion_objects
         }:
             return []
@@ -1648,6 +1683,8 @@ def build_function_call_groups(
         package_name: Optional[str],
     ) -> List[str]:
         context = func.get("context") or func.get("class_context")
+        if isinstance(context, tuple) and len(context) > 0:
+            context = context[0]
         context_names = list(type_keys_for_maps(context, package_name=package_name))
         context_names.extend(companion_owner_context_names(fd, func, package_name))
         return list(dict.fromkeys(context_names))