V0.87.4

.github/workflows/docker-build-test.yml

@@ -51,6 +51,7 @@ jobs:
         platforms: linux/amd64,linux/arm64
         push: false
         target: aider-ce
+        cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/aider-ce:latest-bc
 
     - name: Build Docker images (Push)
       if: ${{ github.event_name != 'pull_request' }}
@@ -62,3 +63,4 @@ jobs:
         push: true
         tags: ${{ secrets.DOCKERHUB_USERNAME }}/aider-ce:dev
         target: aider-ce
+        cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/aider-ce:latest-bc     

.github/workflows/docker-release.yml

@@ -38,4 +38,6 @@ jobs:
           ${{ secrets.DOCKERHUB_USERNAME }}/aider-ce:${{ github.ref_name }}
           ${{ secrets.DOCKERHUB_USERNAME }}/aider-ce:latest
         target: aider-ce
+        cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/aider-ce:latest-bc
+        cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/aider-ce:latest-bc,mode=max        
 

.github/workflows/ubuntu-tests.yml

@@ -46,8 +46,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest
-        pip install .
+        pip install uv
+        uv pip install --system \
+          pytest \
+          -r requirements/requirements.in \
+          -r requirements/requirements-browser.in \
+          -r requirements/requirements-help.in \
+          -r requirements/requirements-playwright.in \
+          ".[browser,help,playwright]"
 
     - name: Run tests
       env:

.github/workflows/windows-tests.yml

@@ -41,8 +41,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest
-        pip install .
+        pip install uv
+        uv pip install --system pytest -r requirements/requirements.in -r requirements/requirements-browser.in -r requirements/requirements-help.in -r requirements/requirements-playwright.in '.[browser,help,playwright]'
 
     - name: Run tests
       env:

README.md

@@ -25,10 +25,27 @@ This project aims to be compatible with upstream Aider, but with priority commit
     * [Manually install necessary ubuntu dependencies](https://github.com/dwash96/aider-ce/issues/14)
 * [.gitignore updates](https://github.com/dwash96/aider-ce/commit/7c7e803fa63d1acd860eef1423e5a03220df6017)
 * [Experimental Context Compaction For Longer Running Generation Tasks](https://github.com/Aider-AI/aider/issues/6)
+* [Fix Deepseek model configurations](https://github.com/Aider-AI/aider/commit/c839a6dd8964d702172cae007375e299732d3823)
+* [Relax Version Pinning For Easier Distribution](https://github.com/dwash96/aider-ce/issues/18)
 
 ### Other Notes
 * [MCP Configuration](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/config/mcp.md)
 
+### Installation Instructions
+This project should be installable using the commands
+
+```
+pip install aider-ce
+```
+
+or
+
+```
+uv install aider-ce
+```
+
+The package exports an `aider-ce` command that accepts all of Aider's configuration options
+
 <p align="center">
     <a href="https://aider.chat/"><img src="https://aider.chat/assets/logo.svg" alt="Aider Logo" width="300"></a>
 </p>

aider/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.87.2.dev"
+__version__ = "0.87.4.dev"
 safe_version = __version__
 
 try:

aider/models.py

@@ -987,8 +987,6 @@ def send_completion(
                 kwargs["tools"] = [dict(type="function", function=tool) for tool in effective_tools]
             else:
                 kwargs["tools"] = effective_tools
-        else:
-            kwargs["tools"] = []
 
         # Forcing a function call is for legacy style `functions` with a single function.
         # This is used by ArchitectCoder and not intended for NavigatorCoder's tools.

aider/repomap.py

@@ -9,6 +9,7 @@
 from importlib import resources
 from pathlib import Path
 
+import tree_sitter
 from diskcache import Cache
 from grep_ast import TreeContext, filename_to_lang
 from pygments.lexers import guess_lexer_for_filename
@@ -413,8 +414,13 @@ def get_tags_raw(self, fname, rel_fname):
         tree = parser.parse(bytes(code, "utf-8"))
 
         # Run the tags queries
-        query = language.query(query_scm)
-        captures = query.captures(tree.root_node)
+        if sys.version_info >= (3, 10):
+            query = tree_sitter.Query(language, query_scm)
+            cursor = tree_sitter.QueryCursor(query)
+            captures = cursor.captures(tree.root_node)
+        else:
+            query = language.query(query_scm)
+            captures = query.captures(tree.root_node)
 
         saw = set()
         if USING_TSL_PACK: