Merge pull request #25 from Cloud-Code-AI/24-bug-pull-request-detail-…

…bug-original-desc-missing

fix: pull_request_desc bug

api/github_helper/constants.py

@@ -0,0 +1,3 @@
+from api.github_helper.utils import get_config
+
+CONFIG_DATA = get_config()

api/github_helper/utils.py

@@ -5,6 +5,7 @@
 import logging
 import hmac
 import hashlib
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -60,3 +61,9 @@ def is_github_signature_valid(headers, body):
 
     mac = hmac.new(github_secret, msg=body, digestmod=hashlib.sha256)
     return hmac.compare_digest(mac.hexdigest(), signature)
+
+
+def get_config():
+    with open("config.json", "r") as f:
+        config_data = json.loads(f.read())
+    return config_data

api/main.py

@@ -7,6 +7,7 @@
     process_pr_desc,
 )
 from api.github_helper.utils import is_github_signature_valid
+from api.github_helper.constants import CONFIG_DATA
 import logging
 
 logging.basicConfig(
@@ -23,8 +24,9 @@ async def handle_webhook(request: Request, background_tasks: BackgroundTasks):
     body = await request.body()
     event = request.headers.get("X-GitHub-Event")
     # Check if the Signature is valid
-    # TODO: Make this optional based on user config settings
-    if not is_github_signature_valid(request.headers, body):
+    if CONFIG_DATA["github_app"]["check_signature"] and not is_github_signature_valid(
+        request.headers, body
+    ):
         return HTTPException(status_code=404, detail="Invalid Signature")
 
     if event == "pull_request":

cloudcode/actions/reviews.py

@@ -42,5 +42,8 @@ def generate_pull_request_desc(
         )
 
         resp = self.provider.chat_completion(prompt)
-        body = output.create_pr_description(parser.extract_json(resp))
+        self.logger.debug(f"PROMPT Generate PR Desc RESP: {resp}")
+        body = output.create_pr_description(
+            parser.extract_json(resp), pull_request_desc
+        )
         return body

cloudcode/helpers/output.py

@@ -18,9 +18,7 @@
 DESC_COLLAPSIBLE_TEMPLATE = """
 <details>
 <summary>Original Description</summary>
-
 {desc}
-
 </details>
 """
 
@@ -41,7 +39,7 @@ def create_pr_review_from_json(data):
 
 
 def create_pr_description(data, original_desc):
-    markdown_output = "## Autogenerated PR Description"
+    markdown_output = "## Autogenerated PR Description \n\n"
     markdown_output += data["desc"]
     markdown_output += "\n\n -- Generated with love by Cloud Code AI"
     markdown_output += "\n\n" + DESC_COLLAPSIBLE_TEMPLATE.format(desc=original_desc)

config.json

@@ -1,5 +1,8 @@
 {
     "language_model": {
         "provider": "litellm"
+    },
+    "github_app": {
+        "check_signature": false
     }
 }