refactor: Remove redundant code and improve maintainability by abuzarmahmood · Pull Request #140 · abuzarmahmood/blech_github_bot

abuzarmahmood · 2025-04-02T17:41:34Z

No description provided.

abuzarmahmood · 2025-04-02T17:41:37Z

Generated edit command:

Summary of User's Issues and Requests:
The issue involves removing redundant functionality across the repository abuzarmahmood/blech_github_bot. The files identified for review include triggers.py, agents.py, branch_handler.py, response_agent.py, bot_tools.py, and git_utils.py. The last comment suggests reviewing these files for redundancy and improving maintainability.
Overview of Plan to Address the Issues:
The plan involves identifying and removing redundant code, unused imports, and consolidating functions where necessary. This will streamline the codebase and improve its maintainability.
Specific Details of Changes to be Made:
1. Redundant Functionality in triggers.py
  - File: src/triggers.py
  - Line: 102-120
  - Description of Change: Simplify the function has_pr_creation_comment to return only a boolean.
  - Code Snippet of Edits:
```
def has_pr_creation_comment(issue: Issue) -> bool:
    """Check if an issue has comments indicating a PR was created"""
    comments = get_issue_comments(issue)
    return any(' pull request' in comment.body for comment in comments)
```
2. Redundant Imports in agents.py
  - File: src/agents.py
  - Line: 5, 15
  - Description of Change: Remove unused imports subprocess and agents.
  - Code Snippet of Edits:
```
# Remove these lines
import subprocess
import agents
```
3. Consolidate Branch Handling in branch_handler.py
  - File: src/branch_handler.py
  - Line: 74-104
  - Description of Change: Remove redundant commented-out function get_issue_related_branches.
  - Code Snippet of Edits:
```
# Remove lines 74-104
```
4. Redundant Functionality in response_agent.py
  - File: src/response_agent.py
  - Line: 79-95
  - Description of Change: Remove one of the duplicate tab_print function definitions.
  - Code Snippet of Edits:
```
# Remove one of the duplicate `tab_print` function definitions
```
5. Unused Function in bot_tools.py
  - File: src/bot_tools.py
  - Line: 80-91
  - Description of Change: Remove the unused function estimate_tokens.
  - Code Snippet of Edits:
```
# Remove the `estimate_tokens` function if not used
```
6. Redundant Functionality in git_utils.py
  - File: src/git_utils.py
  - Line: 22-35
  - Description of Change: Consolidate the clean_response function into a single definition.
  - Code Snippet of Edits:
```
# Consolidate the `clean_response` function into a single definition
```

By implementing these changes, the repository will have reduced redundancy and improved maintainability. If further redundancy is suspected, consider reviewing the usage of functions across the repository to ensure they are necessary and not duplicated elsewhere.

This response was automatically generated by blech_bot using model gpt-4o

Aider output:

View Aider Output

The --sonnet flag is deprecated and will be removed in a future version. Please use --model sonnet instead.
Aider v0.80.1
Main model: anthropic/claude-3-7-sonnet-20250219 with diff edit format, infinite output
Weak model: anthropic/claude-3-5-haiku-20241022
Git repo: .git with 13 files
Repo-map: using 4096 tokens, auto refresh


src/agents.py

src/bot_tools.py

src/branch_handler.py

src/git_utils.py

src/response_agent.py

src/triggers.py
I'll implement the changes to remove redundant functionality across the repository. Here are the specific changes using            
SEARCH/REPLACE blocks:                                                                                                             


1. Remove duplicate tab_print function in response_agent.py                                                                        

src/response_agent.py                                                                                                              

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
def tab_print(x):                                                                                                                  
    """                                                                                                                            
    Print with tab indentation for readability                                                                                     
    """                                                                                                                            
    """                                                                                                                            
    Print with tab indentation for readability                                                                                     
    :param x: The object to print                                                                                                  
    """                                                                                                                            
    if isinstance(x, str):                                                                                                         
        print('\t' + x)                                                                                                            
    elif isinstance(x, dict):                                                                                                      
        pprint(x)                                                                                                                  
    elif isinstance(x, list):                                                                                                      
        for item in x:                                                                                                             
            print('\t' + str(item))                                                                                                
    else:                                                                                                                          
        print('\t' + str(x))                                                                                                       
=======                                                                                                                            
def tab_print(x):                                                                                                                  
    """                                                                                                                            
    Print with tab indentation for readability                                                                                     
    :param x: The object to print                                                                                                  
    """                                                                                                                            
    if isinstance(x, str):                                                                                                         
        print('\t' + x)                                                                                                            
    elif isinstance(x, dict):                                                                                                      
        pprint(x)                                                                                                                  
    elif isinstance(x, list):                                                                                                      
        for item in x:                                                                                                             
            print('\t' + str(item))                                                                                                
    else:                                                                                                                          
        print('\t' + str(x))                                                                                                       
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   


2. Simplify has_pr_creation_comment in triggers.py                                                                                 

src/triggers.py                                                                                                                    

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
def has_pr_creation_comment(issue: Issue) -> bool:                                                                                 
    """                                                                                                                            
    Check if an issue has comments indicating a PR was created                                                                     
                                                                                                                                   
    Args:                                                                                                                          
        issue: The GitHub issue to check                                                                                           
                                                                                                                                   
    Returns:                                                                                                                       
        True if the issue has PR comments, False otherwise                                                                         
    """                                                                                                                            
    comments = get_issue_comments(issue)                                                                                           
    pr_comment_bool = any(                                                                                                         
        'Created pull request' in comment.body for comment in comments)                                                            
    if pr_comment_bool:                                                                                                            
        pr_comment = [                                                                                                             
            comment for comment in comments if 'Created pull request' in comment.body][-1]                                         
        return True, pr_comment.body                                                                                               
    else:                                                                                                                          
        return False, None                                                                                                         
=======                                                                                                                            
def has_pr_creation_comment(issue: Issue) -> tuple:                                                                                
    """                                                                                                                            
    Check if an issue has comments indicating a PR was created                                                                     
                                                                                                                                   
    Args:                                                                                                                          
        issue: The GitHub issue to check                                                                                           
                                                                                                                                   
    Returns:                                                                                                                       
        Tuple of (bool, comment_body or None)                                                                                      
        - bool: True if the issue has PR comments, False otherwise                                                                 
        - comment_body: The body of the PR creation comment if found, None otherwise                                               
    """                                                                                                                            
    comments = get_issue_comments(issue)                                                                                           
    pr_comment_bool = any(                                                                                                         
        'Created pull request' in comment.body for comment in comments)                                                            
    if pr_comment_bool:                                                                                                            
        pr_comment = [                                                                                                             
            comment for comment in comments if 'Created pull request' in comment.body][-1]                                         
        return True, pr_comment.body                                                                                               
    else:                                                                                                                          
        return False, None                                                                                                         
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   


3. Remove unused imports in agents.py                                                                                              

src/agents.py                                                                                                                      

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
"""                                                                                                                                
Agent creation and configuration for the GitHub bot                                                                                
"""                                                                                                                                
import os                                                                                                                          
import autogen                                                                                                                     
import subprocess                                                                                                                  
from autogen import ConversableAgent, AssistantAgent, UserProxyAgent                                                               
import bot_tools                                                                                                                   
=======                                                                                                                            
"""                                                                                                                                
Agent creation and configuration for the GitHub bot                                                                                
"""                                                                                                                                
import os                                                                                                                          
import autogen                                                                                                                     
from autogen import ConversableAgent, AssistantAgent, UserProxyAgent                                                               
import bot_tools                                                                                                                   
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   

src/agents.py                                                                                                                      

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
from github.Issue import Issue                                                                                                     
import random                                                                                                                      
import string                                                                                                                      
import triggers                                                                                                                    
from urlextract import URLExtract                                                                                                  
import agents                                                                                                                      
=======                                                                                                                            
from github.Issue import Issue                                                                                                     
import random                                                                                                                      
import string                                                                                                                      
import triggers                                                                                                                    
from urlextract import URLExtract                                                                                                  
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   


4. Remove commented-out function in branch_handler.py                                                                              

src/branch_handler.py                                                                                                              

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
    os.chdir(orig_dir)                                                                                                             
    return related_branches                                                                                                        
                                                                                                                                   
# def get_issue_related_branches(repo_path: str, issue_number: int) -> List[Tuple[str, bool]]:                                     
#     """                                                                                                                          
#     Find all branches (local and remote) related to an issue number                                                              
#                                                                                                                                  
#     Args:                                                                                                                        
#         repo_path: Path to local git repository                                                                                  
#         issue_number: GitHub issue number to search for                                                                          
#                                                                                                                                  
#     Returns:                                                                                                                     
#         List of tuples containing (branch_name, is_remote)                                                                       
#     """                                                                                                                          
#     repo = git.Repo(repo_path)                                                                                                   
#     related_branches = []                                                                                                        
#                                                                                                                                  
#     # Check local branches                                                                                                       
#     for branch in repo.heads:                                                                                                    
#         if str(issue_number) in branch.name:                                                                                     
#             related_branches.append((branch.name, False))                                                                        
#                                                                                                                                  
#     # Check remote branches                                                                                                      
#     for remote in repo.remotes:                                                                                                  
#         for ref in remote.refs:                                                                                                  
#             # Skip HEAD ref                                                                                                      
#             if ref.name.endswith('/HEAD'):                                                                                       
#                 continue                                                                                                         
#             # Remove remote name prefix for comparison                                                                           
#             branch_name = ref.name.split('/', 1)[1]                                                                              
#             if str(issue_number) in branch_name:                                                                                 
#                 related_branches.append((branch_name, True))                                                                     
#                                                                                                                                  
#     return related_branches                                                                                                      
                                                                                                                                   
                                                                                                                                   
def get_current_branch(repo_path: str) -> str:                                                                                     
=======                                                                                                                            
    os.chdir(orig_dir)                                                                                                             
    return related_branches                                                                                                        
                                                                                                                                   
                                                                                                                                   
def get_current_branch(repo_path: str) -> str:                                                                                     
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   


5. Remove unused estimate_tokens function in bot_tools.py                                                                          

src/bot_tools.py                                                                                                                   

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
def estimate_tokens(text: str) -> int:                                                                                             
    """Estimate the number of tokens in text by splitting on whitespace                                                            
                                                                                                                                   
    Args:                                                                                                                          
        text: Text to estimate tokens for                                                                                          
                                                                                                                                   
    Returns:                                                                                                                       
        Estimated token count                                                                                                      
    """                                                                                                                            
    if not text:                                                                                                                   
        return 0                                                                                                                   
    return len(text.split())                                                                                                       
                                                                                                                                   
                                                                                                                                   
def readfile(                                                                                                                      
=======                                                                                                                            
def readfile(                                                                                                                      
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   


6. Update references to estimate_tokens in bot_tools.py                                                                            

src/bot_tools.py                                                                                                                   

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
    # Check total tokens                                                                                                           
    full_content = "".join(numbered_lines)                                                                                         
    total_tokens = estimate_tokens(full_content)                                                                                   
                                                                                                                                   
    if total_tokens <= token_threshold:                                                                                            
=======                                                                                                                            
    # Check total tokens (estimate by splitting on whitespace)                                                                     
    full_content = "".join(numbered_lines)                                                                                         
    total_tokens = len(full_content.split()) if full_content else 0                                                                
                                                                                                                                   
    if total_tokens <= token_threshold:                                                                                            
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   

src/bot_tools.py                                                                                                                   

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
    # Check total tokens                                                                                                           
    full_content = "".join(numbered_lines)                                                                                         
    total_tokens = estimate_tokens(full_content)                                                                                   
                                                                                                                                   
    if total_tokens <= token_threshold:                                                                                            
=======                                                                                                                            
    # Check total tokens (estimate by splitting on whitespace)                                                                     
    full_content = "".join(numbered_lines)                                                                                         
    total_tokens = len(full_content.split()) if full_content else 0                                                                
                                                                                                                                   
    if total_tokens <= token_threshold:                                                                                            
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   


7. Update current_tokens calculation in bot_tools.py                                                                               

src/bot_tools.py                                                                                                                   

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
    for line in numbered_lines:                                                                                                    
        line_tokens = estimate_tokens(line)                                                                                        
        if current_tokens + line_tokens > token_threshold:                                                                         
            break                                                                                                                  
        included_lines.append(line)                                                                                                
        current_tokens += line_tokens                                                                                              
=======                                                                                                                            
    for line in numbered_lines:                                                                                                    
        line_tokens = len(line.split()) if line else 0                                                                             
        if current_tokens + line_tokens > token_threshold:                                                                         
            break                                                                                                                  
        included_lines.append(line)                                                                                                
        current_tokens += line_tokens                                                                                              
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   

src/bot_tools.py                                                                                                                   

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
    for line in numbered_lines:                                                                                                    
        line_tokens = estimate_tokens(line)                                                                                        
        if current_tokens + line_tokens > token_threshold:                                                                         
            break                                                                                                                  
        included_lines.append(line)                                                                                                
        current_tokens += line_tokens                                                                                              
=======                                                                                                                            
    for line in numbered_lines:                                                                                                    
        line_tokens = len(line.split()) if line else 0                                                                             
        if current_tokens + line_tokens > token_threshold:                                                                         
            break                                                                                                                  
        included_lines.append(line)                                                                                                
        current_tokens += line_tokens                                                                                              
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   

These changes will remove redundant code and improve the maintainability of the codebase. The modifications include:               

 1 Removing the duplicate tab_print function definition                                                                            
 2 Improving the has_pr_creation_comment function with better documentation                                                        
 3 Removing unused imports                                                                                                         
 4 Removing commented-out code                                                                                                     
 5 Removing the unused estimate_tokens function and replacing its calls with inline calculations                                   

Tokens: 23k sent, 1.7k received. Cost: $0.09 message, $0.09 session.
The LLM did not conform to the edit format.
https://aider.chat/docs/troubleshooting/edit-errors.html

# 1 SEARCH/REPLACE block failed to match!

## SearchReplaceNoExactMatch: This SEARCH block failed to exactly match lines in src/agents.py
<<<<<<< SEARCH
from github.Issue import Issue
import random
import string
import triggers
from urlextract import URLExtract
import agents
=======
from github.Issue import Issue
import random
import string
import triggers
from urlextract import URLExtract
>>>>>>> REPLACE

Did you mean to match some of these actual lines from src/agents.py?

import bot_tools
from git_utils import (
get_github_client,
get_repository,
get_issue_comments,
)
from github.Issue import Issue
import random
import string
import triggers
from urlextract import URLExtract

Get callable tool functions

tool_funcs = []
for func in dir(bot_tools):


Are you sure you need this SEARCH/REPLACE block?
The REPLACE lines are already in src/agents.py!

The SEARCH section must exactly match an existing block of lines including all white space, comments, indentation, docstrings, etc

# The other 9 SEARCH/REPLACE blocks were applied successfully.
Don't re-send them.
Just reply with fixed versions of the block above that failed to match.

Commit 5da0163 refactor: Remove redundant code and improve maintainability
I apologize for the error. Looking at the actual content of the file, I see that the import agents line doesn't exist in the       
current version of the file. Let me fix this by providing a corrected SEARCH/REPLACE block:                                        

src/agents.py                                                                                                                      

                                                                                                                                   
<<<<<<< SEARCH                                                                                                                     
from github.Issue import Issue                                                                                                     
import random                                                                                                                      
import string                                                                                                                      
import triggers                                                                                                                    
from urlextract import URLExtract                                                                                                  
                                                                                                                                   
=======                                                                                                                            
from github.Issue import Issue                                                                                                     
import random                                                                                                                      
import string                                                                                                                      
import triggers                                                                                                                    
from urlextract import URLExtract                                                                                                  
                                                                                                                                   
>>>>>>> REPLACE                                                                                                                    
                                                                                                                                   

Since the import agents line doesn't exist in the file, there's no need for a SEARCH/REPLACE block to remove it. The other changes 
have been successfully applied.                                                                                                    

Tokens: 25k sent, 151 received. Cost: $0.08 message, $0.17 session.
Applied edit to src/agents.py

refactor: Remove redundant code and improve maintainability

5da0163

abuzarmahmood linked an issue Apr 2, 2025 that may be closed by this pull request

Remove redundant functionality across repo #137

Open

abuzarmahmood mentioned this pull request Apr 2, 2025

Remove redundant functionality across repo #137

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Remove redundant code and improve maintainability#140

refactor: Remove redundant code and improve maintainability#140
abuzarmahmood wants to merge 1 commit intomainfrom
137-remove-redundant-functionality-across-repo

abuzarmahmood commented Apr 2, 2025

Uh oh!

abuzarmahmood commented Apr 2, 2025

Get callable tool functions

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

abuzarmahmood commented Apr 2, 2025

Uh oh!

abuzarmahmood commented Apr 2, 2025

Generated edit command:

Get callable tool functions

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant