Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions internal/client/refrax_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ func (c *RefraxClient) Refactor(proj domain.Project) (domain.Project, error) {
"You cannot suggest removing JavaDoc comments",
},
}
criticBrain, err := mind(c.params, &criticSystemPrompt, criticStats)
token, err := token(c.params)
if err != nil {
return nil, fmt.Errorf("failed to find token: %w", err)
}
criticBrain, err := mind(c.params, token, &criticSystemPrompt, criticStats)
if err != nil {
return nil, fmt.Errorf("failed to create AI instance: %w", err)
}
Expand All @@ -98,7 +102,7 @@ func (c *RefraxClient) Refactor(proj domain.Project) (domain.Project, error) {
"You cannot remove JavaDoc comments",
},
}
fixerBrain, err := mind(c.params, &fixerSystemPrompt, fixerStats)
fixerBrain, err := mind(c.params, token, &fixerSystemPrompt, fixerStats)
if err != nil {
return nil, fmt.Errorf("failed to create AI instance: %w", err)
}
Expand All @@ -123,7 +127,7 @@ func (c *RefraxClient) Refactor(proj domain.Project) (domain.Project, error) {
"You cannot suggest adding another dependencies",
},
}
reviewerBrain, err := mind(c.params, &reviewerSystemPrompt, reviewerStats)
reviewerBrain, err := mind(c.params, token, &reviewerSystemPrompt, reviewerStats)
if err != nil {
return nil, fmt.Errorf("failed to create AI instance for reviewer: %w", err)
}
Expand All @@ -146,7 +150,7 @@ func (c *RefraxClient) Refactor(proj domain.Project) (domain.Project, error) {
"You cannot change suggestions",
},
}
facilitatorBrain, err := mind(c.params, &facilitatorSystemPrompt, facilitatorStats)
facilitatorBrain, err := mind(c.params, token, &facilitatorSystemPrompt, facilitatorStats)
if err != nil {
return nil, fmt.Errorf("failed to create AI instance: %w", err)
}
Expand Down Expand Up @@ -298,15 +302,15 @@ func printStats(p Params, s ...*stats.Stats) error {
return nil
}

func mind(p Params, system *prompts.System, s *stats.Stats) (brain.Brain, error) {
ai, err := brain.New(p.Provider, token(p), system.String(), p.Playbook)
func mind(p Params, token string, system *prompts.System, s *stats.Stats) (brain.Brain, error) {
ai, err := brain.New(p.Provider, token, system.String(), p.Playbook)
if p.Stats {
ai = brain.NewMetricBrain(ai, s)
}
return ai, err
}

func token(p Params) string {
func token(p Params) (string, error) {
log.Debug("Refactoring provider: %s", p.Provider)
log.Debug("Project path to refactor: %s", p.Input)
var token string
Expand All @@ -316,8 +320,11 @@ func token(p Params) string {
log.Info("Token not provided, trying to find token in .env file")
token = env.Token(".env", p.Provider)
}
if token == "" {
return "", fmt.Errorf("token not found, please provide it via --token flag or in .env file")
}
log.Debug("Using provided token: %s...", mask(token))
return token
return token, nil
}

func proj(params Params) (domain.Project, error) {
Expand Down
10 changes: 10 additions & 0 deletions internal/client/refrax_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,18 @@ import (

"github.com/cqfn/refrax/internal/domain"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestTokenNotFound(t *testing.T) {
params := NewMockParams()
params.Token = ""
client := NewRefraxClient(params)
_, err := client.Refactor(domain.NewMock())
require.Error(t, err)
require.Equal(t, "failed to find token: token not found, please provide it via --token flag or in .env file", err.Error())
}

func TestRefraxClient_Creates_Successfully(t *testing.T) {
client := NewRefraxClient(NewMockParams())
assert.NotNil(t, client, "Refrax client should not be nil")
Expand Down
3 changes: 3 additions & 0 deletions internal/critic/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ func (c *Critic) thinkLong(m *protocol.Message) (*protocol.Message, error) {
return nil, fmt.Errorf("failed to parse task from message: %w", err)
}
artifacts, err := c.agent.Review(tsk)
if err != nil {
return nil, fmt.Errorf("failed to review the task: %w", err)
}
return artifacts.Marshal().Message, err
}

Expand Down
Loading