anthropic fixed

examples/v2/td/ai/ai.go

@@ -64,6 +64,10 @@ type StatefulOpenAIChat struct {
     ctx context.Context
 }
 
+func (s *StatefulOpenAIChat) Name() string {
+    return "openai"
+}
+
 func NewStatefulOpenAIChat(system string, ctx context.Context) *StatefulOpenAIChat {
     return &StatefulOpenAIChat{
         ai: NewOpenAIChat(os.Getenv("OPENAI_API_KEY"), system),
@@ -100,7 +104,7 @@ func NewClaudeSonnet(system string, ctx context.Context) *ClaudeSonnet {
     return &ClaudeSonnet{
         ctx: ctx,
         client: client,
-        system: system,
+        system: system + "\n" + shapeMessage,
     }
 }
 
@@ -110,19 +114,8 @@ func (o *ClaudeSonnet) chat(chat string, ctx context.Context) (string, error) {
         Model: anthropic.ModelClaude3Sonnet20240229,
         Temperature: &temperature,
         MaxTokens: 1000,
+        System: o.system,
         Messages: []anthropic.Message{
-            anthropic.Message{
-                Role: "system",
-                Content: []anthropic.MessageContent{
-                    anthropic.NewTextMessageContent(o.system),
-                },
-            },
-            anthropic.Message{
-                Role: anthropic.RoleUser,
-                Content: []anthropic.MessageContent{
-                    anthropic.NewTextMessageContent(chat),
-                },
-            },
             anthropic.Message{
                 Role: anthropic.RoleUser,
                 Content: []anthropic.MessageContent{
@@ -139,6 +132,10 @@ func (o *ClaudeSonnet) chat(chat string, ctx context.Context) (string, error) {
     return resp.Content[0].GetText(), nil
 }
 
+func (s *ClaudeSonnet) Name() string {
+    return "anthropic"
+}
+
 func (s *ClaudeSonnet) ReadWithTimeout(p string, t time.Duration) (string, error) {
     ctx, cancel := context.WithCancel(s.ctx)
     go func() {

examples/v2/td/players/ai.go

@@ -62,6 +62,7 @@ type AIResponder struct {
 
 type AIFetcher interface {
     ReadWithTimeout(prompt string, t time.Duration) (string, error)
+    Name() string
 }
 
 func NewFetchPosition(ai AIFetcher, debug *testies.DebugFile) AIResponder {
@@ -144,6 +145,10 @@ func (f *AIResponder) fetchResults(team uint8, gs *objects.GameState, ctx contex
     return responses
 }
 
+func (f *AIResponder) Name() string {
+    return f.ai.Name()
+}
+
 func (f *AIResponder) StreamResults(team uint8, gs *objects.GameState, out PositionChan, done Done, ctx context.Context) {
     if !f.streamResults {
         return

examples/v2/td/players/box-strat.go

@@ -115,8 +115,10 @@ func (r *RandomPos) Stats() objects.Stats {
     return objects.Stats{}
 }
 
+func (f *RandomPos) Name() string { return "random-pos" }
 func (f *RandomPos) Run(ctx context.Context) { }
 func (f *BoxPos) Run(ctx context.Context) { }
+func (f *BoxPos) Name() string { return "box-pos" }
 
 func StratPlayerFromString(arg string) Player {
     assert.Assert(strings.HasPrefix(arg, "strat"), "invalid player string for strat client", "arg", arg)

examples/v2/td/players/players.go

@@ -19,6 +19,7 @@ type Player interface {
     StreamResults(team uint8, gs *objects.GameState, out PositionChan, done Done, ctx context.Context)
     Stats() objects.Stats
     Run(ctx context.Context)
+    Name() string
 }
 
 type TeamPlayer struct {

examples/v2/td/players/twitch.go

@@ -66,6 +66,10 @@ func (t *TwitchTDChat) Moves(gs *objects.GameState, ctx context.Context) []objec
     return occurrencesToPositions(occs, gs.AllowedTowers)
 }
 
+func (r *TwitchTDChat) Name() string {
+    return "twitch-" + r.chat
+}
+
 func (r *TwitchTDChat) runStreamResults(gs *objects.GameState, out PositionChan, _ Done, ctx context.Context) {
     outer:
     for {