π OpenHands: AI-Driven Development
Refactor GitLab service into modular mixins pattern (#10727)
Rohit Malhotra61a93d010c05
diff --git a/openhands/integrations/gitlab/gitlab_service.py b/openhands/integrations/gitlab/gitlab_service.pyindex 216ee92fed..24bb32139b 100644--- a/openhands/integrations/gitlab/gitlab_service.py+++ b/openhands/integrations/gitlab/gitlab_service.py@@ -1,33 +1,33 @@import os-from datetime import datetime-from typing import Any-import httpxfrom pydantic import SecretStr-from openhands.core.logger import openhands_logger as logger+from openhands.integrations.gitlab.service import (+ GitLabBranchesMixin,+ GitLabFeaturesMixin,+ GitLabPRsMixin,+ GitLabReposMixin,+ GitLabResolverMixin,+)from openhands.integrations.service_types import (BaseGitService,- Branch,- Comment,GitService,- OwnerType,- PaginatedBranchesResponse,ProviderType,- Repository,- RequestMethod,- SuggestedTask,- TaskType,- UnknownException,- User,)-from openhands.microagent.types import MicroagentContentResponse-from openhands.server.types import AppModefrom openhands.utils.import_utils import get_impl-class GitLabService(BaseGitService, GitService):- """Default implementation of GitService for GitLab integration.+class GitLabService(+ GitLabBranchesMixin,+ GitLabFeaturesMixin,+ GitLabPRsMixin,+ GitLabReposMixin,+ GitLabResolverMixin,+ BaseGitService,+ GitService,+):+ """+ Assembled GitLab service class combining mixins by feature area.TODO: This doesn't seem a good candidate for the get_impl() pattern. What are the abstract methods we should actually separate and implement here?This is an extension point in OpenHands that allows applications to customize GitLab@@ -52,9 +52,11 @@ class GitLabService(BaseGitService, GitService):token: SecretStr | None = None,external_token_manager: bool = False,base_domain: str | None = None,- ):+ ) -> None:self.user_id = user_idself.external_token_manager = external_token_manager+ self.external_auth_id = external_auth_id+ self.external_auth_token = external_auth_tokenif token:self.token = token@@ -74,850 +76,6 @@ class GitLabService(BaseGitService, GitService):def provider(self) -> str:return ProviderType.GITLAB.value- async def _get_gitlab_headers(self) -> dict[str, Any]:- """Retrieve the GitLab Token to construct the headers"""- if not self.token:- latest_token = await self.get_latest_token()- if latest_token:- self.token = latest_token-- return {- 'Authorization': f'Bearer {self.token.get_secret_value()}',- }-- def _has_token_expired(self, status_code: int) -> bool:- return status_code == 401-- async def get_latest_token(self) -> SecretStr | None:- return self.token-- async def _get_cursorrules_url(self, repository: str) -> str:- """Get the URL for checking .cursorrules file."""- project_id = self._extract_project_id(repository)- return (- f'{self.BASE_URL}/projects/{project_id}/repository/files/.cursorrules/raw'- )-- async def _get_microagents_directory_url(- self, repository: str, microagents_path: str- ) -> str:- """Get the URL for checking microagents directory."""- project_id = self._extract_project_id(repository)- return f'{self.BASE_URL}/projects/{project_id}/repository/tree'-- def _get_microagents_directory_params(self, microagents_path: str) -> dict:- """Get parameters for the microagents directory request."""- return {'path': microagents_path, 'recursive': 'true'}-- def _is_valid_microagent_file(self, item: dict) -> bool:- """Check if an item represents a valid microagent file."""- return (- item['type'] == 'blob'- and item['name'].endswith('.md')- and item['name'] != 'README.md'- )-- def _get_file_name_from_item(self, item: dict) -> str:- """Extract file name from directory item."""- return item['name']-- def _get_file_path_from_item(self, item: dict, microagents_path: str) -> str:- """Extract file path from directory item."""- return item['path']-- async def _make_request(- self,- url: str,- params: dict | None = None,- method: RequestMethod = RequestMethod.GET,- ) -> tuple[Any, dict]:- try:- async with httpx.AsyncClient() as client:- gitlab_headers = await self._get_gitlab_headers()-- # Make initial request- response = await self.execute_request(- client=client,- url=url,- headers=gitlab_headers,- params=params,- method=method,- )-- # Handle token refresh if needed- if self.refresh and self._has_token_expired(response.status_code):- await self.get_latest_token()- gitlab_headers = await self._get_gitlab_headers()- response = await self.execute_request(- client=client,- url=url,- headers=gitlab_headers,- params=params,- method=method,- )-- response.raise_for_status()- headers = {}- if 'Link' in response.headers:- headers['Link'] = response.headers['Link']-- if 'X-Total' in response.headers:- headers['X-Total'] = response.headers['X-Total']-- content_type = response.headers.get('Content-Type', '')- if 'application/json' in content_type:- return response.json(), headers- else:- return response.text, headers-- except httpx.HTTPStatusError as e:- raise self.handle_http_status_error(e)- except httpx.HTTPError as e:- raise self.handle_http_error(e)-- async def execute_graphql_query(- self, query: str, variables: dict[str, Any] | None = None- ) -> Any:- """Execute a GraphQL query against the GitLab GraphQL API-- Args:- query: The GraphQL query string- variables: Optional variables for the GraphQL query-- Returns:- The data portion of the GraphQL response- """- if variables is None:- variables = {}- try:- async with httpx.AsyncClient() as client:- gitlab_headers = await self._get_gitlab_headers()- # Add content type header for GraphQL- gitlab_headers['Content-Type'] = 'application/json'-- payload = {- 'query': query,- 'variables': variables if variables is not None else {},- }-- response = await client.post(- self.GRAPHQL_URL, headers=gitlab_headers, json=payload- )-- if self.refresh and self._has_token_expired(response.status_code):- await self.get_latest_token()- gitlab_headers = await self._get_gitlab_headers()- gitlab_headers['Content-Type'] = 'application/json'- response = await client.post(- self.GRAPHQL_URL, headers=gitlab_headers, json=payload- )-- response.raise_for_status()- result = response.json()-- # Check for GraphQL errors- if 'errors' in result:- error_message = result['errors'][0].get(- 'message', 'Unknown GraphQL error'- )- raise UnknownException(f'GraphQL error: {error_message}')-- return result.get('data')- except httpx.HTTPStatusError as e:- raise self.handle_http_status_error(e)- except httpx.HTTPError as e:- raise self.handle_http_error(e)-- async def get_user(self) -> User:- url = f'{self.BASE_URL}/user'- response, _ = await self._make_request(url)-- # Use a default avatar URL if not provided- # In some self-hosted GitLab instances, the avatar_url field may be returned as None.- avatar_url = response.get('avatar_url') or ''-- return User(- id=str(response.get('id', '')),- login=response.get('username'), # type: ignore[call-arg]- avatar_url=avatar_url,- name=response.get('name'),- email=response.get('email'),- company=response.get('organization'),- )-- def _parse_repository(- self, repo: dict, link_header: str | None = None- ) -> Repository:- """Parse a GitLab API project response into a Repository object.-- Args:- repo: Project data from GitLab API- link_header: Optional link header for pagination-- Returns:- Repository object- """- return Repository(- id=str(repo.get('id')), # type: ignore[arg-type]- full_name=repo.get('path_with_namespace'), # type: ignore[arg-type]- stargazers_count=repo.get('star_count'),- git_provider=ProviderType.GITLAB,- is_public=repo.get('visibility') == 'public',- owner_type=(- OwnerType.ORGANIZATION- if repo.get('namespace', {}).get('kind') == 'group'- else OwnerType.USER- ),- link_header=link_header,- main_branch=repo.get('default_branch'),- )-- def _parse_gitlab_url(self, url: str) -> str | None:- """Parse a GitLab URL to extract the repository path.-- Expected format: https://{domain}/{group}/{possibly_subgroup}/{repo}- Returns the full path from group onwards (e.g., 'group/subgroup/repo' or 'group/repo')- """- try:- # Remove protocol and domain- if '://' in url:- url = url.split('://', 1)[1]- if '/' in url:- path = url.split('/', 1)[1]- else:- return None-- # Clean up the path- path = path.strip('/')- if not path:- return None-- # Split the path and remove empty parts- path_parts = [part for part in path.split('/') if part]-- # We need at least 2 parts: group/repo- if len(path_parts) < 2:- return None-- # Join all parts to form the full repository path- return '/'.join(path_parts)-- except Exception:- return None-- async def search_repositories(- self,- query: str,- per_page: int = 30,- sort: str = 'updated',- order: str = 'desc',- public: bool = False,- ) -> list[Repository]:- if public:- # When public=True, query is a GitLab URL that we need to parse- repo_path = self._parse_gitlab_url(query)- if not repo_path:- return [] # Invalid URL format-- repository = await self.get_repository_details_from_repo_name(repo_path)- return [repository]-- return await self.get_paginated_repos(1, per_page, sort, None, query)-- async def get_paginated_repos(- self,- page: int,- per_page: int,- sort: str,- installation_id: str | None,- query: str | None = None,- ) -> list[Repository]:- url = f'{self.BASE_URL}/projects'- order_by = {- 'pushed': 'last_activity_at',- 'updated': 'last_activity_at',- 'created': 'created_at',- 'full_name': 'name',- }.get(sort, 'last_activity_at')-- params = {- 'page': str(page),- 'per_page': str(per_page),- 'order_by': order_by,- 'sort': 'desc', # GitLab uses sort for direction (asc/desc)- 'membership': True, # Include projects user is a member of- }-- if query:- params['search'] = query- params['search_namespaces'] = True-- response, headers = await self._make_request(url, params)-- next_link: str = headers.get('Link', '')- repos = [- self._parse_repository(repo, link_header=next_link) for repo in response- ]- return repos-- async def get_all_repositories(- self, sort: str, app_mode: AppMode- ) -> list[Repository]:- MAX_REPOS = 1000- PER_PAGE = 100 # Maximum allowed by GitLab API- all_repos: list[dict] = []- page = 1-- url = f'{self.BASE_URL}/projects'- # Map GitHub's sort values to GitLab's order_by values- order_by = {- 'pushed': 'last_activity_at',- 'updated': 'last_activity_at',- 'created': 'created_at',- 'full_name': 'name',- }.get(sort, 'last_activity_at')-- while len(all_repos) < MAX_REPOS:- params = {- 'page': str(page),- 'per_page': str(PER_PAGE),- 'order_by': order_by,- 'sort': 'desc', # GitLab uses sort for direction (asc/desc)- 'membership': 1, # Use 1 instead of True- }- response, headers = await self._make_request(url, params)-- if not response: # No more repositories- break-- all_repos.extend(response)- page += 1-- # Check if we've reached the last page- link_header = headers.get('Link', '')- if 'rel="next"' not in link_header:- break-- # Trim to MAX_REPOS if needed and convert to Repository objects- all_repos = all_repos[:MAX_REPOS]- return [self._parse_repository(repo) for repo in all_repos]-- async def get_suggested_tasks(self) -> list[SuggestedTask]:- """Get suggested tasks for the authenticated user across all repositories.-- Returns:- - Merge requests authored by the user.- - Issues assigned to the user.- """- # Get user info to use in queries- user = await self.get_user()- username = user.login-- # GraphQL query to get merge requests- query = """- query GetUserTasks {- currentUser {- authoredMergeRequests(state: opened, sort: UPDATED_DESC, first: 100) {- nodes {- id- iid- title- project {- fullPath- }- conflicts- mergeStatus- pipelines(first: 1) {- nodes {- status- }- }- discussions(first: 100) {- nodes {- notes {- nodes {- resolvable- resolved- }- }- }- }- }- }- }- }- """-- try:- tasks: list[SuggestedTask] = []-- # Get merge requests using GraphQL- response = await self.execute_graphql_query(query)- data = response.get('currentUser', {})-- # Process merge requests- merge_requests = data.get('authoredMergeRequests', {}).get('nodes', [])- for mr in merge_requests:- repo_name = mr.get('project', {}).get('fullPath', '')- mr_number = mr.get('iid')- title = mr.get('title', '')-- # Start with default task type- task_type = TaskType.OPEN_PR-- # Check for specific states- if mr.get('conflicts'):- task_type = TaskType.MERGE_CONFLICTS- elif (- mr.get('pipelines', {}).get('nodes', [])- and mr.get('pipelines', {}).get('nodes', [])[0].get('status')- == 'FAILED'- ):- task_type = TaskType.FAILING_CHECKS- else:- # Check for unresolved comments- has_unresolved_comments = False- for discussion in mr.get('discussions', {}).get('nodes', []):- for note in discussion.get('notes', {}).get('nodes', []):- if note.get('resolvable') and not note.get('resolved'):- has_unresolved_comments = True- break- if has_unresolved_comments:- break-- if has_unresolved_comments:- task_type = TaskType.UNRESOLVED_COMMENTS-- # Only add the task if it's not OPEN_PR- if task_type != TaskType.OPEN_PR:- tasks.append(- SuggestedTask(- git_provider=ProviderType.GITLAB,- task_type=task_type,- repo=repo_name,- issue_number=mr_number,- title=title,- )- )-- # Get assigned issues using REST API- url = f'{self.BASE_URL}/issues'- params = {- 'assignee_username': username,- 'state': 'opened',- 'scope': 'assigned_to_me',- }-- issues_response, _ = await self._make_request(- method=RequestMethod.GET, url=url, params=params- )-- # Process issues- for issue in issues_response:- repo_name = (- issue.get('references', {}).get('full', '').split('#')[0].strip()- )- issue_number = issue.get('iid')- title = issue.get('title', '')-- tasks.append(- SuggestedTask(- git_provider=ProviderType.GITLAB,- task_type=TaskType.OPEN_ISSUE,- repo=repo_name,- issue_number=issue_number,- title=title,- )- )-- return tasks- except Exception:- return []-- async def get_repository_details_from_repo_name(- self, repository: str- ) -> Repository:- encoded_name = repository.replace('/', '%2F')-- url = f'{self.BASE_URL}/projects/{encoded_name}'- repo, _ = await self._make_request(url)-- return self._parse_repository(repo)-- async def get_branches(self, repository: str) -> list[Branch]:- """Get branches for a repository"""- encoded_name = repository.replace('/', '%2F')- url = f'{self.BASE_URL}/projects/{encoded_name}/repository/branches'-- # Set maximum branches to fetch (10 pages with 100 per page)- MAX_BRANCHES = 1000- PER_PAGE = 100-- all_branches: list[Branch] = []- page = 1-- # Fetch up to 10 pages of branches- while page <= 10 and len(all_branches) < MAX_BRANCHES:- params = {'per_page': str(PER_PAGE), 'page': str(page)}- response, headers = await self._make_request(url, params)-- if not response: # No more branches- break-- for branch_data in response:- branch = Branch(- name=branch_data.get('name'),- commit_sha=branch_data.get('commit', {}).get('id', ''),- protected=branch_data.get('protected', False),- last_push_date=branch_data.get('commit', {}).get('committed_date'),- )- all_branches.append(branch)-- page += 1-- # Check if we've reached the last page- link_header = headers.get('Link', '')- if 'rel="next"' not in link_header:- break-- return all_branches-- async def get_paginated_branches(- self, repository: str, page: int = 1, per_page: int = 30- ) -> PaginatedBranchesResponse:- """Get branches for a repository with pagination"""- encoded_name = repository.replace('/', '%2F')- url = f'{self.BASE_URL}/projects/{encoded_name}/repository/branches'-- params = {'per_page': str(per_page), 'page': str(page)}- response, headers = await self._make_request(url, params)-- branches: list[Branch] = []- for branch_data in response:- branch = Branch(- name=branch_data.get('name'),- commit_sha=branch_data.get('commit', {}).get('id', ''),- protected=branch_data.get('protected', False),- last_push_date=branch_data.get('commit', {}).get('committed_date'),- )- branches.append(branch)-- has_next_page = False- total_count = None- if headers.get('Link', ''):- has_next_page = True-- if 'X-Total' in headers:- try:- total_count = int(headers['X-Total'])- except (ValueError, TypeError):- pass-- return PaginatedBranchesResponse(- branches=branches,- has_next_page=has_next_page,- current_page=page,- per_page=per_page,- total_count=total_count,- )-- async def search_branches(- self, repository: str, query: str, per_page: int = 30- ) -> list[Branch]:- """Search branches using GitLab API which supports `search` param."""- encoded_name = repository.replace('/', '%2F')- url = f'{self.BASE_URL}/projects/{encoded_name}/repository/branches'-- params = {'per_page': str(per_page), 'search': query}- response, _ = await self._make_request(url, params)-- branches: list[Branch] = []- for branch_data in response:- branches.append(- Branch(- name=branch_data.get('name'),- commit_sha=branch_data.get('commit', {}).get('id', ''),- protected=branch_data.get('protected', False),- last_push_date=branch_data.get('commit', {}).get('committed_date'),- )- )- return branches-- async def create_mr(- self,- id: int | str,- source_branch: str,- target_branch: str,- title: str,- description: str | None = None,- labels: list[str] | None = None,- ) -> str:- """Creates a merge request in GitLab-- Args:- id: The ID or URL-encoded path of the project- source_branch: The name of the branch where your changes are implemented- target_branch: The name of the branch you want the changes merged into- title: The title of the merge request (optional, defaults to a generic title)- description: The description of the merge request (optional)- labels: A list of labels to apply to the merge request (optional)-- Returns:- - MR URL when successful- - Error message when unsuccessful- """- # Convert string ID to URL-encoded path if needed- project_id = str(id).replace('/', '%2F') if isinstance(id, str) else id- url = f'{self.BASE_URL}/projects/{project_id}/merge_requests'-- # Set default description if none provided- if not description:- description = f'Merging changes from {source_branch} into {target_branch}'-- # Prepare the request payload- payload = {- 'source_branch': source_branch,- 'target_branch': target_branch,- 'title': title,- 'description': description,- }-- # Add labels if provided- if labels and len(labels) > 0:- payload['labels'] = ','.join(labels)-- # Make the POST request to create the MR- response, _ = await self._make_request(- url=url, params=payload, method=RequestMethod.POST- )-- return response['web_url']-- async def get_pr_details(self, repository: str, pr_number: int) -> dict:- """Get detailed information about a specific merge request-- Args:- repository: Repository name in format 'owner/repo'- pr_number: The merge request number (iid)-- Returns:- Raw GitLab API response for the merge request- """- project_id = self._extract_project_id(repository)- url = f'{self.BASE_URL}/projects/{project_id}/merge_requests/{pr_number}'- mr_data, _ = await self._make_request(url)-- return mr_data-- def _extract_project_id(self, repository: str) -> str:- """Extract project_id from repository name for GitLab API calls.-- Args:- repository: Repository name in format 'owner/repo' or 'domain/owner/repo'-- Returns:- URL-encoded project ID for GitLab API- """- if '/' in repository:- parts = repository.split('/')- if len(parts) >= 3 and '.' in parts[0]:- # Self-hosted GitLab: 'domain/owner/repo' -> 'owner/repo'- project_id = '/'.join(parts[1:]).replace('/', '%2F')- else:- # Regular GitLab: 'owner/repo' -> 'owner/repo'- project_id = repository.replace('/', '%2F')- else:- project_id = repository-- return project_id-- async def get_microagent_content(- self, repository: str, file_path: str- ) -> MicroagentContentResponse:- """Fetch individual file content from GitLab repository.-- Args:- repository: Repository name in format 'owner/repo' or 'domain/owner/repo'- file_path: Path to the file within the repository-- Returns:- MicroagentContentResponse with parsed content and triggers-- Raises:- RuntimeError: If file cannot be fetched or doesn't exist- """- # Extract project_id from repository name- project_id = self._extract_project_id(repository)-- encoded_file_path = file_path.replace('/', '%2F')- base_url = f'{self.BASE_URL}/projects/{project_id}'- file_url = f'{base_url}/repository/files/{encoded_file_path}/raw'-- response, _ = await self._make_request(file_url)-- # Parse the content to extract triggers from frontmatter- return self._parse_microagent_content(response, file_path)-- async def get_review_thread_comments(- self, project_id: str, issue_iid: int, discussion_id: str- ) -> list[Comment]:- url = (- f'{self.BASE_URL}/projects/{project_id}'- f'/merge_requests/{issue_iid}/discussions/{discussion_id}'- )-- # Single discussion fetch; notes are returned inline.- response, _ = await self._make_request(url)- notes = response.get('notes') or []- return self._process_raw_comments(notes)-- async def get_issue_or_mr_title_and_body(- self, project_id: str, issue_number: int, is_mr: bool = False- ) -> tuple[str, str]:- """Get the title and body of an issue or merge request.-- Args:- repository: Repository name in format 'owner/repo' or 'domain/owner/repo'- issue_number: The issue/MR IID within the project- is_mr: If True, treat as merge request; if False, treat as issue;- if None, try issue first then merge request (default behavior)-- Returns:- A tuple of (title, body)- """- if is_mr:- url = f'{self.BASE_URL}/projects/{project_id}/merge_requests/{issue_number}'- response, _ = await self._make_request(url)- title = response.get('title') or ''- body = response.get('description') or ''- return title, body-- url = f'{self.BASE_URL}/projects/{project_id}/issues/{issue_number}'- response, _ = await self._make_request(url)- title = response.get('title') or ''- body = response.get('description') or ''- return title, body-- async def get_issue_or_mr_comments(- self,- project_id: str,- issue_number: int,- max_comments: int = 10,- is_mr: bool = False,- ) -> list[Comment]:- """Get comments for an issue or merge request.-- Args:- repository: Repository name in format 'owner/repo' or 'domain/owner/repo'- issue_number: The issue/MR IID within the project- max_comments: Maximum number of comments to retrieve- is_pr: If True, treat as merge request; if False, treat as issue;- if None, try issue first then merge request (default behavior)-- Returns:- List of Comment objects ordered by creation date- """- all_comments: list[Comment] = []- page = 1- per_page = min(max_comments, 10)-- url = (- f'{self.BASE_URL}/projects/{project_id}/merge_requests/{issue_number}/discussions'- if is_mr- else f'{self.BASE_URL}/projects/{project_id}/issues/{issue_number}/notes'- )-- while len(all_comments) < max_comments:- params = {- 'per_page': per_page,- 'page': page,- 'order_by': 'created_at',- 'sort': 'asc',- }-- response, headers = await self._make_request(url, params)- if not response:- break-- if is_mr:- for discussions in response:- # Keep root level comments- all_comments.append(discussions['notes'][0])- else:- all_comments.extend(response)-- link_header = headers.get('Link', '')- if 'rel="next"' not in link_header:- break-- page += 1-- return self._process_raw_comments(all_comments)-- def _process_raw_comments(- self, comments: list, max_comments: int = 10- ) -> list[Comment]:- """Helper method to fetch comments from a given URL with pagination."""- all_comments: list[Comment] = []- for comment_data in comments:- comment = Comment(- id=str(comment_data.get('id', 'unknown')),- body=self._truncate_comment(comment_data.get('body', '')),- author=comment_data.get('author', {}).get('username', 'unknown'),- created_at=datetime.fromisoformat(- comment_data.get('created_at', '').replace('Z', '+00:00')- )- if comment_data.get('created_at')- else datetime.fromtimestamp(0),- updated_at=datetime.fromisoformat(- comment_data.get('updated_at', '').replace('Z', '+00:00')- )- if comment_data.get('updated_at')- else datetime.fromtimestamp(0),- system=comment_data.get('system', False),- )- all_comments.append(comment)-- # Sort comments by creation date and return the most recent ones- all_comments.sort(key=lambda c: c.created_at)- return all_comments[-max_comments:]-- async def is_pr_open(self, repository: str, pr_number: int) -> bool:- """Check if a GitLab merge request is still active (not closed/merged).-- Args:- repository: Repository name in format 'owner/repo'- pr_number: The merge request number (iid)-- Returns:- True if MR is active (opened), False if closed/merged- """- try:- mr_details = await self.get_pr_details(repository, pr_number)-- # GitLab API response structure- # https://docs.gitlab.com/ee/api/merge_requests.html#get-single-mr- if 'state' in mr_details:- return mr_details['state'] == 'opened'- elif 'merged_at' in mr_details and 'closed_at' in mr_details:- # Check if MR is merged or closed- return not (mr_details['merged_at'] or mr_details['closed_at'])-- # If we can't determine the state, assume it's active (safer default)- logger.warning(- f'Could not determine GitLab MR status for {repository}#{pr_number}. '- f'Response keys: {list(mr_details.keys())}. Assuming MR is active.'- )- return True-- except Exception as e:- logger.warning(- f'Could not determine GitLab MR status for {repository}#{pr_number}: {e}. '- f'Including conversation to be safe.'- )- # If we can't determine the MR status, include the conversation to be safe- return True-gitlab_service_cls = os.environ.get('OPENHANDS_GITLAB_SERVICE_CLS',diff --git a/openhands/integrations/gitlab/service/__init__.py b/openhands/integrations/gitlab/service/__init__.pynew file mode 100644index 0000000000..94b01c2c32--- /dev/null+++ b/openhands/integrations/gitlab/service/__init__.py@@ -0,0 +1,15 @@+# openhands/integrations/gitlab/service/__init__.py++from .branches import GitLabBranchesMixin+from .features import GitLabFeaturesMixin+from .prs import GitLabPRsMixin+from .repos import GitLabReposMixin+from .resolver import GitLabResolverMixin++__all__ = [+ 'GitLabBranchesMixin',+ 'GitLabFeaturesMixin',+ 'GitLabPRsMixin',+ 'GitLabReposMixin',+ 'GitLabResolverMixin',+]diff --git a/openhands/integrations/gitlab/service/base.py b/openhands/integrations/gitlab/service/base.pynew file mode 100644index 0000000000..edbb05baae--- /dev/null+++ b/openhands/integrations/gitlab/service/base.py@@ -0,0 +1,180 @@+from typing import Any++import httpx+from pydantic import SecretStr++from openhands.integrations.service_types import (+ BaseGitService,+ RequestMethod,+ UnknownException,+ User,+)+++class GitLabMixinBase(BaseGitService):+ """+ Declares common attributes and method signatures used across mixins.+ """++ BASE_URL: str+ GRAPHQL_URL: str+ token: SecretStr+ refresh: bool+ external_auth_id: str | None+ base_domain: str | None++ async def _get_gitlab_headers(self) -> dict[str, Any]:+ """Retrieve the GitLab Token to construct the headers"""+ if not self.token:+ latest_token = await self.get_latest_token()+ if latest_token:+ self.token = latest_token++ return {+ 'Authorization': f'Bearer {self.token.get_secret_value()}',+ }++ async def get_latest_token(self) -> SecretStr | None: # type: ignore[override]+ return self.token++ async def _make_request(+ self,+ url: str,+ params: dict | None = None,+ method: RequestMethod = RequestMethod.GET,+ ) -> tuple[Any, dict]: # type: ignore[override]+ try:+ async with httpx.AsyncClient() as client:+ gitlab_headers = await self._get_gitlab_headers()++ # Make initial request+ response = await self.execute_request(+ client=client,+ url=url,+ headers=gitlab_headers,+ params=params,+ method=method,+ )++ # Handle token refresh if needed+ if self.refresh and self._has_token_expired(response.status_code):+ await self.get_latest_token()+ gitlab_headers = await self._get_gitlab_headers()+ response = await self.execute_request(+ client=client,+ url=url,+ headers=gitlab_headers,+ params=params,+ method=method,+ )++ response.raise_for_status()+ headers = {}+ if 'Link' in response.headers:+ headers['Link'] = response.headers['Link']++ if 'X-Total' in response.headers:+ headers['X-Total'] = response.headers['X-Total']++ content_type = response.headers.get('Content-Type', '')+ if 'application/json' in content_type:+ return response.json(), headers+ else:+ return response.text, headers++ except httpx.HTTPStatusError as e:+ raise self.handle_http_status_error(e)+ except httpx.HTTPError as e:+ raise self.handle_http_error(e)++ async def execute_graphql_query(+ self, query: str, variables: dict[str, Any] | None = None+ ) -> Any:+ """Execute a GraphQL query against the GitLab GraphQL API++ Args:+ query: The GraphQL query string+ variables: Optional variables for the GraphQL query++ Returns:+ The data portion of the GraphQL response+ """+ if variables is None:+ variables = {}+ try:+ async with httpx.AsyncClient() as client:+ gitlab_headers = await self._get_gitlab_headers()+ # Add content type header for GraphQL+ gitlab_headers['Content-Type'] = 'application/json'++ payload = {+ 'query': query,+ 'variables': variables if variables is not None else {},+ }++ response = await client.post(+ self.GRAPHQL_URL, headers=gitlab_headers, json=payload+ )++ if self.refresh and self._has_token_expired(response.status_code):+ await self.get_latest_token()+ gitlab_headers = await self._get_gitlab_headers()+ gitlab_headers['Content-Type'] = 'application/json'+ response = await client.post(+ self.GRAPHQL_URL, headers=gitlab_headers, json=payload+ )++ response.raise_for_status()+ result = response.json()++ # Check for GraphQL errors+ if 'errors' in result:+ error_message = result['errors'][0].get(+ 'message', 'Unknown GraphQL error'+ )+ raise UnknownException(f'GraphQL error: {error_message}')++ return result.get('data')+ except httpx.HTTPStatusError as e:+ raise self.handle_http_status_error(e)+ except httpx.HTTPError as e:+ raise self.handle_http_error(e)++ async def get_user(self) -> User:+ url = f'{self.BASE_URL}/user'+ response, _ = await self._make_request(url)++ # Use a default avatar URL if not provided+ # In some self-hosted GitLab instances, the avatar_url field may be returned as None.+ avatar_url = response.get('avatar_url') or ''++ return User(+ id=str(response.get('id', '')),+ login=response.get('username'), # type: ignore[call-arg]+ avatar_url=avatar_url,+ name=response.get('name'),+ email=response.get('email'),+ company=response.get('organization'),+ )++ def _extract_project_id(self, repository: str) -> str:+ """Extract project_id from repository name for GitLab API calls.++ Args:+ repository: Repository name in format 'owner/repo' or 'domain/owner/repo'++ Returns:+ URL-encoded project ID for GitLab API+ """+ if '/' in repository:+ parts = repository.split('/')+ if len(parts) >= 3 and '.' in parts[0]:+ # Self-hosted GitLab: 'domain/owner/repo' -> 'owner/repo'+ project_id = '/'.join(parts[1:]).replace('/', '%2F')+ else:+ # Regular GitLab: 'owner/repo' -> 'owner/repo'+ project_id = repository.replace('/', '%2F')+ else:+ project_id = repository++ return project_iddiff --git a/openhands/integrations/gitlab/service/branches.py b/openhands/integrations/gitlab/service/branches.pynew file mode 100644index 0000000000..d4bc1d9e9d--- /dev/null+++ b/openhands/integrations/gitlab/service/branches.py@@ -0,0 +1,107 @@+from openhands.integrations.gitlab.service.base import GitLabMixinBase+from openhands.integrations.service_types import Branch, PaginatedBranchesResponse+++class GitLabBranchesMixin(GitLabMixinBase):+ """+ Methods for interacting with GitLab branches+ """++ async def get_branches(self, repository: str) -> list[Branch]:+ """Get branches for a repository"""+ encoded_name = repository.replace('/', '%2F')+ url = f'{self.BASE_URL}/projects/{encoded_name}/repository/branches'++ # Set maximum branches to fetch (10 pages with 100 per page)+ MAX_BRANCHES = 1000+ PER_PAGE = 100++ all_branches: list[Branch] = []+ page = 1++ # Fetch up to 10 pages of branches+ while page <= 10 and len(all_branches) < MAX_BRANCHES:+ params = {'per_page': str(PER_PAGE), 'page': str(page)}+ response, headers = await self._make_request(url, params)++ if not response: # No more branches+ break++ for branch_data in response:+ branch = Branch(+ name=branch_data.get('name'),+ commit_sha=branch_data.get('commit', {}).get('id', ''),+ protected=branch_data.get('protected', False),+ last_push_date=branch_data.get('commit', {}).get('committed_date'),+ )+ all_branches.append(branch)++ page += 1++ # Check if we've reached the last page+ link_header = headers.get('Link', '')+ if 'rel="next"' not in link_header:+ break++ return all_branches++ async def get_paginated_branches(+ self, repository: str, page: int = 1, per_page: int = 30+ ) -> PaginatedBranchesResponse:+ """Get branches for a repository with pagination"""+ encoded_name = repository.replace('/', '%2F')+ url = f'{self.BASE_URL}/projects/{encoded_name}/repository/branches'++ params = {'per_page': str(per_page), 'page': str(page)}+ response, headers = await self._make_request(url, params)++ branches: list[Branch] = []+ for branch_data in response:+ branch = Branch(+ name=branch_data.get('name'),+ commit_sha=branch_data.get('commit', {}).get('id', ''),+ protected=branch_data.get('protected', False),+ last_push_date=branch_data.get('commit', {}).get('committed_date'),+ )+ branches.append(branch)++ has_next_page = False+ total_count = None+ if headers.get('Link', ''):+ has_next_page = True++ if 'X-Total' in headers:+ try:+ total_count = int(headers['X-Total'])+ except (ValueError, TypeError):+ pass++ return PaginatedBranchesResponse(+ branches=branches,+ has_next_page=has_next_page,+ current_page=page,+ per_page=per_page,+ total_count=total_count,+ )++ async def search_branches(+ self, repository: str, query: str, per_page: int = 30+ ) -> list[Branch]:+ """Search branches using GitLab API which supports `search` param."""+ encoded_name = repository.replace('/', '%2F')+ url = f'{self.BASE_URL}/projects/{encoded_name}/repository/branches'++ params = {'per_page': str(per_page), 'search': query}+ response, _ = await self._make_request(url, params)++ branches: list[Branch] = []+ for branch_data in response:+ branches.append(+ Branch(+ name=branch_data.get('name'),+ commit_sha=branch_data.get('commit', {}).get('id', ''),+ protected=branch_data.get('protected', False),+ last_push_date=branch_data.get('commit', {}).get('committed_date'),+ )+ )+ return branchesdiff --git a/openhands/integrations/gitlab/service/features.py b/openhands/integrations/gitlab/service/features.pynew file mode 100644index 0000000000..6b1b9e05e9--- /dev/null+++ b/openhands/integrations/gitlab/service/features.py@@ -0,0 +1,207 @@+from openhands.integrations.gitlab.service.base import GitLabMixinBase+from openhands.integrations.service_types import (+ MicroagentContentResponse,+ ProviderType,+ RequestMethod,+ SuggestedTask,+ TaskType,+)+++class GitLabFeaturesMixin(GitLabMixinBase):+ """+ Methods used for custom features in UI driven via GitLab integration+ """++ async def _get_cursorrules_url(self, repository: str) -> str:+ """Get the URL for checking .cursorrules file."""+ project_id = self._extract_project_id(repository)+ return (+ f'{self.BASE_URL}/projects/{project_id}/repository/files/.cursorrules/raw'+ )++ async def _get_microagents_directory_url(+ self, repository: str, microagents_path: str+ ) -> str:+ """Get the URL for checking microagents directory."""+ project_id = self._extract_project_id(repository)+ return f'{self.BASE_URL}/projects/{project_id}/repository/tree'++ def _get_microagents_directory_params(self, microagents_path: str) -> dict:+ """Get parameters for the microagents directory request."""+ return {'path': microagents_path, 'recursive': 'true'}++ def _is_valid_microagent_file(self, item: dict) -> bool:+ """Check if an item represents a valid microagent file."""+ return (+ item['type'] == 'blob'+ and item['name'].endswith('.md')+ and item['name'] != 'README.md'+ )++ def _get_file_name_from_item(self, item: dict) -> str:+ """Extract file name from directory item."""+ return item['name']++ def _get_file_path_from_item(self, item: dict, microagents_path: str) -> str:+ """Extract file path from directory item."""+ return item['path']++ async def get_suggested_tasks(self) -> list[SuggestedTask]:+ """Get suggested tasks for the authenticated user across all repositories.++ Returns:+ - Merge requests authored by the user.+ - Issues assigned to the user.+ """+ # Get user info to use in queries+ user = await self.get_user()+ username = user.login++ # GraphQL query to get merge requests+ query = """+ query GetUserTasks {+ currentUser {+ authoredMergeRequests(state: opened, sort: UPDATED_DESC, first: 100) {+ nodes {+ id+ iid+ title+ project {+ fullPath+ }+ conflicts+ mergeStatus+ pipelines(first: 1) {+ nodes {+ status+ }+ }+ discussions(first: 100) {+ nodes {+ notes {+ nodes {+ resolvable+ resolved+ }+ }+ }+ }+ }+ }+ }+ }+ """++ try:+ tasks: list[SuggestedTask] = []++ # Get merge requests using GraphQL+ response = await self.execute_graphql_query(query)+ data = response.get('currentUser', {})++ # Process merge requests+ merge_requests = data.get('authoredMergeRequests', {}).get('nodes', [])+ for mr in merge_requests:+ repo_name = mr.get('project', {}).get('fullPath', '')+ mr_number = mr.get('iid')+ title = mr.get('title', '')++ # Start with default task type+ task_type = TaskType.OPEN_PR++ # Check for specific states+ if mr.get('conflicts'):+ task_type = TaskType.MERGE_CONFLICTS+ elif (+ mr.get('pipelines', {}).get('nodes', [])+ and mr.get('pipelines', {}).get('nodes', [])[0].get('status')+ == 'FAILED'+ ):+ task_type = TaskType.FAILING_CHECKS+ else:+ # Check for unresolved comments+ has_unresolved_comments = False+ for discussion in mr.get('discussions', {}).get('nodes', []):+ for note in discussion.get('notes', {}).get('nodes', []):+ if note.get('resolvable') and not note.get('resolved'):+ has_unresolved_comments = True+ break+ if has_unresolved_comments:+ break++ if has_unresolved_comments:+ task_type = TaskType.UNRESOLVED_COMMENTS++ # Only add the task if it's not OPEN_PR+ if task_type != TaskType.OPEN_PR:+ tasks.append(+ SuggestedTask(+ git_provider=ProviderType.GITLAB,+ task_type=task_type,+ repo=repo_name,+ issue_number=mr_number,+ title=title,+ )+ )++ # Get assigned issues using REST API+ url = f'{self.BASE_URL}/issues'+ params = {+ 'assignee_username': username,+ 'state': 'opened',+ 'scope': 'assigned_to_me',+ }++ issues_response, _ = await self._make_request(+ method=RequestMethod.GET, url=url, params=params+ )++ # Process issues+ for issue in issues_response:+ repo_name = (+ issue.get('references', {}).get('full', '').split('#')[0].strip()+ )+ issue_number = issue.get('iid')+ title = issue.get('title', '')++ tasks.append(+ SuggestedTask(+ git_provider=ProviderType.GITLAB,+ task_type=TaskType.OPEN_ISSUE,+ repo=repo_name,+ issue_number=issue_number,+ title=title,+ )+ )++ return tasks+ except Exception:+ return []++ async def get_microagent_content(+ self, repository: str, file_path: str+ ) -> MicroagentContentResponse:+ """Fetch individual file content from GitLab repository.++ Args:+ repository: Repository name in format 'owner/repo' or 'domain/owner/repo'+ file_path: Path to the file within the repository++ Returns:+ MicroagentContentResponse with parsed content and triggers++ Raises:+ RuntimeError: If file cannot be fetched or doesn't exist+ """+ # Extract project_id from repository name+ project_id = self._extract_project_id(repository)++ encoded_file_path = file_path.replace('/', '%2F')+ base_url = f'{self.BASE_URL}/projects/{project_id}'+ file_url = f'{base_url}/repository/files/{encoded_file_path}/raw'++ response, _ = await self._make_request(file_url)++ # Parse the content to extract triggers from frontmatter+ return self._parse_microagent_content(response, file_path)diff --git a/openhands/integrations/gitlab/service/prs.py b/openhands/integrations/gitlab/service/prs.pynew file mode 100644index 0000000000..dd1366ac5e--- /dev/null+++ b/openhands/integrations/gitlab/service/prs.py@@ -0,0 +1,111 @@+from openhands.core.logger import openhands_logger as logger+from openhands.integrations.gitlab.service.base import GitLabMixinBase+from openhands.integrations.service_types import RequestMethod+++class GitLabPRsMixin(GitLabMixinBase):+ """+ Methods for interacting with GitLab merge requests (PRs)+ """++ async def create_mr(+ self,+ id: int | str,+ source_branch: str,+ target_branch: str,+ title: str,+ description: str | None = None,+ labels: list[str] | None = None,+ ) -> str:+ """Creates a merge request in GitLab++ Args:+ id: The ID or URL-encoded path of the project+ source_branch: The name of the branch where your changes are implemented+ target_branch: The name of the branch you want the changes merged into+ title: The title of the merge request (optional, defaults to a generic title)+ description: The description of the merge request (optional)+ labels: A list of labels to apply to the merge request (optional)++ Returns:+ - MR URL when successful+ - Error message when unsuccessful+ """+ # Convert string ID to URL-encoded path if needed+ project_id = str(id).replace('/', '%2F') if isinstance(id, str) else id+ url = f'{self.BASE_URL}/projects/{project_id}/merge_requests'++ # Set default description if none provided+ if not description:+ description = f'Merging changes from {source_branch} into {target_branch}'++ # Prepare the request payload+ payload = {+ 'source_branch': source_branch,+ 'target_branch': target_branch,+ 'title': title,+ 'description': description,+ }++ # Add labels if provided+ if labels and len(labels) > 0:+ payload['labels'] = ','.join(labels)++ # Make the POST request to create the MR+ response, _ = await self._make_request(+ url=url, params=payload, method=RequestMethod.POST+ )++ return response['web_url']++ async def get_pr_details(self, repository: str, pr_number: int) -> dict:+ """Get detailed information about a specific merge request++ Args:+ repository: Repository name in format 'owner/repo'+ pr_number: The merge request number (iid)++ Returns:+ Raw GitLab API response for the merge request+ """+ project_id = self._extract_project_id(repository)+ url = f'{self.BASE_URL}/projects/{project_id}/merge_requests/{pr_number}'+ mr_data, _ = await self._make_request(url)++ return mr_data++ async def is_pr_open(self, repository: str, pr_number: int) -> bool:+ """Check if a GitLab merge request is still active (not closed/merged).++ Args:+ repository: Repository name in format 'owner/repo'+ pr_number: The merge request number (iid)++ Returns:+ True if MR is active (opened), False if closed/merged+ """+ try:+ mr_details = await self.get_pr_details(repository, pr_number)++ # GitLab API response structure+ # https://docs.gitlab.com/ee/api/merge_requests.html#get-single-mr+ if 'state' in mr_details:+ return mr_details['state'] == 'opened'+ elif 'merged_at' in mr_details and 'closed_at' in mr_details:+ # Check if MR is merged or closed+ return not (mr_details['merged_at'] or mr_details['closed_at'])++ # If we can't determine the state, assume it's active (safer default)+ logger.warning(+ f'Could not determine GitLab MR status for {repository}#{pr_number}. '+ f'Response keys: {list(mr_details.keys())}. Assuming MR is active.'+ )+ return True++ except Exception as e:+ logger.warning(+ f'Could not determine GitLab MR status for {repository}#{pr_number}: {e}. '+ f'Including conversation to be safe.'+ )+ # If we can't determine the MR status, include the conversation to be safe+ return Truediff --git a/openhands/integrations/gitlab/service/repos.py b/openhands/integrations/gitlab/service/repos.pynew file mode 100644index 0000000000..6cfd95b043--- /dev/null+++ b/openhands/integrations/gitlab/service/repos.py@@ -0,0 +1,176 @@+from openhands.integrations.gitlab.service.base import GitLabMixinBase+from openhands.integrations.service_types import OwnerType, ProviderType, Repository+from openhands.server.types import AppMode+++class GitLabReposMixin(GitLabMixinBase):+ """+ Methods for interacting with GitLab repositories+ """++ def _parse_repository(+ self, repo: dict, link_header: str | None = None+ ) -> Repository:+ """Parse a GitLab API project response into a Repository object.++ Args:+ repo: Project data from GitLab API+ link_header: Optional link header for pagination++ Returns:+ Repository object+ """+ return Repository(+ id=str(repo.get('id')), # type: ignore[arg-type]+ full_name=repo.get('path_with_namespace'), # type: ignore[arg-type]+ stargazers_count=repo.get('star_count'),+ git_provider=ProviderType.GITLAB,+ is_public=repo.get('visibility') == 'public',+ owner_type=(+ OwnerType.ORGANIZATION+ if repo.get('namespace', {}).get('kind') == 'group'+ else OwnerType.USER+ ),+ link_header=link_header,+ main_branch=repo.get('default_branch'),+ )++ def _parse_gitlab_url(self, url: str) -> str | None:+ """Parse a GitLab URL to extract the repository path.++ Expected format: https://{domain}/{group}/{possibly_subgroup}/{repo}+ Returns the full path from group onwards (e.g., 'group/subgroup/repo' or 'group/repo')+ """+ try:+ # Remove protocol and domain+ if '://' in url:+ url = url.split('://', 1)[1]+ if '/' in url:+ path = url.split('/', 1)[1]+ else:+ return None++ # Clean up the path+ path = path.strip('/')+ if not path:+ return None++ # Split the path and remove empty parts+ path_parts = [part for part in path.split('/') if part]++ # We need at least 2 parts: group/repo+ if len(path_parts) < 2:+ return None++ # Join all parts to form the full repository path+ return '/'.join(path_parts)++ except Exception:+ return None++ async def search_repositories(+ self,+ query: str,+ per_page: int = 30,+ sort: str = 'updated',+ order: str = 'desc',+ public: bool = False,+ ) -> list[Repository]:+ if public:+ # When public=True, query is a GitLab URL that we need to parse+ repo_path = self._parse_gitlab_url(query)+ if not repo_path:+ return [] # Invalid URL format++ repository = await self.get_repository_details_from_repo_name(repo_path)+ return [repository]++ return await self.get_paginated_repos(1, per_page, sort, None, query)++ async def get_paginated_repos(+ self,+ page: int,+ per_page: int,+ sort: str,+ installation_id: str | None,+ query: str | None = None,+ ) -> list[Repository]:+ url = f'{self.BASE_URL}/projects'+ order_by = {+ 'pushed': 'last_activity_at',+ 'updated': 'last_activity_at',+ 'created': 'created_at',+ 'full_name': 'name',+ }.get(sort, 'last_activity_at')++ params = {+ 'page': str(page),+ 'per_page': str(per_page),+ 'order_by': order_by,+ 'sort': 'desc', # GitLab uses sort for direction (asc/desc)+ 'membership': True, # Include projects user is a member of+ }++ if query:+ params['search'] = query+ params['search_namespaces'] = True++ response, headers = await self._make_request(url, params)++ next_link: str = headers.get('Link', '')+ repos = [+ self._parse_repository(repo, link_header=next_link) for repo in response+ ]+ return repos++ async def get_all_repositories(+ self, sort: str, app_mode: AppMode+ ) -> list[Repository]:+ MAX_REPOS = 1000+ PER_PAGE = 100 # Maximum allowed by GitLab API+ all_repos: list[dict] = []+ page = 1++ url = f'{self.BASE_URL}/projects'+ # Map GitHub's sort values to GitLab's order_by values+ order_by = {+ 'pushed': 'last_activity_at',+ 'updated': 'last_activity_at',+ 'created': 'created_at',+ 'full_name': 'name',+ }.get(sort, 'last_activity_at')++ while len(all_repos) < MAX_REPOS:+ params = {+ 'page': str(page),+ 'per_page': str(PER_PAGE),+ 'order_by': order_by,+ 'sort': 'desc', # GitLab uses sort for direction (asc/desc)+ 'membership': 1, # Use 1 instead of True+ }+ response, headers = await self._make_request(url, params)++ if not response: # No more repositories+ break++ all_repos.extend(response)+ page += 1++ # Check if we've reached the last page+ link_header = headers.get('Link', '')+ if 'rel="next"' not in link_header:+ break++ # Trim to MAX_REPOS if needed and convert to Repository objects+ all_repos = all_repos[:MAX_REPOS]+ return [self._parse_repository(repo) for repo in all_repos]++ async def get_repository_details_from_repo_name(+ self, repository: str+ ) -> Repository:+ encoded_name = repository.replace('/', '%2F')++ url = f'{self.BASE_URL}/projects/{encoded_name}'+ repo, _ = await self._make_request(url)++ return self._parse_repository(repo)diff --git a/openhands/integrations/gitlab/service/resolver.py b/openhands/integrations/gitlab/service/resolver.pynew file mode 100644index 0000000000..ec79cade63--- /dev/null+++ b/openhands/integrations/gitlab/service/resolver.py@@ -0,0 +1,134 @@+from datetime import datetime++from openhands.integrations.gitlab.service.base import GitLabMixinBase+from openhands.integrations.service_types import Comment+++class GitLabResolverMixin(GitLabMixinBase):+ """+ Helper methods used for the GitLab Resolver+ """++ async def get_review_thread_comments(+ self, project_id: str, issue_iid: int, discussion_id: str+ ) -> list[Comment]:+ url = (+ f'{self.BASE_URL}/projects/{project_id}'+ f'/merge_requests/{issue_iid}/discussions/{discussion_id}'+ )++ # Single discussion fetch; notes are returned inline.+ response, _ = await self._make_request(url)+ notes = response.get('notes') or []+ return self._process_raw_comments(notes)++ async def get_issue_or_mr_title_and_body(+ self, project_id: str, issue_number: int, is_mr: bool = False+ ) -> tuple[str, str]:+ """Get the title and body of an issue or merge request.++ Args:+ repository: Repository name in format 'owner/repo' or 'domain/owner/repo'+ issue_number: The issue/MR IID within the project+ is_mr: If True, treat as merge request; if False, treat as issue;+ if None, try issue first then merge request (default behavior)++ Returns:+ A tuple of (title, body)+ """+ if is_mr:+ url = f'{self.BASE_URL}/projects/{project_id}/merge_requests/{issue_number}'+ response, _ = await self._make_request(url)+ title = response.get('title') or ''+ body = response.get('description') or ''+ return title, body++ url = f'{self.BASE_URL}/projects/{project_id}/issues/{issue_number}'+ response, _ = await self._make_request(url)+ title = response.get('title') or ''+ body = response.get('description') or ''+ return title, body++ async def get_issue_or_mr_comments(+ self,+ project_id: str,+ issue_number: int,+ max_comments: int = 10,+ is_mr: bool = False,+ ) -> list[Comment]:+ """Get comments for an issue or merge request.++ Args:+ repository: Repository name in format 'owner/repo' or 'domain/owner/repo'+ issue_number: The issue/MR IID within the project+ max_comments: Maximum number of comments to retrieve+ is_pr: If True, treat as merge request; if False, treat as issue;+ if None, try issue first then merge request (default behavior)++ Returns:+ List of Comment objects ordered by creation date+ """+ all_comments: list[Comment] = []+ page = 1+ per_page = min(max_comments, 10)++ url = (+ f'{self.BASE_URL}/projects/{project_id}/merge_requests/{issue_number}/discussions'+ if is_mr+ else f'{self.BASE_URL}/projects/{project_id}/issues/{issue_number}/notes'+ )++ while len(all_comments) < max_comments:+ params = {+ 'per_page': per_page,+ 'page': page,+ 'order_by': 'created_at',+ 'sort': 'asc',+ }++ response, headers = await self._make_request(url, params)+ if not response:+ break++ if is_mr:+ for discussions in response:+ # Keep root level comments+ all_comments.append(discussions['notes'][0])+ else:+ all_comments.extend(response)++ link_header = headers.get('Link', '')+ if 'rel="next"' not in link_header:+ break++ page += 1++ return self._process_raw_comments(all_comments)++ def _process_raw_comments(+ self, comments: list, max_comments: int = 10+ ) -> list[Comment]:+ """Helper method to fetch comments from a given URL with pagination."""+ all_comments: list[Comment] = []+ for comment_data in comments:+ comment = Comment(+ id=str(comment_data.get('id', 'unknown')),+ body=self._truncate_comment(comment_data.get('body', '')),+ author=comment_data.get('author', {}).get('username', 'unknown'),+ created_at=datetime.fromisoformat(+ comment_data.get('created_at', '').replace('Z', '+00:00')+ )+ if comment_data.get('created_at')+ else datetime.fromtimestamp(0),+ updated_at=datetime.fromisoformat(+ comment_data.get('updated_at', '').replace('Z', '+00:00')+ )+ if comment_data.get('updated_at')+ else datetime.fromtimestamp(0),+ system=comment_data.get('system', False),+ )+ all_comments.append(comment)++ # Sort comments by creation date and return the most recent ones+ all_comments.sort(key=lambda c: c.created_at)+ return all_comments[-max_comments:]