Add Google support (#73)

AleksandrFurmenkovOfficial · web-flow · commit 2900c9e374c1 · 2025-03-01T17:35:54.000+03:00
diff --git a/.github/workflows/aireview.yaml b/.github/workflows/aireview.yaml
@@ -13,22 +13,23 @@ jobs:
         uses: AleksandrFurmenkovOfficial/ai-code-review@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          
           # AI Provider Configuration
-          ai_provider: 'openai'  # Can be 'openai', 'anthropic', ('google', or 'deepseek') soon
+          ai_provider: 'google'  # Can be 'openai', 'anthropic', 'google', ('deepseek' soon)
 
           # Anthropic Configuration (if using Anthropic)
           # anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-          # anthropic_model: 'claude-3-7-sonnet-20250219'  # Optional
+          # anthropic_model: 'claude-3-7-sonnet-20250219'  # Optional, defaults to 'claude-3-7-sonnet-latest'
           
           # OpenAI Configuration (if using OpenAI)
-          openai_api_key: ${{ secrets.OPENAI_API_KEY }}
+          # openai_api_key: ${{ secrets.OPENAI_API_KEY }}
           # openai_model: 'gpt-4o'  # Optional, defaults to 'gpt-4o'
           
           # Google Configuration (if using Google)
-          # google_api_key: ${{ secrets.GOOGLE_API_KEY }}
-          # google_model: 'gemini-2.0-flash-thinking-exp-01-21'  # Optional
+          google_api_key: ${{ secrets.GOOGLE_API_KEY }}
+          google_model: 'gemini-2.0-flash' # Optional, defaults to 'gemini-2.0-flash'
           
-          # Deepseek Configuration (if using Deepseek)
+          # Soon - Deepseek Configuration (if using Deepseek)
           # deepseek_api_key: ${{ secrets.DEEPSEEK_API_KEY }}
           # deepseek_model: 'deepseek-reasoner'  # Optional
           
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 ## Description
 
-Perform code review using various AI models (from OpenAI, Anthropic, and soon Google, Deepseek) to analyze and provide feedback on your code. This GitHub Action helps improve the code quality by automatically reviewing pull requests, focusing on specified file extensions, and excluding specific paths.
+Perform code review using various AI models from OpenAI, Anthropic, Google, Deepseek(soon) to analyze and provide feedback on your code. This GitHub Action helps improve the code quality by automatically reviewing pull requests, focusing on specified file extensions, and excluding specific paths.
 
 ## Inputs
 
@@ -15,7 +15,7 @@ Perform code review using various AI models (from OpenAI, Anthropic, and soon Go
 
 ***pr_number*** - Required. The number of the pull request that needs to be reviewed.
 
-***ai_provider*** - Required. The AI provider to use (openai, anthropic, and soon google, deepseek). Default is 'openai'.
+***ai_provider*** - Required. The AI provider to use { openai, anthropic, google, deepseek(soon)}. Default is 'openai'.
 
 
 ***openai_api_key*** - Required if using OpenAI provider. This key is necessary to access OpenAI's API for code review purposes.
@@ -30,7 +30,7 @@ Perform code review using various AI models (from OpenAI, Anthropic, and soon Go
 
 ***google_api_key*** - Required if using Google provider. This key is necessary to access Google's API for code review purposes.
 
-***google_model*** - Optional. The Google model name (e.g., gemini-2.0-flash-thinking-exp-01-21). Default is 'gemini-2.0-flash-thinking-exp-01-21'.
+***google_model*** - Optional. The Google model name (e.g., gemini-2.0-flash). Default is 'gemini-2.0-flash'.
 
 
 ***deepseek_api_key*** - Required if using Deepseek provider. This key is necessary to access Deepseek's API for code review purposes.
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: AI Code Review
-      uses: AleksandrFurmenkovOfficial/ai-code-review@v0.6
+      uses: AleksandrFurmenkovOfficial/ai-code-review@v0.7
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         owner: ${{ github.repository_owner }}
@@ -92,7 +92,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: AI Code Review
-      uses: AleksandrFurmenkovOfficial/ai-code-review@v0.6
+      uses: AleksandrFurmenkovOfficial/ai-code-review@v0.7
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         owner: ${{ github.repository_owner }}
@@ -118,7 +118,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: AI Code Review
-      uses: AleksandrFurmenkovOfficial/ai-code-review@v0.6
+      uses: AleksandrFurmenkovOfficial/ai-code-review@v0.7
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         owner: ${{ github.repository_owner }}
@@ -135,7 +135,7 @@ jobs:
         fail_action_if_review_failed: 'true'
 ```
 
-### Google Example (soon or suggest your PR to include)
+### Google Example
 
 ```yaml
 name: AI Code Review with Google
@@ -149,7 +149,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: AI Code Review
-      uses: AleksandrFurmenkovOfficial/ai-code-review@main
+      uses: AleksandrFurmenkovOfficial/ai-code-review@v0.7
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         owner: ${{ github.repository_owner }}
@@ -158,7 +158,7 @@ jobs:
         
         ai_provider: 'google'
         google_api_key: ${{ secrets.GOOGLE_API_KEY }}
-        google_model: 'gemini-2.0-flash-thinking-exp-01-21'
+        google_model: 'gemini-2.0-flash'
 ```
 
 ### Deepseek Example (soon or suggest your PR to include)
diff --git a/action.yml b/action.yml
@@ -1,12 +1,12 @@
 name: 'AI Code Review'
-description: 'Perform code review using various AI models (OpenAI, Anthropic, and soon Google, Deepseek)'
+description: 'Perform code review using various AI models from OpenAI, Anthropic, Google and soon Deepseek'
 
 inputs:
   token:
     description: 'GitHub token'
     required: true
   ai_provider:
-    description: 'AI provider to use (openai, anthropic, and soon google, deepseek)'
+    description: 'AI provider to use (openai, anthropic, google and soon deepseek)'
     required: true
     default: 'openai'
   openai_api_key:
@@ -27,9 +27,9 @@ inputs:
     description: 'Google AI API key (required if using Google provider)'
     required: false
   google_model:
-    description: 'Google model name (e.g., gemini-2.0-flash-thinking-exp-01-21)'
+    description: 'Google model name (e.g., gemini-2.0-flash)'
     required: false
-    default: 'gemini-2.0-flash-thinking-exp-01-21'
+    default: 'gemini-2.0-flash'
   deepseek_api_key:
     description: 'Deepseek API key (required if using Deepseek provider)'
     required: false
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ai-code-review",
-  "version": "1.1.0",
+  "version": "0.7.0",
   "description": "AI Code Review is a GitHub Action that integrates various AI models (OpenAI, Google, Anthropic, Deepseek) into your code review process, providing automated feedback on pull requests. Improve your code quality and streamline your development workflow with this powerful and customizable AI-driven code review tool.",
   "main": "index.js",
   "scripts": {
diff --git a/src/google-agent.js b/src/google-agent.js
@@ -1,78 +1,8 @@
-const { warning, info } = require("@actions/core");
-const { GoogleGenerativeAI } = require("@google/generative-ai");
-const BaseAIAgent = require("./base-ai-agent");
+const OpenAIAgent = require("./openai-agent");
 
-class GoogleAgent extends BaseAIAgent {
-    constructor(apiKey, fileContentGetter, fileCommentator, model, failAction = false) {
-        super(apiKey, fileContentGetter, fileCommentator, model, failAction);
-        this.genAI = new GoogleGenerativeAI(apiKey);
-    }
-
-    async initialize() {
-        try {
-            this.model = this.genAI.getGenerativeModel({ 
-                model: this.model,
-                systemInstruction: `You are an expert AI code reviewer responsible for reviewing GitHub PRs.
-                Review the user's changes for typos, logical errors, and security issues.
-                Use the provided tools to add specific, actionable comments.
-                Avoid repeating the same issue multiple times.
-                Comment only when you are confident! Do not report minor issues.
-                Use 'getFileContent' when you need more context.
-                Provide results only via the provided functions.`
-            });
-            return true;
-        } catch (error) {
-            this.handleError(error, 'Error initializing Google AI model');
-            return false;
-        }
-    }
-
-    async doReview(changedFiles) {
-        let reviewSummary = '';
-        const simpleChangedFiles = changedFiles.map(file => ({
-            filename: file.filename,
-            status: file.status,
-            additions: file.additions,
-            deletions: file.deletions,
-            changes: file.changes,
-            patch: file.patch
-        }));
-        
-        try {
-            await this.initialize();
-            
-            const maxRetries = 3;
-            const initialBackoff = 1000;
-            
-            for (let retries = 0; retries < maxRetries; retries++) {
-                try {
-                    reviewSummary = await this.processReview(simpleChangedFiles);
-                    break;
-                } catch (error) {
-                    if (retries >= maxRetries - 1) {
-                        this.handleError(error, 'Max retries reached for code review');
-                    }
-                    
-                    const backoff = initialBackoff * Math.pow(2, retries) + Math.random() * 1000;
-                    warning(`Retry ${retries + 1}/${maxRetries}: ${error.message}. Retrying in ${Math.round(backoff)}ms`);
-                    await new Promise(resolve => setTimeout(resolve, backoff));
-                }
-            }
-        } catch (error) {
-            this.handleError(error, 'Error in code review process', false);
-        }
-        
-        return reviewSummary;
-    }
-
-    async processReview(changedFiles) {
-        warning("Google AI provider is not fully implemented yet. This is a placeholder implementation.");
-        info("Processing changed files with Google AI...");
-        
-        let reviewedFiles = 0;
-        let commentsMade = 0;
-        
-        return `Code review with Google AI completed. This is currently a placeholder implementation. Full support for Google AI will be added in future versions.`;
+class GoogleAgent extends OpenAIAgent {
+    constructor(apiKey, fileContentGetter, fileCommentator, model) {
+        super(apiKey, fileContentGetter, fileCommentator, model, "https://generativelanguage.googleapis.com/v1beta/openai/");
     }
 }
 
diff --git a/src/openai-agent.js b/src/openai-agent.js
@@ -1,12 +1,20 @@
+const core = require("@actions/core");
 const { OpenAI } = require('openai');
 const BaseAIAgent = require("./base-ai-agent");
 
-const c_max_completion_tokens = 8192;
-
 class OpenAIAgent extends BaseAIAgent {
-    constructor(apiKey, fileContentGetter, fileCommentator, model) {
+    constructor(apiKey, fileContentGetter, fileCommentator, model, baseURL = null) {
         super(apiKey, fileContentGetter, fileCommentator, model);
-        this.openai = new OpenAI({ apiKey });
+
+        if (baseURL == null || baseURL === undefined || baseURL.trim() === '' ) {
+            core.info("Using default OpenAI API URL");
+            this.openai = new OpenAI({ apiKey});
+        }
+        else {
+            core.info(`Using custom baseUrl: ${baseURL}`);
+            this.openai = new OpenAI({ apiKey : apiKey, baseURL : baseURL});
+        }
+
         this.tools = [
             {
                 type: "function",
@@ -128,14 +136,23 @@ class OpenAIAgent extends BaseAIAgent {
             }
 
             // Proceed to the next API call
-            const nextResponse = await this.openai.chat.completions.create({
-                model: this.model,
-                messages: [{ role: 'system', content: this.getSystemPrompt() }, ...reviewState.messageHistory],
-                tools: this.tools,
-                max_completion_tokens: c_max_completion_tokens
-            });
-            const nextMessage = nextResponse.choices[0].message;
-            return await this.handleMessageResponse(nextMessage, reviewState);
+            try {
+                core.info(`Sending follow-up request to OpenAI with model: ${this.model}`);
+                const nextResponse = await this.openai.chat.completions.create({
+                    model: this.model,
+                    messages: [{ role: 'system', content: this.getSystemPrompt() }, ...reviewState.messageHistory],
+                    tools: this.tools
+                });
+                const nextMessage = nextResponse.choices[0].message;
+                return await this.handleMessageResponse(nextMessage, reviewState);
+            } catch (error) {
+                core.error(`OpenAI API error in follow-up request: ${error.message}`);
+                if (error.response) {
+                    core.error(`Status: ${error.response.status}`);
+                    core.error(`Data: ${JSON.stringify(error.response.data)}`);
+                }
+                throw error;
+            }
         } else {
             if (message.content && !reviewState.summary) {
                 reviewState.summary = message.content;
@@ -173,15 +190,24 @@ class OpenAIAgent extends BaseAIAgent {
 
         reviewState.messageHistory.push(initialUserMessage);
 
-        const initialResponse = await this.openai.chat.completions.create({
-            model: this.model,
-            messages: [{ role: 'system', content: this.getSystemPrompt() }, ...reviewState.messageHistory],
-            tools: this.tools,
-            max_completion_tokens: c_max_completion_tokens
-        });
-        const initialMessage = initialResponse.choices[0].message;
-        reviewSummary = await this.handleMessageResponse(initialMessage, reviewState);
-        return reviewSummary;
+        try {
+            core.info(`Sending initial request to OpenAI with model: ${this.model}`);
+            const initialResponse = await this.openai.chat.completions.create({
+                model: this.model,
+                messages: [{ role: 'system', content: this.getSystemPrompt() }, ...reviewState.messageHistory],
+                tools: this.tools
+            });
+            const initialMessage = initialResponse.choices[0].message;
+            reviewSummary = await this.handleMessageResponse(initialMessage, reviewState);
+            return reviewSummary;
+        } catch (error) {
+            core.error(`OpenAI API error: ${error.message}`);
+            if (error.response) {
+                core.error(`Status: ${error.response.status}`);
+                core.error(`Data: ${JSON.stringify(error.response.data)}`);
+            }
+            throw error;
+        }
     }
 
     async getFileContent(args) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ai-code-review",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "0.7.0",`
`4`	`4`	`"description": "AI Code Review is a GitHub Action that integrates various AI models (OpenAI, Google, Anthropic, Deepseek) into your code review process, providing automated feedback on pull requests. Improve your code quality and streamline your development workflow with this powerful and customizable AI-driven code review tool.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`