Skip to content
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

Jump to bottom

feat(llm-sfn): log function calling jsonschema when sfn start #847

Merged
merged 4 commits into from
Jul 2, 2024
Merged

feat(llm-sfn): log function calling jsonschema when sfn start #847

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
205720a
feat: log when register function definition
woorui Jun 25, 2024
c087b42
Update core/client.go
woorui Jun 27, 2024
bcaf84a
improve output
fanweixiao Jul 1, 2024
73bfdba
update output to jsonschema string
fanweixiao Jul 2, 2024
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
4 changes: 2 additions & 2 deletions cli/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ var buildCmd = &cobra.Command{
}
log.InfoStatusEvent(os.Stdout, "YoMo Stream Function parse done.")
// build
log.PendingStatusEvent(os.Stdout, "YoMo Stream Function building...")
log.PendingStatusEvent(os.Stdout, "Building YoMo Stream Function instance...")
if err := s.Build(true); err != nil {
log.FailureStatusEvent(os.Stdout, err.Error())
os.Exit(127)
// return
}
log.SuccessStatusEvent(os.Stdout, "Success! YoMo Stream Function build.")
log.SuccessStatusEvent(os.Stdout, "YoMo Stream Function build successful!")
},
}

Expand Down
8 changes: 4 additions & 4 deletions cli/dev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var devCmd = &cobra.Command{
// Serverless
log.InfoStatusEvent(os.Stdout, "YoMo Stream Function file: %v", opts.Filename)
// resolve serverless
log.PendingStatusEvent(os.Stdout, "Create YoMo Stream Function instance...")
log.PendingStatusEvent(os.Stdout, "Creating YoMo Stream Function instance...")

// Connect the serverless to YoMo dev-server, it will automatically emit the mock data.
opts.Name = "yomo-app-demo"
Expand All @@ -66,17 +66,17 @@ var devCmd = &cobra.Command{
}
// build if it's go file
if ext := filepath.Ext(opts.Filename); ext == ".go" {
log.PendingStatusEvent(os.Stdout, "YoMo Stream Function building...")
log.PendingStatusEvent(os.Stdout, "Bingding YoMo Stream Function instance...")
if err := s.Build(true); err != nil {
log.FailureStatusEvent(os.Stdout, err.Error())
os.Exit(127)
}
log.SuccessStatusEvent(os.Stdout, "Success! YoMo Stream Function build.")
log.SuccessStatusEvent(os.Stdout, "YoMo Stream Function build successful!")
}
// run
log.InfoStatusEvent(
os.Stdout,
"Starting YoMo Stream Function instance with zipper: %v",
"Starting YoMo Stream Function instance, connecting to zipper: %v",
opts.ZipperAddr,
)
log.InfoStatusEvent(os.Stdout, "Stream Function is running...")
Expand Down
8 changes: 4 additions & 4 deletions cli/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var runCmd = &cobra.Command{
return
}
// resolve serverless
log.PendingStatusEvent(os.Stdout, "Create YoMo Stream Function instance...")
log.PendingStatusEvent(os.Stdout, "Creating YoMo Stream Function instance...")
if err := parseZipperAddr(&opts); err != nil {
log.FailureStatusEvent(os.Stdout, err.Error())
return
Expand All @@ -70,12 +70,12 @@ var runCmd = &cobra.Command{
}
// build if it's go file
if ext := filepath.Ext(opts.Filename); ext == ".go" {
log.PendingStatusEvent(os.Stdout, "YoMo Stream Function building...")
log.PendingStatusEvent(os.Stdout, "Bingding YoMo Stream Function instance...")
if err := s.Build(true); err != nil {
log.FailureStatusEvent(os.Stdout, err.Error())
os.Exit(127)
}
log.SuccessStatusEvent(os.Stdout, "Success! YoMo Stream Function build.")
log.SuccessStatusEvent(os.Stdout, "YoMo Stream Function build successful!")
}
// run
// wasi
Expand All @@ -88,7 +88,7 @@ var runCmd = &cobra.Command{
}
log.InfoStatusEvent(
os.Stdout,
"Starting YoMo Stream Function instance with zipper: %v",
"Starting YoMo Stream Function instance, connecting to zipper: %v",
opts.ZipperAddr,
)
log.InfoStatusEvent(os.Stdout, "Stream Function is running...")
Expand Down
6 changes: 6 additions & 0 deletions core/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"github.com/yomorun/yomo/pkg/frame-codec/y3codec"
"github.com/yomorun/yomo/pkg/id"
yquic "github.com/yomorun/yomo/pkg/listener/quic"
"github.com/yomorun/yomo/pkg/log"
)

// Client is the abstraction of a YoMo-Client. a YoMo-Client can be
Expand Down Expand Up @@ -254,6 +255,11 @@
if functionDefinition == nil {
return nil
}
// c.Logger.Info("register function definition", "function_definition", string(functionDefinition))
log.SuccessStatusEvent(os.Stdout, fmt.Sprintf("Register LLM Function Calling: [%s]", c.name))

Check warning on line 259 in core/client.go

View check run for this annotation

Codecov / codecov/patch

core/client.go#L259 

Added line #L259 was not covered by tests
// log.InfoStatusEvent(os.Stdout, fmt.Sprintf("-> Name: %s", c.name))
log.InfoStatusEvent(os.Stdout, fmt.Sprintf("-> Description: %s", c.opts.aiFunctionDescription))
log.InfoStatusEvent(os.Stdout, fmt.Sprintf("-> Arguments Struct: %v", c.opts.aiFunctionInputModel))

Check warning on line 262 in core/client.go

View check run for this annotation

Codecov / codecov/patch

core/client.go#L261-L262 

Added lines #L261 - L262 were not covered by tests
hf.FunctionDefinition = functionDefinition
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/log/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func WarningStatusEvent(w io.Writer, fmtstr string, a ...interface{}) {
} else if runtime.GOOS == windowsOS {
fmt.Fprintf(w, "%s\n", fmt.Sprintf(fmtstr, a...))
} else {
fmt.Fprintf(w, "⚠️⚠ %s\n", fmt.Sprintf(fmtstr, a...))
fmt.Fprintf(w, "⚠️ %s\n", fmt.Sprintf(fmtstr, a...))
}
}

Expand All @@ -96,7 +96,7 @@ func InfoStatusEvent(w io.Writer, fmtstr string, a ...interface{}) {
} else if runtime.GOOS == windowsOS {
fmt.Fprintf(w, "%s\n", fmt.Sprintf(fmtstr, a...))
} else {
fmt.Fprintf(w, "ℹ️ %s\n", fmt.Sprintf(fmtstr, a...))
fmt.Fprintf(w, "ℹ️ %s\n", fmt.Sprintf(fmtstr, a...))
}
}

Expand Down