Implemented uploadModel API

Issue-Id: AIMLFW-64

Change-Id: Ie3e6c9483234102e156a212cebea2db590ccd829
Signed-off-by: SANDEEP KUMAR JAISAWAL <s.jaisawal@samsung.com>

diff --git a/apis/mmes_apis.go b/apis/mmes_apis.go
index 56dc343..bb2cc31 100644 (file)
--- a/apis/mmes_apis.go
+++ b/apis/mmes_apis.go
@@ -18,7 +18,6 @@ limitations under the License.
 package apis
 
 import (
-       "bytes"
        "encoding/json"
        "fmt"
        "io"
@@ -43,12 +42,14 @@ func init() {
        router := gin.Default()
 
        router.GET("/getModelInfo", GetModelInfo)
-       router.POST("/createModel", CreateModel)
+       router.POST("/registerModel", RegisterModel)
+       router.MaxMultipartMemory = 8 << 20 //8 Mb
+       router.POST("/uploadModel/:modelName", UploadModel)
        router.Run(os.Getenv("MMES_URL"))
        fmt.Println("Started api server...")
 }
 
-func CreateModel(cont *gin.Context) {
+func RegisterModel(cont *gin.Context) {
        fmt.Println("Creating model...")
        bodyBytes, _ := io.ReadAll(cont.Request.Body)
 
@@ -61,16 +62,15 @@ func CreateModel(cont *gin.Context) {
        }
        fmt.Println(modelInfo.ModelName, modelInfo.RAppId, modelInfo.Metainfo)
 
-       //modelInfo.RAppId = "newRappId-1" Update Unmarshalled struct as per need
+       //Update Unmarshalled struct as per need, e.g. modelInfo.RAppId = "newRappId-1"
        //Need to convert struct to json to create a io.ReadSeeker instance
        //to insert in to a bucket as file/body
-       modelInfo_json, err := json.Marshal(modelInfo)
-       modelinfo_reader := bytes.NewReader(modelInfo_json) //bytes.Reader is type of io.ReadSeeker
+       modelInfoBytes, err := json.Marshal(modelInfo)
 
        //TODO Create singleton for s3_manager
        s3_manager := core.NewS3Manager()
        s3_manager.CreateBucket(modelInfo.ModelName)
-       s3_manager.UploadFile(modelinfo_reader, modelInfo.ModelName+"_info.json", modelInfo.ModelName)
+       s3_manager.UploadFile(modelInfoBytes, modelInfo.ModelName+"_info.json", modelInfo.ModelName)
 
        cont.JSON(http.StatusOK, gin.H{
                "code":    http.StatusOK,
@@ -95,6 +95,7 @@ func GetModelInfo(cont *gin.Context) {
 
        s3_manager := core.NewS3Manager()
        model_info := s3_manager.GetBucketObject(model_name+"_info.json", model_name)
+
        cont.JSON(http.StatusOK, gin.H{
                "code":    http.StatusOK,
                "message": string(model_info),
@@ -102,6 +103,25 @@ func GetModelInfo(cont *gin.Context) {
 
 }
 
+// API to upload the trained model in zip format
+func UploadModel(cont *gin.Context) {
+       fmt.Println("Uploading model API ...")
+       modelName := cont.Param("modelName")
+       //TODO convert multipart.FileHeader to []byted
+       fileHeader, _ := cont.FormFile("file")
+       file, _ := fileHeader.Open()
+       //TODO: Handle error response
+       defer file.Close()
+       byteFile, _ := io.ReadAll((file))
+
+       fmt.Println("Uploading model : ", modelName)
+       fmt.Println("Recieved file name :", fileHeader.Filename)
+
+       s3_manager := core.NewS3Manager()
+       s3_manager.UploadFile(byteFile, fileHeader.Filename, modelName)
+       cont.String(http.StatusOK, fmt.Sprintf("'%s' uploaded!", fileHeader.Filename))
+}
+
 func GetModel(cont *gin.Context) {
        fmt.Println("Fetching model")
        cont.IndentedJSON(http.StatusOK, " ")

diff --git a/core/s3_manager.go b/core/s3_manager.go
index de2e4a9..6e22e3e 100644 (file)
--- a/core/s3_manager.go
+++ b/core/s3_manager.go
@@ -120,12 +120,13 @@ func (s3manager *S3Manager) DeleteBucketObject(client *s3.S3, objectName string,
        return true
 }
 
-func (s3manager *S3Manager) UploadFile(data *bytes.Reader, file_name string, bucketName string) {
+func (s3manager *S3Manager) UploadFile(dataBytes [] byte, file_name string, bucketName string) {
 
+       dataReader := bytes.NewReader(dataBytes) //bytes.Reader is type of io.ReadSeeker
        params := &s3.PutObjectInput{
                Bucket: aws.String(bucketName),
                Key:    aws.String(file_name),
-               Body:   data,
+               Body:   dataReader,
        }
        _, err := s3manager.S3Client.PutObject(params)
        if err != nil {

diff --git a/main.go b/main.go
index 9192876..f984371 100644 (file)
--- a/main.go
+++ b/main.go
@@ -19,13 +19,11 @@ package main
 
 import (
        "fmt"
-
        "example.com/mmes/apis"
 )
 
 func main() {
        fmt.Println("Starting api..")
        mmes := &apis.MMESApis{}
-
        fmt.Println(mmes)
 }