Improve PR info

Side effect change cause I was reviewing the PR with bot

Author: SamSaffron

lib/ai_bot/tools/github_pull_request_diff.rb

@@ -47,27 +47,65 @@ def invoke
           api_url = "https://api.github.com/repos/#{repo}/pulls/#{pull_id}"
           @url = "https://github.com/#{repo}/pull/#{pull_id}"
 
-          body = nil
+          pr_info = nil
+          diff_body = nil
           response_code = "unknown error"
 
           send_http_request(
             api_url,
             headers: {
-              "Accept" => "application/vnd.github.v3.diff",
+              "Accept" => "application/json",
             },
             authenticate_github: true,
           ) do |response|
             response_code = response.code
-            body = read_response_body(response)
+            pr_info = JSON.parse(read_response_body(response)) if response_code == "200"
           end
 
           if response_code == "200"
-            diff = body
+            send_http_request(
+              api_url,
+              headers: {
+                "Accept" => "application/vnd.github.v3.diff",
+              },
+              authenticate_github: true,
+            ) do |response|
+              response_code = response.code
+              diff_body = read_response_body(response)
+            end
+          end
+
+          if response_code == "200" && pr_info && diff_body
+            diff = diff_body
             diff = self.class.sort_and_shorten_diff(diff)
             diff = truncate(diff, max_length: 20_000, percent_length: 0.3, llm: llm)
-            { diff: diff }
+
+            source_repo = pr_info.dig("head", "repo", "full_name")
+            source_branch = pr_info.dig("head", "ref")
+            source_sha = pr_info.dig("head", "sha")
+
+            {
+              diff: diff,
+              pr_info: {
+                title: pr_info["title"],
+                state: pr_info["state"],
+                source: {
+                  repo: source_repo,
+                  branch: source_branch,
+                  sha: source_sha,
+                  url: "https://github.com/#{source_repo}/tree/#{source_branch}",
+                },
+                target: {
+                  repo: pr_info["base"]["repo"]["full_name"],
+                  branch: pr_info["base"]["ref"],
+                },
+                author: pr_info["user"]["login"],
+                created_at: pr_info["created_at"],
+                updated_at: pr_info["updated_at"],
+              },
+            }
           else
-            { error: "Failed to retrieve the diff. Status code: #{response_code}" }
+            { error: "Failed to retrieve the PR information. Status code: #{response_code}" }
           end
         end
 

spec/lib/modules/ai_bot/tools/github_pull_request_diff_spec.rb

@@ -49,15 +49,47 @@
     let(:repo) { "discourse/discourse-automation" }
     let(:pull_id) { 253 }
     let(:diff) { <<~DIFF }
-        diff --git a/lib/discourse_automation/automation.rb b/lib/discourse_automation/automation.rb
-        index 3e3e3e3..4f4f4f4 100644
-        --- a/lib/discourse_automation/automation.rb
-        +++ b/lib/discourse_automation/automation.rb
-        @@ -1,3 +1,3 @@
-        -module DiscourseAutomation
-      DIFF
+      diff --git a/lib/discourse_automation/automation.rb b/lib/discourse_automation/automation.rb
+      index 3e3e3e3..4f4f4f4 100644
+      --- a/lib/discourse_automation/automation.rb
+      +++ b/lib/discourse_automation/automation.rb
+      @@ -1,3 +1,3 @@
+      -module DiscourseAutomation
+    DIFF
+
+    let(:pr_info) do
+      {
+        "title" => "Test PR",
+        "state" => "open",
+        "user" => {
+          "login" => "test-user",
+        },
+        "created_at" => "2023-01-01T00:00:00Z",
+        "updated_at" => "2023-01-02T00:00:00Z",
+        "head" => {
+          "repo" => {
+            "full_name" => "test/repo",
+          },
+          "ref" => "feature-branch",
+          "sha" => "abc123",
+        },
+        "base" => {
+          "repo" => {
+            "full_name" => "main/repo",
+          },
+          "ref" => "main",
+        },
+      }
+    end
+
+    it "retrieves both PR info and diff" do
+      stub_request(:get, "https://api.github.com/repos/#{repo}/pulls/#{pull_id}").with(
+        headers: {
+          "Accept" => "application/json",
+          "User-Agent" => DiscourseAi::AiBot::USER_AGENT,
+        },
+      ).to_return(status: 200, body: pr_info.to_json)
 
-    it "retrieves the diff for the pull request" do
       stub_request(:get, "https://api.github.com/repos/#{repo}/pulls/#{pull_id}").with(
         headers: {
           "Accept" => "application/vnd.github.v3.diff",
@@ -67,12 +99,21 @@
 
       result = tool.invoke
       expect(result[:diff]).to eq(diff)
+      expect(result[:pr_info]).to include(title: "Test PR", state: "open", author: "test-user")
       expect(result[:error]).to be_nil
     end
 
     it "uses the github access token if present" do
       SiteSetting.ai_bot_github_access_token = "ABC"
 
+      stub_request(:get, "https://api.github.com/repos/#{repo}/pulls/#{pull_id}").with(
+        headers: {
+          "Accept" => "application/json",
+          "User-Agent" => DiscourseAi::AiBot::USER_AGENT,
+          "Authorization" => "Bearer ABC",
+        },
+      ).to_return(status: 200, body: pr_info.to_json)
+
       stub_request(:get, "https://api.github.com/repos/#{repo}/pulls/#{pull_id}").with(
         headers: {
           "Accept" => "application/vnd.github.v3.diff",
@@ -94,14 +135,14 @@
     it "returns an error message" do
       stub_request(:get, "https://api.github.com/repos/#{repo}/pulls/#{pull_id}").with(
         headers: {
-          "Accept" => "application/vnd.github.v3.diff",
+          "Accept" => "application/json",
           "User-Agent" => DiscourseAi::AiBot::USER_AGENT,
         },
       ).to_return(status: 404)
 
       result = tool.invoke
       expect(result[:diff]).to be_nil
-      expect(result[:error]).to include("Failed to retrieve the diff")
+      expect(result[:error]).to include("Failed to retrieve the PR information")
     end
   end
 end