Repository navigation
feat: select an agent profile for delegated automation work #479
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| """Persist automation profile selection. | ||
|
|
||
| Revision ID: 025 | ||
| Revises: 024 | ||
| """ | ||
|
|
||
| import sqlalchemy as sa | ||
| from alembic import op | ||
|
|
||
|
|
||
| revision = "025" | ||
| down_revision = "024" | ||
| branch_labels = None | ||
| depends_on = None | ||
|
|
||
|
|
||
| def upgrade() -> None: | ||
| op.add_column( | ||
| "automations", sa.Column("agent_profile_id", sa.Uuid(), nullable=True) | ||
| ) | ||
|
|
||
|
|
||
| def downgrade() -> None: | ||
| op.drop_column("automations", "agent_profile_id") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -423,6 +423,11 @@ def validate_config_size(cls, v: dict[str, Any] | None) -> dict[str, Any] | None | |
| class CreateAutomationRequest(BaseModel): | ||
| model_config = ConfigDict(extra="forbid") | ||
|
|
||
| agent_profile_id: uuid.UUID | None = Field( | ||
| default=None, | ||
| description="Agent profile selected for this automation.", | ||
| ) | ||
|
|
||
| name: str = Field(..., min_length=1, max_length=500) | ||
| model: str | None = Field( | ||
| default=None, | ||
|
|
@@ -523,6 +528,11 @@ class UpdateAutomationRequest(BaseModel): | |
|
|
||
| model_config = ConfigDict(extra="forbid") | ||
|
|
||
| agent_profile_id: uuid.UUID | None = Field( | ||
| default=None, | ||
| description="Agent profile selected for this automation.", | ||
| ) | ||
|
|
||
|
Comment on lines
+531
to
+535
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dup code block |
||
| name: str | None = Field(default=None, min_length=1, max_length=500) | ||
| model: str | None = Field( | ||
| default=None, | ||
|
|
@@ -862,6 +872,7 @@ class TelemetryConsentResponse(BaseModel): | |
|
|
||
|
|
||
| class AutomationResponse(BaseModel): | ||
| agent_profile_id: uuid.UUID | None = None | ||
| id: uuid.UUID | ||
| user_id: uuid.UUID | ||
| org_id: uuid.UUID | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| """Helpers for resolving and validating model profile selections.""" | ||
|
|
||
| import uuid | ||
|
|
||
| from fastapi import HTTPException, status | ||
|
|
||
| from openhands.automation.auth import AuthenticatedUser | ||
|
|
@@ -37,3 +39,17 @@ def resolve_model_profile_for_user( | |
| model_profile = requested_profile or user.active_model_profile_name | ||
| validate_model_profile_for_user(model_profile, user) | ||
| return model_profile | ||
|
|
||
|
|
||
| def validate_agent_profile_selection( | ||
| agent_profile_id: uuid.UUID | None, model: str | None | ||
| ) -> None: | ||
| """An agent profile owns its model and is resolved by the configured server.""" | ||
| if agent_profile_id is None: | ||
| return | ||
| from openhands.automation.config import get_config | ||
|
|
||
| if not get_config().service.is_local_mode: | ||
| raise HTTPException(422, "Agent profiles require a configured Agent Server") | ||
|
Comment on lines
+52
to
+53
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this correct? Profiles won't work in remote deployments? |
||
| if model: | ||
| raise HTTPException(422, "An agent profile already specifies the model") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: followup would be to modify the sdk workspace to support
workspace.get_agent_profilehelper that will return the profile based offAUTOMATION_AGENT_PROFILE_ID