Feat/gitbal catalog

.gitlab-ci.yml

@@ -0,0 +1,27 @@
+image: python:3.9-slim
+
+code-review:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: always
+    - if: '$CI_MERGE_REQUEST_EVENT_TYPE =~ /^(open|reopen|update)$/'
+      when: always
+    - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "approved"'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_comment"'
+      when: always
+  script:
+    - export VERSION=5.rc-1
+    - apt-get update
+    - apt-get install curl -y
+    - apt-get install zip unzip -y
+    - curl -L https://github.com/utsmannn/corivai/archive/refs/tags/v${VERSION}.zip -o action_code.zip
+    - unzip action_code.zip
+    - cp -R corivai-${VERSION}/corivai .
+    - cp corivai-${VERSION}/requirements.txt .
+    - pip install -r requirements.txt
+    - python -m corivai.main-gitlab
+  variables:
+    REVIEWER_OPENAI_URL: "https://generativelanguage.googleapis.com/v1beta/openai/"
+    REVIEWER_MAX_DIFF_SIZE: "500000"
+    REVIEWER_MODEL_NAME: "gemini-1.5-flash"

action.yml

@@ -38,10 +38,11 @@ runs:
 
     - name: Download Action Code and Requirements
       run: |
-        curl -L https://github.com/utsmannn/corivai/archive/refs/heads/main.zip -o action_code.zip
+        export VERSION=5.rc-1
+        curl -L https://github.com/utsmannn/corivai/archive/refs/tags/v${VERSION}.zip -o action_code.zip
         unzip action_code.zip
-        cp -R corivai-main/src .
-        cp corivai-main/requirements.txt .
+        cp -R corivai-${VERSION}/corivai .
+        cp corivai-${VERSION}/requirements.txt .
       shell: bash
 
     - name: Install dependencies
@@ -58,7 +59,7 @@ runs:
         INPUT_MODEL-NAME: ${{ inputs.model-name }}
         INPUT_CUSTOM-INSTRUCTIONS: ${{ inputs.custom-instructions }}
         INPUT_MAX_DIFF_SIZE: ${{ inputs.max-diff-size }}
-      run: python -m src.main
+      run: python -m corivai.main
       shell: bash
 
     - name: Process Review Comments
@@ -74,5 +75,5 @@ runs:
         REPO: ${{ github.repository }}
         REVIEW_THREAD_ID: ${{ github.event.comment.pull_request_review_id }}
         USER_LOGIN: ${{ github.event.comment.user.login }}
-      run: python -m src.comment_processor
+      run: python -m corivai.github_comment_processor
       shell: bash

corivai/__init__.py

@@ -0,0 +1,15 @@
+from corivai.exceptions import ReviewError
+from corivai.decorators import retry
+from corivai.models import ReviewComment, ReviewResponse
+from corivai.generator_review_interface import ResponseReviewGenerator, AIReviewGenerator
+from corivai.pr_reviewer import PRReviewer
+
+__all__ = [
+    'ReviewError',
+    'retry',
+    'ReviewComment',
+    'ReviewResponse',
+    'ResponseReviewGenerator',
+    'AIReviewGenerator',
+    'PRReviewer'
+]

corivai/config.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+
+class CorivaiConfig(BaseModel):
+    api_key: str
+    openai_url: str
+    model_name: str
+    git_token: str
+    max_diff_size: int
+    custom_instruction: str

src/generator_review_interface.py → corivai/generator_review_interface.py

@@ -1,10 +1,11 @@
-import os
-from abc import ABC, abstractmethod
-from typing import List, Dict, Any
 import json
+from abc import ABC, abstractmethod
+from typing import Dict
 
 from openai import OpenAI, BaseModel
-from src.models import ReviewResponse, ReviewComment
+
+from corivai.config import CorivaiConfig
+from corivai.models import ReviewResponse, ReviewComment
 
 
 class ResponseReviewGenerator(ABC):
@@ -22,11 +23,13 @@ class DiffResponse(BaseModel):
     diff: list[DiffItem]
 
 class AIReviewGenerator(ResponseReviewGenerator):
-    def __init__(self, model_name: str):
-        self.baseUrl = os.getenv('INPUT_OPENAI-URL', 'https://api.openai.com/v1')
-        self.apiKey = os.getenv('API_KEY')
-        self.client = OpenAI(base_url=self.baseUrl, api_key=self.apiKey)
-        self.model_name = model_name
+    def __init__(self, config: CorivaiConfig):
+
+        # self.baseUrl = os.getenv('INPUT_OPENAI-URL', 'https://api.openai.com/v1')
+        # self.apiKey = os.getenv('API_KEY')
+
+        self.client = OpenAI(base_url=config.openai_url, api_key=config.api_key)
+        self.model_name = config.model_name
 
     def generate(self, structured_diff: str) -> ReviewResponse:
         response = self.client.beta.chat.completions.parse(

corivai/git_github.py

@@ -0,0 +1,61 @@
+import os
+from typing import Dict, List
+import requests
+from github import Github
+from github.PullRequest import PullRequest
+
+from corivai.git_interface import GitInterface
+from corivai.exceptions import ReviewError
+
+class GitGithub(GitInterface):
+    def __init__(self, token: str, repo_identifier: str):
+        self.token = token
+        self.repo_identifier = repo_identifier
+        self.github = Github(token)
+        self.repo = self.github.get_repo(repo_identifier)
+
+    def get_request_number(self) -> int:
+        pr_ref = os.getenv('GITHUB_REF')
+        if not pr_ref:
+            raise ReviewError("GITHUB_REF not found")
+        try:
+            return int(pr_ref.split('/')[-2])
+        except (IndexError, ValueError) as e:
+            raise ReviewError(f"Invalid PR reference format: {str(e)}")
+
+    def get_request(self, number: int) -> PullRequest:
+        return self.repo.get_pull(number)
+
+    def get_diff(self, request: PullRequest) -> str:
+        headers = {
+            'Authorization': f'Bearer {self.token}',
+            'Accept': 'application/vnd.github.v3.diff'
+        }
+        url = f'https://api.github.com/repos/{self.repo_identifier}/pulls/{request.number}'
+        response = requests.get(url, headers=headers)
+        response.raise_for_status()
+        return response.text
+
+    def get_review_comments(self, request: PullRequest) -> List[Dict]:
+        comments = request.get_review_comments()
+        return [{
+            'path': comment.path,
+            'position': comment.position,
+            'body': comment.body,
+            'diff_hunk': comment.diff_hunk
+        } for comment in comments]
+
+    def create_review_comment(self, request: PullRequest, file_path: str, position: int, body: str) -> None:
+        return None
+
+    def create_review(self, request: PullRequest, comments: List[Dict]) -> None:
+        request.create_review(
+            event="COMMENT",
+            comments=comments
+        )
+
+    def create_issue_comment(self, request: PullRequest, body: str) -> None:
+        request.create_issue_comment(body)
+
+    def get_head_sha(self, request: PullRequest) -> str:
+        return request.head.sha

corivai/git_gitlab.py

@@ -0,0 +1,97 @@
+import os
+from typing import Dict, List
+import requests
+import gitlab
+from gitlab.v4.objects import MergeRequest
+import logging
+
+from corivai.git_interface import GitInterface
+from corivai.exceptions import ReviewError
+
+logging.basicConfig(
+        level=logging.INFO,
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    )
+logger = logging.getLogger(__name__)
+
+
+class GitGitlab(GitInterface):
+    def __init__(self, token: str, repo_identifier: str):
+        self.token = token
+        self.project_id = repo_identifier
+        self.gitlab_url = os.getenv('CI_SERVER_URL', 'https://gitlab.com')
+        self.gl = gitlab.Gitlab(self.gitlab_url, private_token=token)
+        self.project = self.gl.projects.get(repo_identifier)
+
+    def get_request_number(self) -> int:
+        mr_iid = os.getenv('CI_MERGE_REQUEST_IID')
+        if not mr_iid:
+            raise ReviewError("CI_MERGE_REQUEST_IID not found")
+        try:
+            return int(mr_iid)
+        except ValueError as e:
+            raise ReviewError(f"Invalid merge request IID format: {str(e)}")
+
+    def get_request(self, number: int) -> MergeRequest:
+        return self.project.mergerequests.get(number)
+
+    def get_diff(self, request: MergeRequest) -> str:
+        headers = {
+            'PRIVATE-TOKEN': self.token
+        }
+        url = f'{self.gitlab_url}/api/v4/projects/{self.project_id}/merge_requests/{request.iid}/changes'
+        response = requests.get(url, headers=headers)
+        response.raise_for_status()
+
+        changes = response.json().get('changes', [])
+        diff_content = []
+
+        for change in changes:
+            diff_content.append(f"diff --git a/{change['old_path']} b/{change['new_path']}")
+            diff_content.append(change['diff'])
+
+        return '\n'.join(diff_content)
+
+    def get_review_comments(self, request: MergeRequest) -> List[Dict]:
+        discussions = request.discussions.list(get_all=True)
+        comments = []
+
+        for discussion in discussions:
+            for note in discussion.attributes.get('notes', []):
+                if note.get('type') == 'DiffNote':
+                    comments.append({
+                        'path': note.get('position', {}).get('new_path'),
+                        'position': note.get('position', {}).get('new_line'),
+                        'body': note.get('body'),
+                        'diff_hunk': note.get('position', {}).get('new_line')
+                    })
+
+        return comments
+
+    def create_review_comment(self, request: MergeRequest, file_path: str, position: int, body: str) -> None:
+        request.discussions.create({
+            'body': body,
+            'position': {
+                'base_sha': request.diff_refs['base_sha'],
+                'start_sha': request.diff_refs['start_sha'],
+                'head_sha': request.diff_refs['head_sha'],
+                'position_type': 'text',
+                'new_path': file_path,
+                'new_line': position
+            }
+        })
+
+    def create_review(self, request: MergeRequest, comments: List[Dict]) -> None:
+        for comment in comments:
+            self.create_review_comment(
+                request,
+                comment['path'],
+                comment['position'],
+                comment['body']
+            )
+
+    def create_issue_comment(self, request: MergeRequest, body: str) -> None:
+        request.notes.create({'body': body})
+
+    def get_head_sha(self, request: MergeRequest) -> str:
+        return request.sha

corivai/git_interface.py

@@ -0,0 +1,49 @@
+from abc import ABC, abstractmethod
+from typing import Dict, List, Optional
+
+
+class GitInterface(ABC):
+    @abstractmethod
+    def __init__(self, token: str, repo_identifier: str):
+        """Initialize git interface with token and repository identifier"""
+        pass
+
+    @abstractmethod
+    def get_request_number(self) -> int:
+        """Get pull/merge request number from environment"""
+        pass
+
+    @abstractmethod
+    def get_request(self, number: int):
+        """Get pull/merge request object"""
+        pass
+
+    @abstractmethod
+    def get_diff(self, request) -> str:
+        """Get diff content from pull/merge request"""
+        pass
+
+    @abstractmethod
+    def get_review_comments(self, request) -> List[Dict]:
+        """Get existing review comments"""
+        pass
+
+    @abstractmethod
+    def create_review_comment(self, request, file_path: str, position: int, body: str) -> None:
+        """Create a new review comment"""
+        pass
+
+    @abstractmethod
+    def create_review(self, request, comments: List[Dict]) -> None:
+        """Create a batch of review comments"""
+        pass
+
+    @abstractmethod
+    def create_issue_comment(self, request, body: str) -> None:
+        """Create a general comment on the request"""
+        pass
+
+    @abstractmethod
+    def get_head_sha(self, request) -> str:
+        """Get the current HEAD SHA of the request"""
+        pass

src/comment_processor.py → corivai/github_comment_processor.py

@@ -3,7 +3,7 @@
 
 from github import Github
 
-from src import ReviewError
+from corivai import ReviewError
 from openai import OpenAI, BaseModel