Merge pull request #27 from yubing744/owen/show_llm_model

feat: show model ok

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.22.0'
+
+    - name: Cache Go modules
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cache/go-build
+          /go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+
+    - name: Install dependencies
+      run: go mod download
+
+    - name: Build
+      run: make build
+
+    - name: Run unit tests
+      run: make unit-test

Makefile

@@ -1,7 +1,7 @@
-.PHONY: clean build test run docker-* tag release
+.PHONY: clean build unit-test run docker-* tag release
 
 NAME=trading-gpt
-VERSION=0.22.3
+VERSION=0.23.0
 
 clean:
 	rm -rf build/*
@@ -12,7 +12,7 @@ build: clean
 build-linux:
 	CGO_ENABLED=0 GOOS=linux go build -o ./build/bbgo ./main.go
 
-test:
+unit-test:
 	go test ./pkg/...
 
 run: build

pkg/agents/agent_interface.go

@@ -8,6 +8,7 @@ import (
 
 type GenResult struct {
 	Texts []string
+	Model string
 }
 
 type IAgent interface {

pkg/agents/trading/trading_agent.go

@@ -179,6 +179,15 @@ func (a *TradingAgent) GenActions(ctx context.Context, session types.ISession, m
 		log.WithField("text", text).Info("resp.Choices[0].Text")
 
 		result.Texts = append(result.Texts, text)
+
+		// extract model
+		extInfo := resp.Choices[0].GenerationInfo
+		if extInfo != nil {
+			model, ok := extInfo["model"]
+			if ok {
+				result.Model = model.(string)
+			}
+		}
 	}
 
 	if len(result.Texts) > 0 {

pkg/jarvis.go

@@ -430,6 +430,10 @@ func (s *Strategy) agentAction(ctx context.Context, chatSession ttypes.ISession,
 		}
 	}
 
+	if resp.Model != "" {
+		s.replyMsg(ctx, chatSession, fmt.Sprintf("Generated by LLM model: %s", resp.Model))
+	}
+
 	if len(actions) > 0 {
 		if chatSession.HasRole(ttypes.RoleAdmin) {
 			if len(actions) > 1 {

pkg/llms/llm_manager.go

@@ -159,12 +159,23 @@ func (mgr *LLMManager) GenerateContent(ctx context.Context, messages []llms.Mess
 			return nil, errors.Wrap(err2, "get secondly fail")
 		}
 
-		return llm2.GenerateContent(ctx, messages, options...)
+		resp2, err := llm2.GenerateContent(ctx, messages, options...)
+		setModel(resp, mgr.secondly)
+		return resp2, err
 	}
 
+	setModel(resp, mgr.primary)
 	return resp, nil
 }
 
+func setModel(resp *llms.ContentResponse, model string) {
+	if resp != nil {
+		for _, choice := range resp.Choices {
+			choice.GenerationInfo["model"] = model
+		}
+	}
+}
+
 // Call is a simplified interface for a text-only Model, generating a single
 // string response from a single string prompt.
 //