m3tam3re/fabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert unneeded DryRun Vendor registration

Browse Source
This commit is contained in:
Azwar Tamim 2024-09-02 14:41:39 +07:00
parent e26d72c2f0
commit 33632030f6
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/fabric.go
View File

@ -59,7 +59,7 @@ func NewFabricBase(db *db.Db) (ret *Fabric) {
"Enter the index the name of your default model") "Enter the index the name of your default model")
ret.VendorsAll.AddVendors(openai.NewClient(), azure.NewClient(), ollama.NewClient(), groc.NewClient(), ret.VendorsAll.AddVendors(openai.NewClient(), azure.NewClient(), ollama.NewClient(), groc.NewClient(),
gemini.NewClient(), anthropic.NewClient(), dryrun.NewClient()) gemini.NewClient(), anthropic.NewClient())
return return
} }

2
core/models.go
View File

@ -16,11 +16,9 @@ type VendorsModels struct {
} }
func (o *VendorsModels) AddVendorModels(vendor string, models []string) { func (o *VendorsModels) AddVendorModels(vendor string, models []string) {
if vendor != "DryRun" {
o.Vendors = append(o.Vendors, vendor) o.Vendors = append(o.Vendors, vendor)
o.VendorsModels[vendor] = models o.VendorsModels[vendor] = models
} }
}
func (o *VendorsModels) GetVendorAndModelByModelIndex(modelIndex int) (vendor string, model string) { func (o *VendorsModels) GetVendorAndModelByModelIndex(modelIndex int) (vendor string, model string) {
vendorModelIndexFrom := 0 vendorModelIndexFrom := 0

29
vendors/dryrun/dryrun.go vendored
View File

@ -2,6 +2,7 @@ package dryrun
import ( import (
"bytes" "bytes"
"context"
"fmt" "fmt"
"github.com/danielmiessler/fabric/common" "github.com/danielmiessler/fabric/common"
@ -29,10 +30,10 @@ func (c *Client) ListModels() ([]string, error) {
return []string{"dry-run-model"}, nil return []string{"dry-run-model"}, nil
} }
func (c *Client) SendStream(messages []*common.Message, options *common.ChatOptions, channel chan string) error { func (c *Client) SendStream(msgs []*common.Message, opts *common.ChatOptions, channel chan string) error {
output := "Dry run: Would send the following request:\n\n" output := "Dry run: Would send the following request:\n\n"
for _, msg := range messages { for _, msg := range msgs {
switch msg.Role { switch msg.Role {
case "system": case "system":
output += fmt.Sprintf("System:\n%s\n\n", msg.Content) output += fmt.Sprintf("System:\n%s\n\n", msg.Content)
@ -44,21 +45,21 @@ func (c *Client) SendStream(messages []*common.Message, options *common.ChatOpti
} }
output += "Options:\n" output += "Options:\n"
output += fmt.Sprintf("Model: %s\n", options.Model) output += fmt.Sprintf("Model: %s\n", opts.Model)
output += fmt.Sprintf("Temperature: %f\n", options.Temperature) output += fmt.Sprintf("Temperature: %f\n", opts.Temperature)
output += fmt.Sprintf("TopP: %f\n", options.TopP) output += fmt.Sprintf("TopP: %f\n", opts.TopP)
output += fmt.Sprintf("PresencePenalty: %f\n", options.PresencePenalty) output += fmt.Sprintf("PresencePenalty: %f\n", opts.PresencePenalty)
output += fmt.Sprintf("FrequencyPenalty: %f\n", options.FrequencyPenalty) output += fmt.Sprintf("FrequencyPenalty: %f\n", opts.FrequencyPenalty)
channel <- output channel <- output
close(channel) close(channel)
return nil return nil
} }
func (c *Client) Send(messages []*common.Message, options *common.ChatOptions) (string, error) { func (c *Client) Send(ctx context.Context, msgs []*common.Message, opts *common.ChatOptions) (string, error) {
fmt.Println("Dry run: Would send the following request:") fmt.Println("Dry run: Would send the following request:")
for _, msg := range messages { for _, msg := range msgs {
switch msg.Role { switch msg.Role {
case "system": case "system":
fmt.Printf("System:\n%s\n\n", msg.Content) fmt.Printf("System:\n%s\n\n", msg.Content)
@ -70,11 +71,11 @@ func (c *Client) Send(messages []*common.Message, options *common.ChatOptions) (
} }
fmt.Println("Options:") fmt.Println("Options:")
fmt.Printf("Model: %s\n", options.Model) fmt.Printf("Model: %s\n", opts.Model)
fmt.Printf("Temperature: %f\n", options.Temperature) fmt.Printf("Temperature: %f\n", opts.Temperature)
fmt.Printf("TopP: %f\n", options.TopP) fmt.Printf("TopP: %f\n", opts.TopP)
fmt.Printf("PresencePenalty: %f\n", options.PresencePenalty) fmt.Printf("PresencePenalty: %f\n", opts.PresencePenalty)
fmt.Printf("FrequencyPenalty: %f\n", options.FrequencyPenalty) fmt.Printf("FrequencyPenalty: %f\n", opts.FrequencyPenalty)
return "", nil return "", nil
} }