[flyteagent] Add agents and agentForTaskTypes in helm chart
#6239
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 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,12 +1,24 @@ | ||||||||
| package agent | ||||||||
|
|
||||||||
| import ( | ||||||||
| "context" | ||||||||
| "testing" | ||||||||
| "time" | ||||||||
|
|
||||||||
| "github.com/stretchr/testify/assert" | ||||||||
| "github.com/stretchr/testify/mock" | ||||||||
|
|
||||||||
| agentMocks "github.com/flyteorg/flyte/flyteidl/clients/go/admin/mocks" | ||||||||
| "github.com/flyteorg/flyte/flyteidl/clients/go/coreutils" | ||||||||
| "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin" | ||||||||
| flyteIdlCore "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core" | ||||||||
| "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service" | ||||||||
| "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery" | ||||||||
| pluginCoreMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks" | ||||||||
| ioMocks "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/io/mocks" | ||||||||
| "github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/webapi" | ||||||||
| "github.com/flyteorg/flyte/flytestdlib/config" | ||||||||
| "github.com/flyteorg/flyte/flytestdlib/storage" | ||||||||
| ) | ||||||||
|
|
||||||||
| func TestGetAndSetConfig(t *testing.T) { | ||||||||
|
|
@@ -53,9 +65,80 @@ func TestDefaultAgentConfig(t *testing.T) { | |||||||
| expectedTaskTypes := []string{"task_type_1", "task_type_2"} | ||||||||
| assert.Equal(t, expectedTaskTypes, cfg.SupportedTaskTypes) | ||||||||
|
|
||||||||
| assert.Contains(t, cfg.AgentDeployments, "agent_1") | ||||||||
|
|
||||||||
| agent1 := cfg.AgentDeployments["agent_1"] | ||||||||
| assert.Equal(t, "", agent1.Endpoint) | ||||||||
| assert.True(t, agent1.Insecure) | ||||||||
| assert.Equal(t, 300*time.Second, agent1.DefaultTimeout.Duration) | ||||||||
| assert.Equal(t, 300*time.Second, agent1.Timeouts["ExecuteTaskSync"].Duration) | ||||||||
| assert.Equal(t, 100*time.Second, agent1.Timeouts["GetTask"].Duration) | ||||||||
|
|
||||||||
| assert.Equal(t, "agent_1", cfg.AgentForTaskTypes["task_type_1"]) | ||||||||
|
|
||||||||
| assert.Equal(t, 10*time.Second, cfg.PollInterval.Duration) | ||||||||
| } | ||||||||
|
|
||||||||
| func TestTaskWithExpectedAgent(t *testing.T) { | ||||||||
| // Set up the base configuration | ||||||||
| cfg := defaultConfig | ||||||||
| cfg.AgentDeployments["agent_1"].Endpoint = defaultAgentEndpoint | ||||||||
| err := SetConfig(&cfg) | ||||||||
| assert.NoError(t, err) | ||||||||
|
|
||||||||
| // Create mock agent client agent_1 | ||||||||
| agent1Client := new(agentMocks.AsyncAgentServiceClient) | ||||||||
| agent1Client.On("CreateTask", mock.Anything, mock.Anything).Return(&admin.CreateTaskResponse{}, nil) | ||||||||
|
|
||||||||
| // Create a plugin instance using our mock clients | ||||||||
| agentPlugin := webapi.PluginEntry{ | ||||||||
| ID: "agent", | ||||||||
| SupportedTaskTypes: []string{"task_type_1"}, | ||||||||
| PluginLoader: func(ctx context.Context, iCtx webapi.PluginSetupContext) (webapi.AsyncPlugin, error) { | ||||||||
| return &Plugin{ | ||||||||
| metricScope: iCtx.MetricsScope(), | ||||||||
| cfg: &cfg, | ||||||||
| cs: &ClientSet{ | ||||||||
| asyncAgentClients: map[string]service.AsyncAgentServiceClient{ | ||||||||
| defaultAgentEndpoint: agent1Client, | ||||||||
| }, | ||||||||
| }, | ||||||||
| registry: Registry{ | ||||||||
| "task_type_1": {defaultTaskTypeVersion: {AgentDeployment: cfg.AgentDeployments["agent_1"], IsSync: false}}, | ||||||||
| }, | ||||||||
| }, nil | ||||||||
| }, | ||||||||
| } | ||||||||
|
|
||||||||
| // Create task template and input | ||||||||
| template := flyteIdlCore.TaskTemplate{ | ||||||||
| Type: "task_type_1", // Should route to agent_1 | ||||||||
| Target: &flyteIdlCore.TaskTemplate_Container{}, | ||||||||
| } | ||||||||
|
|
||||||||
| pluginEntry := pluginmachinery.CreateRemotePlugin(agentPlugin) | ||||||||
| plugin, err := pluginEntry.LoadPlugin(context.TODO(), newFakeSetupContext("test")) | ||||||||
| assert.NoError(t, err) | ||||||||
|
|
||||||||
| inputs, err := coreutils.MakeLiteralMap(map[string]interface{}{"input": "test"}) | ||||||||
| assert.NoError(t, err) | ||||||||
|
|
||||||||
| // Run task type 1 (should use agent_1) | ||||||||
| tCtx := getTaskContext(t) | ||||||||
| tr := &pluginCoreMocks.TaskReader{} | ||||||||
| tr.OnRead(context.Background()).Return(&template, nil) | ||||||||
| tCtx.OnTaskReader().Return(tr) | ||||||||
| inputReader := &ioMocks.InputReader{} | ||||||||
| inputReader.OnGetMatch(mock.Anything).Return(inputs, nil) | ||||||||
| inputReader.OnGetInputPath().Return(storage.DataReference("fake://input/path")) | ||||||||
| inputReader.OnGetInputPrefixPath().Return(storage.DataReference("fake://input/prefix")) | ||||||||
| tCtx.OnInputReader().Return(inputReader) | ||||||||
|
|
||||||||
| result, err := plugin.Handle(context.Background(), tCtx) | ||||||||
| assert.NoError(t, err) | ||||||||
| assert.NotNil(t, result) | ||||||||
|
|
||||||||
| // Verify agent_1 was called (failed) | ||||||||
| // agent1Client.AssertCalled(t, "CreateTask", mock.Anything, mock.Anything) | ||||||||
|
Comment on lines
+141
to
+142
There was a problem hiding this comment. Consider enabling mock assertion check
The commented out assertion Code suggestionCheck the AI-generated fix before applying
Suggested change
Code Review Run #5f1d05 Is this a valid issue, or was it incorrectly flagged by the Agent?
|
||||||||
|
|
||||||||
| } | ||||||||
Oops, something went wrong.
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.
Consider adding task types to the
supportedTaskTypesarray as an empty array may prevent the agent from handling any tasks. You might want to specify the task types this agent should support.Code suggestion
Code Review Run #5f1d05
Is this a valid issue, or was it incorrectly flagged by the Agent?