Sweep: allow for rebase.

[sweep-nightly[bot]]

Description

This pull request introduces changes to the sweepai/api.py script to modify the behavior of updating sweep pull requests. Instead of merging the default branch into feature branches, it now attempts to rebase the feature branches on top of the default branch. This change aims to streamline the update process and reduce merge conflicts.

Summary

• Changed the update mechanism from merge to rebase for feature branches in sweepai/api.py.
• Added error handling for merge conflicts during the rebase process. If a conflict occurs, the pull request is closed.
• Updated the exception logging to reflect the change from merge to rebase.
• This modification affects the update_sweep_prs_v2 function within the sweepai/api.py file.

Fixes #3284.

---

🎉 Latest improvements to Sweep:

• New dashboard launched for real-time tracking of Sweep issues, covering all stages from search to coding.
• Integration of OpenAI's latest Assistant API for more efficient and reliable code planning and editing, improving speed by 3x.
• Use the GitHub issues extension for creating Sweep issues directly from your editor.

---

💡 To get Sweep to edit this pull request, you can:

• Comment below, and Sweep can edit the entire PR
• Comment on a file, Sweep will only modify the commented file
• Edit the original issue to get Sweep to recreate the PR from scratch

This is an automated message generated by Sweep AI.

[sweep-nightly[bot]]

Rollback Files For Sweep

• [ ] Rollback changes to sweepai/api.py

This is an automated message generated by Sweep AI.

[sweep-nightly[bot]]

Apply Sweep Rules to your PR?

• [ ] Apply: We should use loguru for error logging. If the log is inside an exception, use logger.exception to add tracebacks, where logger is imported from loguru. Use f-strings for string formatting in logger calls (e.g. logger.info(f'Hello {name}') instead of logger.info('Hello {name}', name=name)).
• [ ] Apply: There should be no debug log or print statements in production code.
• [ ] Apply: All functions should have parameters and output annotated with type hints. Use list, tuple and dict instead of typing.List, typing.Tuple and typing.dict.
• [ ] Apply: Leftover TODOs in the code should be handled.
• [ ] Apply: All new business logic should have corresponding unit tests in the same directory. For example, sweepai/api_test.py tests sweepai/api.py. Use unittest and unittest.mock as required.
• [ ] Apply: Any clearly inefficient or repeated code should be optimized or refactored.
• [ ] Apply: Remove any comments before code that are obvious. For example # this prints hello world; print('hello world').

This is an automated message generated by Sweep AI.

[vercel[bot]]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
sweep-docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 6, 2024 1:38am