Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
1071e17626 | ||
|
c9fd7a730a | ||
|
01ecaf95fe |
@ -327,7 +327,6 @@ type ProcessResponse struct {
|
|||||||
// ListModelResponse is a single model description in [ListResponse].
|
// ListModelResponse is a single model description in [ListResponse].
|
||||||
type ListModelResponse struct {
|
type ListModelResponse struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Model string `json:"model"`
|
|
||||||
ModifiedAt time.Time `json:"modified_at"`
|
ModifiedAt time.Time `json:"modified_at"`
|
||||||
Size int64 `json:"size"`
|
Size int64 `json:"size"`
|
||||||
Digest string `json:"digest"`
|
Digest string `json:"digest"`
|
||||||
@ -336,7 +335,6 @@ type ListModelResponse struct {
|
|||||||
|
|
||||||
// ProcessModelResponse is a single model description in [ProcessResponse].
|
// ProcessModelResponse is a single model description in [ProcessResponse].
|
||||||
type ProcessModelResponse struct {
|
type ProcessModelResponse struct {
|
||||||
Name string `json:"name"`
|
|
||||||
Model string `json:"model"`
|
Model string `json:"model"`
|
||||||
Size int64 `json:"size"`
|
Size int64 `json:"size"`
|
||||||
Digest string `json:"digest"`
|
Digest string `json:"digest"`
|
||||||
|
@ -526,7 +526,7 @@ func ListRunningHandler(cmd *cobra.Command, args []string) error {
|
|||||||
var data [][]string
|
var data [][]string
|
||||||
|
|
||||||
for _, m := range models.Models {
|
for _, m := range models.Models {
|
||||||
if len(args) == 0 || strings.HasPrefix(m.Name, args[0]) {
|
if len(args) == 0 || strings.HasPrefix(m.Model, args[0]) {
|
||||||
var procStr string
|
var procStr string
|
||||||
switch {
|
switch {
|
||||||
case m.SizeVRAM == 0:
|
case m.SizeVRAM == 0:
|
||||||
@ -540,7 +540,7 @@ func ListRunningHandler(cmd *cobra.Command, args []string) error {
|
|||||||
cpuPercent := math.Round(float64(sizeCPU) / float64(m.Size) * 100)
|
cpuPercent := math.Round(float64(sizeCPU) / float64(m.Size) * 100)
|
||||||
procStr = fmt.Sprintf("%d%%/%d%% CPU/GPU", int(cpuPercent), int(100-cpuPercent))
|
procStr = fmt.Sprintf("%d%%/%d%% CPU/GPU", int(cpuPercent), int(100-cpuPercent))
|
||||||
}
|
}
|
||||||
data = append(data, []string{m.Name, m.Digest[:12], format.HumanBytes(m.Size), procStr, format.HumanTime(m.ExpiresAt, "Never")})
|
data = append(data, []string{m.Model, m.Digest[:12], format.HumanBytes(m.Size), procStr, format.HumanTime(m.ExpiresAt, "Never")})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1086,7 +1086,6 @@ A single JSON object will be returned.
|
|||||||
{
|
{
|
||||||
"models": [
|
"models": [
|
||||||
{
|
{
|
||||||
"name": "mistral:latest",
|
|
||||||
"model": "mistral:latest",
|
"model": "mistral:latest",
|
||||||
"size": 5137025024,
|
"size": 5137025024,
|
||||||
"digest": "2ae6f6dd7a3dd734790bbbf58b8909a606e0e7e97e94b7604e0aa7ae4490e6d8",
|
"digest": "2ae6f6dd7a3dd734790bbbf58b8909a606e0e7e97e94b7604e0aa7ae4490e6d8",
|
||||||
|
@ -800,7 +800,6 @@ func (s *Server) ListModelsHandler(c *gin.Context) {
|
|||||||
|
|
||||||
// tag should never be masked
|
// tag should never be masked
|
||||||
models = append(models, api.ListModelResponse{
|
models = append(models, api.ListModelResponse{
|
||||||
Model: n.DisplayShortest(),
|
|
||||||
Name: n.DisplayShortest(),
|
Name: n.DisplayShortest(),
|
||||||
Size: m.Size(),
|
Size: m.Size(),
|
||||||
Digest: m.digest,
|
Digest: m.digest,
|
||||||
@ -1219,7 +1218,6 @@ func (s *Server) ProcessHandler(c *gin.Context) {
|
|||||||
|
|
||||||
mr := api.ProcessModelResponse{
|
mr := api.ProcessModelResponse{
|
||||||
Model: model.ShortName,
|
Model: model.ShortName,
|
||||||
Name: model.ShortName,
|
|
||||||
Size: int64(v.estimatedTotal),
|
Size: int64(v.estimatedTotal),
|
||||||
SizeVRAM: int64(v.estimatedVRAM),
|
SizeVRAM: int64(v.estimatedVRAM),
|
||||||
Digest: model.Digest,
|
Digest: model.Digest,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user