Browse Source
fix: Complete the modelarts createServeic of ai
Former-commit-id: 02ed1dfd88
pull/303/head
qiwang
1 year ago
3 changed files with 189 additions and 44 deletions
Split View
Diff Options
-
+13 -13go.mod
-
+26 -26go.sum
-
+150 -5internal/storeLink/modelarts.go
+ 13
- 13
go.mod
View File
| @@ -15,11 +15,11 @@ require ( | |||
| github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2 | |||
| github.com/prometheus/alertmanager v0.27.0 | |||
| github.com/prometheus/client_golang v1.20.2 | |||
| github.com/prometheus/common v0.57.0 | |||
| github.com/prometheus/common v0.58.0 | |||
| github.com/robfig/cron/v3 v3.0.1 | |||
| github.com/zeromicro/go-zero v1.7.0 | |||
| github.com/zeromicro/go-zero v1.7.2 | |||
| gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240725071305-f751eec4dde1 | |||
| gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240831031531-89bdb156378a | |||
| gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240905092954-07ff355339dd | |||
| gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240817071412-44397870b110 | |||
| gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203 | |||
| gitlink.org.cn/JointCloud/pcm-slurm v0.0.0-20240301080743-8b94bbaf57f5 | |||
| @@ -126,7 +126,7 @@ require ( | |||
| go.etcd.io/etcd/api/v3 v3.5.15 // indirect | |||
| go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect | |||
| go.etcd.io/etcd/client/v3 v3.5.15 // indirect | |||
| go.mongodb.org/mongo-driver v1.16.0 // indirect | |||
| go.mongodb.org/mongo-driver v1.16.1 // indirect | |||
| go.opentelemetry.io/otel v1.29.0 // indirect | |||
| go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect | |||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect | |||
| @@ -142,25 +142,25 @@ require ( | |||
| go.uber.org/zap v1.27.0 // indirect | |||
| golang.org/x/crypto v0.26.0 // indirect | |||
| golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect | |||
| golang.org/x/mod v0.20.0 // indirect | |||
| golang.org/x/mod v0.21.0 // indirect | |||
| golang.org/x/net v0.28.0 // indirect | |||
| golang.org/x/oauth2 v0.22.0 // indirect | |||
| golang.org/x/oauth2 v0.23.0 // indirect | |||
| golang.org/x/sync v0.8.0 // indirect | |||
| golang.org/x/sys v0.24.0 // indirect | |||
| golang.org/x/term v0.23.0 // indirect | |||
| golang.org/x/text v0.17.0 // indirect | |||
| golang.org/x/sys v0.25.0 // indirect | |||
| golang.org/x/term v0.24.0 // indirect | |||
| golang.org/x/text v0.18.0 // indirect | |||
| golang.org/x/time v0.6.0 // indirect | |||
| golang.org/x/tools v0.24.0 // indirect | |||
| google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect | |||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect | |||
| google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect | |||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect | |||
| google.golang.org/protobuf v1.34.2 // indirect | |||
| gopkg.in/inf.v0 v0.9.1 // indirect | |||
| gopkg.in/yaml.v2 v2.4.0 // indirect | |||
| gopkg.in/yaml.v3 v3.0.1 // indirect | |||
| k8s.io/api v0.31.0 // indirect | |||
| k8s.io/klog/v2 v2.130.1 // indirect | |||
| k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect | |||
| k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect | |||
| k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect | |||
| k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect | |||
| sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect | |||
| sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect | |||
| ) | |||
+ 26
- 26
go.sum
View File
| @@ -406,8 +406,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b | |||
| github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= | |||
| github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= | |||
| github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= | |||
| github.com/prometheus/common v0.57.0 h1:Ro/rKjwdq9mZn1K5QPctzh+MA4Lp0BuYk5ZZEVhoNcY= | |||
| github.com/prometheus/common v0.57.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI= | |||
| github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo= | |||
| github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= | |||
| github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= | |||
| github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= | |||
| github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g= | |||
| @@ -464,12 +464,12 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 | |||
| github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= | |||
| github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= | |||
| github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= | |||
| github.com/zeromicro/go-zero v1.7.0 h1:B+y7tUVlo3qVQ6F0I0R9bi+Dq4I1QdO9ZB+dz1r0p1s= | |||
| github.com/zeromicro/go-zero v1.7.0/go.mod h1:ypW4PzQI+jUrMcNJDDQ+7YW+pE+tMua9Xj/pmtmS1Dc= | |||
| github.com/zeromicro/go-zero v1.7.2 h1:a8lyVOG3KXG4LrAy6ZmtJTJtisX4Ostc4Pst4fE704I= | |||
| github.com/zeromicro/go-zero v1.7.2/go.mod h1:WFXfF92Exw0O7WECifS6r99JSzv4KEN49x9RhAfgkMc= | |||
| gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240725071305-f751eec4dde1 h1:DicBXoQiC6mumMBeyqSPNrsjtqJIgk5Pv2hscu2xryw= | |||
| gitlink.org.cn/JointCloud/pcm-ac v0.0.0-20240725071305-f751eec4dde1/go.mod h1:3eECiw9O2bIFkkePlloKyLNXiqBAhOxNrDoGaaGseGY= | |||
| gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240831031531-89bdb156378a h1:x3qNoZu7leHTx5gaDuLNR/T9ubwIpCXZH5hS6ZfwltQ= | |||
| gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240831031531-89bdb156378a/go.mod h1:/eOmBFZKWGoabG3sRVkVvIbLwsd2631k4jkUBR6x1AA= | |||
| gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240905092954-07ff355339dd h1:rwEf9EHx9/KRHtA0VXDfSS3sEsi8e79C/4LVd9PgcFw= | |||
| gitlink.org.cn/JointCloud/pcm-modelarts v0.0.0-20240905092954-07ff355339dd/go.mod h1:/eOmBFZKWGoabG3sRVkVvIbLwsd2631k4jkUBR6x1AA= | |||
| gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240817071412-44397870b110 h1:GaXwr5sgDh0raHjUf9IewTvnRvajYea7zbLsaerYyXo= | |||
| gitlink.org.cn/JointCloud/pcm-octopus v0.0.0-20240817071412-44397870b110/go.mod h1:QOD5+/l2D+AYBjF2h5T0mdJyfGAmF78QmeKdbBXbjLQ= | |||
| gitlink.org.cn/JointCloud/pcm-openstack v0.0.0-20240403033338-e7edabad4203 h1:s6PsZ1+bev294IWdZRlV7mnOwI1+UzFcldVW/BqhQzI= | |||
| @@ -484,8 +484,8 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.15 h1:fo0HpWz/KlHGMCC+YejpiCmyWDEuIpnTDzpJLB5 | |||
| go.etcd.io/etcd/client/pkg/v3 v3.5.15/go.mod h1:mXDI4NAOwEiszrHCb0aqfAYNCrZP4e9hRca3d1YK8EU= | |||
| go.etcd.io/etcd/client/v3 v3.5.15 h1:23M0eY4Fd/inNv1ZfU3AxrbbOdW79r9V9Rl62Nm6ip4= | |||
| go.etcd.io/etcd/client/v3 v3.5.15/go.mod h1:CLSJxrYjvLtHsrPKsy7LmZEE+DK2ktfd2bN4RhBMwlU= | |||
| go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4BQ4= | |||
| go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= | |||
| go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8= | |||
| go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= | |||
| go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= | |||
| go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= | |||
| go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= | |||
| @@ -570,8 +570,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | |||
| golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | |||
| golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | |||
| golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | |||
| golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= | |||
| golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= | |||
| golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= | |||
| golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= | |||
| golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
| golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
| golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
| @@ -619,8 +619,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr | |||
| golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | |||
| golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | |||
| golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= | |||
| golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= | |||
| golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= | |||
| golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= | |||
| golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= | |||
| golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
| golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
| golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
| @@ -686,16 +686,16 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | |||
| golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | |||
| golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | |||
| golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | |||
| golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= | |||
| golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | |||
| golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= | |||
| golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | |||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | |||
| golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= | |||
| golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= | |||
| golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= | |||
| golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= | |||
| golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= | |||
| golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= | |||
| golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= | |||
| golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= | |||
| golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= | |||
| golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | |||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | |||
| golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | |||
| @@ -706,8 +706,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= | |||
| golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | |||
| golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= | |||
| golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= | |||
| golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= | |||
| golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= | |||
| golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= | |||
| golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= | |||
| golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | |||
| golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | |||
| golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | |||
| @@ -819,10 +819,10 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc | |||
| google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= | |||
| google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= | |||
| google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= | |||
| google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed h1:3RgNmBoI9MZhsj3QxC+AP/qQhNwpCLOvYDYYsFrhFt0= | |||
| google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= | |||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg= | |||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= | |||
| google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= | |||
| google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= | |||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= | |||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= | |||
| google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= | |||
| google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= | |||
| google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= | |||
| @@ -902,10 +902,10 @@ k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= | |||
| k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= | |||
| k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= | |||
| k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= | |||
| k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= | |||
| k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= | |||
| k8s.io/utils v0.0.0-20240821151609-f90d01438635 h1:2wThSvJoW/Ncn9TmQEYXRnevZXi2duqHWf5OX9S3zjI= | |||
| k8s.io/utils v0.0.0-20240821151609-f90d01438635/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= | |||
| k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo= | |||
| k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= | |||
| k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA= | |||
| k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= | |||
| rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= | |||
| rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= | |||
| rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= | |||
+ 150
- 5
internal/storeLink/modelarts.go
View File
| @@ -16,6 +16,7 @@ package storeLink | |||
| import ( | |||
| "context" | |||
| "fmt" | |||
| "github.com/pkg/errors" | |||
| "gitlink.org.cn/JointCloud/pcm-coordinator/internal/scheduler/schedulers/option" | |||
| "gitlink.org.cn/JointCloud/pcm-coordinator/internal/scheduler/service/collector" | |||
| @@ -30,6 +31,7 @@ import ( | |||
| "mime/multipart" | |||
| "strconv" | |||
| "strings" | |||
| "sync" | |||
| "time" | |||
| ) | |||
| @@ -45,6 +47,59 @@ type ModelArtsLink struct { | |||
| participantId int64 | |||
| pageIndex int32 | |||
| pageSize int32 | |||
| SourceLocation string | |||
| Version string | |||
| ModelId string | |||
| } | |||
| // Version 结构体表示版本号 | |||
| type Version struct { | |||
| Major, Minor, Patch int | |||
| } | |||
| // ParseVersion 从字符串解析版本号 | |||
| func ParseVersion(versionStr string) (*Version, error) { | |||
| parts := strings.Split(versionStr, ".") | |||
| if len(parts) != 3 { | |||
| return nil, fmt.Errorf("invalid version format: %s", versionStr) | |||
| } | |||
| major, err := strconv.Atoi(parts[0]) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| minor, err := strconv.Atoi(parts[1]) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| patch, err := strconv.Atoi(parts[2]) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| return &Version{Major: major, Minor: minor, Patch: patch}, nil | |||
| } | |||
| // Increment 根据给定规则递增版本号 | |||
| func (v *Version) Increment() { | |||
| if v.Patch < 9 { | |||
| v.Patch++ | |||
| } else { | |||
| v.Patch = 0 | |||
| if v.Minor < 9 { | |||
| v.Minor++ | |||
| } else { | |||
| v.Minor = 0 | |||
| v.Major++ | |||
| } | |||
| } | |||
| } | |||
| // String 将版本号转换回字符串格式 | |||
| func (v *Version) String() string { | |||
| return fmt.Sprintf("%d.%d.%d", v.Major, v.Minor, v.Patch) | |||
| } | |||
| func NewModelArtsLink(modelArtsRpc modelartsservice.ModelArtsService, modelArtsImgRpc imagesservice.ImagesService, name string, id int64, nickname string) *ModelArtsLink { | |||
| @@ -260,6 +315,32 @@ func (m *ModelArtsLink) UploadAlgorithmCode(ctx context.Context, resourceType st | |||
| return nil | |||
| } | |||
| // Determine whether there is a necessary image in image management and query the image name based on the image name | |||
| func (m *ModelArtsLink) getSourceLocationFromImages(ctx context.Context, option *option.InferOption) error { | |||
| req := &modelarts.ListImagesReq{ | |||
| //Platform: m.platform, | |||
| Limit: m.pageIndex, | |||
| Offset: 10, | |||
| } | |||
| ListImagesResp, err := m.modelArtsRpc.ListImages(ctx, req) | |||
| if err != nil { | |||
| return err | |||
| } | |||
| if ListImagesResp.Code != 200 { | |||
| return errors.New("failed to get ListImages") | |||
| } | |||
| for _, ListImages := range ListImagesResp.Data { | |||
| if ListImages.Name == option.ModelName { | |||
| m.SourceLocation = ListImages.SwrPath | |||
| //m.Version = ListImages.Mo | |||
| return nil | |||
| } | |||
| } | |||
| return errors.New("SourceLocation not set") | |||
| } | |||
| // Get AI Application List | |||
| func (m *ModelArtsLink) GetModelId(ctx context.Context, option *option.InferOption) error { | |||
| req := &modelarts.ListModelReq{ | |||
| @@ -279,20 +360,74 @@ func (m *ModelArtsLink) GetModelId(ctx context.Context, option *option.InferOpti | |||
| for _, ListModel := range ListModelResp.Models { | |||
| if ListModel.ModelName == option.ModelName { | |||
| option.ModelId = ListModel.ModelId | |||
| m.Version = ListModel.ModelVersion | |||
| return nil | |||
| } | |||
| } | |||
| return nil | |||
| } | |||
| // 创建ai应用 | |||
| // Get AI Application List | |||
| func (m *ModelArtsLink) GetModelStatus(ctx context.Context, option *option.InferOption) error { | |||
| req := &modelarts.ShowModelReq{ | |||
| Platform: m.platform, | |||
| ModelId: option.ModelId, | |||
| } | |||
| ShowModelsResp, err := m.modelArtsRpc.ShowModels(ctx, req) | |||
| if err != nil { | |||
| return err | |||
| } | |||
| if ShowModelsResp.Code != 200 { | |||
| return errors.New("failed to get ListModels") | |||
| } | |||
| ModelStatus := ShowModelsResp.ShowModelDetail.ModelStatus | |||
| var wg sync.WaitGroup | |||
| wg.Add(1) | |||
| //model := MyModel{Status: "draft"} | |||
| // 使用goroutine进行轮询 | |||
| go func() { | |||
| defer wg.Done() | |||
| for { | |||
| status := ModelStatus | |||
| if status == "published" { | |||
| fmt.Println("Model is now published.") | |||
| break // 一旦状态变为published，就退出循环 | |||
| } | |||
| fmt.Println("Waiting for model to be published...") | |||
| time.Sleep(2 * time.Second) // 等待一段时间后再次检查 | |||
| } | |||
| }() | |||
| // 等待goroutine完成 | |||
| wg.Wait() | |||
| // 在这里执行模型状态为published后需要进行的操作 | |||
| fmt.Println("Continuing with the program...") | |||
| return nil | |||
| } | |||
| // Create an AI application | |||
| func (m *ModelArtsLink) CreateModel(ctx context.Context, option *option.InferOption) error { | |||
| //Before creating an AI application, check if there are any images that can be created | |||
| err := m.getSourceLocationFromImages(ctx, option) | |||
| if err != nil { // | |||
| return errors.New("No image available for creationd") | |||
| } | |||
| version, err := ParseVersion(m.Version) | |||
| version.Increment() | |||
| req := &modelarts.CreateModelReq{ | |||
| Platform: m.platform, | |||
| ModelName: option.ModelName, | |||
| ModelType: "PyTorch", | |||
| ModelVersion: "0.0.1", | |||
| SourceLocation: "", | |||
| ModelType: "Image", | |||
| ModelVersion: version.String(), | |||
| SourceLocation: m.SourceLocation, | |||
| } | |||
| ModelResp, err := m.modelArtsRpc.CreateModel(ctx, req) | |||
| if err != nil { | |||
| @@ -609,7 +744,17 @@ func (m *ModelArtsLink) GetInferResult(ctx context.Context, url string, file mul | |||
| func (m *ModelArtsLink) CreateInferDeployInstance(ctx context.Context, option *option.InferOption) (string, error) { | |||
| err := m.CreateModel(ctx, option) | |||
| err := m.GetModelId(ctx, option) | |||
| if err != nil { | |||
| return "", err | |||
| } | |||
| err = m.CreateModel(ctx, option) | |||
| if err != nil { | |||
| return "", err | |||
| } | |||
| err = m.GetModelStatus(ctx, option) | |||
| if err != nil { | |||
| return "", err | |||
| } | |||