Fix dynamic repo on PR comment and new key names (#87)

Author: david-hurley

docs/dagger/dagger-hackathon/README.md

@@ -126,18 +126,16 @@ The below steps will take you through making a breaking change to a file in our
 
 - Rename `docs/dagger/dagger-hackathon/.env-example` to `.env`  
 - Populate the placeholder keys with real values (we will provide for Hackathon day)  
-- Create environment variables for `GITHUB_TOKEN`, `AZURE_API_KEY`, `AZURE_API_ENDPOINT`   
+- Create environment variables for `GITHUB_TOKEN` and `AZURE_OPENAI_API_KEY`
   A GitHub Token can be created in GitHub under Settings → Developer Settings → Create a classic token  
   Example:
   ```bash
   export GITHUB_TOKEN="XXX"
   ```
 The Azure OpenAI details can be found below:
 
-```bash
-  export AZURE_API_KEY="FT0Dd0iIglkzGbizOMUp79k0Frea7neDtVXRhFZ5m39CJJJcdfxFJQQJ99BEACYeBjFXJ3w3AAABACO"
-  export AZURE_API_ENDPOINT="https://vdfvdf.openai.azure.com/"
-```
+- Azure OpenAI API Key: FT0Dd0iIglkzGbizOMUp79k0Frea7neDtVXRhFZ5m39CJJJcdfxFJQQJ99BEACYeBjFXJ3w3AAABACO
+- Azure OpenAI Endpoint: https://vdfvdf.openai.azure.com/
 
 > **Note:** The full API key will be provided during the hackathon.
 
@@ -148,8 +146,8 @@ The Azure OpenAI details can be found below:
     --github_branch="BRANCH-NAME" \
     --github_repo="USERNAME/REPO-NAME" \
     --github_token="GITHUB_TOKEN" \
-    --azure_api_key="AZURE_API_KEY" \
-    --azure_endpoint="AZURE_API_ENDPOINT" \
+    --azure_openai_api_key="AZURE_OPENAI_API_KEY" \
+    --azure_openai_endpoint="ENDPOINT-URL" \
     fix-my-tests-agent
   ```
 

docs/dagger/dagger-hackathon/dagger-hackathon-pipeline/src/dagger_hackathon/main.py

@@ -36,9 +36,9 @@ class DaggerHackathon:
     github_branch: str
     github_repo: str
     github_token: dagger.Secret
-    azure_api_key: dagger.Secret
-    azure_endpoint: str
-    azure_model: str = "gpt-4o"
+    azure_openai_api_key: dagger.Secret # use in azure_xxx in StructureLlmResponse with AzureOpenAI library
+    azure_openai_endpoint: str
+    azure_openai_model: str = "gpt-4o"
     @function
     async def GetPrMetadata(self) -> PrMetadataResult:
         """Get the PR number and commit ID
@@ -129,19 +129,18 @@ async def StructureLlmResponse(
         command_to_execute = [
             "python", "dagger-hackathon-pipeline/src/dagger_hackathon/structure_llm_response.py",
             "--response", response_to_structure,
-            "--endpoint", self.azure_endpoint,
-            "--model", self.azure_model
+            "--endpoint", self.azure_openai_endpoint,
+            "--model", self.azure_openai_model
         ]
         container = (
             dag.container()
             .from_("python:3.11")
             .with_mounted_directory("/app", self.source)
             .with_workdir("/app")
-            .with_secret_variable("AZURE_OPENAI_API_KEY", self.azure_api_key)
+            .with_secret_variable("AZURE_OPENAI_API_KEY", self.azure_openai_api_key)
             .with_exec(["pip", "install", "--upgrade", "pip"])
             .with_exec(["pip", "install", "openai==1.82.0", "pydantic==2.11.5"])  
             .with_exec(["sh", "-c", "export $(grep -v '^#' .env | xargs)"])
-            .with_exec(["sh", "-c", "echo $OPENAI_API_KEY"])
             .with_exec(command_to_execute)
         )
 
@@ -174,7 +173,7 @@ async def CreatePrSuggestion(
             "--method", "POST",
             "-H", "Accept: application/vnd.github+json",
             "-H", "X-GitHub-Api-Version: 2022-11-28",
-            f"/repos/codetocloudorg/platform-engineering/pulls/{pr_metadata.pr_number}/comments",
+            f"/repos/{self.github_repo}/pulls/{pr_metadata.pr_number}/comments",
             "-f", f"body=```suggestion\n{proposed_code_changes.change}\n```",
             "-f", f"commit_id={pr_metadata.commit_id}",
             "-f", f"path={proposed_code_changes.path}",
@@ -244,8 +243,6 @@ async def FixMyTestsAgent(
             .with_prompt_file(dag.current_module().source().file("debug_unit_test_prompt.md"))
         )
 
-        analyzed_results_output = await analyze_results.last_reply()
-
         proposed_code_change = await self.StructureLlmResponse(
             await analyze_results.last_reply()
         )
@@ -259,4 +256,4 @@ async def FixMyTestsAgent(
             pr_metadata=pr_metadata,
             pr_suggestions=created_pr_suggestion
         ))
-        
+        

docs/dagger/dagger-hackathon/dagger-hackathon-pipeline/src/dagger_hackathon/structure_llm_response.py

@@ -1,7 +1,6 @@
 import argparse
 from pydantic import BaseModel, Field
 from openai import AzureOpenAI
-import os
 
 class ProposedCodeChangesPydantic(BaseModel):
     path: str = Field(description="The path to the source file. ie: docs/dagger/dagger-hackathon/src/file.py")
@@ -34,4 +33,4 @@ def main():
     print(structured_output)
 
 if __name__ == "__main__":
-    main()
+    main()

docs/dagger/dagger-hackathon/src/addition.py

@@ -1,2 +1,2 @@
 def add(a, b):
-    return a - b*2
+    return a - b * 10