From c31baa5aea0a47d727d5a1ddf23fbc598a2675b2 Mon Sep 17 00:00:00 2001 From: Ori Kotek Date: Tue, 12 Sep 2023 13:24:47 +0300 Subject: [PATCH 1/6] Fix a bug in GitHub Actions --- .github/workflows/pr-agent-review.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-agent-review.yaml b/.github/workflows/pr-agent-review.yaml index eb811a38..6932b4bd 100644 --- a/.github/workflows/pr-agent-review.yaml +++ b/.github/workflows/pr-agent-review.yaml @@ -21,8 +21,8 @@ jobs: id: pragent uses: Codium-ai/pr-agent@main env: - OPENAI.KEY: ${{ secrets.OPENAI_KEY }} - OPENAI.ORG: ${{ secrets.OPENAI_ORG }} # optional + OPENAI_KEY: ${{ secrets.OPENAI_KEY }} + OPENAI_ORG: ${{ secrets.OPENAI_ORG }} # optional GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PINECONE.API_KEY: ${{ secrets.PINECONE_API_KEY }} PINECONE.ENVIRONMENT: ${{ secrets.PINECONE_ENVIRONMENT }} From 2f6178306fa369bc07b4c5c2a29677281b56ee17 Mon Sep 17 00:00:00 2001 From: Ori Kotek Date: Tue, 12 Sep 2023 13:28:35 +0300 Subject: [PATCH 2/6] Fix a bug in GitHub Actions --- pr_agent/servers/github_action_runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pr_agent/servers/github_action_runner.py b/pr_agent/servers/github_action_runner.py index fbf4f89c..96e1481a 100644 --- a/pr_agent/servers/github_action_runner.py +++ b/pr_agent/servers/github_action_runner.py @@ -12,8 +12,8 @@ async def run_action(): # Get environment variables GITHUB_EVENT_NAME = os.environ.get('GITHUB_EVENT_NAME') GITHUB_EVENT_PATH = os.environ.get('GITHUB_EVENT_PATH') - OPENAI_KEY = os.environ.get('OPENAI_KEY') - OPENAI_ORG = os.environ.get('OPENAI_ORG') + OPENAI_KEY = os.environ.get('OPENAI_KEY') or os.environ.get('OPENAI.KEY') + OPENAI_ORG = os.environ.get('OPENAI_ORG') or os.environ.get('OPENAI.ORG') GITHUB_TOKEN = os.environ.get('GITHUB_TOKEN') get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False) From 21feb92b754bc650bd9529578b8da64edca0068d Mon Sep 17 00:00:00 2001 From: Ori Kotek Date: Tue, 12 Sep 2023 16:41:12 +0300 Subject: [PATCH 3/6] Support issue comments in GitHub Actions --- action.yaml | 2 +- pr_agent/servers/github_action_runner.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/action.yaml b/action.yaml index 85d55e4e..bacb453c 100644 --- a/action.yaml +++ b/action.yaml @@ -5,4 +5,4 @@ branding: color: 'green' runs: using: 'docker' - image: 'Dockerfile.github_action_dockerhub' + image: 'Dockerfile.github_action' diff --git a/pr_agent/servers/github_action_runner.py b/pr_agent/servers/github_action_runner.py index 96e1481a..7dbea972 100644 --- a/pr_agent/servers/github_action_runner.py +++ b/pr_agent/servers/github_action_runner.py @@ -61,12 +61,21 @@ async def run_action(): if action in ["created", "edited"]: comment_body = event_payload.get("comment", {}).get("body") if comment_body: - pr_url = event_payload.get("issue", {}).get("pull_request", {}).get("url") - if pr_url: + is_pr = False + # check if issue is pull request + if event_payload.get("issue", {}).get("pull_request"): + url = event_payload.get("issue", {}).get("pull_request", {}).get("url") + is_pr = True + else: + url = event_payload.get("issue", {}).get("url") + if url: body = comment_body.strip().lower() comment_id = event_payload.get("comment", {}).get("id") - provider = get_git_provider()(pr_url=pr_url) - await PRAgent().handle_request(pr_url, body, notify=lambda: provider.add_eyes_reaction(comment_id)) + provider = get_git_provider()(pr_url=url) + if is_pr: + await PRAgent().handle_request(url, body, notify=lambda: provider.add_eyes_reaction(comment_id)) + else: + await PRAgent().handle_request(url, body) if __name__ == '__main__': From d4eb100cbcb6081a4acea05a5418d5651cab24ca Mon Sep 17 00:00:00 2001 From: Ori Kotek Date: Tue, 12 Sep 2023 16:44:20 +0300 Subject: [PATCH 4/6] Support issue comments in GitHub Actions --- action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yaml b/action.yaml index bacb453c..85d55e4e 100644 --- a/action.yaml +++ b/action.yaml @@ -5,4 +5,4 @@ branding: color: 'green' runs: using: 'docker' - image: 'Dockerfile.github_action' + image: 'Dockerfile.github_action_dockerhub' From b7a2551cab36783e75489801e25900fac5f2f75e Mon Sep 17 00:00:00 2001 From: Ori Kotek Date: Tue, 12 Sep 2023 16:46:02 +0300 Subject: [PATCH 5/6] Support issue comments in GitHub Actions --- action.yaml | 2 +- pr_agent/settings/configuration.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/action.yaml b/action.yaml index 85d55e4e..bacb453c 100644 --- a/action.yaml +++ b/action.yaml @@ -5,4 +5,4 @@ branding: color: 'green' runs: using: 'docker' - image: 'Dockerfile.github_action_dockerhub' + image: 'Dockerfile.github_action' diff --git a/pr_agent/settings/configuration.toml b/pr_agent/settings/configuration.toml index 75dfcf97..2dd0fb3e 100644 --- a/pr_agent/settings/configuration.toml +++ b/pr_agent/settings/configuration.toml @@ -11,6 +11,7 @@ ai_timeout=180 max_description_tokens = 500 max_commits_tokens = 500 secret_provider="google_cloud_storage" +cli_mode=false [pr_reviewer] # /review # require_focused_review=false From 31ba7acf49c5f265d1163b4d5f34b8df3969fc79 Mon Sep 17 00:00:00 2001 From: Ori Kotek Date: Tue, 12 Sep 2023 16:53:54 +0300 Subject: [PATCH 6/6] Support issue comments in GitHub Actions --- action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yaml b/action.yaml index bacb453c..85d55e4e 100644 --- a/action.yaml +++ b/action.yaml @@ -5,4 +5,4 @@ branding: color: 'green' runs: using: 'docker' - image: 'Dockerfile.github_action' + image: 'Dockerfile.github_action_dockerhub'