From d050a3f77c5b786bb5bccf12b6ce20db585547a2 Mon Sep 17 00:00:00 2001 From: Keith Webber Date: Tue, 11 Feb 2025 19:43:52 -0800 Subject: [PATCH 1/3] docs: Provide feedback when cloning submodules (#9448) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Changes 🏗️ Added `--progress` to the submodule update, so that cloning progress can be tracked and does not appear to hang. ### Checklist 📋 #### For code changes: - [x] No code change, just docs.
Example test plan - [ ] Create from scratch and execute an agent with at least 3 blocks - [ ] Import an agent from file upload, and confirm it executes correctly - [ ] Upload agent to marketplace - [ ] Import an agent from marketplace and confirm it executes correctly - [ ] Edit an agent from monitor, and confirm it executes correctly
#### For configuration changes: - [x] No configuration change, just docs.
Provide feedback when cloning submodules - now updating submodules shows the cloning repo's progress
Co-authored-by: Your Name --- autogpt_platform/README.md | 2 +- docs/content/platform/getting-started.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogpt_platform/README.md b/autogpt_platform/README.md index 64e61e880c..3fbb6519b1 100644 --- a/autogpt_platform/README.md +++ b/autogpt_platform/README.md @@ -22,7 +22,7 @@ To run the AutoGPT Platform, follow these steps: 2. Run the following command: ``` - git submodule update --init --recursive + git submodule update --init --recursive --progress ``` This command will initialize and update the submodules in the repository. The `supabase` folder will be cloned to the root directory. diff --git a/docs/content/platform/getting-started.md b/docs/content/platform/getting-started.md index 3613d014f5..7ec256c9d4 100644 --- a/docs/content/platform/getting-started.md +++ b/docs/content/platform/getting-started.md @@ -77,7 +77,7 @@ To run the backend services, follow these steps: * Within the repository, clone the submodules and navigate to the `autogpt_platform` directory: ```bash - git submodule update --init --recursive + git submodule update --init --recursive --progress cd autogpt_platform ``` This command will initialize and update the submodules in the repository. The `supabase` folder will be cloned to the root directory. From 3b8cde6d11f5e45c892223b23a5bb658dccdd384 Mon Sep 17 00:00:00 2001 From: Zamil Majdy Date: Wed, 12 Feb 2025 19:22:26 +0700 Subject: [PATCH 2/3] feat(block): Add batch matched result and its count on ExtractTextInformationBlock (#9470) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Changes 🏗️ Introduced `matched_result` & `matched_count` as a batch matched result list and its count for the block execution of ExtractTextInformationBlock. ### Checklist 📋 #### For code changes: - [ ] I have clearly listed my changes in the PR description - [ ] I have made a test plan - [ ] I have tested my changes according to the test plan: - [ ] ...
Example test plan - [ ] Create from scratch and execute an agent with at least 3 blocks - [ ] Import an agent from file upload, and confirm it executes correctly - [ ] Upload agent to marketplace - [ ] Import an agent from marketplace and confirm it executes correctly - [ ] Edit an agent from monitor, and confirm it executes correctly
#### For configuration changes: - [ ] `.env.example` is updated or already compatible with my changes - [ ] `docker-compose.yml` is updated or already compatible with my changes - [ ] I have included a list of my configuration changes in the PR description (under **Changes**)
Examples of configuration changes - Changing ports - Adding new services that need to communicate with each other - Secrets or environment variable changes - New or infrastructure changes such as databases
--- .../backend/backend/blocks/text.py | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/autogpt_platform/backend/backend/blocks/text.py b/autogpt_platform/backend/backend/blocks/text.py index b2ad5e77e1..21351bbbd6 100644 --- a/autogpt_platform/backend/backend/blocks/text.py +++ b/autogpt_platform/backend/backend/blocks/text.py @@ -76,6 +76,8 @@ class ExtractTextInformationBlock(Block): class Output(BlockSchema): positive: str = SchemaField(description="Extracted text") negative: str = SchemaField(description="Original text") + matched_results: list[str] = SchemaField(description="List of matched results") + matched_count: int = SchemaField(description="Number of matched results") def __init__(self): super().__init__( @@ -103,13 +105,31 @@ class ExtractTextInformationBlock(Block): }, ], test_output=[ + # Test case 1 ("positive", "World!"), + ("matched_results", ["World!"]), + ("matched_count", 1), + # Test case 2 ("positive", "Hello, World!"), + ("matched_results", ["Hello, World!"]), + ("matched_count", 1), + # Test case 3 ("negative", "Hello, World!"), + ("matched_results", []), + ("matched_count", 0), + # Test case 4 ("positive", "Hello,"), + ("matched_results", ["Hello,"]), + ("matched_count", 1), + # Test case 5 ("positive", "World!!"), + ("matched_results", ["World!!"]), + ("matched_count", 1), + # Test case 6 ("positive", "World!!"), ("positive", "Earth!!"), + ("matched_results", ["World!!", "Earth!!"]), + ("matched_count", 2), ], ) @@ -130,13 +150,16 @@ class ExtractTextInformationBlock(Block): for match in re.finditer(input_data.pattern, txt, flags) if input_data.group <= len(match.groups()) ] + if not input_data.find_all: + matches = matches[:1] for match in matches: yield "positive", match - if not input_data.find_all: - return if not matches: yield "negative", input_data.text + yield "matched_results", matches + yield "matched_count", len(matches) + class FillTextTemplateBlock(Block): class Input(BlockSchema): From 016ec0ff6b38341873735a11d2585a8ad8c623e8 Mon Sep 17 00:00:00 2001 From: Bently Date: Wed, 12 Feb 2025 16:32:47 +0100 Subject: [PATCH 3/3] fix(frontend) update PublishAgentAwaitingReview router push path (#9471) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the PublishAgentAwaitingReview router.push path, it was going to ``/marketplace/dashboard`` it should be ``/profile/dashboard`` ### Changes 🏗️ https://github.com/Significant-Gravitas/AutoGPT/blob/8181ee8cd1f71bd351a3e0ad66356a0313877db2/autogpt_platform/frontend/src/components/agptui/composite/PublishAgentPopout.tsx#L265-L267 to be ```tsx onViewProgress={() => { router.push("/profile/dashboard"); handleClose(); }} ``` --- .../src/components/agptui/composite/PublishAgentPopout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogpt_platform/frontend/src/components/agptui/composite/PublishAgentPopout.tsx b/autogpt_platform/frontend/src/components/agptui/composite/PublishAgentPopout.tsx index 8842f6dbbb..7022cdd754 100644 --- a/autogpt_platform/frontend/src/components/agptui/composite/PublishAgentPopout.tsx +++ b/autogpt_platform/frontend/src/components/agptui/composite/PublishAgentPopout.tsx @@ -263,7 +263,7 @@ export const PublishAgentPopout: React.FC = ({ onClose={handleClose} onDone={handleClose} onViewProgress={() => { - router.push("/marketplace/dashboard"); + router.push("/profile/dashboard"); handleClose(); }} />