feature(backend): Add ability to execute store agents without agent ownership #9179

Swiftyos · 2025-01-03T10:27:22Z

Description

This PR enables the execution of store agents even if they are not owned by the user. Key changes include handling store-listed agents in the get_graph logic, improving execution flow, and ensuring version-specific handling. These updates support more flexible agent execution.

Changes 🏗️

Graph Retrieval: Updated get_graph to check store listings for agents not owned by the user.
Version Handling: Added graph_version to execution methods for consistent version-specific execution.
Execution Flow: Refactored scheduler.py, rest_api.py, and other modules for clearer logic and better maintainability.
Testing: Updated test_manager.py and other test cases to validate execution of store-listed agents added test for accessing graph

supabase · 2025-01-03T10:27:28Z

This pull request has been ignored for the connected project bgwpwdsxblryihinutbx because there are no changes detected in supabase directory. You can change this behaviour in Project Integrations Settings ↗︎.

Preview Branches by Supabase.
Learn more about Supabase Branching ↗︎.

github-actions · 2025-01-03T10:27:34Z

This PR targets the master branch but does not come from dev or a hotfix/* branch.

Automatically setting the base branch to dev.

netlify · 2025-01-03T10:28:16Z

✅ Deploy Preview for auto-gpt-docs ready!

Name	Link
🔨 Latest commit	`99bc218`
🔍 Latest deploy log	https://app.netlify.com/sites/auto-gpt-docs/deploys/678103e2e6bda40008dd9d12
😎 Deploy Preview	https://deploy-preview-9179--auto-gpt-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

…re-agents-without-agent-ownership

qodo-merge-pro · 2025-01-03T12:35:53Z

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 3 🔵🔵🔵⚪⚪
🧪 PR contains tests
🔒 No security concerns identified
⚡ Recommended focus areas for review Access Control The new store listing access check logic should be carefully reviewed to ensure it properly restricts access to only published store agents and prevents unauthorized access to private agents. if graph.userId == user_id: return GraphModel.from_db(graph, for_export) if graph else None # If the graph is not owned by the user, we need to check if it's a store listing. if not version: version = graph.version store_listing_where: StoreListingWhereInput = { "agentId": graph_id, "agentVersion": version, } store_listing = await StoreListing.prisma().find_first(where=store_listing_where) # If it is not a store listing, return None if not store_listing: return None # If it is a store listing, return the graph model return GraphModel.from_db(graph, for_export) if graph else None Breaking Change The graph_version parameter was made required in add_execution() which could break existing code that doesn't pass this parameter. Verify all callers have been updated. def add_execution( self, graph_id: str, data: BlockInput, user_id: str, graph_version: int, ) -> GraphExecutionEntry: graph: GraphModel \| None = self.db_client.get_graph( graph_id=graph_id, user_id=user_id, version=graph_version )

netlify · 2025-01-03T12:36:43Z

✅ Deploy Preview for auto-gpt-docs-dev ready!

Name	Link
🔨 Latest commit	`99bc218`
🔍 Latest deploy log	https://app.netlify.com/sites/auto-gpt-docs-dev/deploys/678103e24340890008bf9419
😎 Deploy Preview	https://deploy-preview-9179--auto-gpt-docs-dev.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

…without-agent-ownership' of github.com:Significant-Gravitas/AutoGPT into swiftyos/open-2276-add-ability-to-execute-store-agents-without-agent-ownership

…re-agents-without-agent-ownership

autogpt_platform/backend/backend/data/graph.py

Co-authored-by: Reinier van der Leer <[email protected]>

autogpt_platform/backend/backend/executor/manager.py

autogpt_platform/backend/backend/data/graph.py

autogpt_platform/backend/backend/server/routers/v1.py

…re-agents-without-agent-ownership

autogpt_platform/backend/backend/data/graph.py

…re-agents-without-agent-ownership

…without-agent-ownership' of github.com:Significant-Gravitas/AutoGPT into swiftyos/open-2276-add-ability-to-execute-store-agents-without-agent-ownership

…re-agents-without-agent-ownership

…ctionality (#9218) ### Changes 🏗️ 1. **Core Features**: - Add agents to the user's library. - Update library agents (auto-update, favorite, archive, delete). - Paginate library agents and presets. - Execute graphs using presets. 2. **Refactoring**: - Replaced `UserAgent` with `LibraryAgent`. - Separated routes for agents and presets. 3. **Schema Changes**: - Added `LibraryAgent` table with fields like `isArchived`, `isDeleted`, etc. - Soft delete functionality for `AgentPreset`. 4. **Testing**: - Updated tests for `LibraryAgent` operations. - Added edge case tests for deletion, archiving, and pagination. 5. **Database Migrations**: - Migration to drop `UserAgent` and add `LibraryAgent`. - Added fields for soft deletion and auto-update. Note this includes the changes from the following PR's to avoid merge conflicts with them: #9179 #9211 --------- Co-authored-by: Reinier van der Leer <[email protected]>

majdyz · 2025-01-10T15:54:19Z

autogpt_platform/backend/schema.prisma

@@ -553,7 +555,7 @@ model StoreListingVersion {
  StoreListingReview StoreListingReview[]

  @@unique([agentId, agentVersion])
-  @@index([agentId, agentVersion, isApproved])
+  @@index([agentId, agentVersion, isDeleted])


AgentId and agent version is already unique

Adding another index on this will be useless and slowing down the write

majdyz · 2025-01-10T15:55:47Z

autogpt_platform/backend/schema.prisma

-  @@index([agentId])
+  // Unique index on agentId to ensure only one listing per agent, regardless of number of versions the agent has.
+  @@unique([agentId])
+  @@index([agentId, owningUserId])


Same as below,

majdyz · 2025-01-10T15:58:46Z

autogpt_platform/backend/schema.prisma

  @@index([owningUserId])
+  // Used in the view query
+  @@index([isDeleted, isApproved])


These two indices with Boolean values will only be used on a query like this

Select ... From StoreListing where is deleted = ...

If you have another column in the filter, it will never be used. So I don't think this will be useful.

If [isDeleted, isApproved] is indeed the filter column, the index with two columns will override the one below.
So we can safely remove it.

… agent ownership" (#9263) Reverts #9179 This PR is preventing the running of agents in dev.

…wnership (#9179) This PR enables the execution of store agents even if they are not owned by the user. Key changes include handling store-listed agents in the `get_graph` logic, improving execution flow, and ensuring version-specific handling. These updates support more flexible agent execution. - **Graph Retrieval:** Updated `get_graph` to check store listings for agents not owned by the user. - **Version Handling:** Added `graph_version` to execution methods for consistent version-specific execution. - **Execution Flow:** Refactored `scheduler.py`, `rest_api.py`, and other modules for clearer logic and better maintainability. - **Testing:** Updated `test_manager.py` and other test cases to validate execution of store-listed agents added test for accessing graph --------- Co-authored-by: Reinier van der Leer <[email protected]> Co-authored-by: Zamil Majdy <[email protected]>

Allow execution of store listings

4465994

github-actions bot changed the base branch from master to dev January 3, 2025 10:27

github-actions bot added platform/backend AutoGPT Platform - Back end size/m labels Jan 3, 2025

Swiftyos marked this pull request as ready for review January 3, 2025 12:35

Swiftyos requested a review from a team as a code owner January 3, 2025 12:35

Swiftyos requested review from Bentlybro and majdyz and removed request for a team January 3, 2025 12:35

Merge branch 'dev' into swiftyos/open-2276-add-ability-to-execute-sto…

6b9580b

…re-agents-without-agent-ownership

qodo-merge-pro bot added the Review effort [1-5]: 3 label Jan 3, 2025

Swiftyos added 5 commits January 3, 2025 13:40

updated comment to make the meaning of userId clearer

6df94aa

Merge branch 'swiftyos/open-2276-add-ability-to-execute-store-agents-…

a7e0af0

…without-agent-ownership' of github.com:Significant-Gravitas/AutoGPT into swiftyos/open-2276-add-ability-to-execute-store-agents-without-agent-ownership

Merge branch 'dev' into swiftyos/open-2276-add-ability-to-execute-sto…

c6daeef

…re-agents-without-agent-ownership

fixed merged error

4f861e3

fmt

797f9ed

Pwuts reviewed Jan 7, 2025

View reviewed changes

autogpt_platform/backend/backend/data/graph.py Outdated Show resolved Hide resolved

Update autogpt_platform/backend/backend/data/graph.py

bb8e562

Co-authored-by: Reinier van der Leer <[email protected]>

Pwuts reviewed Jan 7, 2025

View reviewed changes

autogpt_platform/backend/backend/executor/manager.py Show resolved Hide resolved

Pwuts reviewed Jan 7, 2025

View reviewed changes

autogpt_platform/backend/backend/data/graph.py Show resolved Hide resolved

Pwuts reviewed Jan 7, 2025

View reviewed changes

autogpt_platform/backend/backend/server/routers/v1.py Show resolved Hide resolved

Merge branch 'dev' into swiftyos/open-2276-add-ability-to-execute-sto…

f051266

…re-agents-without-agent-ownership

Swiftyos requested a review from Pwuts January 7, 2025 15:59

Pwuts changed the title ~~feature(platform): add ability to execute store agents without agent ownership~~ feature(backend): Add ability to execute store agents without agent ownership Jan 7, 2025

add isActive filter back in

37e8b51

majdyz reviewed Jan 8, 2025

View reviewed changes

autogpt_platform/backend/backend/data/graph.py Show resolved Hide resolved

updated get graph checks

cf453cf

Swiftyos dismissed majdyz’s stale review via cf453cf January 9, 2025 10:53

added tests for get_graph

4cdfb4e

github-actions bot added size/l and removed size/m labels Jan 9, 2025

Merge branch 'dev' into swiftyos/open-2276-add-ability-to-execute-sto…

874e2b3

…re-agents-without-agent-ownership

Swiftyos requested a review from majdyz January 9, 2025 11:26

Swiftyos enabled auto-merge January 9, 2025 11:31

Swiftyos and others added 3 commits January 9, 2025 16:04

ensure isApproved and not isDeleted added tests to check

30504e1

Merge branch 'swiftyos/open-2276-add-ability-to-execute-store-agents-…

3be552c

…without-agent-ownership' of github.com:Significant-Gravitas/AutoGPT into swiftyos/open-2276-add-ability-to-execute-store-agents-without-agent-ownership

cosmetic change

714913a

majdyz previously approved these changes Jan 9, 2025

View reviewed changes

majdyz disabled auto-merge January 9, 2025 19:01

Swiftyos added 2 commits January 10, 2025 09:46

update store indexing

8adf7bf

Merge branch 'swiftyos/open-2276-add-ability-to-execute-store-agents-…

9e008ad

…without-agent-ownership' of github.com:Significant-Gravitas/AutoGPT into swiftyos/open-2276-add-ability-to-execute-store-agents-without-agent-ownership

Swiftyos dismissed majdyz’s stale review via 9e008ad January 10, 2025 08:47

Swiftyos added 2 commits January 10, 2025 10:06

fix linting

3052656

Merge branch 'dev' into swiftyos/open-2276-add-ability-to-execute-sto…

99bc218

…re-agents-without-agent-ownership

Swiftyos merged commit 00bb7c6 into dev Jan 10, 2025
20 checks passed

Swiftyos deleted the swiftyos/open-2276-add-ability-to-execute-store-agents-without-agent-ownership branch January 10, 2025 11:39

majdyz reviewed Jan 10, 2025

View reviewed changes

aarushik93 mentioned this pull request Jan 13, 2025

Revert "feature(backend): Add ability to execute store agents without agent ownership" #9263

Merged

github-merge-queue bot pushed a commit that referenced this pull request Jan 13, 2025

Revert "feature(backend): Add ability to execute store agents without…

fe84cbe

… agent ownership" (#9263) Reverts #9179 This PR is preventing the running of agents in dev.

This was referenced Jan 14, 2025

feat(backend): Enable executing store agents without agent ownership #9267

Open

Fix up and re-introduce Library v2 back-end work #9257

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature(backend): Add ability to execute store agents without agent ownership #9179

feature(backend): Add ability to execute store agents without agent ownership #9179

Swiftyos commented Jan 3, 2025 •

edited

Loading

supabase bot commented Jan 3, 2025

github-actions bot commented Jan 3, 2025

netlify bot commented Jan 3, 2025 •

edited

Loading

qodo-merge-pro bot commented Jan 3, 2025

netlify bot commented Jan 3, 2025 •

edited

Loading

majdyz Jan 10, 2025

majdyz Jan 10, 2025

majdyz Jan 10, 2025

majdyz Jan 10, 2025

feature(backend): Add ability to execute store agents without agent ownership #9179

feature(backend): Add ability to execute store agents without agent ownership #9179

Conversation

Swiftyos commented Jan 3, 2025 • edited Loading

Description

Changes 🏗️

supabase bot commented Jan 3, 2025

github-actions bot commented Jan 3, 2025

netlify bot commented Jan 3, 2025 • edited Loading

✅ Deploy Preview for auto-gpt-docs ready!

qodo-merge-pro bot commented Jan 3, 2025

PR Reviewer Guide 🔍

netlify bot commented Jan 3, 2025 • edited Loading

✅ Deploy Preview for auto-gpt-docs-dev ready!

majdyz Jan 10, 2025

Choose a reason for hiding this comment

majdyz Jan 10, 2025

Choose a reason for hiding this comment

majdyz Jan 10, 2025

Choose a reason for hiding this comment

majdyz Jan 10, 2025

Choose a reason for hiding this comment

Swiftyos commented Jan 3, 2025 •

edited

Loading

netlify bot commented Jan 3, 2025 •

edited

Loading

netlify bot commented Jan 3, 2025 •

edited

Loading