Skip to content

feat(nubi): add query timeout flag, resilient polling, and recovery hints #115

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.

Sign up for GitHub

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
blue4209211 merged 3 commits into from
Sep 6, 2026
Merged

feat(nubi): add query timeout flag, resilient polling, and recovery hints #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7736270
feat(nubi): add query timeout flag, resilient polling, and recovery h…
blue4209211 Sep 6, 2026
546772f
fix(nubi): round sub-second duration to ms and check err in poll
blue4209211 Sep 6, 2026
9663519
feat(nubi): support --account-id on nubi get, isolate polling query p…
blue4209211 Sep 6, 2026
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
14 changes: 9 additions & 5 deletions cmd/nubi_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ var nubiGetCmd = &cobra.Command{
return fmt.Errorf("either conversation-id argument or --session-id flag must be provided")
}

accountID := viper.GetString("account-id")
if accountID == "" {
return fmt.Errorf("account-id is required, please set it in your config file or pass via flag")
accountID, err := resolveAccountID(cmd)
if err != nil {
return err
}

username := viper.GetString("username")
Expand Down Expand Up @@ -60,7 +60,7 @@ var nubiGetCmd = &cobra.Command{
if details != nil && details.Conversation.ID != "" {
targetID = details.Conversation.ID
} else {
return fmt.Errorf("conversation not found")
return fmt.Errorf("conversation not found for account %s", accountID)
}
}

Expand All @@ -72,8 +72,11 @@ var nubiGetCmd = &cobra.Command{
return fmt.Errorf("failed to get conversation details: %w", err)
}
}
if details == nil || details.Conversation.ID == "" {
return fmt.Errorf("conversation not found for account %s", accountID)
}
resolvedID := conversationID
if details != nil && details.Conversation.ID != "" {
if details.Conversation.ID != "" {
resolvedID = details.Conversation.ID
}
stats, _ := nubiClient.GetConversationStats(ctx, resolvedID)
Expand Down Expand Up @@ -173,5 +176,6 @@ var nubiGetCmd = &cobra.Command{

func init() {
nubiGetCmd.Flags().String("session-id", "", "Optional session ID if conversation details lookup by session is explicitly needed")
nubiGetCmd.Flags().String("account-id", "", "Account ID to fetch the conversation from (overrides default profile)")
nubiCmd.AddCommand(nubiGetCmd)
}
243 changes: 227 additions & 16 deletions cmd/nubi_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ import (
"github.com/spf13/viper"
)

var nubiQueryAsync bool
var (
nubiQueryAsync bool
nubiQueryTimeout time.Duration
)

var nubiQueryCmd = &cobra.Command{
Use: "query <prompt>",
Expand Down Expand Up @@ -50,7 +53,13 @@ var nubiQueryCmd = &cobra.Command{
sessionID := uuid.New().String()
nubiClient := nubi.New(client.NewClient(), accountID, username, sessionID, endpoint)

ctx, cancel := context.WithCancel(cmd.Context())
var ctx context.Context
var cancel context.CancelFunc
if nubiQueryTimeout > 0 {
ctx, cancel = context.WithTimeout(cmd.Context(), nubiQueryTimeout)
} else {
ctx, cancel = context.WithCancel(cmd.Context())
}
defer cancel()

sigChan := make(chan os.Signal, 1)
Expand All @@ -67,6 +76,22 @@ var nubiQueryCmd = &cobra.Command{
async, _ := cmd.Flags().GetBool("async")
if async {
if err := nubiClient.TriggerInvestigation(ctx, query); err != nil {
if format.GetFormat().Get() == "json" {
jsonResp := map[string]interface{}{
"error": fmt.Sprintf("failed to trigger investigation: %v", err),
"status": "ERROR",
"account_id": nubiClient.AccountID,
"query": query,
}
if hint := triggerErrorHint(err, nubiClient.AccountID); hint != "" {
jsonResp["hint"] = hint
}
format.GetFormat().Print(jsonResp)
return nil
Comment thread
blue4209211 marked this conversation as resolved.
}
if hint := triggerErrorHint(err, nubiClient.AccountID); hint != "" {
return fmt.Errorf("failed to trigger investigation: %w\nHint: %s", err, hint)
}
return fmt.Errorf("failed to trigger investigation: %w", err)
}
if format.GetFormat().Get() == "json" {
Expand Down Expand Up @@ -102,17 +127,158 @@ var nubiQueryCmd = &cobra.Command{
out := format.GetFormat().GetOutput()

if err != nil {
if errors.Is(err, context.Canceled) {
isTimeout := errors.Is(err, context.DeadlineExceeded) || errors.Is(ctx.Err(), context.DeadlineExceeded)
isCanceled := errors.Is(err, context.Canceled) || errors.Is(ctx.Err(), context.Canceled)

if isTimeout || isCanceled {
statusStr := "TIMED_OUT"
durStr := duration.Round(time.Second).String()
if duration < time.Second {
durStr = duration.Round(time.Millisecond).String()
if durStr == "0s" {
durStr = "<1ms"
}
}
Comment thread
blue4209211 marked this conversation as resolved.
errMsg := fmt.Sprintf("Query timed out after %s.", durStr)
if isCanceled {
statusStr = "CANCELED"
errMsg = "Request canceled."
}

endpointURL := strings.TrimSuffix(nubiClient.Endpoint, "/")
refID := nubiClient.ConversationID
if refID == "" {
refID = nubiClient.SessionID
}
conversationURL := fmt.Sprintf("%s/ask-nudgebee?accountId=%s&conversation_id=%s", endpointURL, nubiClient.AccountID, refID)

recoveryHint := fmt.Sprintf("The investigation was triggered server-side. Retrieve results using 'nbctl nubi get %s --account-id %s' or increase timeout using '--timeout'.", refID, nubiClient.AccountID)
if refID == nubiClient.SessionID {
recoveryHint = fmt.Sprintf("The investigation was triggered server-side. Retrieve results using 'nbctl nubi get --session-id %s --account-id %s' or increase timeout using '--timeout'.", refID, nubiClient.AccountID)
}

if format.GetFormat().Get() == "json" {
format.GetFormat().Print(map[string]interface{}{
"error": "Request canceled.",
"status": "CANCELED",
})
jsonResp := map[string]interface{}{
"error": errMsg,
"status": statusStr,
"account_id": nubiClient.AccountID,
"session_id": nubiClient.SessionID,
"query": query,
"url": conversationURL,
"hint": recoveryHint,
}
if nubiClient.ConversationID != "" {
jsonResp["conversation_id"] = nubiClient.ConversationID
}
format.GetFormat().Print(jsonResp)
return nil
}
_, _ = fmt.Fprintln(out, "Request canceled.")

grayStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("240"))
boldStyle := lipgloss.NewStyle().Bold(true)
yellowStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("214"))

_, _ = fmt.Fprintln(out, yellowStyle.Render(errMsg))
_, _ = fmt.Fprintln(out, grayStyle.Render("\nThe investigation was triggered and may still be running or completed server-side."))
if nubiClient.ConversationID != "" {
_, _ = fmt.Fprintf(out, " %s %s\n", boldStyle.Render("Conversation ID:"), nubiClient.ConversationID)
}
_, _ = fmt.Fprintf(out, " %s %s\n", boldStyle.Render("Session ID:"), nubiClient.SessionID)

accountFlag := ""
if nubiClient.AccountID != "" {
accountFlag = fmt.Sprintf(" --account-id %s", nubiClient.AccountID)
}
_, _ = fmt.Fprintln(out, grayStyle.Render("\nTo retrieve the response once completed:"))
if nubiClient.ConversationID != "" {
_, _ = fmt.Fprintf(out, " nbctl nubi get %s%s\n", nubiClient.ConversationID, accountFlag)
} else {
_, _ = fmt.Fprintf(out, " nbctl nubi get --session-id %s%s\n", nubiClient.SessionID, accountFlag)
}

_, _ = fmt.Fprintln(out, grayStyle.Render("\nTo view in browser:"))
_, _ = fmt.Fprintf(out, " %s\n", conversationURL)

_, _ = fmt.Fprintln(out, grayStyle.Render("\nOptions to increase timeout or run in background:"))
_, _ = fmt.Fprintf(out, " nbctl nubi query %q --timeout 5m\n", query)
_, _ = fmt.Fprintf(out, " nbctl nubi query %q --async\n", query)

return nil
}

// If polling failed after triggering investigation, provide recovery information
if nubiClient.SessionID != "" && !strings.Contains(err.Error(), "triggering investigation") {
Comment thread
blue4209211 marked this conversation as resolved.
endpointURL := strings.TrimSuffix(nubiClient.Endpoint, "/")
refID := nubiClient.ConversationID
if refID == "" {
refID = nubiClient.SessionID
}
conversationURL := fmt.Sprintf("%s/ask-nudgebee?accountId=%s&conversation_id=%s", endpointURL, nubiClient.AccountID, refID)

recoveryHint := fmt.Sprintf("The investigation was triggered server-side. Retrieve results using 'nbctl nubi get %s --account-id %s'.", refID, nubiClient.AccountID)
if refID == nubiClient.SessionID {
recoveryHint = fmt.Sprintf("The investigation was triggered server-side. Retrieve results using 'nbctl nubi get --session-id %s --account-id %s'.", refID, nubiClient.AccountID)
}

if format.GetFormat().Get() == "json" {
jsonResp := map[string]interface{}{
"error": fmt.Sprintf("error executing query: %v", err),
"status": "ERROR",
"account_id": nubiClient.AccountID,
"session_id": nubiClient.SessionID,
"query": query,
"url": conversationURL,
"hint": recoveryHint,
}
if nubiClient.ConversationID != "" {
jsonResp["conversation_id"] = nubiClient.ConversationID
}
format.GetFormat().Print(jsonResp)
return nil
}

grayStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("240"))
boldStyle := lipgloss.NewStyle().Bold(true)
redStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("196"))

_, _ = fmt.Fprintln(out, redStyle.Render(fmt.Sprintf("Error executing query: %v", err)))
_, _ = fmt.Fprintln(out, grayStyle.Render("\nThe investigation was triggered and may still be running or completed server-side."))
if nubiClient.ConversationID != "" {
_, _ = fmt.Fprintf(out, " %s %s\n", boldStyle.Render("Conversation ID:"), nubiClient.ConversationID)
}
_, _ = fmt.Fprintf(out, " %s %s\n", boldStyle.Render("Session ID:"), nubiClient.SessionID)

accountFlag := ""
if nubiClient.AccountID != "" {
accountFlag = fmt.Sprintf(" --account-id %s", nubiClient.AccountID)
}
_, _ = fmt.Fprintln(out, grayStyle.Render("\nTo retrieve the response once completed:"))
if nubiClient.ConversationID != "" {
_, _ = fmt.Fprintf(out, " nbctl nubi get %s%s\n", nubiClient.ConversationID, accountFlag)
} else {
_, _ = fmt.Fprintf(out, " nbctl nubi get --session-id %s%s\n", nubiClient.SessionID, accountFlag)
}
return nil
}

if format.GetFormat().Get() == "json" {
jsonResp := map[string]interface{}{
"error": fmt.Sprintf("error executing query: %v", err),
"status": "ERROR",
"account_id": nubiClient.AccountID,
"query": query,
}
if hint := triggerErrorHint(err, nubiClient.AccountID); hint != "" {
jsonResp["hint"] = hint
}
format.GetFormat().Print(jsonResp)
return nil
}

if hint := triggerErrorHint(err, nubiClient.AccountID); hint != "" {
return fmt.Errorf("error executing query: %w\nHint: %s", err, hint)
}

return fmt.Errorf("error executing query: %w", err)
}

Expand Down Expand Up @@ -193,25 +359,70 @@ func (s *nubiQueryShell) triggerAndPoll(ctx context.Context, query string) (stri
}

func (s *nubiQueryShell) poll(ctx context.Context) (string, string, error) {
consecutiveErrors := 0
const maxConsecutiveErrors = 5

check := func() (string, string, bool, error) {
resp, status, statusText, _, _, _, err := s.nubiClient.GetConversation(ctx)
if err != nil {
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) ||
errors.Is(ctx.Err(), context.Canceled) || errors.Is(ctx.Err(), context.DeadlineExceeded) {
if ctx.Err() != nil {
return "", "", false, ctx.Err()
}
return "", "", false, err
}
consecutiveErrors++
if consecutiveErrors >= maxConsecutiveErrors {
return "", "", false, fmt.Errorf("getting conversation: %w", err)
}
return "", "", false, nil
}
consecutiveErrors = 0

if s.spinner != nil && statusText != "" {
s.spinner.Suffix = " " + statusText
}
Comment thread
blue4209211 marked this conversation as resolved.

if status != "IN_PROGRESS" {
return resp, status, true, nil
}
return "", "", false, nil
}

// Immediate check
if resp, status, done, err := check(); done || err != nil {
return resp, status, err
}

ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()

for {
select {
case <-ctx.Done():
return "", "", ctx.Err()
case <-time.After(2 * time.Second):
resp, status, _, _, _, _, err := s.nubiClient.GetConversation(ctx)
if err != nil {
return "", "", fmt.Errorf("getting conversation: %w", err)
}

if status != "IN_PROGRESS" {
return resp, status, nil
case <-ticker.C:
if resp, status, done, err := check(); done || err != nil {
return resp, status, err
}
}
}
}

func init() {
nubiQueryCmd.Flags().BoolVar(&nubiQueryAsync, "async", false, "Trigger query asynchronously without waiting for response")
nubiQueryCmd.Flags().DurationVarP(&nubiQueryTimeout, "timeout", "t", 0, "Maximum time to wait for query completion (e.g. 2m, 5m). Default is 0 (no timeout)")
nubiQueryCmd.Flags().String("account-id", "", "Account ID to execute the query against")
nubiCmd.AddCommand(nubiQueryCmd)
}

func triggerErrorHint(err error, accountID string) string {
if err == nil {
return ""
}
if strings.Contains(strings.ToLower(err.Error()), "user does not have access") {
return fmt.Sprintf("User does not have access to account %s. Verify the account ID or assign an account role via 'nbctl auth assign-role'.", accountID)
}
return ""
}
Loading