Merge branch 'dev' into dependabot/npm_and_yarn/autogpt_platform/fron…

…tend/dev/production-dependencies-1d77d47298
Significant-Gravitas · Nov 27, 2024 · 8ba1713 · 8ba1713
2 parents cf9524e + fd6c1d9
commit 8ba1713
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/autogpt_platform/backend/backend/blocks/github/_api.py b/autogpt_platform/backend/backend/blocks/github/_api.py
@@ -35,9 +35,9 @@ def _get_headers(credentials: GithubCredentials) -> dict[str, str]:
     }
 
 
-def get_api(credentials: GithubCredentials) -> Requests:
+def get_api(credentials: GithubCredentials, convert_urls: bool = True) -> Requests:
     return Requests(
         trusted_origins=["https://api.github.com", "https://github.com"],
-        extra_url_validator=_convert_to_api_url,
+        extra_url_validator=_convert_to_api_url if convert_urls else None,
         extra_headers=_get_headers(credentials),
     )
diff --git a/autogpt_platform/backend/backend/blocks/github/issues.py b/autogpt_platform/backend/backend/blocks/github/issues.py
@@ -46,15 +46,27 @@ def __init__(self):
             categories={BlockCategory.DEVELOPER_TOOLS},
             input_schema=GithubCommentBlock.Input,
             output_schema=GithubCommentBlock.Output,
-            test_input={
-                "issue_url": "https://github.com/owner/repo/issues/1",
-                "comment": "This is a test comment.",
-                "credentials": TEST_CREDENTIALS_INPUT,
-            },
+            test_input=[
+                {
+                    "issue_url": "https://github.com/owner/repo/issues/1",
+                    "comment": "This is a test comment.",
+                    "credentials": TEST_CREDENTIALS_INPUT,
+                },
+                {
+                    "issue_url": "https://github.com/owner/repo/pull/1",
+                    "comment": "This is a test comment.",
+                    "credentials": TEST_CREDENTIALS_INPUT,
+                },
+            ],
             test_credentials=TEST_CREDENTIALS,
             test_output=[
                 ("id", 1337),
                 ("url", "https://github.com/owner/repo/issues/1#issuecomment-1337"),
+                ("id", 1337),
+                (
+                    "url",
+                    "https://github.com/owner/repo/issues/1#issuecomment-1337",
+                ),
             ],
             test_mock={
                 "post_comment": lambda *args, **kwargs: (
@@ -70,6 +82,8 @@ def post_comment(
     ) -> tuple[int, str]:
         api = get_api(credentials)
         data = {"body": body_text}
+        if "pull" in issue_url:
+            issue_url = issue_url.replace("pull", "issues")
         comments_url = issue_url + "/comments"
         response = api.post(comments_url, json=data)
         comment = response.json()

diff --git a/autogpt_platform/backend/backend/blocks/llm.py b/autogpt_platform/backend/backend/blocks/llm.py
@@ -526,7 +526,7 @@ def parse_response(resp: str) -> tuple[dict[str, Any], str | None]:
 class AITextGeneratorBlock(Block):
     class Input(BlockSchema):
         prompt: str = SchemaField(
-            description="The prompt to send to the language model.",
+            description="The prompt to send to the language model. You can use any of the {keys} from Prompt Values to fill in the prompt with values from the prompt values dictionary by putting them in curly braces.",
             placeholder="Enter your prompt here...",
         )
         model: LlmModel = SchemaField(