[Feat] ✨ Unified Entrance of Web Services

README.md

@@ -49,9 +49,12 @@
 > 查看文档 [**>>> 🚧 正在施工中 <<<**]()
 
 
-
 ## 📌 效果展示
 
+### 视频演示
+
+[Bilibili - MEGREZ——你的新一代开源GPU管理系统](https://www.bilibili.com/video/BV1EnfWY9ECC/)
+
 ### 登录注册
 
 |           登录            |              注册              |

frontend/src/views/admin/Instances.vue

@@ -70,12 +70,11 @@
               :href="'http://' + data.code_server_address" target="_blank" v-tooltip.top="'VSCode Web'" />
             <Button v-else icon="pi pi-code" aria-label="Filter" v-tooltip.top="'VSCode Web'" disabled />
             <Button v-if="data.status == statusRunning" severity="info" icon="pi pi-inbox" aria-label="Filter" as="a"
-              :href="'http://' + data.jupyter_address + '/lab'" target="_blank" v-tooltip.top="'Jupter Lab'" />
+              :href="'http://' + data.jupyter_address" target="_blank" v-tooltip.top="'Jupyter Lab'" />
-            <Button v-else severity="info" icon="pi pi-inbox" aria-label="Filter" v-tooltip.top="'Jupter Lab'"
+            <Button v-else severity="info" icon="pi pi-inbox" aria-label="Filter" v-tooltip.top="'Jupyter Lab'"
               disabled />
             <Button v-if="data.status == statusRunning" severity="contrast" icon="pi pi-chart-bar" as="a"
-              :href="'http://' + data.grafana_address + '/public-dashboards/2c510f203876465ba76617510ce3e219'"
+              :href="'http://' + data.grafana_address" target="_blank" v-tooltip.top="'监控'" />
-              target="_blank" v-tooltip.top="'监控'" />
             <Button v-else severity="contrast" icon="pi pi-chart-bar" v-tooltip.top="'监控'" disabled />
             <Button v-if="!isAdmin" icon="pi pi-ellipsis-h" severity="secondary" aria-label="Bookmark"
               @click="showMenu($event, data)" />
@@ -122,13 +121,13 @@
         </Fieldset>
         <Fieldset legend="GPU">
           <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.gpu_type }} * {{ instanceDetail.gpu_count
-            }}</span>
+          }}</span>
           <span v-else>无卡模式</span>
         </Fieldset>
         <div class="flex flex-col md:flex-row gap-4">
           <Fieldset class="flex flex-wrap gap-2 w-full" legend="CPU">
             <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.cpu_count_per_gpu * instanceDetail.gpu_count
-              }}
+            }}
               核</span>
             <span v-else>1 核</span>
           </Fieldset>

frontend/src/views/users/InstanceList.vue

@@ -74,12 +74,11 @@
               :href="'http://' + data.code_server_address" target="_blank" v-tooltip.top="'VSCode Web'" />
             <Button v-else icon="pi pi-code" aria-label="Filter" v-tooltip.top="'VSCode Web'" disabled />
             <Button v-if="data.status == statusRunning" severity="info" icon="pi pi-inbox" aria-label="Filter" as="a"
-              :href="'http://' + data.jupyter_address + '/lab'" target="_blank" v-tooltip.top="'Jupter Lab'" />
+              :href="'http://' + data.jupyter_address" target="_blank" v-tooltip.top="'Jupyter Lab'" />
-            <Button v-else severity="info" icon="pi pi-inbox" aria-label="Filter" v-tooltip.top="'Jupter Lab'"
+            <Button v-else severity="info" icon="pi pi-inbox" aria-label="Filter" v-tooltip.top="'Jupyter Lab'"
               disabled />
             <Button v-if="data.status == statusRunning" severity="contrast" icon="pi pi-chart-bar" as="a"
-              :href="'http://' + data.grafana_address + '/public-dashboards/2c510f203876465ba76617510ce3e219'"
+              :href="'http://' + data.grafana_address" target="_blank" v-tooltip.top="'监控'" />
-              target="_blank" v-tooltip.top="'监控'" />
             <Button v-else severity="contrast" icon="pi pi-chart-bar" v-tooltip.top="'监控'" disabled />
             <Button icon="pi pi-ellipsis-h" severity="secondary" aria-label="Bookmark"
               @click="showMenu($event, data)" />

routers/api/v1/admin/instance/forceDelete.go

@@ -38,6 +38,8 @@ func forceDeleteHandler(ctx iris.Context) {
 
 	if instance.FromAction == models.InstanceActionStop || instance.FromAction == models.InstanceActionPause || instance.FromAction == models.InstanceActionRestart {
 		redis.RawDB.IncrBy(ctx, "remain_gpu:server:"+strconv.Itoa(int(instance.ServerID)), int64(instance.GpuCount))
+	}
+	if instance.FromAction != models.InstanceActionCreate {
 		redis.RawDB.IncrBy(ctx, "remain_volume:server:"+strconv.Itoa(int(instance.ServerID)), int64(instance.VolumeSize+30))
 	}
 

routers/index/cors.go

@@ -0,0 +1,12 @@
+package index
+
+import "github.com/kataras/iris/v12"
+
+func cors(ctx iris.Context) {
+	ctx.Header("Access-Control-Allow-Origin", "*")
+	ctx.Header("Access-Control-Allow-Methods", "GET")
+	ctx.Header("Access-Control-Allow-Headers", "Content-Type, Authorization")
+	ctx.Header("Access-Control-Max-Age", "86400")
+	ctx.Header("Access-Control-Allow-Credentials", "true")
+	ctx.Next()
+}

routers/index/routers.go

@@ -5,6 +5,7 @@ import (
 )
 
 func InitIndex(app *iris.Application) {
+	app.Use(cors)
 	app.HandleDir("/", GetWebFS(), iris.DirOptions{
 		IndexName: "/index.html",
 		Compress:  true,

services/dispatcher/control.go

@@ -61,7 +61,7 @@ func control(serverID uint, data Data) (err error) {
 			if err != nil {
 				ctx := context.Background()
 				redis.RawDB.IncrBy(ctx, "remain_gpu:server:"+strconv.Itoa(int(serverID)), int64(instance.GpuCount))
-				database.DB.Model(&instance).Update("status", models.InstanceStatusFail).Update("from_action", models.InstanceActionRestart)
+				database.DB.Model(&instance).Update("status", models.InstanceStatusFail).Update("from_action", models.InstanceActionStart)
 				lc.Error("instance restart error: %v", err)
 				return
 			}

services/dispatcher/modify.go

@@ -61,7 +61,6 @@ func modify(serverID uint, data Data) (err error) {
 	err = instanceController.Patch(&instance, gpuCount, volumeSize, data.CpuOnly)
 	if err != nil {
 		ctx := context.Background()
-		redis.RawDB.IncrBy(ctx, "remain_gpu:server:"+strconv.Itoa(int(serverID)), int64(gpuCount))
 		redis.RawDB.IncrBy(ctx, "remain_volume:server:"+strconv.Itoa(int(serverID)), int64(volumeSize-oldVolumeSize))
 		database.DB.Model(&instance).Update("status", models.InstanceStatusFail).Update("from_action", models.InstanceActionModify)
 		lc.Error("patch instance error: %v", err)

services/instanceController/create.go

@@ -48,7 +48,7 @@ func Create(instance *models.Instances) (containerName, volumeName string, err e
 	}
 
 	go func() {
-		SetJupterPassword(server.IP, server.Port, server.Apikey, containerName, instance.SshPasswd)
+		SetJupyterPassword(server.IP, server.Port, server.Apikey, containerName, instance.SshPasswd)
 		SetCodeServerPassword(server.IP, server.Port, server.Apikey, containerName, instance.SshPasswd)
 	}()
 
@@ -64,9 +64,9 @@ func Create(instance *models.Instances) (containerName, volumeName string, err e
 
 	instance.SshAddress = server.IP + ":" + portBindings["22"]
 	instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-	instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
+	instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
-	instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
+	instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
-	instance.CodeServerAddress = server.IP + ":" + portBindings["8080"]
+	instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 	instance.Status = 0
 	result = database.DB.Save(&instance)

services/instanceController/createInstance.go

@@ -40,14 +40,13 @@ func createInstance(ip string, port int, apikey string,
 		Memory:         strconv.Itoa(memorySize) + "GB",
 		ContainerPorts: []string{
 			"22",    // SSH
+			"80",    // Nginx
 			"6007",  // TensorBoard
-			"8888",  // Jupyter Notebook
-			"3000",  // Grafana
-			"8080",  // Code-Server
 			"34567", // Custom Port
 		},
 		Env: []string{
 			"NVIDIA_DRIVER_CAPABILITIES=video,compute,utility",
+			"NVIDIA_VISIBLE_DEVICES=none",
 		},
 	}
 
@@ -63,7 +62,7 @@ func createInstance(ip string, port int, apikey string,
 	if config.GetSystemMountDir() != "" {
 		data.Binds = append(data.Binds, bindStruct{
 			Src:  config.GetSystemMountDir(),
-			Dest: "/root/megrez",
+			Dest: "/root/megrez-pub",
 		})
 	}
 

services/instanceController/execute.go

@@ -57,9 +57,9 @@ func SetRootPassword(ip string, port int, apikey string,
 	return nil
 }
 
-func SetJupterPassword(ip string, port int, apikey string,
+func SetJupyterPassword(ip string, port int, apikey string,
 	containerName, password string) (err error) {
-	l.SetFunction("SetJupterPassword")
+	l.SetFunction("SetJupyterPassword")
 
 	// Set Jupyter Password
 	data := executeReq{
@@ -85,8 +85,8 @@ func SetJupterPassword(ip string, port int, apikey string,
 	c.Do()
 
 	if c.GetStatusCode() != 200 {
-		l.Error("set jupter password error: %d", c.GetStatusCode())
+		l.Error("set jupyter password error: %d", c.GetStatusCode())
-		return errors.New("set jupter password request error")
+		return errors.New("set jupyter password request error")
 	}
 
 	var res resStruct
@@ -97,7 +97,7 @@ func SetJupterPassword(ip string, port int, apikey string,
 	}
 
 	if res.Code != 200 {
-		l.Error("set jupter password code: %d, error: %s", res.Code, res.Msg)
+		l.Error("set jupyter password code: %d, error: %s", res.Code, res.Msg)
 		return errors.New(res.Msg)
 	}
 
@@ -124,8 +124,8 @@ func SetJupterPassword(ip string, port int, apikey string,
 	c.Do()
 
 	if c.GetStatusCode() != 200 {
-		l.Error("restart jupter error: %d", c.GetStatusCode())
+		l.Error("restart jupyter error: %d", c.GetStatusCode())
-		return errors.New("restart jupter request error")
+		return errors.New("restart jupyter request error")
 	}
 
 	err = json.Unmarshal(c.GetBody(), &res)
@@ -135,7 +135,7 @@ func SetJupterPassword(ip string, port int, apikey string,
 	}
 
 	if res.Code != 200 {
-		l.Error("restart jupter code: %d, error: %s", res.Code, res.Msg)
+		l.Error("restart jupyter code: %d, error: %s", res.Code, res.Msg)
 		return errors.New(res.Msg)
 	}
 

services/instanceController/patch.go

@@ -87,16 +87,12 @@ func Patch(instance *models.Instances, gpuCount, volumeSize int, cpuOnly bool) (
 
 		err = SetRootPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 		if err != nil {
-			deleteInstance(server.IP, server.Port, server.Apikey, instance.ContainerName)
-			if instance.VolumeName != "" {
-				deleteVolume(server.IP, server.Port, server.Apikey, instance.VolumeName, false)
-			}
 			l.Error("set root password error: %v", err)
 			return err
 		}
 
 		go func() {
-			SetJupterPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
+			SetJupyterPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 			SetCodeServerPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 		}()
 
@@ -108,8 +104,9 @@ func Patch(instance *models.Instances, gpuCount, volumeSize int, cpuOnly bool) (
 
 		instance.SshAddress = server.IP + ":" + portBindings["22"]
 		instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-		instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
+		instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
-		instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
+		instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
+		instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 		instance.CpuOnly = true
 		instance.GpuCount = 0
@@ -135,16 +132,12 @@ func Patch(instance *models.Instances, gpuCount, volumeSize int, cpuOnly bool) (
 
 	err = SetRootPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 	if err != nil {
-		deleteInstance(server.IP, server.Port, server.Apikey, instance.ContainerName)
-		if instance.VolumeName != "" {
-			deleteVolume(server.IP, server.Port, server.Apikey, instance.VolumeName, false)
-		}
 		l.Error("set root password error: %v", err)
 		return err
 	}
 
 	go func() {
-		SetJupterPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
+		SetJupyterPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 		SetCodeServerPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 	}()
 
@@ -156,9 +149,9 @@ func Patch(instance *models.Instances, gpuCount, volumeSize int, cpuOnly bool) (
 
 	instance.SshAddress = server.IP + ":" + portBindings["22"]
 	instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-	instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
+	instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
-	instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
+	instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
-	instance.CodeServerAddress = server.IP + ":" + portBindings["8080"]
+	instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 	instance.CpuOnly = false
 	instance.GpuCount = gpuCount

services/instanceController/restart.go

@@ -40,16 +40,12 @@ func Restart(instance *models.Instances) (err error) {
 
 	err = SetRootPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 	if err != nil {
-		deleteInstance(server.IP, server.Port, server.Apikey, instance.ContainerName)
-		if instance.VolumeName != "" {
-			deleteVolume(server.IP, server.Port, server.Apikey, instance.VolumeName, false)
-		}
 		l.Error("set root password error: %v", err)
 		return err
 	}
 
 	go func() {
-		SetJupterPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
+		SetJupyterPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 		SetCodeServerPassword(server.IP, server.Port, server.Apikey, instance.ContainerName, instance.SshPasswd)
 	}()
 
@@ -61,9 +57,9 @@ func Restart(instance *models.Instances) (err error) {
 
 	instance.SshAddress = server.IP + ":" + portBindings["22"]
 	instance.TensorBoardAddress = server.IP + ":" + portBindings["6007"]
-	instance.JupyterAddress = server.IP + ":" + portBindings["8888"]
+	instance.JupyterAddress = server.IP + ":" + portBindings["80"] + "/jupyter"
-	instance.GrafanaAddress = server.IP + ":" + portBindings["3000"]
+	instance.GrafanaAddress = server.IP + ":" + portBindings["80"] + "/monitor/public-dashboards/2c510f203876465ba76617510ce3e219"
-	instance.CodeServerAddress = server.IP + ":" + portBindings["8080"]
+	instance.CodeServerAddress = server.IP + ":" + portBindings["80"] + "/code-server/"
 
 	instance.Status = models.InstanceStatusRunning
 	result = database.DB.Save(&instance)

services/system/init.go

@@ -7,6 +7,8 @@ import (
 	"megrez/services/database"
 )
 
+const imagesKey = "images"
+
 func systemInit() (err error) {
 	l.SetFunction("systemInit")
 
@@ -35,6 +37,16 @@ func systemInit() (err error) {
 		return
 	}
 
+	st := models.System{
+		Key:   imagesKey,
+		Value: "{}",
+	}
+	result = database.DB.Create(&st)
+	if result.Error != nil {
+		l.Error("Create system failed, Error: %v", result.Error)
+		return
+	}
+
 	l.Info("System init success")
 
 	return