aider-ce 0.88.20__py3-none-any.whl → 0.88.38__py3-none-any.whl

aider/queries/tree-sitter-languages/elm-tags.scm

@@ -17,3 +17,6 @@
 (module_declaration
     (upper_case_qid (upper_case_identifier)) @name.definition.module
 ) @definition.module
+
+(import_clause
+  (upper_case_qid) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/fortran-tags.scm

@@ -12,4 +12,7 @@
 
 (module_procedure_statement
   name: (name) @name.definition.function) @definition.function
+
+(use_statement
+  (name) @name.reference.import) @reference.import
    

aider/queries/tree-sitter-languages/go-tags.scm

@@ -28,3 +28,9 @@
   name: (type_identifier) @name.definition.type) @definition.type
 
 (type_identifier) @name.reference.type @reference.type
+
+(import_spec
+  path: [
+    (interpreted_string_literal)
+    (raw_string_literal)
+  ] @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/haskell-tags.scm

@@ -1,3 +1,5 @@
 (function  (variable) @name.definition.function)
 (bind      (variable) @name.definition.function)
 (signature (variable) @name.definition.type)
+
+(import) @name.reference.import @reference.import

aider/queries/tree-sitter-languages/java-tags.scm

@@ -18,3 +18,9 @@
   type: (type_identifier) @name.reference.class) @reference.class
 
 (superclass (type_identifier) @name.reference.class) @reference.class
+
+(import_declaration
+  (scoped_identifier) @name.reference.import) @reference.import
+
+(import_declaration
+  (identifier) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/javascript-tags.scm

@@ -86,3 +86,11 @@
 
 (new_expression
   constructor: (_) @name.reference.class) @reference.class
+
+(import_statement
+  source: (string (string_fragment) @name.reference.import)) @reference.import
+
+(call_expression
+  function: (identifier) @import_func
+  arguments: (arguments (string (string_fragment) @name.reference.import))
+  (#eq? @import_func "require")) @reference.import

aider/queries/tree-sitter-languages/julia-tags.scm

@@ -54,7 +54,7 @@
   (identifier) @name.reference.export) @reference.export
 
 (using_statement
-  (identifier) @name.reference.module) @reference.module
+  (identifier) @name.reference.import) @reference.import
 
 (import_statement
-  (identifier) @name.reference.module) @reference.module
+  (identifier) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/kotlin-tags.scm

@@ -25,3 +25,6 @@
     (constructor_invocation
       (user_type) @name.reference.type)
   ]) @reference.type
+
+(import_header
+  (identifier) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/ocaml_interface-tags.scm

@@ -96,3 +96,9 @@
   ) @definition.function
   (#strip! @doc "^\\(\\*+\\s*|\\s*\\*+\\)$")
 )
+
+(open_statement
+  (module_path) @name.reference.import) @reference.import
+
+(include_statement
+  (module_path) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/php-tags.scm

@@ -24,3 +24,9 @@
 
 (member_call_expression
   name: (name) @name.reference.call) @reference.call
+
+(namespace_use_declaration
+  (namespace_use_clause (qualified_name) @name.reference.import)) @reference.import
+
+(require_expression (string) @name.reference.import) @reference.import
+(include_expression (string) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/python-tags.scm

@@ -10,3 +10,13 @@
       (attribute
         attribute: (identifier) @name.reference.call)
   ]) @reference.call
+
+(import_statement
+  name: (dotted_name) @name.reference.import) @reference.import
+
+(import_statement
+  name: (aliased_import
+    name: (dotted_name) @name.reference.import)) @reference.import
+
+(import_from_statement
+  module_name: (dotted_name) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/ruby-tags.scm

@@ -62,3 +62,8 @@
   (#is-not? local)
   (#not-match? @name.reference.call "^(lambda|load|require|require_relative|__FILE__|__LINE__)$")
 )
+
+(call
+  method: (identifier) @import_method
+  arguments: (argument_list (string (string_content) @name.reference.import))
+  (#match? @import_method "^(require|require_relative|load)$")) @reference.import

aider/queries/tree-sitter-languages/rust-tags.scm

@@ -58,3 +58,6 @@
 (impl_item
     type: (type_identifier) @name.reference.implementation
     !trait) @reference.implementation
+
+(use_declaration
+    argument: (_) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/scala-tags.scm

@@ -60,6 +60,5 @@
 (extends_clause
   (type_identifier) @name.reference.class) @reference.class
 
-(extends_clause
-  (generic_type
-    (type_identifier) @name.reference.class)) @reference.class
+(import_declaration
+  (identifier) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/typescript-tags.scm

@@ -39,3 +39,6 @@
 
 (enum_declaration
   name: (identifier) @name.definition.enum) @definition.enum
+
+(import_statement
+  source: (string (string_fragment) @name.reference.import)) @reference.import

aider/queries/tree-sitter-languages/zig-tags.scm

@@ -1,3 +1,20 @@
-(FnProto) @name.definition.function
-(VarDecl "const" @name.definition.constant)
-(VarDecl "var"   @name.definition.variable)
+(FnProto
+  (IDENTIFIER) @name.definition.function) @definition.function
+
+(VarDecl
+  "const"
+  (IDENTIFIER) @name.definition.constant) @definition.constant
+
+(VarDecl
+  "var"
+  (IDENTIFIER) @name.definition.variable) @definition.variable
+
+(
+  (SuffixExpr
+    (BUILTINIDENTIFIER) @func
+    (FnCallArguments
+      (ErrorUnionExpr
+        (SuffixExpr
+          (STRINGLITERALSINGLE) @name.reference.import)))) @reference.import
+  (#eq? @func "@import")
+)

aider/repomap.py

@@ -1,5 +1,6 @@
 import math
 import os
+import re
 import shutil
 import sqlite3
 import sys
@@ -23,7 +24,7 @@ from aider.helpers.similarity import (
     normalize_vector,
 )
 from aider.special import filter_important_files
-from aider.tools.tool_utils import ToolError
+from aider.tools.utils.helpers import ToolError
 
 # tree_sitter is throwing a FutureWarning
 warnings.simplefilter("ignore", category=FutureWarning)
@@ -75,9 +76,9 @@ Tag = TagBase
 SQLITE_ERRORS = (sqlite3.OperationalError, sqlite3.DatabaseError, OSError)
 
 
-CACHE_VERSION = 5
+CACHE_VERSION = 6
 if USING_TSL_PACK:
-    CACHE_VERSION = 7
+    CACHE_VERSION = 8
 
 UPDATING_REPO_MAP_MESSAGE = "Updating repo map"
 
@@ -156,10 +157,12 @@ class RepoMap:
         max_code_line_length=100,
         repo_root=None,
         use_memory_cache=False,
+        use_enhanced_map=False,
     ):
         self.io = io
         self.verbose = verbose
         self.refresh = refresh
+        self.use_enhanced_map = use_enhanced_map
 
         self.map_cache_dir = map_cache_dir
         # Prefer an explicit repo root (eg per-test repo), fallback to CWD
@@ -195,6 +198,7 @@ class RepoMap:
         self._mentioned_ident_similarity = 0.8
 
         if self.verbose:
+            self.io.tool_output(f"RepoMap loaded entries from tags cache: {len(self.TAGS_CACHE)}")
             self.io.tool_output(
                 f"RepoMap initialized with map_mul_no_files: {self.map_mul_no_files}"
             )
@@ -465,6 +469,33 @@ class RepoMap:
         distance = len(p1) + len(p2) - (2 * common_count)
         return distance
 
+    def check_import_match(self, definer, imports):
+        definer_path = Path(definer)
+        definer_parts = list(definer_path.parts)
+        if not definer_parts:
+            return False
+
+        # Remove extension from last part
+        definer_parts[-1] = os.path.splitext(definer_parts[-1])[0]
+
+        for imp in imports:
+            imp_parts = [p for p in re.split(r"[.\\/]", imp) if p]
+            if len(imp_parts) > len(definer_parts):
+                continue
+
+            # Check for sub-sequence match
+            # Check for sub-sequence match
+            for i in range(len(definer_parts) - len(imp_parts) + 1):
+                if definer_parts[i : i + len(imp_parts)] == imp_parts:
+                    # Allow if it's a suffix match (standard aliasing)
+                    if i + len(imp_parts) == len(definer_parts):
+                        return True
+
+                    # Allow partial/middle match if enough specificity (>= 2 parts)
+                    if len(imp_parts) >= 2:
+                        return True
+        return False
+
     def get_tags_raw(self, fname, rel_fname):
         lang = filename_to_lang(fname)
         if not lang:
@@ -474,7 +505,8 @@ class RepoMap:
             language = get_language(lang)
             parser = get_parser(lang)
         except Exception as err:
-            print(f"Skipping file {fname}: {err}")
+            if self.verbose:
+                print(f"Skipping file {fname}: {err}")
             return
 
         query_scm = get_scm_fname(lang)
@@ -572,6 +604,8 @@ class RepoMap:
         defines = defaultdict(set)
         references = defaultdict(list)
         definitions = defaultdict(set)
+        file_imports = defaultdict(set)
+        import_ast_mode = False
 
         personalization = dict()
 
@@ -660,10 +694,13 @@ class RepoMap:
                 elif tag.kind == "ref":
                     references[tag.name].append(rel_fname)
 
-        ##
-        # dump(defines)
-        # dump(references)
-        # dump(personalization)
+                if tag.specific_kind == "import":
+                    file_imports[rel_fname].add(tag.name)
+
+        self.io.profile("Process Files")
+
+        if self.use_enhanced_map and len(file_imports) > 0:
+            import_ast_mode = True
 
         if not references:
             references = dict((k, list(v)) for k, v in defines.items())
@@ -723,7 +760,19 @@ class RepoMap:
             ext_mul = round(math.log2(unique_file_refs * total_refs**2 + 1))
 
             for referencer, num_refs in Counter(references[ident]).items():
-                for definer in definers:
+                relevant_definers = [] if import_ast_mode else definers
+
+                if import_ast_mode:
+                    if referencer in file_imports:
+                        matches = [
+                            d
+                            for d in definers
+                            if self.check_import_match(d, file_imports[referencer])
+                        ]
+                        if matches:
+                            relevant_definers = matches
+
+                for definer in relevant_definers:
                     # dump(referencer, definer, num_refs, mul)
 
                     # Only add edge if file extensions match
@@ -743,7 +792,9 @@ class RepoMap:
                     # num_refs = math.sqrt(num_refs)
                     path_distance = self.shared_path_components(referencer, definer)
                     weight = num_refs * use_mul * 2 ** (-1 * path_distance)
-                    G.add_edge(referencer, definer, weight=weight, ident=ident)
+                    G.add_edge(referencer, definer, weight=weight, key=ident, ident=ident)
+
+        self.io.profile("Build Graph")
 
         if not references:
             pass
@@ -762,6 +813,8 @@ class RepoMap:
             except ZeroDivisionError:
                 return []
 
+        self.io.profile("PageRank")
+
         # distribute the rank from each source node, across all of its out edges
         ranked_definitions = defaultdict(float)
         for src in G.nodes:
@@ -776,12 +829,13 @@ class RepoMap:
                 ident = data["ident"]
                 ranked_definitions[(dst, ident)] += data["rank"]
 
+        self.io.profile("Distribute Rank")
+
         ranked_tags = []
         ranked_definitions = sorted(
             ranked_definitions.items(), reverse=True, key=lambda x: (x[1], x[0])
         )
 
-        # dump(ranked_definitions)
         # with open('defs.txt', 'w') as out_file:
         #     import pprint
         #     printer = pprint.PrettyPrinter(indent=2, stream=out_file)
@@ -884,6 +938,8 @@ class RepoMap:
         mentioned_fnames=None,
         mentioned_idents=None,
     ):
+        self.io.profile("Start Rank Tags Map Uncached", start=True)
+
         if not other_fnames:
             other_fnames = list()
         if not max_map_tokens:
@@ -899,6 +955,8 @@ class RepoMap:
             chat_fnames, other_fnames, mentioned_fnames, mentioned_idents, True
         )
 
+        self.io.profile("Finish Getting Ranked Tags")
+
         other_rel_fnames = sorted(set(self.get_rel_fname(fname) for fname in other_fnames))
         special_fnames = filter_important_files(other_rel_fnames)
         ranked_tags_fnames = set(tag[0] for tag in ranked_tags)
@@ -947,6 +1005,8 @@ class RepoMap:
 
             middle = int((lower_bound + upper_bound) // 2)
 
+        self.io.profile("Calculate Best Tree")
+
         return best_tree
 
     tree_cache = dict()