baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Separate ListResponse and ModelResponse for api/tags vs api/ps (#4842)

Browse source 
* Remove false time fields

* Struct Separation for List and Process

* Remove Marshaler
This commit is contained in:
royjhan 2024-06-06 10:11:45 -07:00 committed by GitHub
parent de5beb06b3
commit 4bf1da4944
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/client.go
View file

@ -355,8 +355,8 @@ func (c *Client) List(ctx context.Context) (*ListResponse, error) {
} }
// List running models. // List running models.
func (c *Client) ListRunning(ctx context.Context) (*ListResponse, error) { func (c *Client) ListRunning(ctx context.Context) (*ProcessResponse, error) {
var lr ListResponse var lr ProcessResponse
if err := c.do(ctx, http.MethodGet, "/api/ps", nil, &lr); err != nil { if err := c.do(ctx, http.MethodGet, "/api/ps", nil, &lr); err != nil {
return nil, err return nil, err
} }

26
api/types.go
View file

@ -282,19 +282,33 @@ type PushRequest struct {
// ListResponse is the response from [Client.List]. // ListResponse is the response from [Client.List].
type ListResponse struct { type ListResponse struct {
Models []ModelResponse `json:"models"` Models []ListModelResponse `json:"models"`
} }
// ModelResponse is a single model description in [ListResponse]. // ProcessResponse is the response from [Client.Process].
type ModelResponse struct { type ProcessResponse struct {
Models []ProcessModelResponse `json:"models"`
}
// ListModelResponse is a single model description in [ListResponse].
type ListModelResponse struct {
Name string `json:"name"` Name string `json:"name"`
Model string `json:"model"` Model string `json:"model"`
ModifiedAt time.Time `json:"modified_at,omitempty"` ModifiedAt time.Time `json:"modified_at"`
Size int64 `json:"size"` Size int64 `json:"size"`
Digest string `json:"digest"` Digest string `json:"digest"`
Details ModelDetails `json:"details,omitempty"` Details ModelDetails `json:"details,omitempty"`
ExpiresAt time.Time `json:"expires_at,omitempty"` }
SizeVRAM int64 `json:"size_vram,omitempty"`
// ProcessModelResponse is a single model description in [ProcessResponse].
type ProcessModelResponse struct {
Name string `json:"name"`
Model string `json:"model"`
Size int64 `json:"size"`
Digest string `json:"digest"`
Details ModelDetails `json:"details,omitempty"`
ExpiresAt time.Time `json:"expires_at"`
SizeVRAM int64 `json:"size_vram"`
} }
type TokenResponse struct { type TokenResponse struct {

12
server/routes.go
View file

@ -730,7 +730,7 @@ func (s *Server) ListModelsHandler(c *gin.Context) {
return return
} }
models := []api.ModelResponse{} models := []api.ListModelResponse{}
for n, m := range ms { for n, m := range ms {
f, err := m.Config.Open() f, err := m.Config.Open()
if err != nil { if err != nil {
@ -746,7 +746,7 @@ func (s *Server) ListModelsHandler(c *gin.Context) {
} }
// tag should never be masked // tag should never be masked
models = append(models, api.ModelResponse{ models = append(models, api.ListModelResponse{
Model: n.DisplayShortest(), Model: n.DisplayShortest(),
Name: n.DisplayShortest(), Name: n.DisplayShortest(),
Size: m.Size(), Size: m.Size(),
@ -762,7 +762,7 @@ func (s *Server) ListModelsHandler(c *gin.Context) {
}) })
} }
slices.SortStableFunc(models, func(i, j api.ModelResponse) int { slices.SortStableFunc(models, func(i, j api.ListModelResponse) int {
// most recently modified first // most recently modified first
return cmp.Compare(j.ModifiedAt.Unix(), i.ModifiedAt.Unix()) return cmp.Compare(j.ModifiedAt.Unix(), i.ModifiedAt.Unix())
}) })
@ -1139,7 +1139,7 @@ func streamResponse(c *gin.Context, ch chan any) {
} }
func (s *Server) ProcessHandler(c *gin.Context) { func (s *Server) ProcessHandler(c *gin.Context) {
models := []api.ModelResponse{} models := []api.ProcessModelResponse{}
for _, v := range s.sched.loaded { for _, v := range s.sched.loaded {
model := v.model model := v.model
@ -1151,7 +1151,7 @@ func (s *Server) ProcessHandler(c *gin.Context) {
QuantizationLevel: model.Config.FileType, QuantizationLevel: model.Config.FileType,
} }
mr := api.ModelResponse{ mr := api.ProcessModelResponse{
Model: model.ShortName, Model: model.ShortName,
Name: model.ShortName, Name: model.ShortName,
Size: int64(v.estimatedTotal), Size: int64(v.estimatedTotal),
@ -1171,7 +1171,7 @@ func (s *Server) ProcessHandler(c *gin.Context) {
models = append(models, mr) models = append(models, mr)
} }
c.JSON(http.StatusOK, api.ListResponse{Models: models}) c.JSON(http.StatusOK, api.ProcessResponse{Models: models})
} }
// ChatPrompt builds up a prompt from a series of messages for the currently `loaded` model // ChatPrompt builds up a prompt from a series of messages for the currently `loaded` model

2
server/routes_test.go
View file

@ -116,6 +116,8 @@ func Test_Routes(t *testing.T) {
body, err := io.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
require.NoError(t, err) require.NoError(t, err)
assert.NotContains(t, string(body), "expires_at")
var modelList api.ListResponse var modelList api.ListResponse
err = json.Unmarshal(body, &modelList) err = json.Unmarshal(body, &modelList)
require.NoError(t, err) require.NoError(t, err)