mirror of
https://github.com/APIParkLab/APIPark.git
synced 2026-06-14 20:41:15 +08:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Dot.L
|
ca2682fb22 | ||
|
Dot.L
|
b2baa711c2 | ||
|
ningyv
|
3d51f96dda | ||
|
Dot.L
|
b55675e5a5 |
@@ -75,11 +75,6 @@ jobs:
|
||||
with:
|
||||
name: frontend-package
|
||||
path: frontend/dist
|
||||
# 设置 QEMU 以支持多架构构建
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
- name: Login Docker #登录docker
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
|
||||
+55246
-57436
File diff suppressed because it is too large
Load Diff
@@ -190,7 +190,6 @@ func (i *imlMcpController) OnComplete() {
|
||||
i.server["ja-JP"] = server.NewSSEServer(i.generateJPMCPServer(), server.WithBasePath(fmt.Sprintf("/api/v1/%s", mcp_server.GlobalBasePath)))
|
||||
|
||||
i.openServer = server.NewSSEServer(enSer, server.WithBasePath(fmt.Sprintf("/openapi/v1/%s", strings.Trim(mcp_server.GlobalBasePath, "/"))))
|
||||
|
||||
}
|
||||
|
||||
func (i *imlMcpController) GlobalMCPHandle(ctx *gin.Context) {
|
||||
@@ -264,28 +263,6 @@ func (i *imlMcpController) ServiceHandleMessage(ctx *gin.Context) {
|
||||
i.handleMessage(ctx, mcp_server.DefaultMCPServer())
|
||||
}
|
||||
|
||||
func (i *imlMcpController) ServiceHandleStreamHTTP(ctx *gin.Context) {
|
||||
apikey := ctx.Request.URL.Query().Get("apikey")
|
||||
serviceId := ctx.Param("serviceId")
|
||||
if serviceId == "" {
|
||||
ctx.AbortWithStatusJSON(403, gin.H{"code": -1, "msg": "invalid service id", "success": "fail"})
|
||||
return
|
||||
}
|
||||
ok, err := i.authorizationModule.CheckAPIKeyAuthorization(ctx, serviceId, apikey)
|
||||
if err != nil {
|
||||
ctx.AbortWithStatusJSON(403, gin.H{"code": -1, "msg": err.Error(), "success": "fail"})
|
||||
return
|
||||
}
|
||||
if !ok {
|
||||
ctx.AbortWithStatusJSON(403, gin.H{"code": -1, "msg": "invalid apikey", "success": "fail"})
|
||||
return
|
||||
}
|
||||
cfg := i.settingModule.Get(ctx)
|
||||
req := ctx.Request.WithContext(utils.SetGatewayInvoke(ctx.Request.Context(), cfg.InvokeAddress))
|
||||
req = req.WithContext(utils.SetLabel(req.Context(), "apikey", apikey))
|
||||
mcp_server.DefaultMCPServer().ServeHTTP(ctx.Writer, req)
|
||||
}
|
||||
|
||||
func (i *imlMcpController) handleMessage(ctx *gin.Context, server http.Handler) {
|
||||
sessionId := ctx.Request.URL.Query().Get("sessionId")
|
||||
apikey, ok := i.sessionKeys.Load(sessionId)
|
||||
|
||||
@@ -15,7 +15,6 @@ type IMcpController interface {
|
||||
ServiceHandleSSE(ctx *gin.Context)
|
||||
ServiceHandleMessage(ctx *gin.Context)
|
||||
GlobalMCPConfig(ctx *gin.Context) (string, error)
|
||||
ServiceHandleStreamHTTP(ctx *gin.Context)
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -20,6 +20,10 @@ interface PageListRef {
|
||||
[key: string]: any;
|
||||
}
|
||||
|
||||
/**
|
||||
* 排名列表
|
||||
* @returns
|
||||
*/
|
||||
const RankingList = ({ topRankingList, serviceType }: { topRankingList: RankingListData; serviceType: 'aiService' | 'restService' }) => {
|
||||
/** 全局状态 */
|
||||
const { state } = useGlobalContext()
|
||||
|
||||
@@ -9,13 +9,13 @@ require (
|
||||
github.com/eolinker/eosc v0.18.3
|
||||
github.com/eolinker/go-common v1.1.7
|
||||
github.com/gabriel-vasile/mimetype v1.4.4
|
||||
github.com/getkin/kin-openapi v0.132.0
|
||||
github.com/getkin/kin-openapi v0.127.0
|
||||
github.com/gin-contrib/gzip v1.0.1
|
||||
github.com/gin-gonic/gin v1.10.0
|
||||
github.com/go-sql-driver/mysql v1.7.0
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/influxdata/influxdb-client-go/v2 v2.14.0
|
||||
github.com/mark3labs/mcp-go v0.33.0
|
||||
github.com/mark3labs/mcp-go v0.17.0
|
||||
github.com/mitchellh/mapstructure v1.5.0
|
||||
github.com/nsqio/go-nsq v1.1.0
|
||||
github.com/ollama/ollama v0.5.8
|
||||
@@ -46,6 +46,7 @@ require (
|
||||
github.com/golang/snappy v0.0.4 // indirect
|
||||
github.com/gorilla/websocket v1.4.2 // indirect
|
||||
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
|
||||
github.com/invopop/yaml v0.3.1 // indirect
|
||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
||||
github.com/jinzhu/now v1.1.5 // indirect
|
||||
github.com/josharian/intern v1.0.0 // indirect
|
||||
@@ -58,13 +59,10 @@ require (
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
|
||||
github.com/oapi-codegen/runtime v1.0.0 // indirect
|
||||
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
|
||||
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
|
||||
github.com/perimeterx/marshmallow v1.1.5 // indirect
|
||||
github.com/redis/go-redis/v9 v9.5.3 // indirect
|
||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||
github.com/spf13/cast v1.7.1 // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.2.12 // indirect
|
||||
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
|
||||
|
||||
@@ -34,12 +34,10 @@ github.com/eolinker/eosc v0.18.3 h1:3IK5HkAPnJRfLbQ0FR7kWsZr6Y/OiqqGazvN1q2BL5A=
|
||||
github.com/eolinker/eosc v0.18.3/go.mod h1:O9PQQXFCpB6fjHf+oFt/LN6EOAv779ItbMixMKCfTfk=
|
||||
github.com/eolinker/go-common v1.1.7 h1:bi7wDmlCYQGjS3k8Bz/o+Mo9aMJAzmPsBLXWurxPfwk=
|
||||
github.com/eolinker/go-common v1.1.7/go.mod h1:Kb/jENMN1mApnodvRgV4YwO9FJby1Jkt2EUjrBjvSX4=
|
||||
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
|
||||
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
||||
github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
|
||||
github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
|
||||
github.com/getkin/kin-openapi v0.132.0 h1:3ISeLMsQzcb5v26yeJrBcdTCEQTag36ZjaGk7MIRUwk=
|
||||
github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58=
|
||||
github.com/getkin/kin-openapi v0.127.0 h1:Mghqi3Dhryf3F8vR370nN67pAERW+3a95vomb3MAREY=
|
||||
github.com/getkin/kin-openapi v0.127.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM=
|
||||
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
|
||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||
github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
|
||||
@@ -80,6 +78,8 @@ github.com/influxdata/influxdb-client-go/v2 v2.14.0 h1:AjbBfJuq+QoaXNcrova8smSjw
|
||||
github.com/influxdata/influxdb-client-go/v2 v2.14.0/go.mod h1:Ahpm3QXKMJslpXl3IftVLVezreAUtBOTZssDrjZEFHI=
|
||||
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU=
|
||||
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
|
||||
github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=
|
||||
github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA=
|
||||
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
||||
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
||||
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
||||
@@ -101,8 +101,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
|
||||
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
|
||||
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
|
||||
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
|
||||
github.com/mark3labs/mcp-go v0.33.0 h1:naxhjnTIs/tyPZmWUZFuG0lDmdA6sUyYGGf3gsHvTCc=
|
||||
github.com/mark3labs/mcp-go v0.33.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
|
||||
github.com/mark3labs/mcp-go v0.17.0 h1:5Ps6T7qXr7De/2QTqs9h6BKeZ/qdeUeGrgM5lPzi930=
|
||||
github.com/mark3labs/mcp-go v0.17.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
||||
@@ -118,10 +118,6 @@ github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE=
|
||||
github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
|
||||
github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo=
|
||||
github.com/oapi-codegen/runtime v1.0.0/go.mod h1:LmCUMQuPB4M/nLXilQXhHw+BLZdDb18B34OO356yJ/A=
|
||||
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY=
|
||||
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw=
|
||||
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c=
|
||||
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
|
||||
github.com/ollama/ollama v0.5.8 h1:b2S6YdZ18/ntCsWzoy/HmB3BHGW4GX0Qp7RARrJtJXU=
|
||||
github.com/ollama/ollama v0.5.8/go.mod h1:ibdmDvb/TjKY1OArBWIazL3pd1DHTk8eG2MMjEkWhiI=
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
|
||||
@@ -138,8 +134,6 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
|
||||
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
|
||||
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
|
||||
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
|
||||
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
|
||||
@@ -33,12 +33,12 @@ func TestLoki(t *testing.T) {
|
||||
// headers["Content-Type"] = "application/json"
|
||||
// headers["X-Scope-OrgID"] = "tenant1"
|
||||
// queries := url.Values{}
|
||||
// queries.SetMCPServer("query", "{cluster=\"apinto\"} | json | request_id = `c9f6b19c-7dfe-496b-9b39-4d049232fe95`")
|
||||
// queries.Set("query", "{cluster=\"apinto\"} | json | request_id = `c9f6b19c-7dfe-496b-9b39-4d049232fe95`")
|
||||
// now := time.Now()
|
||||
// start := now.Add(-time.Hour * 24 * 30)
|
||||
// queries.SetMCPServer("start", strconv.FormatInt(start.UnixNano(), 10))
|
||||
// queries.SetMCPServer("end", strconv.FormatInt(now.UnixNano(), 10))
|
||||
// queries.SetMCPServer("limit", "100")
|
||||
// queries.Set("start", strconv.FormatInt(start.UnixNano(), 10))
|
||||
// queries.Set("end", strconv.FormatInt(now.UnixNano(), 10))
|
||||
// queries.Set("limit", "100")
|
||||
// a := time.Now()
|
||||
// result, err := send[LogInfo](http.MethodGet, "http://localhost:3100/loki/api/v1/query_range", headers, queries, "")
|
||||
// if err != nil {
|
||||
@@ -57,8 +57,8 @@ func TestLoki(t *testing.T) {
|
||||
// headers["Content-Type"] = "application/json"
|
||||
// headers["X-Scope-OrgID"] = "tenant1"
|
||||
// queries := url.Values{}
|
||||
// //queries.SetMCPServer("query", "sum(count_over_time({cluster=\"apinto\"}[24h])) by (strategy)")
|
||||
// queries.SetMCPServer("query", "sum(count_over_time({cluster=\"apinto\"}[24h]))")
|
||||
// //queries.Set("query", "sum(count_over_time({cluster=\"apinto\"}[24h])) by (strategy)")
|
||||
// queries.Set("query", "sum(count_over_time({cluster=\"apinto\"}[24h]))")
|
||||
// result, err := send[LogCount](http.MethodGet, "http://localhost:3100/loki/api/v1/query", headers, queries, "")
|
||||
// if err != nil {
|
||||
// t.Fatalf("failed to send request: %v", err)
|
||||
@@ -75,12 +75,12 @@ func TestLoki(t *testing.T) {
|
||||
// headers["Content-Type"] = "application/json"
|
||||
// headers["X-Scope-OrgID"] = "tenant1"
|
||||
// queries := url.Values{}
|
||||
// queries.SetMCPServer("query", "{cluster=\"apinto\"} | json | strategy=\"03899736-5d79-4f26-bd6a-c312a5880780\"")
|
||||
// queries.Set("query", "{cluster=\"apinto\"} | json | strategy=\"03899736-5d79-4f26-bd6a-c312a5880780\"")
|
||||
// now := time.Now()
|
||||
// start := now.Add(-time.Hour * 24 * 30)
|
||||
// queries.SetMCPServer("start", strconv.FormatInt(start.UnixNano(), 10))
|
||||
// queries.SetMCPServer("end", strconv.FormatInt(now.UnixNano(), 10))
|
||||
// queries.SetMCPServer("limit", "1")
|
||||
// queries.Set("start", strconv.FormatInt(start.UnixNano(), 10))
|
||||
// queries.Set("end", strconv.FormatInt(now.UnixNano(), 10))
|
||||
// queries.Set("limit", "1")
|
||||
// now = time.Now()
|
||||
// result, err := send[map[string]interface{}](http.MethodGet, "http://localhost:3100/loki/api/v1/query_range", headers, queries, "")
|
||||
// t.LogItem(time.Now().Sub(now))
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
package mcp_server
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
var client = http.Client{}
|
||||
|
||||
type Position string
|
||||
|
||||
const (
|
||||
PositionHeader Position = "header"
|
||||
PositionBody Position = "body"
|
||||
PositionQuery Position = "query"
|
||||
PositionPath Position = "path"
|
||||
)
|
||||
|
||||
type ContentType string
|
||||
|
||||
const (
|
||||
ContentTypeJSON ContentType = "application/json"
|
||||
ContentTypeXML ContentType = "application/xml"
|
||||
ContentTypeHTML ContentType = "text/html"
|
||||
ContentTypeText ContentType = "text/plain"
|
||||
ContentTypeForm ContentType = "application/x-www-form-urlencoded"
|
||||
ContentTypeFile ContentType = "multipart/form-data"
|
||||
)
|
||||
|
||||
func NewParam(position Position, required bool, description string) *Param {
|
||||
return &Param{position: position, required: required, description: description}
|
||||
}
|
||||
|
||||
type Param struct {
|
||||
position Position
|
||||
required bool
|
||||
description string
|
||||
}
|
||||
|
||||
func (p *Param) Description() string {
|
||||
return p.description
|
||||
}
|
||||
|
||||
func (p *Param) Required() bool {
|
||||
return p.required
|
||||
}
|
||||
|
||||
type BodyParam struct {
|
||||
contentType ContentType
|
||||
params map[string]interface{}
|
||||
}
|
||||
|
||||
func NewBodyParam(contentType string) *BodyParam {
|
||||
t := ContentType(contentType)
|
||||
if t == "" {
|
||||
t = ContentTypeJSON
|
||||
}
|
||||
return &BodyParam{contentType: t}
|
||||
}
|
||||
|
||||
func (p *BodyParam) Set(k string, v interface{}) {
|
||||
if p.params == nil {
|
||||
p.params = make(map[string]interface{})
|
||||
}
|
||||
p.params[k] = v
|
||||
}
|
||||
|
||||
func (p *BodyParam) Encode() (string, error) {
|
||||
switch p.contentType {
|
||||
case ContentTypeJSON:
|
||||
data, err := json.Marshal(p.params)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("body param encode error: %w", err)
|
||||
}
|
||||
return string(data), nil
|
||||
case ContentTypeForm, ContentTypeFile:
|
||||
data := url.Values{}
|
||||
for k, v := range p.params {
|
||||
data.Set(k, fmt.Sprintf("%v", v))
|
||||
}
|
||||
return data.Encode(), nil
|
||||
default:
|
||||
return "", fmt.Errorf("unsupported content type: %s", p.contentType)
|
||||
}
|
||||
}
|
||||
+26
-205
@@ -4,12 +4,10 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
"github.com/mitchellh/mapstructure"
|
||||
|
||||
"github.com/mark3labs/mcp-go/server"
|
||||
|
||||
"github.com/eolinker/eosc"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -20,120 +18,55 @@ var (
|
||||
|
||||
func NewServer() *Server {
|
||||
return &Server{
|
||||
servers: make(map[string]*Handler),
|
||||
sseServers: eosc.BuildUntyped[string, *server.SSEServer](),
|
||||
}
|
||||
}
|
||||
|
||||
type Server struct {
|
||||
servers map[string]*Handler
|
||||
locker sync.RWMutex
|
||||
sseServers eosc.Untyped[string, *server.SSEServer]
|
||||
}
|
||||
|
||||
type Handler struct {
|
||||
*server.MCPServer
|
||||
handlers map[string]http.Handler
|
||||
func (s *Server) Set(path string, sseServer *server.SSEServer) {
|
||||
s.sseServers.Set(path, sseServer)
|
||||
}
|
||||
|
||||
func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
r.URL.Path = strings.TrimSuffix(r.URL.Path, "/")
|
||||
if strings.HasSuffix(r.URL.Path, "/mcp") {
|
||||
h.handlers["openapi-stream"].ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
if strings.HasPrefix(r.URL.Path, "/api") {
|
||||
h.handlers["api-sse"].ServeHTTP(w, r)
|
||||
return
|
||||
} else if strings.HasPrefix(r.URL.Path, "/openapi") {
|
||||
h.handlers["openapi-sse"].ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
func (s *Server) Set(id string, ser *server.MCPServer) {
|
||||
s.locker.Lock()
|
||||
defer s.locker.Unlock()
|
||||
tmp := &Handler{
|
||||
MCPServer: ser,
|
||||
handlers: make(map[string]http.Handler),
|
||||
}
|
||||
tmp.handlers["api-sse"] = server.NewSSEServer(ser, server.WithStaticBasePath(fmt.Sprintf("/api/v1/%s/%s", ServiceBasePath, id)))
|
||||
tmp.handlers["openapi-sse"] = server.NewSSEServer(ser, server.WithStaticBasePath(fmt.Sprintf("/openapi/v1/%s/%s", ServiceBasePath, id)))
|
||||
tmp.handlers["openapi-stream"] = server.NewStreamableHTTPServer(ser, server.WithEndpointPath(fmt.Sprintf("/openapi/v1/%s/%s/mcp", ServiceBasePath, id)))
|
||||
s.servers[id] = tmp
|
||||
|
||||
}
|
||||
|
||||
func (s *Server) Del(id string) {
|
||||
s.locker.Lock()
|
||||
defer s.locker.Unlock()
|
||||
delete(s.servers, id)
|
||||
}
|
||||
|
||||
func (s *Server) Get(id string) (*Handler, bool) {
|
||||
s.locker.RLock()
|
||||
defer s.locker.RUnlock()
|
||||
ser, has := s.servers[id]
|
||||
if !has {
|
||||
return nil, false
|
||||
}
|
||||
m := &Handler{
|
||||
MCPServer: ser.MCPServer,
|
||||
handlers: make(map[string]http.Handler),
|
||||
}
|
||||
for k, v := range ser.handlers {
|
||||
m.handlers[k] = v
|
||||
}
|
||||
|
||||
return m, true
|
||||
func (s *Server) Del(path string) {
|
||||
s.sseServers.Del(path)
|
||||
}
|
||||
|
||||
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
sid, err := genPath(r.URL.Path)
|
||||
if err != nil {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
w.Write([]byte(err.Error()))
|
||||
return
|
||||
}
|
||||
ser, has := s.Get(sid)
|
||||
sseServer, has := s.sseServers.Get(trimPath(r.URL.Path))
|
||||
if has {
|
||||
ser.ServeHTTP(w, r)
|
||||
sseServer.ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
func genPath(path string) (sid string, err error) {
|
||||
func trimPath(path string) string {
|
||||
path = strings.TrimSuffix(path, "/")
|
||||
ps := strings.Split(path, "/")
|
||||
if len(ps) < 2 {
|
||||
err = fmt.Errorf("invalid path: %s", path)
|
||||
return
|
||||
}
|
||||
sid = ps[len(ps)-2]
|
||||
return
|
||||
path = strings.TrimSuffix(path, "/message")
|
||||
path = strings.TrimSuffix(path, "/sse")
|
||||
return path
|
||||
}
|
||||
|
||||
func SetServer(sid string, name string, version string, tools ...ITool) {
|
||||
ser, has := mcpServer.Get(sid)
|
||||
if !has {
|
||||
mcpServer.Set(sid, server.NewMCPServer(name, version, server.WithToolCapabilities(true)))
|
||||
ser, has = mcpServer.Get(sid)
|
||||
if !has {
|
||||
return
|
||||
}
|
||||
}
|
||||
ts := make([]server.ServerTool, 0, len(tools))
|
||||
func SetSSEServer(sid string, name string, version string, tools ...ITool) {
|
||||
s := server.NewMCPServer(name, version)
|
||||
for _, tool := range tools {
|
||||
ts = append(ts, tool.Tool())
|
||||
tool.RegisterMCP(s)
|
||||
}
|
||||
ser.SetTools(ts...)
|
||||
apiPath := fmt.Sprintf("/api/v1/%s/%s", ServiceBasePath, sid)
|
||||
openAPIPath := fmt.Sprintf("/openapi/v1/%s/%s", ServiceBasePath, sid)
|
||||
mcpServer.Set(apiPath, server.NewSSEServer(s, server.WithBasePath(apiPath)))
|
||||
mcpServer.Set(openAPIPath, server.NewSSEServer(s, server.WithBasePath(openAPIPath)))
|
||||
}
|
||||
|
||||
func DelServer(sid string) {
|
||||
mcpServer.Del(sid)
|
||||
func DelSSEServer(sid string) {
|
||||
apiPath := fmt.Sprintf("/api/v1/%s/%s", ServiceBasePath, sid)
|
||||
openAPIPath := fmt.Sprintf("/openapi/v1/%s/%s", ServiceBasePath, sid)
|
||||
mcpServer.Del(apiPath)
|
||||
mcpServer.Del(openAPIPath)
|
||||
}
|
||||
|
||||
func ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -143,115 +76,3 @@ func ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
func DefaultMCPServer() *Server {
|
||||
return mcpServer
|
||||
}
|
||||
|
||||
func SetServerByOpenapi(sid, name, version, content string) error {
|
||||
mcpInfo, err := ConvertMCPFromOpenAPI3Data([]byte(content))
|
||||
if err != nil {
|
||||
return fmt.Errorf("convert mcp from openapi3 data error: %w", err)
|
||||
}
|
||||
tools := make([]ITool, 0, len(mcpInfo.Apis))
|
||||
for _, a := range mcpInfo.Apis {
|
||||
toolOptions := make([]mcp.ToolOption, 0, len(a.Params)+2)
|
||||
toolOptions = append(toolOptions, mcp.WithDescription(a.Description))
|
||||
params := make(map[string]*Param)
|
||||
for _, v := range a.Params {
|
||||
params[v.Name] = NewParam(Position(v.In), v.Required, v.Description)
|
||||
options := make([]mcp.PropertyOption, 0, 2)
|
||||
if v.Required {
|
||||
options = append(options, mcp.Required())
|
||||
}
|
||||
options = append(options, mcp.Description(v.Description))
|
||||
toolOptions = append(toolOptions, mcp.WithString(v.Name, options...))
|
||||
}
|
||||
if a.Body != nil {
|
||||
type Schema struct {
|
||||
Type string `mapstructure:"type"`
|
||||
Properties map[string]interface{} `mapstructure:"properties"`
|
||||
Items interface{} `mapstructure:"items"`
|
||||
Required interface{} `mapstructure:"required"`
|
||||
}
|
||||
var tmp Schema
|
||||
err = mapstructure.Decode(a.Body, &tmp)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
required := map[string]struct{}{}
|
||||
switch t := tmp.Required.(type) {
|
||||
case []interface{}:
|
||||
for _, v := range t {
|
||||
i, ok := v.(string)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
required[i] = struct{}{}
|
||||
}
|
||||
}
|
||||
for k, v := range tmp.Properties {
|
||||
description := ""
|
||||
typ := "string"
|
||||
isRequired := false
|
||||
if _, ok := required[k]; ok {
|
||||
isRequired = true
|
||||
}
|
||||
var props map[string]interface{}
|
||||
var items interface{}
|
||||
switch t := v.(type) {
|
||||
case map[string]interface{}:
|
||||
if m, ok := t["type"]; ok {
|
||||
n, ok := m.(string)
|
||||
if ok {
|
||||
typ = n
|
||||
}
|
||||
}
|
||||
if m, ok := t["description"]; ok {
|
||||
n, ok := m.(string)
|
||||
if ok {
|
||||
description = n
|
||||
}
|
||||
}
|
||||
switch typ {
|
||||
case "array":
|
||||
if m, ok := t["items"]; ok {
|
||||
items = m
|
||||
}
|
||||
case "object":
|
||||
if m, ok := t["properties"]; ok {
|
||||
n, ok := m.(map[string]interface{})
|
||||
if ok {
|
||||
props = n
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
params[k] = NewParam(PositionBody, isRequired, description)
|
||||
options := make([]mcp.PropertyOption, 0, 3)
|
||||
options = append(options, mcp.Description(description))
|
||||
if props != nil {
|
||||
options = append(options, mcp.Properties(props))
|
||||
}
|
||||
if items != nil {
|
||||
options = append(options, mcp.Items(items))
|
||||
}
|
||||
switch typ {
|
||||
case "string":
|
||||
toolOptions = append(toolOptions, mcp.WithString(k, options...))
|
||||
case "integer", "number", "float":
|
||||
toolOptions = append(toolOptions, mcp.WithNumber(k, options...))
|
||||
case "boolean":
|
||||
toolOptions = append(toolOptions, mcp.WithBoolean(k, options...))
|
||||
case "array":
|
||||
toolOptions = append(toolOptions, mcp.WithArray(k, options...))
|
||||
case "object":
|
||||
toolOptions = append(toolOptions, mcp.WithObject(k, options...))
|
||||
default:
|
||||
return fmt.Errorf("unsupported type: %s", typ)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tools = append(tools, NewTool(a.Summary, a.Path, a.Method, a.ContentType, params, toolOptions...))
|
||||
}
|
||||
SetServer(sid, name, version, tools...)
|
||||
return nil
|
||||
}
|
||||
|
||||
+60
-44
@@ -2,6 +2,7 @@ package mcp_server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
@@ -15,38 +16,36 @@ import (
|
||||
)
|
||||
|
||||
type ITool interface {
|
||||
Tool() server.ServerTool
|
||||
RegisterMCP(s *server.MCPServer)
|
||||
}
|
||||
|
||||
const (
|
||||
MCPBody = "Body"
|
||||
MCPHeader = "Header"
|
||||
MCPQuery = "Query"
|
||||
MCPPath = "Path"
|
||||
)
|
||||
|
||||
type Tool struct {
|
||||
name string
|
||||
url string
|
||||
method string
|
||||
contentType string
|
||||
params map[string]*Param
|
||||
opts []mcp.ToolOption
|
||||
}
|
||||
|
||||
func (t *Tool) Tool() server.ServerTool {
|
||||
return server.ServerTool{
|
||||
Tool: mcp.NewTool(t.name, t.opts...),
|
||||
Handler: generateInvokeTool(t.url, t.method, t.contentType, t.params),
|
||||
}
|
||||
}
|
||||
|
||||
func NewTool(name string, uri string, method string, contentType string, params map[string]*Param, opts ...mcp.ToolOption) ITool {
|
||||
func NewTool(name string, uri string, method string, contentType string, opts ...mcp.ToolOption) ITool {
|
||||
return &Tool{
|
||||
name: name,
|
||||
url: uri,
|
||||
method: method,
|
||||
contentType: contentType,
|
||||
params: params,
|
||||
opts: opts,
|
||||
}
|
||||
}
|
||||
|
||||
func generateInvokeTool(path string, method string, contentType string, params map[string]*Param) func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
return func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
func (t *Tool) RegisterMCP(s *server.MCPServer) {
|
||||
s.AddTool(mcp.NewTool(t.name, t.opts...), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
invokeAddress := utils.GatewayInvoke(ctx)
|
||||
if invokeAddress == "" {
|
||||
return nil, fmt.Errorf("invoke address is empty")
|
||||
@@ -59,54 +58,69 @@ func generateInvokeTool(path string, method string, contentType string, params m
|
||||
u.Scheme = "http"
|
||||
}
|
||||
|
||||
path := t.url
|
||||
queries := url.Values{}
|
||||
headers := make(map[string]string)
|
||||
bodyParam := NewBodyParam(contentType)
|
||||
for k, p := range params {
|
||||
vv, ok := request.GetArguments()[k]
|
||||
if !ok && p.required {
|
||||
return nil, fmt.Errorf("param %s is required", k)
|
||||
}
|
||||
if p.position == PositionHeader || p.position == PositionQuery || p.position == PositionPath {
|
||||
v, ok := vv.(string)
|
||||
if !ok || v == "<nil>" {
|
||||
if p.required {
|
||||
return nil, fmt.Errorf("param %s is required", k)
|
||||
body := ""
|
||||
for k, v := range request.Params.Arguments {
|
||||
if k == "Body" {
|
||||
switch a := v.(type) {
|
||||
case string:
|
||||
body = a
|
||||
case map[string]interface{}:
|
||||
switch t.contentType {
|
||||
case "application/json":
|
||||
tmp, _ := json.Marshal(a)
|
||||
body = string(tmp)
|
||||
case "application/x-www-form-urlencoded":
|
||||
bodyValue := url.Values{}
|
||||
for kk, vv := range a {
|
||||
bodyValue.Set(kk, fmt.Sprintf("%v", vv))
|
||||
}
|
||||
body = bodyValue.Encode()
|
||||
}
|
||||
continue
|
||||
default:
|
||||
tmp, _ := json.Marshal(a)
|
||||
body = string(tmp)
|
||||
}
|
||||
continue
|
||||
}
|
||||
tmp, ok := v.(map[string]interface{})
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
switch k {
|
||||
case MCPHeader:
|
||||
for kk, vv := range tmp {
|
||||
headers[kk] = fmt.Sprintf("%v", vv)
|
||||
}
|
||||
|
||||
switch p.position {
|
||||
case PositionPath:
|
||||
path = strings.ReplaceAll(path, "{"+k+"}", fmt.Sprintf("%v", vv))
|
||||
case PositionQuery:
|
||||
queries.Set(k, fmt.Sprintf("%v", vv))
|
||||
case PositionHeader:
|
||||
headers[k] = fmt.Sprintf("%v", vv)
|
||||
case PositionBody:
|
||||
if vv == nil {
|
||||
continue
|
||||
case MCPQuery:
|
||||
for kk, vv := range tmp {
|
||||
queries.Set(kk, fmt.Sprintf("%v", vv))
|
||||
}
|
||||
case MCPPath:
|
||||
for kk, vv := range tmp {
|
||||
p, ok := vv.(string)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("invalid path %s", v)
|
||||
}
|
||||
path = strings.Replace(path, fmt.Sprintf("{%s}", kk), p, -1)
|
||||
}
|
||||
bodyParam.Set(k, vv)
|
||||
}
|
||||
}
|
||||
bodyData, err := bodyParam.Encode()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
u.Path = path
|
||||
u.RawQuery = queries.Encode()
|
||||
|
||||
req, err := http.NewRequest(method, u.String(), strings.NewReader(bodyData))
|
||||
req, err := http.NewRequest(t.method, u.String(), strings.NewReader(body))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for k, v := range headers {
|
||||
req.Header.Set(k, v)
|
||||
}
|
||||
if contentType != "" {
|
||||
req.Header.Set("Content-Type", contentType)
|
||||
if t.contentType != "" {
|
||||
req.Header.Set("Content-Type", t.contentType)
|
||||
}
|
||||
apikey := utils.Label(ctx, "apikey")
|
||||
if apikey != "" {
|
||||
@@ -127,5 +141,7 @@ func generateInvokeTool(path string, method string, contentType string, params m
|
||||
}
|
||||
|
||||
return mcp.NewToolResultText(string(d)), nil
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
var client = http.Client{}
|
||||
|
||||
+12
-32
@@ -8,8 +8,6 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
service_overview "github.com/APIParkLab/APIPark/service/service-overview"
|
||||
|
||||
ai_provider_local "github.com/APIParkLab/APIPark/ai-provider/local"
|
||||
|
||||
model_runtime "github.com/APIParkLab/APIPark/ai-provider/model-runtime"
|
||||
@@ -37,13 +35,12 @@ var (
|
||||
)
|
||||
|
||||
type imlAPIModule struct {
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
serviceOverviewService service_overview.IOverviewService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
aiAPIService ai_api.IAPIService `autowired:""`
|
||||
aiModelService ai_model.IProviderModelService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
transaction store.ITransaction `autowired:""`
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
aiAPIService ai_api.IAPIService `autowired:""`
|
||||
aiModelService ai_model.IProviderModelService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
transaction store.ITransaction `autowired:""`
|
||||
}
|
||||
|
||||
func (i *imlAPIModule) getAPIDoc(ctx context.Context, serviceId string) (*openapi3.T, error) {
|
||||
@@ -80,17 +77,9 @@ func (i *imlAPIModule) updateAPIDoc(ctx context.Context, serviceId, serviceName,
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return i.transaction.Transaction(ctx, func(ctx context.Context) error {
|
||||
count, err := i.apiDocService.UpdateDoc(ctx, serviceId, &api_doc.UpdateDoc{
|
||||
ID: uuid.New().String(),
|
||||
Content: string(result),
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("update api doc error:%v", err)
|
||||
}
|
||||
return i.serviceOverviewService.Update(ctx, serviceId, &service_overview.Update{
|
||||
ApiCount: &count,
|
||||
})
|
||||
return i.apiDocService.UpdateDoc(ctx, serviceId, &api_doc.UpdateDoc{
|
||||
ID: uuid.New().String(),
|
||||
Content: string(result),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -104,19 +93,10 @@ func (i *imlAPIModule) deleteAPIDoc(ctx context.Context, serviceId string, path
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return i.transaction.Transaction(ctx, func(ctx context.Context) error {
|
||||
count, err := i.apiDocService.UpdateDoc(ctx, serviceId, &api_doc.UpdateDoc{
|
||||
ID: uuid.New().String(),
|
||||
Content: string(result),
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("update api doc error:%v", err)
|
||||
}
|
||||
return i.serviceOverviewService.Update(ctx, serviceId, &service_overview.Update{
|
||||
ApiCount: &count,
|
||||
})
|
||||
return i.apiDocService.UpdateDoc(ctx, serviceId, &api_doc.UpdateDoc{
|
||||
ID: uuid.New().String(),
|
||||
Content: string(result),
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func (i *imlAPIModule) Create(ctx context.Context, serviceId string, input *ai_api_dto.CreateAPI) error {
|
||||
|
||||
+15
-24
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
func genOpenAPI3Template(title string, description string) *openapi3.T {
|
||||
result := new(openapi3.T)
|
||||
result.OpenAPI = "3.0.1"
|
||||
result.OpenAPI = "3.1.0"
|
||||
result.Info = &openapi3.Info{
|
||||
Title: title,
|
||||
Description: description,
|
||||
@@ -37,8 +37,6 @@ func genOperation(summary string, description string, variables []*ai_api_dto.Ai
|
||||
|
||||
func genRequestBody(variables []*ai_api_dto.AiPromptVariable) *openapi3.RequestBodyRef {
|
||||
requestBody := openapi3.NewRequestBody()
|
||||
requestBody.Description = "Request body"
|
||||
requestBody.Required = true
|
||||
requestBody.Content = openapi3.NewContentWithSchema(genRequestBodySchema(variables), []string{"application/json"})
|
||||
return &openapi3.RequestBodyRef{
|
||||
Value: requestBody,
|
||||
@@ -57,14 +55,10 @@ func genResponse() *openapi3.ResponseRef {
|
||||
|
||||
func genRequestBodySchema(variables []*ai_api_dto.AiPromptVariable) *openapi3.Schema {
|
||||
result := openapi3.NewObjectSchema()
|
||||
required := make([]string, 0, 2)
|
||||
required = append(required, "messages")
|
||||
if len(variables) > 0 {
|
||||
result.WithProperty("variables", genVariableSchema(variables))
|
||||
required = append(required, "variables")
|
||||
result.WithRequired([]string{"variables", "messages"})
|
||||
}
|
||||
|
||||
result.WithRequired(required)
|
||||
streamSchema := openapi3.NewBoolSchema()
|
||||
streamSchema.Title = "stream"
|
||||
streamSchema.Description = "Whether to stream the response"
|
||||
@@ -135,8 +129,6 @@ func genMessageSchema() *openapi3.Schema {
|
||||
"role": roleSchema,
|
||||
"content": contentSchema,
|
||||
})
|
||||
|
||||
result.WithRequired([]string{"role", "content"})
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -145,21 +137,20 @@ func genMessagesSchema() *openapi3.Schema {
|
||||
result.Title = "Messages"
|
||||
result.Description = "Chat Messages"
|
||||
result.Items = openapi3.NewSchemaRef("#/components/schemas/Message", messageSchema)
|
||||
result.Required = []string{"content", "role"}
|
||||
return result
|
||||
}
|
||||
|
||||
func genResponseSchema() *openapi3.Schema {
|
||||
result := openapi3.NewObjectSchema()
|
||||
result.Description = "Response from the server"
|
||||
|
||||
|
||||
// 创建 choices 数组
|
||||
choicesSchema := openapi3.NewArraySchema()
|
||||
choiceItemSchema := openapi3.NewObjectSchema()
|
||||
|
||||
|
||||
// choice 中的 message 字段
|
||||
choiceItemSchema.WithPropertyRef("message", messageSchemaRef)
|
||||
|
||||
|
||||
// finish_reason 字段
|
||||
finishReasonSchema := openapi3.NewStringSchema().WithEnum(
|
||||
"stop",
|
||||
@@ -169,41 +160,41 @@ func genResponseSchema() *openapi3.Schema {
|
||||
"null",
|
||||
)
|
||||
choiceItemSchema.WithProperty("finish_reason", finishReasonSchema)
|
||||
|
||||
|
||||
// index 字段
|
||||
choiceItemSchema.WithProperty("index", openapi3.NewIntegerSchema())
|
||||
|
||||
|
||||
// logprobs 字段，可以为 null
|
||||
choiceItemSchema.WithProperty("logprobs", openapi3.NewSchema().WithNullable())
|
||||
|
||||
|
||||
choicesSchema.Items = &openapi3.SchemaRef{Value: choiceItemSchema}
|
||||
result.WithProperty("choices", choicesSchema)
|
||||
|
||||
|
||||
// object 字段
|
||||
result.WithProperty("object", openapi3.NewStringSchema().WithEnum("chat.completion"))
|
||||
|
||||
|
||||
// usage 字段
|
||||
usageSchema := openapi3.NewObjectSchema()
|
||||
usageSchema.WithProperty("prompt_tokens", openapi3.NewIntegerSchema())
|
||||
usageSchema.WithProperty("completion_tokens", openapi3.NewIntegerSchema())
|
||||
usageSchema.WithProperty("total_tokens", openapi3.NewIntegerSchema())
|
||||
|
||||
|
||||
// prompt_tokens_details 字段
|
||||
promptTokensDetailsSchema := openapi3.NewObjectSchema()
|
||||
promptTokensDetailsSchema.WithProperty("cached_tokens", openapi3.NewIntegerSchema())
|
||||
usageSchema.WithProperty("prompt_tokens_details", promptTokensDetailsSchema)
|
||||
|
||||
|
||||
result.WithProperty("usage", usageSchema)
|
||||
|
||||
|
||||
// 其他字段
|
||||
result.WithProperty("created", openapi3.NewIntegerSchema())
|
||||
result.WithProperty("system_fingerprint", openapi3.NewStringSchema().WithNullable())
|
||||
result.WithProperty("model", openapi3.NewStringSchema())
|
||||
result.WithProperty("id", openapi3.NewStringSchema())
|
||||
|
||||
|
||||
// 保留原有的错误字段
|
||||
result.WithProperty("code", openapi3.NewIntegerSchema())
|
||||
result.WithProperty("error", openapi3.NewStringSchema())
|
||||
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -3,11 +3,6 @@ package api_doc
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/eolinker/go-common/store"
|
||||
|
||||
service_overview "github.com/APIParkLab/APIPark/service/service-overview"
|
||||
|
||||
api_doc_dto "github.com/APIParkLab/APIPark/module/api-doc/dto"
|
||||
api_doc "github.com/APIParkLab/APIPark/service/api-doc"
|
||||
@@ -21,10 +16,8 @@ import (
|
||||
var _ IAPIDocModule = (*imlAPIDocModule)(nil)
|
||||
|
||||
type imlAPIDocModule struct {
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
serviceOverviewService service_overview.IOverviewService `autowired:""`
|
||||
transaction store.ITransaction `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
}
|
||||
|
||||
func (i *imlAPIDocModule) UpdateDoc(ctx context.Context, serviceId string, input *api_doc_dto.UpdateDoc) (*api_doc_dto.ApiDocDetail, error) {
|
||||
@@ -36,18 +29,11 @@ func (i *imlAPIDocModule) UpdateDoc(ctx context.Context, serviceId string, input
|
||||
input.Id = uuid.New().String()
|
||||
}
|
||||
// 每个API加上前缀
|
||||
err = i.transaction.Transaction(ctx, func(ctx context.Context) error {
|
||||
count, err := i.apiDocService.UpdateDoc(ctx, serviceId, &api_doc.UpdateDoc{
|
||||
ID: input.Id,
|
||||
Content: input.Content,
|
||||
Prefix: info.Prefix,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("update api doc error:%v", err)
|
||||
}
|
||||
return i.serviceOverviewService.Update(ctx, serviceId, &service_overview.Update{
|
||||
ApiCount: &count,
|
||||
})
|
||||
|
||||
err = i.apiDocService.UpdateDoc(ctx, serviceId, &api_doc.UpdateDoc{
|
||||
ID: input.Id,
|
||||
Content: input.Content,
|
||||
Prefix: info.Prefix,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
+32
-35
@@ -9,8 +9,6 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
service_overview "github.com/APIParkLab/APIPark/service/service-overview"
|
||||
|
||||
mcp_server "github.com/APIParkLab/APIPark/mcp-server"
|
||||
|
||||
"github.com/APIParkLab/APIPark/module/monitor/driver"
|
||||
@@ -60,22 +58,21 @@ var (
|
||||
)
|
||||
|
||||
type imlCatalogueModule struct {
|
||||
catalogueService catalogue.ICatalogueService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
serviceOverviewService service_overview.IOverviewService `autowired:""`
|
||||
serviceTagService service_tag.ITagService `autowired:""`
|
||||
serviceDocService service_doc.IDocService `autowired:""`
|
||||
tagService tag.ITagService `autowired:""`
|
||||
releaseService release.IReleaseService `autowired:""`
|
||||
subscribeService subscribe.ISubscribeService `autowired:""`
|
||||
subscribeApplyService subscribe.ISubscribeApplyService `autowired:""`
|
||||
transaction store.ITransaction `autowired:""`
|
||||
clusterService cluster.IClusterService `autowired:""`
|
||||
settingService setting.ISettingService `autowired:""`
|
||||
monitorService monitor.IMonitorService `autowired:""`
|
||||
root *Root
|
||||
catalogueService catalogue.ICatalogueService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
serviceTagService service_tag.ITagService `autowired:""`
|
||||
serviceDocService service_doc.IDocService `autowired:""`
|
||||
tagService tag.ITagService `autowired:""`
|
||||
releaseService release.IReleaseService `autowired:""`
|
||||
subscribeService subscribe.ISubscribeService `autowired:""`
|
||||
subscribeApplyService subscribe.ISubscribeApplyService `autowired:""`
|
||||
transaction store.ITransaction `autowired:""`
|
||||
clusterService cluster.IClusterService `autowired:""`
|
||||
settingService setting.ISettingService `autowired:""`
|
||||
monitorService monitor.IMonitorService `autowired:""`
|
||||
root *Root
|
||||
}
|
||||
|
||||
func (i *imlCatalogueModule) DefaultCatalogue(ctx context.Context) (*catalogue_dto.Catalogue, error) {
|
||||
@@ -450,26 +447,27 @@ func (i *imlCatalogueModule) Services(ctx context.Context, keyword string) ([]*c
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
serviceIds := utils.SliceToSlice(items, func(i *service.Service) string {
|
||||
return i.Id
|
||||
})
|
||||
overviewMap, err := i.serviceOverviewService.Map(ctx, serviceIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
serviceIds = utils.SliceToSlice(serviceIds, func(s string) string {
|
||||
return s
|
||||
}, func(s string) bool {
|
||||
// 只展示已发布的服务
|
||||
if info, ok := overviewMap[s]; ok && info.IsReleased {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}, func(s *service.Service) bool {
|
||||
// 未发布的不给展示
|
||||
_, err = i.releaseService.GetRunning(ctx, s.Id)
|
||||
return err == nil
|
||||
})
|
||||
if len(serviceIds) < 1 {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
commits, err := i.releaseService.GetRunningApiDocCommits(ctx, serviceIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
apiCountMap, err := i.apiDocService.LatestAPICountByCommits(ctx, commits...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
subscriberCountMap, err := i.subscribeService.CountMapByService(ctx, subscribe.ApplyStatusSubscribe, serviceIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -481,9 +479,8 @@ func (i *imlCatalogueModule) Services(ctx context.Context, keyword string) ([]*c
|
||||
|
||||
result := make([]*catalogue_dto.ServiceItem, 0, len(items))
|
||||
for _, v := range items {
|
||||
|
||||
ov, ok := overviewMap[v.Id]
|
||||
if !ok || ov.ReleaseApiCount < 1 {
|
||||
apiNum, ok := apiCountMap[v.Id]
|
||||
if !ok || apiNum < 1 {
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -492,8 +489,8 @@ func (i *imlCatalogueModule) Services(ctx context.Context, keyword string) ([]*c
|
||||
Name: v.Name,
|
||||
Tags: auto.List(serviceTagMap[v.Id]),
|
||||
Catalogue: auto.UUID(v.Catalogue),
|
||||
ApiNum: apiNum,
|
||||
SubscriberNum: subscriberCountMap[v.Id],
|
||||
ApiNum: ov.ReleaseApiCount,
|
||||
Description: v.Description,
|
||||
Logo: v.Logo,
|
||||
EnableMCP: v.EnableMCP,
|
||||
|
||||
+73
-72
@@ -10,6 +10,7 @@ import (
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/APIParkLab/APIPark/service/subscribe"
|
||||
|
||||
@@ -47,7 +48,7 @@ type imlMcpModule struct {
|
||||
}
|
||||
|
||||
func (i *imlMcpModule) Services(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
keyword, _ := req.GetArguments()["keyword"].(string)
|
||||
keyword, _ := req.Params.Arguments["keyword"].(string)
|
||||
list, err := i.serviceService.Search(ctx, keyword, map[string]interface{}{
|
||||
"as_server": true,
|
||||
}, "update_at desc")
|
||||
@@ -115,34 +116,34 @@ func (i *imlMcpModule) Services(ctx context.Context, req mcp.CallToolRequest) (*
|
||||
|
||||
}
|
||||
|
||||
//func (i *imlMcpModule) Apps(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
// keyword := req.GetArguments()["keyword"].(string)
|
||||
// condition := make(map[string]interface{})
|
||||
// condition["as_app"] = true
|
||||
// list, err := i.serviceService.Search(ctx, keyword, condition, "update_at desc")
|
||||
// if err != nil {
|
||||
// return nil, fmt.Errorf("search service error: %w", err)
|
||||
// }
|
||||
// if len(list) == 0 {
|
||||
// list, err = i.serviceService.Search(ctx, "", condition, "update_at desc")
|
||||
// if err != nil {
|
||||
// return nil, fmt.Errorf("search service error: %w", err)
|
||||
// }
|
||||
// }
|
||||
// data, _ := json.Marshal(utils.SliceToSlice(list, func(s *service.Service) *mcp_dto.App {
|
||||
// return &mcp_dto.App{
|
||||
// Id: s.Id,
|
||||
// Name: s.Name,
|
||||
// Description: s.Name,
|
||||
// CreateTime: s.CreateTime,
|
||||
// UpdateTime: s.UpdateTime,
|
||||
// }
|
||||
// }))
|
||||
// return mcp.NewToolResultText(string(data)), nil
|
||||
//}
|
||||
func (i *imlMcpModule) Apps(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
keyword := req.Params.Arguments["keyword"].(string)
|
||||
condition := make(map[string]interface{})
|
||||
condition["as_app"] = true
|
||||
list, err := i.serviceService.Search(ctx, keyword, condition, "update_at desc")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("search service error: %w", err)
|
||||
}
|
||||
if len(list) == 0 {
|
||||
list, err = i.serviceService.Search(ctx, "", condition, "update_at desc")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("search service error: %w", err)
|
||||
}
|
||||
}
|
||||
data, _ := json.Marshal(utils.SliceToSlice(list, func(s *service.Service) *mcp_dto.App {
|
||||
return &mcp_dto.App{
|
||||
Id: s.Id,
|
||||
Name: s.Name,
|
||||
Description: s.Name,
|
||||
CreateTime: s.CreateTime,
|
||||
UpdateTime: s.UpdateTime,
|
||||
}
|
||||
}))
|
||||
return mcp.NewToolResultText(string(data)), nil
|
||||
}
|
||||
|
||||
func (i *imlMcpModule) APIs(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
serviceId, _ := req.GetArguments()["service"].(string)
|
||||
serviceId, _ := req.Params.Arguments["service"].(string)
|
||||
serviceIds := make([]string, 0, 1)
|
||||
if serviceId == "" {
|
||||
serviceIds = append(serviceIds, serviceId)
|
||||
@@ -189,45 +190,45 @@ func (i *imlMcpModule) APIs(ctx context.Context, req mcp.CallToolRequest) (*mcp.
|
||||
return mcp.NewToolResultText(string(data)), nil
|
||||
}
|
||||
|
||||
//func (i *imlMcpModule) SubscriberAuthorizations(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
// serviceId, ok := req.GetArguments()["service"].(string)
|
||||
// if !ok {
|
||||
// return nil, fmt.Errorf("service id is required")
|
||||
// }
|
||||
// subscribes, err := i.subscriberService.Subscribers(ctx, serviceId, subscribe.ApplyStatusSubscribe)
|
||||
// if err != nil {
|
||||
// return nil, fmt.Errorf("get subscriber error: %w,service id is %s", err, serviceId)
|
||||
// }
|
||||
// appIds := utils.SliceToSlice(subscribes, func(s *subscribe.Subscribe) string {
|
||||
// return s.Application
|
||||
// })
|
||||
// if len(appIds) == 0 {
|
||||
// return nil, fmt.Errorf("no subscriber found,service id is %s", serviceId)
|
||||
// }
|
||||
// list, err := i.appAuthorizationService.ListByApp(ctx, appIds...)
|
||||
// if err != nil {
|
||||
// return nil, fmt.Errorf("get app authorization error: %w,app ids is %s", err, appIds)
|
||||
// }
|
||||
// result := utils.SliceToSlice(list, func(a *application_authorization.Authorization) *mcp_dto.AppAuthorization {
|
||||
// return &mcp_dto.AppAuthorization{
|
||||
// Id: a.UUID,
|
||||
// Name: a.Name,
|
||||
// position: a.position,
|
||||
// TokenName: a.TokenName,
|
||||
// Config: a.Config,
|
||||
// }
|
||||
// }, func(a *application_authorization.Authorization) bool {
|
||||
// if a.Type != "apikey" {
|
||||
// return false
|
||||
// }
|
||||
// if a.ExpireTime != 0 && a.ExpireTime < time.Now().Unix() {
|
||||
// return false
|
||||
// }
|
||||
// return true
|
||||
// })
|
||||
// data, _ := json.Marshal(result)
|
||||
// return mcp.NewToolResultText(string(data)), nil
|
||||
//}
|
||||
func (i *imlMcpModule) SubscriberAuthorizations(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
serviceId, ok := req.Params.Arguments["service"].(string)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("service id is required")
|
||||
}
|
||||
subscribes, err := i.subscriberService.Subscribers(ctx, serviceId, subscribe.ApplyStatusSubscribe)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("get subscriber error: %w,service id is %s", err, serviceId)
|
||||
}
|
||||
appIds := utils.SliceToSlice(subscribes, func(s *subscribe.Subscribe) string {
|
||||
return s.Application
|
||||
})
|
||||
if len(appIds) == 0 {
|
||||
return nil, fmt.Errorf("no subscriber found,service id is %s", serviceId)
|
||||
}
|
||||
list, err := i.appAuthorizationService.ListByApp(ctx, appIds...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("get app authorization error: %w,app ids is %s", err, appIds)
|
||||
}
|
||||
result := utils.SliceToSlice(list, func(a *application_authorization.Authorization) *mcp_dto.AppAuthorization {
|
||||
return &mcp_dto.AppAuthorization{
|
||||
Id: a.UUID,
|
||||
Name: a.Name,
|
||||
Position: a.Position,
|
||||
TokenName: a.TokenName,
|
||||
Config: a.Config,
|
||||
}
|
||||
}, func(a *application_authorization.Authorization) bool {
|
||||
if a.Type != "apikey" {
|
||||
return false
|
||||
}
|
||||
if a.ExpireTime != 0 && a.ExpireTime < time.Now().Unix() {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
})
|
||||
data, _ := json.Marshal(result)
|
||||
return mcp.NewToolResultText(string(data)), nil
|
||||
}
|
||||
|
||||
var (
|
||||
client = &http.Client{}
|
||||
@@ -247,18 +248,18 @@ func (i *imlMcpModule) Invoke(ctx context.Context, req mcp.CallToolRequest) (*mc
|
||||
u.Scheme = "http"
|
||||
}
|
||||
|
||||
path, ok := req.GetArguments()["path"].(string)
|
||||
path, ok := req.Params.Arguments["path"].(string)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("invalid path")
|
||||
}
|
||||
u.Path = fmt.Sprintf("%s/%s", strings.TrimSuffix(u.Path, "/"), strings.TrimPrefix(path, "/"))
|
||||
|
||||
method, ok := req.GetArguments()["method"].(string)
|
||||
method, ok := req.Params.Arguments["method"].(string)
|
||||
if !ok {
|
||||
method = "GET"
|
||||
}
|
||||
queryParam := url.Values{}
|
||||
query, ok := req.GetArguments()["query"].(map[string]interface{})
|
||||
query, ok := req.Params.Arguments["query"].(map[string]interface{})
|
||||
if ok {
|
||||
for k, v := range query {
|
||||
switch v := v.(type) {
|
||||
@@ -277,7 +278,7 @@ func (i *imlMcpModule) Invoke(ctx context.Context, req mcp.CallToolRequest) (*mc
|
||||
}
|
||||
u.RawQuery = queryParam.Encode()
|
||||
headerParam := http.Header{}
|
||||
header, ok := req.GetArguments()["header"].(map[string]interface{})
|
||||
header, ok := req.Params.Arguments["header"].(map[string]interface{})
|
||||
if ok {
|
||||
for k, v := range header {
|
||||
switch v := v.(type) {
|
||||
@@ -293,12 +294,12 @@ func (i *imlMcpModule) Invoke(ctx context.Context, req mcp.CallToolRequest) (*mc
|
||||
}
|
||||
}
|
||||
|
||||
body, ok := req.GetArguments()["body"].(string)
|
||||
body, ok := req.Params.Arguments["body"].(string)
|
||||
if !ok {
|
||||
body = ""
|
||||
}
|
||||
|
||||
contentType, ok := req.GetArguments()["content-type"].(string)
|
||||
contentType, ok := req.Params.Arguments["content-type"].(string)
|
||||
if !ok {
|
||||
contentType = "application/json"
|
||||
}
|
||||
|
||||
@@ -13,12 +13,12 @@ type IMcpModule interface {
|
||||
// Services 获取服务列表
|
||||
Services(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error)
|
||||
// Apps 获取应用列表
|
||||
//Apps(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error)
|
||||
Apps(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error)
|
||||
// APIs 获取API列表
|
||||
APIs(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error)
|
||||
|
||||
// SubscriberAuthorizations 获取订阅者授权
|
||||
//SubscriberAuthorizations(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error)
|
||||
SubscriberAuthorizations(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error)
|
||||
Invoke(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error)
|
||||
}
|
||||
|
||||
|
||||
+151
-150
@@ -7,14 +7,10 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/eolinker/go-common/server"
|
||||
|
||||
"github.com/eolinker/go-common/register"
|
||||
|
||||
service_overview "github.com/APIParkLab/APIPark/service/service-overview"
|
||||
|
||||
mcp_server "github.com/APIParkLab/APIPark/mcp-server"
|
||||
api_doc "github.com/APIParkLab/APIPark/service/api-doc"
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
"github.com/mitchellh/mapstructure"
|
||||
|
||||
strategy_driver "github.com/APIParkLab/APIPark/module/strategy/driver"
|
||||
strategy_dto "github.com/APIParkLab/APIPark/module/strategy/dto"
|
||||
@@ -55,70 +51,22 @@ var (
|
||||
)
|
||||
|
||||
type imlPublishModule struct {
|
||||
projectDiffModule serviceDiff.IServiceDiffModule `autowired:""`
|
||||
releaseModule releaseModule.IReleaseModule `autowired:""`
|
||||
publishService publish.IPublishService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
upstreamService upstream.IUpstreamService `autowired:""`
|
||||
strategyService strategy.IStrategyService `autowired:""`
|
||||
releaseService release.IReleaseService `autowired:""`
|
||||
clusterService cluster.IClusterService `autowired:""`
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
serviceOverviewService service_overview.IOverviewService `autowired:""`
|
||||
transaction store.ITransaction `autowired:""`
|
||||
projectDiffModule serviceDiff.IServiceDiffModule `autowired:""`
|
||||
releaseModule releaseModule.IReleaseModule `autowired:""`
|
||||
publishService publish.IPublishService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
upstreamService upstream.IUpstreamService `autowired:""`
|
||||
strategyService strategy.IStrategyService `autowired:""`
|
||||
releaseService release.IReleaseService `autowired:""`
|
||||
clusterService cluster.IClusterService `autowired:""`
|
||||
serviceService service.IServiceService `autowired:""`
|
||||
transaction store.ITransaction `autowired:""`
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) OnInit() {
|
||||
register.Handle(func(v server.Server) {
|
||||
ctx := context.Background()
|
||||
list, err := i.releaseService.GetRunningList(ctx)
|
||||
if err != nil {
|
||||
log.Errorf("onInit: get running list failed:%s", err.Error())
|
||||
return
|
||||
}
|
||||
if len(list) < 1 {
|
||||
return
|
||||
}
|
||||
|
||||
serviceMap := make(map[string]*release.Release)
|
||||
serviceIds := make([]string, 0, len(list))
|
||||
for _, v := range list {
|
||||
if _, ok := serviceMap[v.Service]; !ok {
|
||||
serviceMap[v.Service] = v
|
||||
serviceIds = append(serviceIds, v.Service)
|
||||
}
|
||||
}
|
||||
overviewList, err := i.serviceOverviewService.List(ctx, serviceIds...)
|
||||
if err != nil {
|
||||
log.Errorf("onInit: get running list failed:%s", err.Error())
|
||||
return
|
||||
}
|
||||
for _, v := range overviewList {
|
||||
if v.IsReleased {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
listCommits, err := i.apiDocService.ListLatestDocCommit(ctx, serviceIds...)
|
||||
if err != nil {
|
||||
log.Errorf("onInit: get running api doc commits failed:%s", err.Error())
|
||||
return
|
||||
}
|
||||
isReleased := true
|
||||
for _, v := range listCommits {
|
||||
i.serviceOverviewService.Update(ctx, v.Target, &service_overview.Update{
|
||||
ApiCount: nil,
|
||||
ReleaseApiCount: &v.Data.APICount,
|
||||
IsReleased: &isReleased,
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) initGateway(ctx context.Context, partitionId string, clientDriver gateway.IClientDriver) error {
|
||||
func (m *imlPublishModule) initGateway(ctx context.Context, partitionId string, clientDriver gateway.IClientDriver) error {
|
||||
return nil
|
||||
//projects, err := i.serviceService.List(ctx)
|
||||
//projects, err := m.serviceService.List(ctx)
|
||||
//if err != nil {
|
||||
// return err
|
||||
//}
|
||||
@@ -126,7 +74,7 @@ func (i *imlPublishModule) initGateway(ctx context.Context, partitionId string,
|
||||
// return p.Id
|
||||
//})
|
||||
//for _, projectId := range projectIds {
|
||||
// releaseInfo, err := i.GetProjectRelease(ctx, projectId, partitionId)
|
||||
// releaseInfo, err := m.GetProjectRelease(ctx, projectId, partitionId)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
@@ -142,8 +90,8 @@ func (i *imlPublishModule) initGateway(ctx context.Context, partitionId string,
|
||||
//return nil
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) getProjectRelease(ctx context.Context, projectID string, commitId string) (*gateway.ProjectRelease, error) {
|
||||
commits, err := i.releaseService.GetCommits(ctx, commitId)
|
||||
func (m *imlPublishModule) getProjectRelease(ctx context.Context, projectID string, commitId string) (*gateway.ProjectRelease, error) {
|
||||
commits, err := m.releaseService.GetCommits(ctx, commitId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -162,17 +110,17 @@ func (i *imlPublishModule) getProjectRelease(ctx context.Context, projectID stri
|
||||
strategyCommitIds = append(strategyCommitIds, c.Commit)
|
||||
}
|
||||
}
|
||||
serviceInfo, err := i.serviceService.Get(ctx, projectID)
|
||||
serviceInfo, err := m.serviceService.Get(ctx, projectID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
apiInfos, err := i.apiService.ListInfo(ctx, apiIds...)
|
||||
apiInfos, err := m.apiService.ListInfo(ctx, apiIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
proxyCommits, err := i.apiService.ListProxyCommit(ctx, apiProxyCommitIds...)
|
||||
proxyCommits, err := m.apiService.ListProxyCommit(ctx, apiProxyCommitIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -229,7 +177,7 @@ func (i *imlPublishModule) getProjectRelease(ctx context.Context, projectID stri
|
||||
r.Apis = apis
|
||||
var upstreamRelease *gateway.UpstreamRelease
|
||||
if len(upstreamCommitIds) > 0 {
|
||||
upstreamCommits, err := i.upstreamService.ListCommit(ctx, upstreamCommitIds...)
|
||||
upstreamCommits, err := m.upstreamService.ListCommit(ctx, upstreamCommitIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -254,7 +202,7 @@ func (i *imlPublishModule) getProjectRelease(ctx context.Context, projectID stri
|
||||
r.Upstream = upstreamRelease
|
||||
}
|
||||
if len(strategyCommitIds) > 0 {
|
||||
strategyCommits, err := i.strategyService.ListStrategyCommit(ctx, strategyCommitIds...)
|
||||
strategyCommits, err := m.strategyService.ListStrategyCommit(ctx, strategyCommitIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -286,9 +234,9 @@ func (i *imlPublishModule) getProjectRelease(ctx context.Context, projectID stri
|
||||
return r, nil
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) GetProjectRelease(ctx context.Context, projectID string, partitionId string) (*gateway.ProjectRelease, error) {
|
||||
func (m *imlPublishModule) GetProjectRelease(ctx context.Context, projectID string, partitionId string) (*gateway.ProjectRelease, error) {
|
||||
|
||||
releaseInfo, err := i.releaseService.GetRunning(ctx, projectID)
|
||||
releaseInfo, err := m.releaseService.GetRunning(ctx, projectID)
|
||||
if err != nil {
|
||||
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, err
|
||||
@@ -296,11 +244,11 @@ func (i *imlPublishModule) GetProjectRelease(ctx context.Context, projectID stri
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
return i.getProjectRelease(ctx, projectID, releaseInfo.UUID)
|
||||
return m.getProjectRelease(ctx, projectID, releaseInfo.UUID)
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) getReleaseInfo(ctx context.Context, projectID, releaseId, version string, clusterIds []string) (map[string]*gateway.ProjectRelease, error) {
|
||||
projectRelease, err := i.getProjectRelease(ctx, projectID, releaseId)
|
||||
func (m *imlPublishModule) getReleaseInfo(ctx context.Context, projectID, releaseId, version string, clusterIds []string) (map[string]*gateway.ProjectRelease, error) {
|
||||
projectRelease, err := m.getProjectRelease(ctx, projectID, releaseId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -318,19 +266,19 @@ func (i *imlPublishModule) getReleaseInfo(ctx context.Context, projectID, releas
|
||||
return projectReleaseMap, nil
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) PublishStatuses(ctx context.Context, serviceId string, id string) ([]*dto.PublishStatus, error) {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) PublishStatuses(ctx context.Context, serviceId string, id string) ([]*dto.PublishStatus, error) {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
flow, err := i.publishService.Get(ctx, id)
|
||||
flow, err := m.publishService.Get(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if flow.Service != serviceId {
|
||||
return nil, errors.New("服务不一致")
|
||||
}
|
||||
list, err := i.publishService.GetPublishStatus(ctx, id)
|
||||
list, err := m.publishService.GetPublishStatus(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -354,18 +302,18 @@ func (i *imlPublishModule) PublishStatuses(ctx context.Context, serviceId string
|
||||
//
|
||||
// ctx context.Context, serviceId string, input *dto.ApplyInput
|
||||
// *dto.Publish, error
|
||||
func (i *imlPublishModule) Apply(ctx context.Context, serviceId string, input *dto.ApplyInput) (*dto.Publish, error) {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) Apply(ctx context.Context, serviceId string, input *dto.ApplyInput) (*dto.Publish, error) {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
err = i.checkPublish(ctx, serviceId, input.Release)
|
||||
err = m.checkPublish(ctx, serviceId, input.Release)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
previous := ""
|
||||
running, err := i.releaseService.GetRunning(ctx, serviceId)
|
||||
running, err := m.releaseService.GetRunning(ctx, serviceId)
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
|
||||
return nil, err
|
||||
@@ -374,42 +322,42 @@ func (i *imlPublishModule) Apply(ctx context.Context, serviceId string, input *d
|
||||
previous = running.UUID
|
||||
}
|
||||
|
||||
releaseToPublish, err := i.releaseService.GetRelease(ctx, input.Release)
|
||||
releaseToPublish, err := m.releaseService.GetRelease(ctx, input.Release)
|
||||
if err != nil {
|
||||
// 目标版本不存在
|
||||
return nil, err
|
||||
}
|
||||
|
||||
newPublishId := uuid.NewString()
|
||||
diff, ok, err := i.projectDiffModule.DiffForLatest(ctx, serviceId, previous)
|
||||
diff, ok, err := m.projectDiffModule.DiffForLatest(ctx, serviceId, previous)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !ok {
|
||||
return nil, errors.New("latest completeness check failed")
|
||||
}
|
||||
err = i.publishService.Create(ctx, newPublishId, serviceId, releaseToPublish.UUID, previous, releaseToPublish.Version, input.Remark, diff)
|
||||
err = m.publishService.Create(ctx, newPublishId, serviceId, releaseToPublish.UUID, previous, releaseToPublish.Version, input.Remark, diff)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
np, err := i.publishService.Get(ctx, newPublishId)
|
||||
np, err := m.publishService.Get(ctx, newPublishId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return dto.FromModel(np, releaseToPublish.Remark), nil
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) CheckPublish(ctx context.Context, serviceId string, releaseId string) (*dto.DiffOut, error) {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) CheckPublish(ctx context.Context, serviceId string, releaseId string) (*dto.DiffOut, error) {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
err = i.checkPublish(ctx, serviceId, releaseId)
|
||||
err = m.checkPublish(ctx, serviceId, releaseId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
running, err := i.releaseService.GetRunning(ctx, serviceId)
|
||||
running, err := m.releaseService.GetRunning(ctx, serviceId)
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, err
|
||||
}
|
||||
@@ -419,30 +367,30 @@ func (i *imlPublishModule) CheckPublish(ctx context.Context, serviceId string, r
|
||||
}
|
||||
if releaseId == "" {
|
||||
// 发布latest 版本
|
||||
diff, _, err := i.projectDiffModule.DiffForLatest(ctx, serviceId, runningReleaseId)
|
||||
diff, _, err := m.projectDiffModule.DiffForLatest(ctx, serviceId, runningReleaseId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return i.projectDiffModule.Out(ctx, diff)
|
||||
return m.projectDiffModule.Out(ctx, diff)
|
||||
} else {
|
||||
// 发布 releaseId 版本, 返回 与当前版本的差异
|
||||
diff, err := i.projectDiffModule.Diff(ctx, serviceId, runningReleaseId, releaseId)
|
||||
diff, err := m.projectDiffModule.Diff(ctx, serviceId, runningReleaseId, releaseId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return i.projectDiffModule.Out(ctx, diff)
|
||||
return m.projectDiffModule.Out(ctx, diff)
|
||||
}
|
||||
|
||||
}
|
||||
func (i *imlPublishModule) checkPublish(ctx context.Context, serviceId string, releaseId string) error {
|
||||
flows, err := i.publishService.ListForStatus(ctx, serviceId, publish.StatusApply, publish.StatusAccept)
|
||||
func (m *imlPublishModule) checkPublish(ctx context.Context, serviceId string, releaseId string) error {
|
||||
flows, err := m.publishService.ListForStatus(ctx, serviceId, publish.StatusApply, publish.StatusAccept)
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return err
|
||||
}
|
||||
if len(flows) > 0 {
|
||||
return errors.New("正在发布中")
|
||||
}
|
||||
running, err := i.releaseService.GetRunning(ctx, serviceId)
|
||||
running, err := m.releaseService.GetRunning(ctx, serviceId)
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return err
|
||||
}
|
||||
@@ -455,8 +403,8 @@ func (i *imlPublishModule) checkPublish(ctx context.Context, serviceId string, r
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func (i *imlPublishModule) Close(ctx context.Context, serviceId, id string) error {
|
||||
err := i.publishService.SetStatus(ctx, serviceId, id, publish.StatusClose)
|
||||
func (m *imlPublishModule) Close(ctx context.Context, serviceId, id string) error {
|
||||
err := m.publishService.SetStatus(ctx, serviceId, id, publish.StatusClose)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -464,12 +412,12 @@ func (i *imlPublishModule) Close(ctx context.Context, serviceId, id string) erro
|
||||
return nil
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) Stop(ctx context.Context, serviceId string, id string) error {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) Stop(ctx context.Context, serviceId string, id string) error {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
flow, err := i.publishService.Get(ctx, id)
|
||||
flow, err := m.publishService.Get(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -484,44 +432,44 @@ func (i *imlPublishModule) Stop(ctx context.Context, serviceId string, id string
|
||||
if flow.Status == publish.StatusApply {
|
||||
status = publish.StatusClose
|
||||
}
|
||||
return i.publishService.SetStatus(ctx, serviceId, id, status)
|
||||
return m.publishService.SetStatus(ctx, serviceId, id, status)
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) Refuse(ctx context.Context, serviceId string, id string, commits string) error {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) Refuse(ctx context.Context, serviceId string, id string, commits string) error {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return i.publishService.Refuse(ctx, serviceId, id, commits)
|
||||
return m.publishService.Refuse(ctx, serviceId, id, commits)
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) Accept(ctx context.Context, serviceId string, id string, commits string) error {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) Accept(ctx context.Context, serviceId string, id string, commits string) error {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return i.publishService.Accept(ctx, serviceId, id, commits)
|
||||
return m.publishService.Accept(ctx, serviceId, id, commits)
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) publish(ctx context.Context, id string, clusterId string, projectRelease *gateway.ProjectRelease) error {
|
||||
func (m *imlPublishModule) publish(ctx context.Context, id string, clusterId string, projectRelease *gateway.ProjectRelease) error {
|
||||
|
||||
publishStatus := &publish.Status{
|
||||
Publish: id,
|
||||
Status: publish.StatusPublishing,
|
||||
UpdateAt: time.Now(),
|
||||
}
|
||||
err := i.publishService.SetPublishStatus(ctx, publishStatus)
|
||||
err := m.publishService.SetPublishStatus(ctx, publishStatus)
|
||||
if err != nil {
|
||||
return fmt.Errorf("set publishing publishStatus error: %v", err)
|
||||
}
|
||||
defer func() {
|
||||
err := i.publishService.SetPublishStatus(ctx, publishStatus)
|
||||
err := m.publishService.SetPublishStatus(ctx, publishStatus)
|
||||
if err != nil {
|
||||
log.Errorf("set publishing publishStatus error: %v", err)
|
||||
}
|
||||
}()
|
||||
|
||||
client, err := i.clusterService.GatewayClient(ctx, clusterId)
|
||||
client, err := m.clusterService.GatewayClient(ctx, clusterId)
|
||||
if err != nil {
|
||||
publishStatus.Status = publish.StatusPublishError
|
||||
publishStatus.Error = err.Error()
|
||||
@@ -553,12 +501,12 @@ func (i *imlPublishModule) publish(ctx context.Context, id string, clusterId str
|
||||
return nil
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) Publish(ctx context.Context, serviceId string, id string) error {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) Publish(ctx context.Context, serviceId string, id string) error {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
flow, err := i.publishService.Get(ctx, id)
|
||||
flow, err := m.publishService.Get(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -568,7 +516,7 @@ func (i *imlPublishModule) Publish(ctx context.Context, serviceId string, id str
|
||||
if flow.Status != publish.StatusAccept && flow.Status != publish.StatusDone {
|
||||
return errors.New("只有通过状态才能发布")
|
||||
}
|
||||
clusters, err := i.clusterService.List(ctx)
|
||||
clusters, err := m.clusterService.List(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -576,21 +524,21 @@ func (i *imlPublishModule) Publish(ctx context.Context, serviceId string, id str
|
||||
return i.Uuid
|
||||
})
|
||||
|
||||
projectReleaseMap, err := i.getReleaseInfo(ctx, serviceId, flow.Release, flow.Release, clusterIds)
|
||||
projectReleaseMap, err := m.getReleaseInfo(ctx, serviceId, flow.Release, flow.Release, clusterIds)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
hasError := false
|
||||
return i.transaction.Transaction(ctx, func(ctx context.Context) error {
|
||||
return m.transaction.Transaction(ctx, func(ctx context.Context) error {
|
||||
for _, c := range clusters {
|
||||
err = i.publish(ctx, flow.Id, c.Uuid, projectReleaseMap[c.Uuid])
|
||||
err = m.publish(ctx, flow.Id, c.Uuid, projectReleaseMap[c.Uuid])
|
||||
if err != nil {
|
||||
hasError = true
|
||||
log.Error(err)
|
||||
continue
|
||||
}
|
||||
}
|
||||
err = i.releaseService.SetRunning(ctx, serviceId, flow.Release)
|
||||
err = m.releaseService.SetRunning(ctx, serviceId, flow.Release)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -599,37 +547,29 @@ func (i *imlPublishModule) Publish(ctx context.Context, serviceId string, id str
|
||||
status = publish.StatusPublishError
|
||||
}
|
||||
if status == publish.StatusDone {
|
||||
info, err := i.serviceService.Get(ctx, serviceId)
|
||||
info, err := m.serviceService.Get(ctx, serviceId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if info.EnableMCP {
|
||||
err = i.updateMCPServer(ctx, serviceId, info.Name, flow.Version)
|
||||
err = m.updateMCPServer(ctx, serviceId, info.Name, flow.Version)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
apidocCommit, err := i.apiDocService.LatestDocCommit(ctx, serviceId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
isReleased := true
|
||||
i.serviceOverviewService.Update(ctx, serviceId, &service_overview.Update{
|
||||
ReleaseApiCount: &apidocCommit.Data.APICount,
|
||||
IsReleased: &isReleased,
|
||||
})
|
||||
}
|
||||
return i.publishService.SetStatus(ctx, serviceId, id, status)
|
||||
|
||||
return m.publishService.SetStatus(ctx, serviceId, id, status)
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) List(ctx context.Context, serviceId string, page, pageSize int) ([]*dto.Publish, int64, error) {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) List(ctx context.Context, serviceId string, page, pageSize int) ([]*dto.Publish, int64, error) {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
list, total, err := i.publishService.ListProjectPage(ctx, serviceId, page, pageSize)
|
||||
list, total, err := m.publishService.ListProjectPage(ctx, serviceId, page, pageSize)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
@@ -655,34 +595,95 @@ func (i *imlPublishModule) updateMCPServer(ctx context.Context, sid string, name
|
||||
if err != nil {
|
||||
return fmt.Errorf("get api doc commit error: %w", err)
|
||||
}
|
||||
return mcp_server.SetServerByOpenapi(sid, name, version, commitDoc.Data.Content)
|
||||
mcpInfo, err := mcp_server.ConvertMCPFromOpenAPI3Data([]byte(commitDoc.Data.Content))
|
||||
if err != nil {
|
||||
return fmt.Errorf("convert mcp from openapi3 data error: %w", err)
|
||||
}
|
||||
tools := make([]mcp_server.ITool, 0, len(mcpInfo.Apis))
|
||||
for _, a := range mcpInfo.Apis {
|
||||
toolOptions := make([]mcp.ToolOption, 0, len(a.Params)+2)
|
||||
toolOptions = append(toolOptions, mcp.WithDescription(a.Description))
|
||||
headers := make(map[string]interface{})
|
||||
queries := make(map[string]interface{})
|
||||
path := make(map[string]interface{})
|
||||
for _, v := range a.Params {
|
||||
p := map[string]interface{}{
|
||||
"type": "string",
|
||||
"required": v.Required,
|
||||
"description": v.Description,
|
||||
}
|
||||
switch v.In {
|
||||
case "header":
|
||||
headers[v.Name] = p
|
||||
case "query":
|
||||
queries[v.Name] = p
|
||||
case "path":
|
||||
path[v.Name] = p
|
||||
}
|
||||
}
|
||||
if len(headers) > 0 {
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPHeader, mcp.Properties(headers), mcp.Description("request headers.")))
|
||||
}
|
||||
if len(queries) > 0 {
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPQuery, mcp.Properties(queries), mcp.Description("request queries.")))
|
||||
}
|
||||
if len(path) > 0 {
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPPath, mcp.Properties(path), mcp.Description("request path params.")))
|
||||
}
|
||||
if a.Body != nil {
|
||||
type Schema struct {
|
||||
Type string `mapstructure:"type"`
|
||||
Properties map[string]interface{} `mapstructure:"properties"`
|
||||
Items interface{} `mapstructure:"items"`
|
||||
}
|
||||
var tmp Schema
|
||||
err = mapstructure.Decode(a.Body, &tmp)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//switch a.ContentType {
|
||||
//case "application/json":
|
||||
switch tmp.Type {
|
||||
case "object":
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPBody, mcp.Properties(tmp.Properties), mcp.Description("request body,it is avalible when method is POST、PUT、PATCH.")))
|
||||
case "array":
|
||||
toolOptions = append(toolOptions, mcp.WithArray(mcp_server.MCPBody, mcp.Items(tmp.Items), mcp.Description("request body,it is avalible when method is POST、PUT、PATCH.")))
|
||||
}
|
||||
//case "application/x-www-form-urlencoded":
|
||||
// toolOptions = append(toolOptions, mcp.WithString(mcp_server.MCPBody, mcp.Items(tmp.Items), mcp.Description("request body,it is avalible when method is POST、PUT、PATCH.")))
|
||||
|
||||
}
|
||||
tools = append(tools, mcp_server.NewTool(a.Summary, a.Path, a.Method, a.ContentType, toolOptions...))
|
||||
}
|
||||
mcp_server.SetSSEServer(sid, name, version, tools...)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (i *imlPublishModule) Detail(ctx context.Context, serviceId string, id string) (*dto.PublishDetail, error) {
|
||||
_, err := i.serviceService.Check(ctx, serviceId, asServer)
|
||||
func (m *imlPublishModule) Detail(ctx context.Context, serviceId string, id string) (*dto.PublishDetail, error) {
|
||||
_, err := m.serviceService.Check(ctx, serviceId, asServer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
flow, err := i.publishService.Get(ctx, id)
|
||||
flow, err := m.publishService.Get(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if flow.Service != serviceId {
|
||||
return nil, errors.New("项目不一致")
|
||||
}
|
||||
diff, err := i.publishService.GetDiff(ctx, id)
|
||||
diff, err := m.publishService.GetDiff(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out, err := i.projectDiffModule.Out(ctx, diff)
|
||||
out, err := m.projectDiffModule.Out(ctx, diff)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
publishStatuses, err := i.PublishStatuses(ctx, serviceId, id)
|
||||
publishStatuses, err := m.PublishStatuses(ctx, serviceId, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
releaseInfo, err := i.releaseService.GetRelease(ctx, flow.Release)
|
||||
releaseInfo, err := m.releaseService.GetRelease(ctx, flow.Release)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -65,6 +65,7 @@ func (m *imlReleaseModule) latestStrategyCommits(ctx context.Context, serviceId
|
||||
}
|
||||
|
||||
func (m *imlReleaseModule) Create(ctx context.Context, serviceId string, input *dto.CreateInput) (string, error) {
|
||||
|
||||
proInfo, err := m.projectService.Check(ctx, serviceId, projectRuleMustServer)
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
|
||||
@@ -30,7 +30,7 @@ type Create struct {
|
||||
MatchRules []Match `json:"match"`
|
||||
Upstream string `json:"upstream"`
|
||||
Proxy *InputProxy `json:"proxy"`
|
||||
Disable bool `json:"disable"`
|
||||
Disable bool `json:"disabled"`
|
||||
}
|
||||
|
||||
type InputProxy struct {
|
||||
@@ -70,7 +70,7 @@ type Edit struct {
|
||||
Methods *[]string `json:"methods"`
|
||||
Protocols *[]string `json:"protocols"`
|
||||
MatchRules *[]Match `json:"match"`
|
||||
Disable *bool `json:"disable"`
|
||||
Disable *bool `json:"disabled"`
|
||||
Upstream *string `json:"upstream"`
|
||||
}
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ type Detail struct {
|
||||
SimpleDetail
|
||||
Proxy *Proxy `json:"proxy"`
|
||||
Protocols []string `json:"protocols"`
|
||||
Disable bool `json:"disable"`
|
||||
Disable bool `json:"disabled"`
|
||||
//Doc map[string]interface{} `json:"doc"`
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ type EditService struct {
|
||||
Name *string `json:"name"`
|
||||
Description *string `json:"description"`
|
||||
ServiceType *string `json:"service_type"`
|
||||
Prefix *string `json:"prefix"`
|
||||
Catalogue *string `json:"catalogue"`
|
||||
Logo *string `json:"logo"`
|
||||
Tags *[]string `json:"tags"`
|
||||
|
||||
+79
-54
@@ -10,12 +10,14 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
service_overview "github.com/APIParkLab/APIPark/service/service-overview"
|
||||
|
||||
"github.com/APIParkLab/APIPark/common"
|
||||
|
||||
"github.com/mitchellh/mapstructure"
|
||||
|
||||
"github.com/eolinker/go-common/register"
|
||||
|
||||
"github.com/mark3labs/mcp-go/mcp"
|
||||
|
||||
mcp_server "github.com/APIParkLab/APIPark/mcp-server"
|
||||
|
||||
"github.com/APIParkLab/APIPark/service/release"
|
||||
@@ -81,12 +83,11 @@ type imlServiceModule struct {
|
||||
tagService tag.ITagService `autowired:""`
|
||||
localModelService ai_local.ILocalModelService `autowired:""`
|
||||
|
||||
serviceOverviewService service_overview.IOverviewService `autowired:""`
|
||||
serviceTagService service_tag.ITagService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
clusterService cluster.IClusterService `autowired:""`
|
||||
subscribeServer subscribe.ISubscribeService `autowired:""`
|
||||
serviceTagService service_tag.ITagService `autowired:""`
|
||||
apiService api.IAPIService `autowired:""`
|
||||
apiDocService api_doc.IAPIDocService `autowired:""`
|
||||
clusterService cluster.IClusterService `autowired:""`
|
||||
subscribeServer subscribe.ISubscribeService `autowired:""`
|
||||
|
||||
releaseService release.IReleaseService `autowired:""`
|
||||
serviceModelMappingService service_model_mapping.IServiceModelMappingService `autowired:""`
|
||||
@@ -303,7 +304,6 @@ func (i *imlServiceModule) OnInit() {
|
||||
log.Error(err)
|
||||
return
|
||||
}
|
||||
|
||||
for _, s := range services {
|
||||
err = i.updateMCPServer(ctx, s.Id, s.Name, "1.0")
|
||||
if err != nil {
|
||||
@@ -311,28 +311,6 @@ func (i *imlServiceModule) OnInit() {
|
||||
return
|
||||
}
|
||||
}
|
||||
overviews, err := i.serviceOverviewService.List(ctx)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
return
|
||||
}
|
||||
if len(overviews) > 0 {
|
||||
return
|
||||
}
|
||||
countMap, err := i.apiDocService.APICountByServices(ctx)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
return
|
||||
}
|
||||
for k, v := range countMap {
|
||||
err = i.serviceOverviewService.Update(ctx, k, &service_overview.Update{
|
||||
ApiCount: &v,
|
||||
})
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -391,11 +369,67 @@ func (i *imlServiceModule) updateMCPServer(ctx context.Context, sid string, name
|
||||
if err != nil {
|
||||
return fmt.Errorf("get api doc commit error: %w", err)
|
||||
}
|
||||
return mcp_server.SetServerByOpenapi(sid, name, version, commitDoc.Data.Content)
|
||||
mcpInfo, err := mcp_server.ConvertMCPFromOpenAPI3Data([]byte(commitDoc.Data.Content))
|
||||
if err != nil {
|
||||
return fmt.Errorf("convert mcp from openapi3 data error: %w", err)
|
||||
}
|
||||
tools := make([]mcp_server.ITool, 0, len(mcpInfo.Apis))
|
||||
for _, a := range mcpInfo.Apis {
|
||||
toolOptions := make([]mcp.ToolOption, 0, len(a.Params)+2)
|
||||
toolOptions = append(toolOptions, mcp.WithDescription(a.Description))
|
||||
headers := make(map[string]interface{})
|
||||
queries := make(map[string]interface{})
|
||||
path := make(map[string]interface{})
|
||||
for _, v := range a.Params {
|
||||
p := map[string]interface{}{
|
||||
"type": "string",
|
||||
"required": v.Required,
|
||||
"description": v.Description,
|
||||
}
|
||||
switch v.In {
|
||||
case "header":
|
||||
headers[v.Name] = p
|
||||
case "query":
|
||||
queries[v.Name] = p
|
||||
case "path":
|
||||
path[v.Name] = p
|
||||
}
|
||||
}
|
||||
if len(headers) > 0 {
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPHeader, mcp.Properties(headers), mcp.Description("request headers.")))
|
||||
}
|
||||
if len(queries) > 0 {
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPQuery, mcp.Properties(queries), mcp.Description("request queries.")))
|
||||
}
|
||||
if len(path) > 0 {
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPPath, mcp.Properties(path), mcp.Description("request path params.")))
|
||||
}
|
||||
if a.Body != nil {
|
||||
type Schema struct {
|
||||
Type string `mapstructure:"type"`
|
||||
Properties map[string]interface{} `mapstructure:"properties"`
|
||||
Items interface{} `mapstructure:"items"`
|
||||
}
|
||||
var tmp Schema
|
||||
err = mapstructure.Decode(a.Body, &tmp)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
switch tmp.Type {
|
||||
case "object":
|
||||
toolOptions = append(toolOptions, mcp.WithObject(mcp_server.MCPBody, mcp.Properties(tmp.Properties), mcp.Description("request body,it is avalible when method is POST、PUT、PATCH.")))
|
||||
case "array":
|
||||
toolOptions = append(toolOptions, mcp.WithArray(mcp_server.MCPBody, mcp.Items(tmp.Items), mcp.Description("request body,it is avalible when method is POST、PUT、PATCH.")))
|
||||
}
|
||||
}
|
||||
tools = append(tools, mcp_server.NewTool(a.Summary, a.Path, a.Method, a.ContentType, toolOptions...))
|
||||
}
|
||||
mcp_server.SetSSEServer(sid, name, version, tools...)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (i *imlServiceModule) deleteMCPServer(ctx context.Context, sid string) {
|
||||
mcp_server.DelServer(sid)
|
||||
mcp_server.DelSSEServer(sid)
|
||||
}
|
||||
|
||||
func (i *imlServiceModule) ExportAll(ctx context.Context) ([]*service_dto.ExportService, error) {
|
||||
@@ -476,14 +510,7 @@ func (i *imlServiceModule) SearchMyServices(ctx context.Context, teamId string,
|
||||
serviceIds := utils.SliceToSlice(services, func(p *service.Service) string {
|
||||
return p.Id
|
||||
})
|
||||
//apiCountMap, err := i.apiDocService.APICountByServices(ctx, serviceIds...)
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
//serviceIds := utils.SliceToSlice(services, func(s *service.Service) string {
|
||||
// return s.Id
|
||||
//})
|
||||
overviewMap, err := i.serviceOverviewService.Map(ctx, serviceIds...)
|
||||
apiCountMap, err := i.apiDocService.APICountByServices(ctx, serviceIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -493,12 +520,10 @@ func (i *imlServiceModule) SearchMyServices(ctx context.Context, teamId string,
|
||||
if teamId != "" && model.Team != teamId {
|
||||
continue
|
||||
}
|
||||
apiCount := apiCountMap[model.Id]
|
||||
item := toServiceItem(model)
|
||||
if ov, ok := overviewMap[model.Id]; ok {
|
||||
item.ApiNum = ov.ApiCount
|
||||
item.CanDelete = ov.ApiCount == 0
|
||||
}
|
||||
|
||||
item.ApiNum = apiCount
|
||||
item.CanDelete = apiCount == 0
|
||||
items = append(items, item)
|
||||
|
||||
}
|
||||
@@ -604,21 +629,22 @@ func (i *imlServiceModule) Search(ctx context.Context, teamID string, keyword st
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
serviceIds := utils.SliceToSlice(list, func(s *service.Service) string {
|
||||
return s.Id
|
||||
})
|
||||
overviewMap, err := i.serviceOverviewService.Map(ctx, serviceIds...)
|
||||
|
||||
apiCountMap, err := i.apiDocService.APICountByServices(ctx, serviceIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
items := make([]*service_dto.ServiceItem, 0, len(list))
|
||||
for _, model := range list {
|
||||
apiCount := apiCountMap[model.Id]
|
||||
item := toServiceItem(model)
|
||||
if v, ok := overviewMap[model.Id]; ok {
|
||||
item.ApiNum = v.ApiCount
|
||||
item.CanDelete = v.ApiCount == 0
|
||||
}
|
||||
|
||||
item.ApiNum = apiCount
|
||||
item.CanDelete = apiCount == 0
|
||||
items = append(items, item)
|
||||
}
|
||||
return items, nil
|
||||
@@ -708,7 +734,7 @@ func (i *imlServiceModule) Create(ctx context.Context, teamID string, input *ser
|
||||
mo.AsServer = *input.AsServer
|
||||
}
|
||||
|
||||
//input.Prefix = strings.Trim(strings.Trim(input.Prefix, " "), "/")
|
||||
input.Prefix = strings.Trim(strings.Trim(input.Prefix, " "), "/")
|
||||
err := i.transaction.Transaction(ctx, func(ctx context.Context) error {
|
||||
if input.Tags != nil {
|
||||
tags, err := i.getTagUuids(ctx, input.Tags)
|
||||
@@ -813,7 +839,6 @@ func (i *imlServiceModule) Edit(ctx context.Context, id string, input *service_d
|
||||
ServiceType: serviceType,
|
||||
Catalogue: input.Catalogue,
|
||||
AdditionalConfig: &info.AdditionalConfig,
|
||||
Prefix: input.Prefix,
|
||||
ApprovalType: &approvalType,
|
||||
EnableMCP: input.EnableMCP,
|
||||
}
|
||||
|
||||
@@ -15,23 +15,15 @@ func (p *plugin) mcpAPIs() []pm3.Api {
|
||||
globalMessagePath := fmt.Sprintf("/openapi/v1/%s/message", strings.Trim(mcp_server.GlobalBasePath, "/"))
|
||||
serviceMessagePath := fmt.Sprintf("/openapi/v1/%s/:serviceId/message", strings.Trim(mcp_server.ServiceBasePath, "/"))
|
||||
serviceSSEPath := fmt.Sprintf("/openapi/v1/%s/:serviceId/sse", strings.Trim(mcp_server.ServiceBasePath, "/"))
|
||||
serviceStreamablePath := fmt.Sprintf("/openapi/v1/%s/:serviceId/mcp", strings.Trim(mcp_server.ServiceBasePath, "/"))
|
||||
ignore.IgnorePath("openapi", http.MethodPost, globalMessagePath)
|
||||
|
||||
ignore.IgnorePath("openapi", http.MethodGet, serviceSSEPath)
|
||||
ignore.IgnorePath("openapi", http.MethodPost, serviceMessagePath)
|
||||
ignore.IgnorePath("openapi", http.MethodGet, serviceStreamablePath)
|
||||
ignore.IgnorePath("openapi", http.MethodPost, serviceStreamablePath)
|
||||
ignore.IgnorePath("openapi", http.MethodDelete, serviceStreamablePath)
|
||||
|
||||
return []pm3.Api{
|
||||
pm3.CreateApiSimple(http.MethodGet, fmt.Sprintf("/openapi/v1/%s/sse", strings.Trim(mcp_server.GlobalBasePath, "/")), p.mcpController.GlobalHandleSSE),
|
||||
pm3.CreateApiSimple(http.MethodPost, globalMessagePath, p.mcpController.GlobalHandleMessage),
|
||||
pm3.CreateApiSimple(http.MethodGet, serviceSSEPath, p.mcpController.ServiceHandleSSE),
|
||||
pm3.CreateApiSimple(http.MethodPost, serviceMessagePath, p.mcpController.ServiceHandleMessage),
|
||||
|
||||
pm3.CreateApiSimple(http.MethodPost, serviceStreamablePath, p.mcpController.ServiceHandleStreamHTTP),
|
||||
pm3.CreateApiSimple(http.MethodDelete, serviceStreamablePath, p.mcpController.ServiceHandleStreamHTTP),
|
||||
pm3.CreateApiSimple(http.MethodGet, serviceStreamablePath, p.mcpController.ServiceHandleStreamHTTP),
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -29,11 +29,9 @@ VERSION=$(gen_version)
|
||||
|
||||
|
||||
SYS_ARCH=$(arch)
|
||||
echo "SYS_ARCH: ${SYS_ARCH}"
|
||||
echo "ARCH: ${ARCH}"
|
||||
if [[ (${SYS_ARCH} == "aarch64" || ${SYS_ARCH} == "arm64") && $ARCH == "amd64" ]];then
|
||||
OPTIONS="--platform=linux/amd64"
|
||||
elif [[ (${SYS_ARCH} == "amd64" || ${SYS_ARCH} == "x86_64") && $ARCH == "arm64" ]];then
|
||||
elif [[ ${SYS_ARCH} == "amd64" && $ARCH == "arm64" ]];then
|
||||
OPTIONS="--platform=linux/arm64"
|
||||
fi
|
||||
|
||||
|
||||
+10
-14
@@ -5,8 +5,6 @@ import (
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/eolinker/eosc/log"
|
||||
|
||||
"github.com/APIParkLab/APIPark/service/universally/commit"
|
||||
"github.com/APIParkLab/APIPark/stores/api"
|
||||
"github.com/eolinker/go-common/utils"
|
||||
@@ -61,9 +59,7 @@ func (i *imlAPIDocService) APICountByServices(ctx context.Context, serviceIds ..
|
||||
if len(serviceIds) > 0 {
|
||||
w["service"] = serviceIds
|
||||
}
|
||||
now := time.Now()
|
||||
list, err := i.store.List(ctx, w)
|
||||
log.Infof("search api doc count by services, serviceIds: %v, cost: %v", serviceIds, time.Since(now))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -72,35 +68,35 @@ func (i *imlAPIDocService) APICountByServices(ctx context.Context, serviceIds ..
|
||||
}), nil
|
||||
}
|
||||
|
||||
func (i *imlAPIDocService) UpdateDoc(ctx context.Context, serviceId string, input *UpdateDoc) (int64, error) {
|
||||
func (i *imlAPIDocService) UpdateDoc(ctx context.Context, serviceId string, input *UpdateDoc) error {
|
||||
doc, err := NewDocLoader(input.Content)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return err
|
||||
}
|
||||
if err := doc.Valid(); err != nil {
|
||||
return 0, err
|
||||
return err
|
||||
}
|
||||
if input.Prefix != "" {
|
||||
err = doc.AddPrefixInAll(input.Prefix)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return err
|
||||
}
|
||||
}
|
||||
data, err := doc.Marshal()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
return err
|
||||
}
|
||||
input.Content = string(data)
|
||||
operator := utils.UserId(ctx)
|
||||
|
||||
info, err := i.store.First(ctx, map[string]interface{}{
|
||||
"service": serviceId,
|
||||
})
|
||||
|
||||
operator := utils.UserId(ctx)
|
||||
if err != nil {
|
||||
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return 0, err
|
||||
return err
|
||||
}
|
||||
return doc.APICount(), i.store.Insert(ctx, &api.Doc{
|
||||
return i.store.Insert(ctx, &api.Doc{
|
||||
UUID: input.ID,
|
||||
Service: serviceId,
|
||||
Content: input.Content,
|
||||
@@ -113,7 +109,7 @@ func (i *imlAPIDocService) UpdateDoc(ctx context.Context, serviceId string, inpu
|
||||
info.Updater = operator
|
||||
info.UpdateAt = time.Now()
|
||||
info.APICount = doc.APICount()
|
||||
return doc.APICount(), i.store.Save(ctx, info)
|
||||
return i.store.Save(ctx, info)
|
||||
}
|
||||
|
||||
func (i *imlAPIDocService) GetDoc(ctx context.Context, serviceId string) (*Doc, error) {
|
||||
|
||||
@@ -15,7 +15,7 @@ import (
|
||||
|
||||
type IAPIDocService interface {
|
||||
// UpdateDoc 更新文档
|
||||
UpdateDoc(ctx context.Context, serviceId string, input *UpdateDoc) (int64, error)
|
||||
UpdateDoc(ctx context.Context, serviceId string, input *UpdateDoc) error
|
||||
// GetDoc 获取文档
|
||||
GetDoc(ctx context.Context, serviceId string) (*Doc, error)
|
||||
|
||||
|
||||
@@ -28,43 +28,6 @@ type imlReleaseService struct {
|
||||
releaseRuntime release.IReleaseRuntime `autowired:""`
|
||||
}
|
||||
|
||||
func (s *imlReleaseService) UpdateRelease(ctx context.Context, id string, update *Update) error {
|
||||
info, err := s.releaseStore.GetByUUID(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if update.Version != nil {
|
||||
info.Name = *update.Version
|
||||
}
|
||||
if update.Remark != nil {
|
||||
info.Remark = *update.Remark
|
||||
}
|
||||
|
||||
_, err = s.releaseStore.Update(ctx, info)
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *imlReleaseService) GetRunningList(ctx context.Context, serviceId ...string) ([]*Release, error) {
|
||||
w := make(map[string]interface{})
|
||||
if len(serviceId) > 0 {
|
||||
w["service"] = serviceId
|
||||
}
|
||||
list, err := s.releaseRuntime.List(ctx, w)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(list) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
commitIds := utils.SliceToSlice(list, func(o *release.Runtime) string {
|
||||
return o.Release
|
||||
})
|
||||
commits, err := s.releaseStore.List(ctx, map[string]interface{}{
|
||||
"uuid": commitIds,
|
||||
})
|
||||
return utils.SliceToSlice(commits, FromEntity), err
|
||||
}
|
||||
|
||||
func (s *imlReleaseService) GetRunningApiDocCommits(ctx context.Context, serviceIds ...string) ([]string, error) {
|
||||
w := make(map[string]interface{})
|
||||
if len(serviceIds) > 0 {
|
||||
|
||||
@@ -26,12 +26,6 @@ func FromEntity(e *release.Release) *Release {
|
||||
}
|
||||
}
|
||||
|
||||
type Update struct {
|
||||
Version *string
|
||||
Remark *string
|
||||
APICount *int64 // API数量
|
||||
}
|
||||
|
||||
type APICommit struct {
|
||||
Release string
|
||||
API string
|
||||
|
||||
@@ -15,15 +15,12 @@ type IReleaseService interface {
|
||||
GetRelease(ctx context.Context, id string) (*Release, error)
|
||||
// CreateRelease 创建发布
|
||||
CreateRelease(ctx context.Context, service, version, remark string, apiRequestCommit, apisProxyCommits map[string]string, apiDocCommits, serviceDocCommits string, upstreams map[string]map[string]string, strategies map[string]string) (*Release, error)
|
||||
UpdateRelease(ctx context.Context, id string, update *Update) error
|
||||
// DeleteRelease 删除发布
|
||||
DeleteRelease(ctx context.Context, id string) error
|
||||
|
||||
GetRunningApiDocCommits(ctx context.Context, serviceIds ...string) ([]string, error)
|
||||
List(ctx context.Context, service string) ([]*Release, error)
|
||||
GetReleaseInfos(ctx context.Context, id string) ([]*APICommit, []*APICommit, *APICommit, []*UpstreamCommit, *ServiceCommit, error)
|
||||
GetCommits(ctx context.Context, id string) ([]*ProjectCommits, error)
|
||||
//GetRunningApiDocCommits(ctx context.Context, serviceIds ...string) ([]string, error)
|
||||
GetRunningApiDocCommits(ctx context.Context, serviceIds ...string) ([]string, error)
|
||||
GetRunningApiProxyCommit(ctx context.Context, service string, apiUUID string) (string, error)
|
||||
Completeness(partitions []string, apis []string, requestCommits []*commit.Commit[api.Request], proxyCommits []*commit.Commit[api.Proxy], upstreamCommits []*commit.Commit[upstream.Config]) bool
|
||||
|
||||
@@ -33,7 +30,6 @@ type IReleaseService interface {
|
||||
// service: the service name
|
||||
// Return type(s): *Release, error
|
||||
GetRunning(ctx context.Context, service string) (*Release, error)
|
||||
GetRunningList(ctx context.Context, serviceId ...string) ([]*Release, error)
|
||||
|
||||
SetRunning(ctx context.Context, service string, id string) error
|
||||
CheckNewVersion(ctx context.Context, service string, version string) (bool, error)
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
package service_overview
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"github.com/eolinker/go-common/utils"
|
||||
|
||||
"github.com/APIParkLab/APIPark/stores/service"
|
||||
)
|
||||
|
||||
var _ IOverviewService = (*imlOverviewService)(nil)
|
||||
|
||||
type imlOverviewService struct {
|
||||
store service.IOverviewStore `autowired:""`
|
||||
}
|
||||
|
||||
func genUpdateFields(info *service.Overview, update *Update) {
|
||||
if update.ApiCount != nil {
|
||||
info.ApiCount = *update.ApiCount
|
||||
}
|
||||
if update.ReleaseApiCount != nil {
|
||||
info.ReleaseApiCount = *update.ReleaseApiCount
|
||||
}
|
||||
if update.IsReleased != nil {
|
||||
info.IsReleased = *update.IsReleased
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (i imlOverviewService) Update(ctx context.Context, serviceId string, update *Update) error {
|
||||
if update == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
info, err := i.store.First(ctx, map[string]interface{}{
|
||||
"service": serviceId,
|
||||
})
|
||||
if err != nil {
|
||||
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return err
|
||||
}
|
||||
info = &service.Overview{
|
||||
Service: serviceId,
|
||||
}
|
||||
genUpdateFields(info, update)
|
||||
return i.store.Insert(ctx, info)
|
||||
}
|
||||
genUpdateFields(info, update)
|
||||
_, err = i.store.Update(ctx, info)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (i imlOverviewService) List(ctx context.Context, serviceIds ...string) ([]*Overview, error) {
|
||||
w := make(map[string]interface{})
|
||||
if len(serviceIds) > 0 {
|
||||
w = map[string]interface{}{
|
||||
"service": serviceIds,
|
||||
}
|
||||
}
|
||||
list, err := i.store.List(ctx, w)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return utils.SliceToSlice(list, FromEntity), nil
|
||||
}
|
||||
|
||||
func (i imlOverviewService) Map(ctx context.Context, serviceIds ...string) (map[string]*Overview, error) {
|
||||
list, err := i.List(ctx, serviceIds...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return utils.SliceToMap(list, func(i *Overview) string {
|
||||
return i.Service
|
||||
}), nil
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package service_overview
|
||||
|
||||
import (
|
||||
"github.com/APIParkLab/APIPark/stores/service"
|
||||
)
|
||||
|
||||
type Overview struct {
|
||||
Service string
|
||||
ApiCount int64
|
||||
ReleaseApiCount int64
|
||||
IsReleased bool
|
||||
}
|
||||
|
||||
func FromEntity(e *service.Overview) *Overview {
|
||||
return &Overview{
|
||||
Service: e.Service,
|
||||
ApiCount: e.ApiCount,
|
||||
ReleaseApiCount: e.ReleaseApiCount,
|
||||
IsReleased: e.IsReleased,
|
||||
}
|
||||
}
|
||||
|
||||
type Update struct {
|
||||
ApiCount *int64
|
||||
ReleaseApiCount *int64
|
||||
IsReleased *bool
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package service_overview
|
||||
|
||||
import (
|
||||
"context"
|
||||
"reflect"
|
||||
|
||||
"github.com/eolinker/go-common/autowire"
|
||||
)
|
||||
|
||||
type IOverviewService interface {
|
||||
Update(ctx context.Context, serviceId string, update *Update) error
|
||||
List(ctx context.Context, serviceIds ...string) ([]*Overview, error)
|
||||
Map(ctx context.Context, serviceIds ...string) (map[string]*Overview, error)
|
||||
}
|
||||
|
||||
func init() {
|
||||
autowire.Auto[IOverviewService](func() reflect.Value {
|
||||
return reflect.ValueOf(new(imlOverviewService))
|
||||
})
|
||||
}
|
||||
@@ -229,8 +229,5 @@ func updateHandler(e *service.Service, i *Edit) {
|
||||
if i.EnableMCP != nil {
|
||||
e.EnableMCP = *i.EnableMCP
|
||||
}
|
||||
//if i.Prefix != nil {
|
||||
// e.Prefix = *i.Prefix
|
||||
//}
|
||||
e.UpdateAt = time.Now()
|
||||
}
|
||||
|
||||
@@ -182,7 +182,6 @@ type Edit struct {
|
||||
AdditionalConfig *map[string]string
|
||||
State *int
|
||||
ApprovalType *ApprovalType
|
||||
Prefix *string
|
||||
EnableMCP *bool
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ type Doc struct {
|
||||
Content string `gorm:"type:longtext;null;column:content;comment:文档内容"`
|
||||
Updater string `gorm:"size:36;not null;column:updater;comment:更新人;index:updater" aovalue:"updater"`
|
||||
UpdateAt time.Time `gorm:"type:timestamp;NOT NULL;DEFAULT:CURRENT_TIMESTAMP;column:update_at;comment:更新时间"`
|
||||
APICount int64 `gorm:"type:int(11);not null;column:api_count;default:0;comment:接口数量"`
|
||||
APICount int64 `gorm:"type:int(11);not null;column:api_count;comment:接口数量"`
|
||||
}
|
||||
|
||||
func (i *Doc) TableName() string {
|
||||
|
||||
@@ -35,22 +35,6 @@ func (p *Service) TableName() string {
|
||||
return "service"
|
||||
}
|
||||
|
||||
type Overview struct {
|
||||
Id int64 `gorm:"type:BIGINT(20);size:20;not null;auto_increment;primary_key;column:id;comment:主键ID;"`
|
||||
Service string `gorm:"size:255;not null;column:service;comment:服务ID"`
|
||||
ApiCount int64 `gorm:"type:BIGINT(20);not null;column:api_count;comment:接口数量"`
|
||||
ReleaseApiCount int64 `gorm:"type:BIGINT(20);not null;column:release_api_count;comment:已发布接口数量"`
|
||||
IsReleased bool `gorm:"type:tinyint(1);not null;column:is_released;comment:是否已发布"`
|
||||
}
|
||||
|
||||
func (o *Overview) IdValue() int64 {
|
||||
return o.Id
|
||||
}
|
||||
|
||||
func (o *Overview) TableName() string {
|
||||
return "service_overview"
|
||||
}
|
||||
|
||||
type Authorization struct {
|
||||
Id int64 `gorm:"type:BIGINT(20);size:20;not null;auto_increment;primary_key;column:id;comment:主键ID;"`
|
||||
UUID string `gorm:"size:36;not null;column:uuid;uniqueIndex:uuid;comment:UUID;"`
|
||||
|
||||
@@ -13,12 +13,6 @@ type IServiceStore interface {
|
||||
type imlServiceStore struct {
|
||||
store.SearchStore[Service]
|
||||
}
|
||||
type IOverviewStore interface {
|
||||
store.IBaseStore[Overview]
|
||||
}
|
||||
type imlOverviewStore struct {
|
||||
store.Store[Overview]
|
||||
}
|
||||
|
||||
type IServiceTagStore interface {
|
||||
store.IBaseStore[Tag]
|
||||
@@ -67,9 +61,6 @@ func init() {
|
||||
return reflect.ValueOf(new(imlServiceDocStore))
|
||||
})
|
||||
|
||||
autowire.Auto[IOverviewStore](func() reflect.Value {
|
||||
return reflect.ValueOf(new(imlOverviewStore))
|
||||
})
|
||||
autowire.Auto[IServiceModelMappingStore](func() reflect.Value {
|
||||
return reflect.ValueOf(new(imlServiceModelMappingStore))
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user