Merge pull request #17 from mutablelogic/v1

Anthropic and Bitwarden Changes

Author: djthorpe

README.md

@@ -189,6 +189,16 @@ You can create a payload with form data:
 
 The payload should be a `struct` where the fields are converted to form tuples. File uploads require a field of type `multipart.File`.
 
+## Unmarshalling responses
+
+You can implement your own unmarshalling of responses by implementing the `Unmarshaler` interface:
+
+```go
+type Unmarshaler interface {
+  Unmarshal(mimetype string, r io.Reader) error
+}
+```
+
 ## Streaming Responses
 
 If the returned content is a stream of JSON responses, then you can use the `OptResponse(fn func() error)` option, which

client.go

@@ -34,6 +34,9 @@ type Client struct {
 	sync.Mutex
 	*http.Client
 
+	// Parent object for client options
+	Parent any
+
 	endpoint *url.URL
 	ua       string
 	rate     float32 // number of requests allowed per second

clientopts.go

@@ -113,3 +113,16 @@ func OptHeader(key, value string) ClientOpt {
 		return nil
 	}
 }
+
+// OptParent sets the parent client for this client, which is
+// used for setting additional client options in the parent
+func OptParent(v any) ClientOpt {
+	return func(client *Client) error {
+		if v == nil {
+			return ErrBadParameter.With("OptParent")
+		} else {
+			client.Parent = v
+		}
+		return nil
+	}
+}

cmd/api/anthropic.go

@@ -1,12 +1,14 @@
 package main
 
 import (
+	"context"
 	"fmt"
-	"strings"
 
+	// Packages
 	"github.com/djthorpe/go-tablewriter"
 	"github.com/mutablelogic/go-client"
 	"github.com/mutablelogic/go-client/pkg/anthropic"
+	"github.com/mutablelogic/go-client/pkg/openai/schema"
 )
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -52,10 +54,17 @@ func anthropicParse(flags *Flags, opts ...client.ClientOpt) error {
 ///////////////////////////////////////////////////////////////////////////////
 // METHODS
 
-func anthropicChat(w *tablewriter.Writer, args []string) error {
+func anthropicChat(ctx context.Context, w *tablewriter.Writer, args []string) error {
 	// Request -> Response
-	message := anthropic.NewMessage("user", strings.Join(args, " "))
-	responses, err := anthropicClient.Messages(message)
+	message := schema.NewMessage("user")
+	for _, arg := range args {
+		message.Add(schema.Text(arg))
+	}
+
+	// Request -> Response
+	responses, err := anthropicClient.Messages(ctx, []*schema.Message{
+		message,
+	})
 	if err != nil {
 		return err
 	}