Browse Source

新增token

pull/52/head
JeshuaRen 8 months ago
parent
commit
e888412c58
3 changed files with 31 additions and 22 deletions
  1. +8
    -2
      sdks/pcmscheduler/jobset.go
  2. +22
    -20
      sdks/pcmscheduler/models.go
  3. +1
    -0
      sdks/uploader/models.go

+ 8
- 2
sdks/pcmscheduler/jobset.go View File

@@ -120,7 +120,7 @@ type ScheduleData struct {
ClusterIDs []schsdk.ClusterID `json:"clusterIDs"` ClusterIDs []schsdk.ClusterID `json:"clusterIDs"`
} }


func (c *Client) CreateJob(req CreateJobReq) (*CreateJobResp, error) {
func (c *Client) CreateJob(req CreateJobReq, token string) (*CreateJobResp, error) {
targetUrl, err := url.JoinPath(c.baseURL, "/createTask") targetUrl, err := url.JoinPath(c.baseURL, "/createTask")
if err != nil { if err != nil {
return nil, err return nil, err
@@ -135,6 +135,9 @@ func (c *Client) CreateJob(req CreateJobReq) (*CreateJobResp, error) {


resp, err := http2.PostJSON(targetUrl, http2.RequestParam{ resp, err := http2.PostJSON(targetUrl, http2.RequestParam{
Body: req, Body: req,
Header: map[string]string{
"Authorization": token,
},
}) })
if err != nil { if err != nil {
return nil, err return nil, err
@@ -176,7 +179,7 @@ type DataScheduleResults struct {
Results []DataScheduleResult `json:"results"` Results []DataScheduleResult `json:"results"`
} }


func (c *Client) RunJob(req RunJobReq) error {
func (c *Client) RunJob(req RunJobReq, token string) error {
targetUrl, err := url.JoinPath(c.baseURL, "runTask") targetUrl, err := url.JoinPath(c.baseURL, "runTask")
if err != nil { if err != nil {
return err return err
@@ -184,6 +187,9 @@ func (c *Client) RunJob(req RunJobReq) error {


resp, err := http2.PostJSON(targetUrl, http2.RequestParam{ resp, err := http2.PostJSON(targetUrl, http2.RequestParam{
Body: req, Body: req,
Header: map[string]string{
"Authorization": token,
},
}) })
if err != nil { if err != nil {
return err return err


+ 22
- 20
sdks/pcmscheduler/models.go View File

@@ -376,40 +376,42 @@ func (d *DataBindingBase) Noop() {}
type DatasetBinding struct { type DatasetBinding struct {
serder.Metadata `union:"dataset"` serder.Metadata `union:"dataset"`
DataBindingBase DataBindingBase
Type string `json:"type"`
Name string `json:"name"`
ClusterIDs []schsdk.ClusterID `json:"clusterIDs"`
Description string `json:"description"`
Category string `json:"category"`
PackageID cdssdk.PackageID `json:"packageID"`
Type string `json:"type"`
Name string `json:"name"`
ClusterIDs []schsdk.ClusterID `json:"clusterIDs"`
Description string `json:"description"`
Category string `json:"category"`
PackageID cdssdk.PackageID `json:"packageID"`
RepositoryName string `json:"repositoryName"`
} }


type ModelBinding struct { type ModelBinding struct {
serder.Metadata `union:"model"` serder.Metadata `union:"model"`
DataBindingBase DataBindingBase
Type string `json:"type"`
Name string `json:"name"`
ClusterIDs []schsdk.ClusterID `json:"clusterIDs"`
Description string `json:"description"`
Category string `json:"category"`
ModelType string `json:"modelType"`
Env string `json:"env"`
Version string `json:"version"`
PackageID cdssdk.PackageID `json:"packageID"`
Type string `json:"type"`
Name string `json:"name"`
ClusterIDs []schsdk.ClusterID `json:"clusterIDs"`
Description string `json:"description"`
Category string `json:"category"`
ModelType string `json:"modelType"`
Env string `json:"env"`
Version string `json:"version"`
PackageID cdssdk.PackageID `json:"packageID"`
RepositoryName string `json:"repositoryName"`
} }


type CodeBinding struct { type CodeBinding struct {
serder.Metadata `union:"code"` serder.Metadata `union:"code"`
DataBindingBase DataBindingBase
Type string `json:"type"`
Name string `json:"name"`
//ClusterIDs []schsdk.ClusterID `json:"clusterIDs"`
Type string `json:"type"`
Name string `json:"name"`
ClusterID schsdk.ClusterID `json:"clusterID"` ClusterID schsdk.ClusterID `json:"clusterID"`
Description string `json:"description"` Description string `json:"description"`
ImageID schsdk.ImageID `json:"imageID"` ImageID schsdk.ImageID `json:"imageID"`
BootstrapObjectID cdssdk.ObjectID `json:"bootstrapObjectID"` BootstrapObjectID cdssdk.ObjectID `json:"bootstrapObjectID"`
//FilePath string `json:"filePath"`
PackageID cdssdk.PackageID `json:"packageID"`
PackageID cdssdk.PackageID `json:"packageID"`
// 当集群为openi的时候,需要传入分支
Branch string `json:"branch"`
} }


//type ImageBinding struct { //type ImageBinding struct {


+ 1
- 0
sdks/uploader/models.go View File

@@ -80,6 +80,7 @@ type BindingCluster struct {
BindingID DataID `gorm:"column:binding_id" json:"bindingID"` BindingID DataID `gorm:"column:binding_id" json:"bindingID"`
ClusterID ClusterID `gorm:"column:cluster_id" json:"clusterID"` ClusterID ClusterID `gorm:"column:cluster_id" json:"clusterID"`
Status string `gorm:"column:status" json:"status"` Status string `gorm:"column:status" json:"status"`
Param string `gorm:"column:param" json:"Param"`
JsonData string `gorm:"column:json_data" json:"jsonData"` JsonData string `gorm:"column:json_data" json:"jsonData"`
} }




Loading…
Cancel
Save