diff --git a/README.md b/README.md new file mode 100644 index 0000000..fe6d369 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +Orca +====== + +openai api proxy + +缓存已经做完 + +计费还在做 diff --git a/misc/test/curl.sh b/misc/test/curl.sh index e00549c..ba3194b 100755 --- a/misc/test/curl.sh +++ b/misc/test/curl.sh @@ -1,6 +1,9 @@ #!/bin/bash -curl http://localhost:22035/v1/engines/text-embedding-ada-002/embeddings \ +API_HOST="http://10.0.84.49:22035" +# API_HOST="http://localhost:22035" + +curl "${API_HOST}/v1/engines/text-embedding-ada-002/embeddings" \ -H "Content-Type: application/json" \ -H "Authorization: Bearer $OPENAI_API_KEY" \ - -d '{"input":["\u80fd\u91cf\u793c\u7269\u662f\u600e\u4e48\u56de\u4e8b\uff1f\u7528\u4e2d\u6587"], "encoding_format": "base64"}' + -d '{"input":[ "\u80fd\u91cf\u793c\u7269\u662f\u600e\u4e48\u56de\u4e8b\uff1f\u7528\u4e2d\u6587"], "encoding_format": "base64"}' diff --git a/server/src/core/fetch.go b/server/src/core/fetch.go index 2d6ba85..d8e0031 100644 --- a/server/src/core/fetch.go +++ b/server/src/core/fetch.go @@ -49,7 +49,7 @@ func (pr *row) fetchRemote() (ab []byte, ok bool, err error) { } if rsp.StatusCode >= 200 || rsp.StatusCode < 300 { - // ok = true + ok = true } else { err = fmt.Errorf(`status code fail: %d`, rsp.StatusCode) b.WriteString(err.Error()) diff --git a/server/src/core/metrics.go b/server/src/core/metrics.go index 89dd8e2..b9cb39a 100644 --- a/server/src/core/metrics.go +++ b/server/src/core/metrics.go @@ -6,6 +6,7 @@ import ( "project/metrics" "project/pb" "project/util" + "project/zj" ) func doMetrics(ab []byte, cached bool, r *http.Request) { @@ -22,6 +23,9 @@ func doMetrics(ab []byte, cached bool, r *http.Request) { } metrics.RspToken(u.PromptTokens, u.TotalTokens, cached) + if !cached { + zj.J(`token`, u.PromptTokens, u.TotalTokens) + } ip, err := util.GetIP(r) sip := ip.String() diff --git a/server/src/project.go b/server/src/project.go index cc8f201..7418057 100644 --- a/server/src/project.go +++ b/server/src/project.go @@ -3,7 +3,6 @@ package project import ( "project/build" "project/config" - "project/tmptest" "project/web" "project/zj" @@ -17,7 +16,7 @@ func Start() { zj.Init() - tmptest.Test() + // tmptest.Test() go web.Server()