diff --git a/api/types.go b/api/types.go index 3fbc5829..5048d5b6 100644 --- a/api/types.go +++ b/api/types.go @@ -203,12 +203,22 @@ type GenerateResponse struct { CreatedAt time.Time `json:"created_at"` Response string `json:"response"` + ModelConfiguration ModelConfiguration `json:"model_configuration"` + Done bool `json:"done"` Context []int `json:"context,omitempty"` Metrics } +type ModelConfiguration struct { + ModelFormat string `json:"model_format"` + ModelFamily string `json:"model_family"` + ModelFamilies []string `json:"model_families"` + ModelType string `json:"model_type"` + FileType string `json:"file_type"` +} + func (m *Metrics) Summary() { if m.TotalDuration > 0 { fmt.Fprintf(os.Stderr, "total duration: %v\n", m.TotalDuration) diff --git a/server/images.go b/server/images.go index 67ddf1ad..687487c9 100644 --- a/server/images.go +++ b/server/images.go @@ -36,6 +36,7 @@ type RegistryOptions struct { type Model struct { Name string `json:"name"` + Config ConfigV2 ShortName string ModelPath string OriginalModel string @@ -137,16 +138,12 @@ type ManifestV2 struct { } type ConfigV2 struct { - ModelFormat string `json:"model_format"` - ModelFamily string `json:"model_family"` - ModelFamilies []string `json:"model_families"` - ModelType string `json:"model_type"` - FileType string `json:"file_type"` - RootFS RootFS `json:"rootfs"` - // required by spec Architecture string `json:"architecture"` OS string `json:"os"` + RootFS RootFS `json:"rootfs"` + + api.ModelConfiguration } func (c *ConfigV2) SetModelFormat(format string) { @@ -235,6 +232,21 @@ func GetModel(name string) (*Model, error) { License: []string{}, } + filename, err := GetBlobsPath(manifest.Config.Digest) + if err != nil { + return nil, err + } + + configFile, err := os.Open(filename) + if err != nil { + return nil, err + } + defer configFile.Close() + + if err := json.NewDecoder(configFile).Decode(&model.Config); err != nil { + return nil, err + } + for _, layer := range manifest.Layers { filename, err := GetBlobsPath(layer.Digest) if err != nil { diff --git a/server/routes.go b/server/routes.go index d367045b..2259672f 100644 --- a/server/routes.go +++ b/server/routes.go @@ -198,7 +198,11 @@ func GenerateHandler(c *gin.Context) { // an empty request loads the model if req.Prompt == "" && req.Template == "" && req.System == "" { - c.JSON(http.StatusOK, api.GenerateResponse{CreatedAt: time.Now().UTC(), Model: req.Model, Done: true}) + c.JSON(http.StatusOK, api.GenerateResponse{ + CreatedAt: time.Now().UTC(), + Model: req.Model, + ModelConfiguration: model.Config.ModelConfiguration, + Done: true}) return } @@ -257,10 +261,11 @@ func GenerateHandler(c *gin.Context) { } resp := api.GenerateResponse{ - Model: r.Model, - CreatedAt: r.CreatedAt, - Done: r.Done, - Response: r.Content, + Model: r.Model, + ModelConfiguration: model.Config.ModelConfiguration, + CreatedAt: r.CreatedAt, + Done: r.Done, + Response: r.Content, Metrics: api.Metrics{ TotalDuration: r.TotalDuration, LoadDuration: r.LoadDuration,