feat: ftl call suggests verbs if no match found

CONTRIBUTING.md

@@ -11,6 +11,12 @@ This guide is for you.
 
 ## Development Prerequisites
 
+We recommend that you use OrbStack instead of Docker desktop when developing on this project:
+```
+brew install orbstack
+```
+or [OrbStack Website](https://orbstack.dev/)
+
 The tools used by this project are managed by
 [Hermit](https://cashapp.github.io/hermit/), a self-bootstrapping package
 installer. To activate the Hermit environment, cd into the source directory and

backend/controller/controller.go

@@ -737,8 +737,11 @@ func (s *Service) callWithRequest(
 
 	verbRef := schema.RefFromProto(req.Msg.Verb)
 	verb := &schema.Verb{}
-	err = sch.ResolveRefToType(verbRef, verb)
-	if err != nil {
+
+	if err = sch.ResolveRefToType(verbRef, verb); err != nil {
+		if errors.Is(err, schema.ErrNotFound) {
+			return nil, connect.NewError(connect.CodeNotFound, err)
+		}
 		return nil, err
 	}
 

backend/controller/ingress/request_test.go

@@ -177,7 +177,8 @@ func TestBuildRequestBody(t *testing.T) {
 				Verb:   test.verb,
 			}, r, sch)
 			if test.err != "" {
-				assert.EqualError(t, err, test.err)
+				assert.Contains(t, err.Error(), test.err)
+				assert.IsError(t, err, schema.ErrNotFound)
 				return
 			}
 			assert.NoError(t, err)

backend/schema/schema.go

@@ -2,6 +2,7 @@ package schema
 
 import (
 	"crypto/sha256"
+	"errors"
 	"fmt"
 	"reflect"
 	"strings"
@@ -12,6 +13,8 @@ import (
 	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 )
 
+var ErrNotFound = errors.New("not found")
+
 type Schema struct {
 	Pos Position `parser:"" protobuf:"1,optional"`
 
@@ -44,10 +47,13 @@ func (s *Schema) Hash() [sha256.Size]byte {
 	return sha256.Sum256([]byte(s.String()))
 }
 
+// ResolveRefMonomorphised -
+// If a Ref is not found, returns ErrNotFound.
 func (s *Schema) ResolveRefMonomorphised(ref *Ref) (*Data, error) {
 	out := &Data{}
-	err := s.ResolveRefToType(ref, out)
-	if err != nil {
+
+	if err := s.ResolveRefToType(ref, out); err != nil {
+		// If a ref is not found, returns ErrNotFound
 		return nil, err
 	}
 	return out.Monomorphise(ref)
@@ -90,7 +96,8 @@ func (s *Schema) ResolveRefToType(ref *Ref, out Decl) error {
 			}
 		}
 	}
-	return fmt.Errorf("could not resolve reference %v", ref)
+
+	return errors.Join(ErrNotFound, fmt.Errorf("could not resolve reference %v", ref))
 }
 
 // Module returns the named module if it exists.

cmd/ftl/cmd_call.go

@@ -3,8 +3,11 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
+	"strings"
 	"time"
+	"unicode/utf8"
 
 	"connectrpc.com/connect"
 	"github.com/jpillora/backoff"
@@ -23,12 +26,13 @@ type callCmd struct {
 	Request string         `arg:"" optional:"" help:"JSON5 request payload." default:"{}"`
 }
 
-func (c *callCmd) Run(ctx context.Context, client ftlv1connect.VerbServiceClient) error {
+func (c *callCmd) Run(ctx context.Context, client ftlv1connect.VerbServiceClient, ctlCli ftlv1connect.ControllerServiceClient) error {
 	ctx, cancel := context.WithTimeout(ctx, c.Wait)
 	defer cancel()
 	if err := rpc.Wait(ctx, backoff.Backoff{Max: time.Second * 2}, client); err != nil {
 		return err
 	}
+
 	logger := log.FromContext(ctx)
 	request := map[string]any{}
 	err := json5.Unmarshal([]byte(c.Request), &request)
@@ -39,10 +43,23 @@ func (c *callCmd) Run(ctx context.Context, client ftlv1connect.VerbServiceClient
 	if err != nil {
 		return fmt.Errorf("invalid request: %w", err)
 	}
+
+	logger.Debugf("Calling %s", c.Verb)
+
+	// otherwise, we have a match so call the verb
 	resp, err := client.Call(ctx, connect.NewRequest(&ftlv1.CallRequest{
 		Verb: c.Verb.ToProto(),
 		Body: requestJSON,
 	}))
+
+	if cerr := new(connect.Error); errors.As(err, &cerr) && cerr.Code() == connect.CodeNotFound {
+		suggestions, err := c.findSuggestions(ctx, ctlCli)
+
+		// if we have suggestions, return a helpful error message. otherwise continue to the original error
+		if err == nil {
+			return fmt.Errorf("verb not found: %s\n\nDid you mean one of these?\n%s", c.Verb, strings.Join(suggestions, "\n"))
+		}
+	}
 	if err != nil {
 		return err
 	}
@@ -58,3 +75,88 @@ func (c *callCmd) Run(ctx context.Context, client ftlv1connect.VerbServiceClient
 	}
 	return nil
 }
+
+// findSuggestions looks up the schema and finds verbs that are similar to the one that was not found
+// it uses the levenshtein distance to determine similarity - if the distance is less than 40% of the length of the verb,
+// it returns an error if no closely matching suggestions are found
+func (c *callCmd) findSuggestions(ctx context.Context, client ftlv1connect.ControllerServiceClient) ([]string, error) {
+	logger := log.FromContext(ctx)
+
+	// lookup the verbs
+	res, err := client.GetSchema(ctx, connect.NewRequest(&ftlv1.GetSchemaRequest{}))
+	if err != nil {
+		return nil, err
+	}
+
+	modules := res.Msg.GetSchema().GetModules()
+	verbs := []string{}
+
+	// build a list of all the verbs
+	for _, module := range modules {
+		for _, decl := range module.GetDecls() {
+			v := decl.GetVerb()
+			if v == nil {
+				continue
+			}
+
+			verbName := fmt.Sprintf("%s.%s", module.Name, v.Name)
+			if verbName == fmt.Sprintf("%s.%s", c.Verb.Module, c.Verb.Name) {
+				break
+			}
+
+			verbs = append(verbs, module.Name+"."+v.Name)
+		}
+	}
+
+	suggestions := []string{}
+
+	logger.Debugf("Found %d verbs", len(verbs))
+	needle := fmt.Sprintf("%s.%s", c.Verb.Module, c.Verb.Name)
+
+	// only consider suggesting verbs that are within 40% of the length of the needle
+	distanceThreshold := int(float64(len(needle))*0.4) + 1
+	for _, verb := range verbs {
+		d := levenshtein(verb, needle)
+		logger.Debugf("Verb %s distance %d", verb, d)
+
+		if d <= distanceThreshold {
+			suggestions = append(suggestions, verb)
+		}
+	}
+
+	if len(suggestions) > 0 {
+		return suggestions, nil
+	}
+
+	return nil, fmt.Errorf("no suggestions found")
+}
+
+// Levenshtein computes the Levenshtein distance between two strings.
+//
+// credit goes to https://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Levenshtein_distance#Go
+func levenshtein(a, b string) int {
+	f := make([]int, utf8.RuneCountInString(b)+1)
+
+	for j := range f {
+		f[j] = j
+	}
+
+	for _, ca := range a {
+		j := 1
+		fj1 := f[0] // fj1 is the value of f[j - 1] in last iteration
+		f[0]++
+		for _, cb := range b {
+			mn := min(f[j]+1, f[j-1]+1) // delete & insert
+			if cb != ca {
+				mn = min(mn, fj1+1) // change
+			} else {
+				mn = min(mn, fj1) // matched
+			}
+
+			fj1, f[j] = f[j], mn // save f[j] to fj1(j is about to increase), update f[j] to mn
+			j++
+		}
+	}
+
+	return f[len(f)-1]
+}