Compare commits
No commits in common. "77739b0004d0a5bdb5b83caf0f46ff91884b75d0" and "897aedf9f5dc056cb26ba9915550cd2a542c0ead" have entirely different histories.
77739b0004
...
897aedf9f5
|
@ -95,28 +95,7 @@ def create_aider_command(issue: str) -> list[str]:
|
||||||
|
|
||||||
|
|
||||||
class GiteaClient:
|
class GiteaClient:
|
||||||
"""
|
|
||||||
Client for interacting with the Gitea API.
|
|
||||||
|
|
||||||
This class provides methods to interact with a Gitea instance's API,
|
|
||||||
including retrieving repository information, creating branches, and fetching issues.
|
|
||||||
|
|
||||||
Attributes:
|
|
||||||
gitea_url (str): The base URL for the Gitea API endpoints.
|
|
||||||
session (requests.Session): HTTP session for making API requests.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, gitea_url: str, token: str) -> None:
|
def __init__(self, gitea_url: str, token: str) -> None:
|
||||||
"""
|
|
||||||
Initialize a new Gitea API client.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
gitea_url (str): Base URL for the Gitea instance (without '/api/v1').
|
|
||||||
token (str): Authentication token for the Gitea API. If empty, requests will be unauthenticated.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
AssertionError: If gitea_url ends with '/api/v1'.
|
|
||||||
"""
|
|
||||||
assert not gitea_url.endswith('/api/v1')
|
assert not gitea_url.endswith('/api/v1')
|
||||||
self.gitea_url = gitea_url + '/api/v1'
|
self.gitea_url = gitea_url + '/api/v1'
|
||||||
self.session = requests.Session()
|
self.session = requests.Session()
|
||||||
|
@ -124,43 +103,16 @@ class GiteaClient:
|
||||||
if token:
|
if token:
|
||||||
self.session.headers['Authorization'] = f'token {token}'
|
self.session.headers['Authorization'] = f'token {token}'
|
||||||
|
|
||||||
def get_default_branch_sha(self, owner: str, repo: str, branch: str) -> str:
|
def get_default_branch_sha(self, owner, repo, branch):
|
||||||
"""
|
"""Retrieve the commit SHA of the default branch."""
|
||||||
Retrieve the commit SHA of the specified branch.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
owner (str): Owner of the repository.
|
|
||||||
repo (str): Name of the repository.
|
|
||||||
branch (str): Name of the branch.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
str: The commit SHA of the specified branch.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
requests.HTTPError: If the API request fails.
|
|
||||||
"""
|
|
||||||
url = f'{self.gitea_url}/repos/{owner}/{repo}/branches/{branch}'
|
url = f'{self.gitea_url}/repos/{owner}/{repo}/branches/{branch}'
|
||||||
response = self.session.get(url)
|
response = self.session.get(url)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
data = response.json()
|
data = response.json()
|
||||||
return data['commit']['sha']
|
return data['commit']['sha']
|
||||||
|
|
||||||
def create_branch(self, owner: str, repo: str, new_branch: str, sha: str) -> bool:
|
def create_branch(self, owner, repo, new_branch, sha):
|
||||||
"""
|
"""Create a new branch from the provided SHA."""
|
||||||
Create a new branch from the provided SHA.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
owner (str): Owner of the repository.
|
|
||||||
repo (str): Name of the repository.
|
|
||||||
new_branch (str): Name of the new branch to create.
|
|
||||||
sha (str): Commit SHA to use as the starting point for the new branch.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool: True if the branch was created successfully, False if the branch already exists.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
requests.HTTPError: If the API request fails for reasons other than branch already existing.
|
|
||||||
"""
|
|
||||||
url = f'{self.gitea_url}/repos/{owner}/{repo}/git/refs'
|
url = f'{self.gitea_url}/repos/{owner}/{repo}/git/refs'
|
||||||
json_data = {'ref': f'refs/heads/{new_branch}', 'sha': sha}
|
json_data = {'ref': f'refs/heads/{new_branch}', 'sha': sha}
|
||||||
response = self.session.post(url, json=json_data)
|
response = self.session.post(url, json=json_data)
|
||||||
|
@ -170,20 +122,8 @@ class GiteaClient:
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def get_issues(self, owner: str, repo: str) -> list:
|
def get_issues(self, owner, repo):
|
||||||
"""
|
"""Download issues from the specified repository and filter those with the aider label."""
|
||||||
Download issues from the specified repository and filter those with the 'aider' label.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
owner (str): Owner of the repository.
|
|
||||||
repo (str): Name of the repository.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
list: A list of issue dictionaries, filtered to only include issues with the 'aider' label.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
requests.HTTPError: If the API request fails.
|
|
||||||
"""
|
|
||||||
url = f'{self.gitea_url}/repos/{owner}/{repo}/issues'
|
url = f'{self.gitea_url}/repos/{owner}/{repo}/issues'
|
||||||
response = self.session.get(url)
|
response = self.session.get(url)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
|
@ -297,11 +237,7 @@ def solve_issue_in_repository(
|
||||||
run_cmd(['git', 'checkout', '-b', branch_name], tmpdirname)
|
run_cmd(['git', 'checkout', '-b', branch_name], tmpdirname)
|
||||||
|
|
||||||
# Run aider
|
# Run aider
|
||||||
succeeded = run_cmd(
|
succeeded = run_cmd(create_aider_command(f'# {issue_title}\n{issue_description}'), tmpdirname, check=False)
|
||||||
create_aider_command(f'# {issue_title}\n{issue_description}'),
|
|
||||||
tmpdirname,
|
|
||||||
check=False,
|
|
||||||
)
|
|
||||||
if not succeeded:
|
if not succeeded:
|
||||||
logger.error('Aider invocation failed for issue #%s', issue_number)
|
logger.error('Aider invocation failed for issue #%s', issue_number)
|
||||||
return False
|
return False
|
||||||
|
|
Loading…
Reference in New Issue
Block a user