up

misc/test/curl.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 API_HOST="http://10.0.84.49:22035"
 # API_HOST="http://localhost:22035"

proto/rsp.proto

@@ -13,4 +13,5 @@ message Rsp {
 message RspUsage {
 	uint32 prompt_tokens = 1;
 	uint32 total_tokens = 2;
+	uint32 completion_tokens = 3;
 }

server/src/core/pool.go

@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-func (c *Core) add(req *pb.Req, hr *http.Request) (pr *row) {
+func (c *Core) add(req *pb.Req, hr *http.Request) (pr *row, cached bool) {
 
 	hash := req.Hash()
 
@@ -16,6 +16,7 @@ func (c *Core) add(req *pb.Req, hr *http.Request) (pr *row) {
 	if ok {
 		zj.F(`hit %x`, hash)
 		c.mux.Unlock()
+		cached = true
 		return
 	}
 

server/src/core/req.go

@@ -15,7 +15,7 @@ func (c *Core) getAB(p *pb.Req, r *http.Request) (ab []byte, cached bool, err er
 		return
 	}
 
-	pr := c.add(p, r)
+	pr, cached := c.add(p, r)
 
 	go func() {
 		reqFile := util.CacheName(p.Hash()) + `-req.json`

server/src/util/file.go

@@ -18,7 +18,7 @@ type DownloadFunc func(url string) (ab []byte, err error)
 
 // CacheName ...
 func CacheName(hash [16]byte) string {
-	s := fmt.Sprintf(`cache/%x/%x/%x`, hash[0:2], hash[2:4], hash[4:])
+	s := fmt.Sprintf(`cache/%02x/%02x/%02x/%x`, hash[0], hash[1], hash[2], hash[3:])
 	os.MkdirAll(StaticFile(filepath.Dir(s)), 0755)
 	return s
 }