Merge branch '3.0' into stable

Author: TheTechromancer

.github/workflows/benchmark.yml

@@ -18,7 +18,7 @@ permissions:
 jobs:
   benchmark:
     runs-on: ubuntu-latest
-    
+
     steps:
     - uses: actions/checkout@v6
       with:
@@ -29,10 +29,11 @@ jobs:
       with:
         python-version: "3.11"
 
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+
     - name: Install dependencies
-      run: |
-        pip install poetry
-        poetry install --with dev
+      run: uv sync --group dev
 
     - name: Install system dependencies
       run: |
@@ -42,7 +43,7 @@ jobs:
     # Generate benchmark comparison report using our branch-based script
     - name: Generate benchmark comparison report
       run: |
-        poetry run python bbot/scripts/benchmark_report.py \
+        uv run python bbot/scripts/benchmark_report.py \
           --base ${{ github.base_ref }} \
           --current ${{ github.head_ref }} \
           --output benchmark_report.md \
@@ -66,101 +67,85 @@ jobs:
       with:
         script: |
           const fs = require('fs');
-          
-          try {
-            const report = fs.readFileSync('benchmark_report.md', 'utf8');
-            
-            // Find existing benchmark comment (with pagination)
+
+          // Helper: find existing benchmark comments on this PR
+          async function findBenchmarkComments() {
             const comments = await github.rest.issues.listComments({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: context.issue.number,
-              per_page: 100, // Get more comments per page
+              per_page: 100,
             });
-            
-            // Debug: log all comments to see what we're working with
+
             console.log(`Found ${comments.data.length} comments on this PR`);
-            comments.data.forEach((comment, index) => {
-              console.log(`Comment ${index}: user=${comment.user.login}, body preview="${comment.body.substring(0, 100)}..."`);
-            });
-            
-            const existingComments = comments.data.filter(comment => 
+
+            const benchmarkComments = comments.data.filter(comment =>
               comment.body.toLowerCase().includes('performance benchmark') &&
               comment.user.login === 'github-actions[bot]'
             );
-            
-            console.log(`Found ${existingComments.length} existing benchmark comments`);
-            
-            if (existingComments.length > 0) {
-              // Sort comments by creation date to find the most recent
-              const sortedComments = existingComments.sort((a, b) => 
+
+            console.log(`Found ${benchmarkComments.length} existing benchmark comments`);
+            return benchmarkComments;
+          }
+
+          // Helper: post or update the benchmark comment
+          async function upsertComment(body) {
+            const existing = await findBenchmarkComments();
+
+            if (existing.length > 0) {
+              const sorted = existing.sort((a, b) =>
                 new Date(b.created_at) - new Date(a.created_at)
               );
-              
-              const mostRecentComment = sortedComments[0];
-              console.log(`Updating most recent benchmark comment: ${mostRecentComment.id} (created: ${mostRecentComment.created_at})`);
-              
+
               await github.rest.issues.updateComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                comment_id: mostRecentComment.id,
-                body: report
+                comment_id: sorted[0].id,
+                body: body
               });
-              console.log('Updated existing benchmark comment');
-              
-              // Delete any older duplicate comments
-              if (existingComments.length > 1) {
-                console.log(`Deleting ${existingComments.length - 1} older duplicate comments`);
-                for (let i = 1; i < sortedComments.length; i++) {
-                  const commentToDelete = sortedComments[i];
-                  console.log(`Attempting to delete comment ${commentToDelete.id} (created: ${commentToDelete.created_at})`);
-                  
-                  try {
-                    await github.rest.issues.deleteComment({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      comment_id: commentToDelete.id
-                    });
-                    console.log(`Successfully deleted duplicate comment: ${commentToDelete.id}`);
-                  } catch (error) {
-                    console.error(`Failed to delete comment ${commentToDelete.id}: ${error.message}`);
-                    console.error(`Error details:`, error);
-                  }
+              console.log(`Updated benchmark comment: ${sorted[0].id}`);
+
+              // Clean up older duplicates
+              for (let i = 1; i < sorted.length; i++) {
+                try {
+                  await github.rest.issues.deleteComment({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    comment_id: sorted[i].id
+                  });
+                  console.log(`Deleted duplicate comment: ${sorted[i].id}`);
+                } catch (e) {
+                  console.error(`Failed to delete comment ${sorted[i].id}: ${e.message}`);
                 }
               }
             } else {
-              // Create new comment
               await github.rest.issues.createComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: context.issue.number,
-                body: report
+                body: body
               });
               console.log('Created new benchmark comment');
             }
-          } catch (error) {
-            console.error('Failed to post benchmark results:', error);
-            
-            // Post a fallback comment
-            const fallbackMessage = [
-              '## Performance Benchmark Report',
-              '',
-              '> ⚠️ **Failed to generate detailed benchmark comparison**',
-              '> ',
-              '> The benchmark comparison failed to run. This might be because:',
-              '> - Benchmark tests don\'t exist on the base branch yet',
-              '> - Dependencies are missing', 
-              '> - Test execution failed',
-              '> ',
-              '> Please check the [workflow logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details.',
-              '> ',
-              '> 📁 Benchmark artifacts may be available for download from the workflow run.'
-            ].join('\\n');
-            
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body: fallbackMessage
-            });
-          } 
+          }
+
+          let report;
+          try {
+            report = fs.readFileSync('benchmark_report.md', 'utf8');
+          } catch (e) {
+            console.error('Failed to read benchmark report:', e.message);
+            report = `## Performance Benchmark Report
+
+          > **Failed to generate detailed benchmark comparison**
+          >
+          > The benchmark comparison failed to run. This might be because:
+          > - Benchmark tests don't exist on the base branch yet
+          > - Dependencies are missing
+          > - Test execution failed
+          >
+          > Please check the [workflow logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details.
+          >
+          > Benchmark artifacts may be available for download from the workflow run.`;
+          }
+
+          await upsertComment(report);

.github/workflows/distro_tests.yml

@@ -17,7 +17,7 @@ jobs:
         os: ["ubuntu:22.04", "ubuntu:24.04", "debian", "archlinux", "fedora", "kalilinux/kali-rolling", "parrotsec/security"]
     steps:
       - uses: actions/checkout@v6
-      - name: Install Python and Poetry
+      - name: Install Python and uv
         run: |
           if [ -f /etc/os-release ]; then
             . /etc/os-release
@@ -51,7 +51,7 @@ jobs:
             pyenv rehash
             python3.11 -m pip install --user pipx
             python3.11 -m pipx ensurepath
-            pipx install poetry
+            pipx install uv
           "
       - name: Set OS Environment Variable
         run: echo "OS_NAME=${{ matrix.os }}" | sed 's|[:/]|_|g' >> $GITHUB_ENV
@@ -61,9 +61,9 @@ jobs:
           export PATH="$HOME/.pyenv/bin:$PATH"
           export PATH="$HOME/.pyenv/shims:$PATH"
           export BBOT_DISTRO_TESTS=true
-          poetry env use python3.11
-          poetry install
-          poetry run pytest --reruns 2 --exitfirst -o timeout_func_only=true --timeout 1200 --disable-warnings --log-cli-level=INFO .
+          uv python pin 3.11
+          uv sync --group dev
+          uv run pytest --reruns 2 --exitfirst -o timeout_func_only=true --timeout 1200 --disable-warnings --log-cli-level=INFO .
       - name: Upload Debug Logs
         if: always()
         uses: actions/upload-artifact@v6

.github/workflows/docs_updater.yml

@@ -17,13 +17,13 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: "3.x"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
       - name: Install dependencies
-        run: |
-          pip install poetry
-          poetry install
+        run: uv sync --group dev
       - name: Generate docs
         run: |
-          poetry run bbot/scripts/docs.py
+          uv run bbot/scripts/docs.py
       - name: Create or Update Pull Request
         uses: peter-evans/create-pull-request@v8
         with: