Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Recursively allow files under subtree
!/.github/**
!/aider/**
!/cecli/**
!/benchmark/**
!/docker/**
!/requirements/**
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/issue.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Question or bug report
description: Submit a question or bug report to help us improve aider
description: Submit a question or bug report to help us improve cecli
labels: []
body:
- type: textarea
Expand All @@ -11,9 +11,9 @@ body:
- type: textarea
attributes:
label: Version and model info
description: Please include aider version, model being used (`gpt-4-xxx`, etc) and any other switches or config settings that are active.
description: Please include cecli version, model being used (`gemini-3-xxx`, etc) and any other switches or config settings that are active.
placeholder: |
Aider v0.XX.Y
cecli v0.XX.Y
Model: gpt-N-... using ???? edit format
Git repo: .git with ### files
Repo-map: using #### tokens
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/check_pypi_version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: Check PyPI Version

# Check to be sure `pip install aider-chat` installs the most recently published version.
# If dependencies get yanked, it may render the latest version uninstallable.
# See https://github.com/Aider-AI/aider/issues/3699 for example.

on:
schedule:
# Run once a day at midnight UTC
Expand All @@ -26,23 +22,23 @@ jobs:
- name: Install aider-ce
run: pip install aider-ce

- name: Get installed aider version
- name: Get installed cecli version
id: installed_version
run: |
set -x # Enable debugging output
aider_version_output=$(aider-ce --version)
cecli_version_output=$(aider-ce --version)
if [ $? -ne 0 ]; then
echo "Error: 'aider --version' command failed."
echo "Error: 'cecli --version' command failed."
exit 1
fi
echo "Raw aider --version output: $aider_version_output"
echo "Raw cecli --version output: $cecli_version_output"

# Extract version number (format X.Y.Z)
version_num=$(echo "$aider_version_output" | grep -oP '\d+\.\d+\.\d+')
version_num=$(echo "$cecli_version_output" | grep -oP '\d+\.\d+\.\d+')

# Check if grep found anything
if [ -z "$version_num" ]; then
echo "Error: Could not extract version number using grep -oP '\d+\.\d+\.\d+' from output: $aider_version_output"
echo "Error: Could not extract version number using grep -oP '\d+\.\d+\.\d+' from output: $cecli_version_output"
exit 1
fi

Expand Down Expand Up @@ -80,7 +76,7 @@ jobs:
echo "Installed version: ${{ steps.installed_version.outputs.version }}"
echo "Latest tag version: ${{ steps.latest_tag.outputs.tag }}"
if [ "${{ steps.installed_version.outputs.version }}" != "${{ steps.latest_tag.outputs.tag }}" ]; then
echo "Error: Installed aider version (${{ steps.installed_version.outputs.version }}) does not match the latest tag (${{ steps.latest_tag.outputs.tag }})."
echo "Error: Installed cecli version (${{ steps.installed_version.outputs.version }}) does not match the latest tag (${{ steps.latest_tag.outputs.tag }})."
exit 1
fi
echo "Versions match."
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker Build Test
on:
push:
paths-ignore:
- 'aider/website/**'
- 'cecli/website/**'
- 'README.md'
- 'HISTORY.md'
- '.github/workflows/*'
Expand All @@ -12,7 +12,7 @@ on:
- main
pull_request:
paths-ignore:
- 'aider/website/**'
- 'cecli/website/**'
- 'README.md'
- 'HISTORY.md'
- '.github/workflows/*'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
branches:
- "main"
paths:
- "aider/website/**"
- "cecli/website/**"
- ".github/workflows/pages.yml"

# Allows you to run this workflow manually from the Actions tab
Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: aider/website
working-directory: cecli/website
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -46,7 +46,7 @@ jobs:
ruby-version: '3.3' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
working-directory: '${{ github.workspace }}/aider/website'
working-directory: '${{ github.workspace }}/cecli/website'
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3
Expand All @@ -58,7 +58,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: "aider/website/_site"
path: "cecli/website/_site"

# Deployment job
deploy:
Expand All @@ -84,4 +84,4 @@ jobs:

- name: Run linkchecker
run: |
linkchecker --ignore-url='.+\.(mp4|mov|avi)' https://aider.chat
linkchecker --ignore-url='.+\.(mp4|mov|avi)' https://cecli.dev
6 changes: 2 additions & 4 deletions .github/workflows/ubuntu-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Ubuntu Python Tests
on:
push:
paths-ignore:
- 'aider/website/**'
- 'cecli/website/**'
- 'README.md'
- 'HISTORY.md'
- '.github/workflows/*'
Expand All @@ -12,7 +12,7 @@ on:
- main
pull_request:
paths-ignore:
- 'aider/website/**'
- 'cecli/website/**'
- 'README.md'
- 'HISTORY.md'
- '.github/workflows/*'
Expand Down Expand Up @@ -57,7 +57,5 @@ jobs:
".[help,playwright]"

- name: Run tests
env:
AIDER_ANALYTICS: false
run: |
pytest
6 changes: 2 additions & 4 deletions .github/workflows/windows-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Windows Python Tests
on:
push:
paths-ignore:
- 'aider/website/**'
- 'cecli/website/**'
- 'README.md'
- 'HISTORY.md'
- '.github/workflows/*'
Expand All @@ -12,7 +12,7 @@ on:
- main
pull_request:
paths-ignore:
- 'aider/website/**'
- 'cecli/website/**'
- 'README.md'
- 'HISTORY.md'
- '.github/workflows/*'
Expand Down Expand Up @@ -45,7 +45,5 @@ jobs:
uv pip install --system pytest pytest-asyncio pytest-mock -r requirements/requirements.in -r requirements/requirements-help.in -r requirements/requirements-playwright.in '.[help,playwright]'

- name: Run tests
env:
AIDER_ANALYTICS: false
run: |
pytest
20 changes: 8 additions & 12 deletions .github/workflows/windows_check_pypi_version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: Windows Check PyPI Version

# Check to be sure `pip install aider-chat` installs the most recently published version on Windows.
# If dependencies get yanked, it may render the latest version uninstallable.
# See https://github.com/Aider-AI/aider/issues/3699 for example.

on:
schedule:
# Run once a day at 1 AM UTC (offset from Ubuntu check)
Expand All @@ -29,22 +25,22 @@ jobs:
- name: Install aider-ce
run: pip install aider-ce

- name: Get installed aider version
- name: Get installed cecli version
id: installed_version
run: |
Write-Host "Running 'aider --version'..."
$aider_version_output = aider-ce --version
Write-Host "Running 'cecli --version'..."
$cecli_version_output = aider-ce --version
if ($LASTEXITCODE -ne 0) {
Write-Error "Error: 'aider --version' command failed."
Write-Error "Error: 'cecli --version' command failed."
exit 1
}
Write-Host "Raw aider --version output: $aider_version_output"
Write-Host "Raw cecli --version output: $cecli_version_output"

# Extract version number (format X.Y.Z) using PowerShell regex
$match = [regex]::Match($aider_version_output, '\d+\.\d+\.\d+')
$match = [regex]::Match($cecli_version_output, '\d+\.\d+\.\d+')

if (-not $match.Success) {
Write-Error "Error: Could not extract version number using regex '\d+\.\d+\.\d+' from output: $aider_version_output"
Write-Error "Error: Could not extract version number using regex '\d+\.\d+\.\d+' from output: $cecli_version_output"
exit 1
}
$version_num = $match.Value
Expand Down Expand Up @@ -84,7 +80,7 @@ jobs:
Write-Host "Installed version: ${{ steps.installed_version.outputs.version }}"
Write-Host "Latest tag version: ${{ steps.latest_tag.outputs.tag }}"
if ("${{ steps.installed_version.outputs.version }}" -ne "${{ steps.latest_tag.outputs.tag }}") {
Write-Error "Error: Installed aider version (${{ steps.installed_version.outputs.version }}) does not match the latest tag (${{ steps.latest_tag.outputs.tag }})."
Write-Error "Error: Installed cecli version (${{ steps.installed_version.outputs.version }}) does not match the latest tag (${{ steps.latest_tag.outputs.tag }})."
exit 1
}
Write-Host "Versions match."
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Recursively allow files under subtree
!/.github/**
!/aider/**
!/cecli/**
!/benchmark/**
!/docker/**
!/requirements/**
Expand Down Expand Up @@ -34,5 +34,8 @@
.aider*
aider/__version__.py
aider/_version.py
.cecli*
cecli/__version__.py
cecli/_version.py
*.pyc
env/
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ repos:
rev: v2.2.6
hooks:
- id: codespell
args: ["--skip", "aider/website/docs/languages.md"]
args: ["--skip", "cecli/website/docs/languages.md"]
additional_dependencies:
- tomli
- repo: local
hooks:
- id: filter-model-metadata
name: Filter model metadata to chat mode only
entry: node scripts/filter-chat-mode.js
args: ["aider/resources/model-metadata.json"]
args: ["cecli/resources/model-metadata.json"]
language: system
files: ^aider/resources/model-metadata\.json$
files: ^cecli/resources/model-metadata\.json$
pass_filenames: false
28 changes: 14 additions & 14 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This needs to sync with aider/help_pats.py
# This needs to sync with cecli/help_pats.py

include requirements/requirements.in
include requirements/requirements-dev.in
Expand All @@ -7,19 +7,19 @@ include requirements/requirements-playwright.in

global-exclude .DS_Store

recursive-exclude aider/website/examples *
recursive-exclude aider/website/_posts *
recursive-exclude cecli/website/examples *
recursive-exclude cecli/website/_posts *

exclude aider/website/HISTORY.md
exclude aider/website/docs/benchmarks*.md
exclude aider/website/docs/ctags.md
exclude aider/website/docs/unified-diffs.md
exclude cecli/website/HISTORY.md
exclude cecli/website/docs/benchmarks*.md
exclude cecli/website/docs/ctags.md
exclude cecli/website/docs/unified-diffs.md

exclude aider/website/install.ps1
exclude aider/website/install.sh
exclude cecli/website/install.ps1
exclude cecli/website/install.sh

recursive-exclude aider/website/docs/leaderboards *
recursive-exclude aider/website/assets *
recursive-exclude aider/website *.js
recursive-exclude aider/website *.html
recursive-exclude aider/website *.yml
recursive-exclude cecli/website/docs/leaderboards *
recursive-exclude cecli/website/assets *
recursive-exclude cecli/website *.js
recursive-exclude cecli/website *.html
recursive-exclude cecli/website *.yml
Loading