Skip to content

Commit 503dc42

Browse files
fogfishfogfish
committed
update deps
1 parent d76653f commit 503dc42

File tree

18 files changed

+140
-119
lines changed

18 files changed

+140
-119
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ import (
9090

9191
// LLMs toolkit
9292
"github.com/kshard/chatter"
93-
"github.com/kshard/chatter/llm/autoconfig"
93+
"github.com/kshard/chatter/provider/autoconfig"
9494

9595
// Agents toolkit
9696
"github.com/kshard/thinker/agent"

‎command/registry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (r *Registry) Invoke(reply *chatter.Reply) (thinker.Phase, chatter.Message,
104104
return thinker.AGENT_RETURN, nil, nil
105105
}
106106

107-
return thinker.AGENT_ASK, answer, nil
107+
return thinker.AGENT_ASK, &answer, nil
108108
}
109109

110110
func convert(cmd thinker.Cmd) (chatter.Cmd, error) {

‎doc/HOWTO.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ The library uses [`chatter`](github.com/kshard/chatter) as an adapter to access
1111
* [OpenAI](https://platform.openai.com/docs/api-reference/introduction)
1212
* [LM Studio](https://lmstudio.ai)
1313

14-
Once the provider and LLMs access is configures, your application can start using it. The [`autoconfig`](github.com/kshard/chatter/llm/autoconfig) is recommended approach to begin with. It does not require any specification within Golang code.
14+
Once the provider and LLMs access is configures, your application can start using it. The [`autoconfig`](github.com/kshard/chatter/provider/autoconfig) is recommended approach to begin with. It does not require any specification within Golang code.
1515

1616
```go
17-
import "github.com/kshard/chatter/llm/autoconfig"
17+
import "github.com/kshard/chatter/provider/autoconfig"
1818

1919
llm, err := autoconfig.New("thinker")
2020
if err != nil {

‎examples/01_helloworld/hw.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"fmt"
1414

1515
"github.com/kshard/chatter"
16-
"github.com/kshard/chatter/llm/autoconfig"
16+
"github.com/kshard/chatter/provider/autoconfig"
1717
"github.com/kshard/thinker/agent"
1818
)
1919

@@ -38,7 +38,7 @@ func anagram(expr string) (chatter.Message, error) {
3838

3939
func main() {
4040
// create instance of LLM API, see doc/HOWTO.md for details
41-
llm, err := autoconfig.New("thinker")
41+
llm, err := autoconfig.FromNetRC("thinker")
4242
if err != nil {
4343
panic(err)
4444
}

‎examples/02_rainbow/rainbow.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
"github.com/kshard/chatter"
1818
"github.com/kshard/chatter/aio"
19-
"github.com/kshard/chatter/llm/autoconfig"
19+
"github.com/kshard/chatter/provider/autoconfig"
2020
"github.com/kshard/thinker"
2121
"github.com/kshard/thinker/agent/worker"
2222
"github.com/kshard/thinker/codec"
@@ -49,7 +49,7 @@ func validate(seq []string) error {
4949

5050
func main() {
5151
// create instance of LLM API, see doc/HOWTO.md for details
52-
llm, err := autoconfig.New("thinker")
52+
llm, err := autoconfig.FromNetRC("thinker")
5353
if err != nil {
5454
panic(err)
5555
}

‎examples/03_script/script.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"github.com/kshard/chatter"
1717
"github.com/kshard/chatter/aio"
18-
"github.com/kshard/chatter/llm/autoconfig"
18+
"github.com/kshard/chatter/provider/autoconfig"
1919
"github.com/kshard/thinker"
2020
"github.com/kshard/thinker/agent"
2121
"github.com/kshard/thinker/codec"
@@ -82,7 +82,7 @@ func main() {
8282
registry.Register(softcmd.Return())
8383

8484
// create instance of LLM API, see doc/HOWTO.md for details
85-
llm, err := autoconfig.New("thinker")
85+
llm, err := autoconfig.FromNetRC("thinker")
8686
if err != nil {
8787
panic(err)
8888
}

‎examples/04_reflex/reflex.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"github.com/kshard/chatter"
1717
"github.com/kshard/chatter/aio"
18-
"github.com/kshard/chatter/llm/autoconfig"
18+
"github.com/kshard/chatter/provider/autoconfig"
1919
"github.com/kshard/thinker/agent/worker"
2020
"github.com/kshard/thinker/codec"
2121
"github.com/kshard/thinker/command/softcmd"
@@ -39,7 +39,7 @@ func main() {
3939
registry.Register(softcmd.Bash("MacOS", "/tmp/script"))
4040

4141
// create instance of LLM API, see doc/HOWTO.md for details
42-
llm, err := autoconfig.New("thinker")
42+
llm, err := autoconfig.FromNetRC("thinker")
4343
if err != nil {
4444
panic(err)
4545
}

‎examples/05_chain/chain.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"os"
1515

1616
"github.com/kshard/chatter"
17-
"github.com/kshard/chatter/llm/autoconfig"
17+
"github.com/kshard/chatter/provider/autoconfig"
1818
"github.com/kshard/thinker"
1919
"github.com/kshard/thinker/agent"
2020
"github.com/kshard/thinker/agent/worker"
@@ -72,7 +72,7 @@ func (agt AgentB) Encode(string) (chatter.Message, error) {
7272

7373
func main() {
7474
// create instance of LLM API, see doc/HOWTO.md for details
75-
llm, err := autoconfig.New("thinker")
75+
llm, err := autoconfig.FromNetRC("thinker")
7676
if err != nil {
7777
panic(err)
7878
}

‎examples/06_text_processor/processor.go

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ package main
1111
import (
1212
"context"
1313
"fmt"
14+
"io"
1415

1516
"github.com/fogfish/stream/lfs"
1617
"github.com/fogfish/stream/spool"
1718
"github.com/kshard/chatter"
18-
"github.com/kshard/chatter/llm/autoconfig"
19+
"github.com/kshard/chatter/provider/autoconfig"
1920
"github.com/kshard/thinker/agent"
2021
"github.com/kshard/thinker/agent/worker"
2122
"github.com/kshard/thinker/codec"
@@ -40,7 +41,7 @@ func processor(s string) (chatter.Message, error) {
4041
}
4142

4243
func main() {
43-
llm, err := autoconfig.New("thinker")
44+
llm, err := autoconfig.FromNetRC("thinker")
4445
if err != nil {
4546
panic(err)
4647
}
@@ -55,7 +56,7 @@ func main() {
5556
if err != nil {
5657
panic(err)
5758
}
58-
q := spool.New(r, w, spool.Mutable)
59+
q := spool.New(r, w, spool.IsMutable)
5960

6061
// We need 10 files, let's use agents to get itls
6162
fmt.Printf("==> creating files ...\n")
@@ -70,14 +71,26 @@ func main() {
7071
wrk := agent.NewPrompter(llm, processor)
7172

7273
fmt.Printf("==> processing files ...\n")
73-
q.ForEachFile(context.Background(), "/",
74-
func(ctx context.Context, path string, txt []byte) ([]byte, error) {
74+
q.ForEach(context.Background(), "/",
75+
func(ctx context.Context, path string, r io.Reader, w io.Writer) error {
7576
fmt.Printf("==> %v ...\n", path)
77+
78+
txt, err := io.ReadAll(r)
79+
if err != nil {
80+
return err
81+
}
82+
7683
kwd, err := wrk.PromptOnce(ctx, string(txt))
7784
if err != nil {
78-
return nil, err
85+
return err
7986
}
80-
return []byte(kwd.String()), nil
87+
88+
_, err = w.Write([]byte(kwd.String()))
89+
if err != nil {
90+
return err
91+
}
92+
93+
return nil
8194
},
8295
)
8396
}

‎examples/07_aws_sfs/cmd/classify/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ package main
1010

1111
import (
1212
"github.com/aws/aws-lambda-go/lambda"
13-
"github.com/kshard/chatter/llm/bedrock"
13+
"github.com/kshard/chatter/provider/bedrock/foundation/converse"
1414
"github.com/kshard/thinker/examples/07_aws_sfs/core"
1515
)
1616

1717
func main() {
18-
llm, err := bedrock.New(
19-
bedrock.WithLLM(bedrock.LLAMA3_1_70B_INSTRUCT),
20-
bedrock.WithRegion("us-west-2"),
18+
llm, err := converse.New(
19+
"us.anthropic.claude-3-7-sonnet-20250219-v1:0",
20+
converse.WithRegion("us-west-2"),
2121
)
2222
if err != nil {
2323
panic(err)

0 commit comments

Comments
 (0)