johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

AI: Refactor use of face embeddings, labels, and nsfw models #127 #1090

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-04-10 16:49:34 +02:00
parent ecef34a8da
commit caf3ae1ab5
52 changed files with 1040 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
internal/ai/vision/api_request.go
View File

@@ -2,39 +2,59 @@ package vision
import (
"encoding/json"
"path"
"fmt"
"os"
"strings"
"github.com/photoprism/photoprism/internal/api/download"
"github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/media"
"github.com/photoprism/photoprism/pkg/media/http/scheme"
"github.com/photoprism/photoprism/pkg/rnd"
)
const (
LabelsEndpoint = "labels"
)
type Files = []string
// ApiRequest represents a Vision API service request.
type ApiRequest struct {
Id string `form:"id" yaml:"Id,omitempty" json:"id,omitempty"`
Model string `form:"model" yaml:"Model,omitempty" json:"model,omitempty"`
Images []string `form:"images" yaml:"Images,omitempty" json:"images,omitempty"`
Videos []string `form:"videos" yaml:"Videos,omitempty" json:"videos,omitempty"`
Id string `form:"id" yaml:"Id,omitempty" json:"id,omitempty"`
Model string `form:"model" yaml:"Model,omitempty" json:"model,omitempty"`
Images Files `form:"images" yaml:"Images,omitempty" json:"images,omitempty"`
}
func NewClientRequest(model string, images []string) *ApiRequest {
imageUrls := make([]string, 0, len(images))
// NewClientRequest returns a new Vision API request with the specified file payload and scheme.
func NewClientRequest(images Files, fileScheme string) (*ApiRequest, error) {
imageUrls := make(Files, len(images))
if fileScheme == scheme.Https && !strings.HasPrefix(DownloadUrl, "https://") {
log.Tracef("vision: file request scheme changed from https to data because https is not configured")
fileScheme = scheme.Data
}
for i := range images {
if id, err := download.Register(images[i]); err != nil {
log.Errorf("vision: %s (register download)", err)
} else {
imageUrls = append(imageUrls, path.Join(DownloadUrl, id))
switch fileScheme {
case scheme.Https:
if id, err := download.Register(images[i]); err != nil {
return nil, fmt.Errorf("%s (register download)", err)
} else {
imageUrls[i] = fmt.Sprintf("%s/%s", DownloadUrl, id)
}
case scheme.Data:
if file, err := os.Open(images[i]); err != nil {
return nil, fmt.Errorf("%s (create data url)", err)
} else {
imageUrls[i] = media.DataUrl(file)
}
default:
return nil, fmt.Errorf("invalid file scheme %s", clean.Log(fileScheme))
}
}
return &ApiRequest{
Id: rnd.UUID(),
Model: "",
Images: imageUrls,
}
}, nil
}
// GetId returns the request ID string and generates a random ID if none was set.
@@ -48,5 +68,5 @@ func (r *ApiRequest) GetId() string {
// MarshalJSON returns request as JSON.
func (r *ApiRequest) MarshalJSON() ([]byte, error) {
return json.Marshal(r)
return json.Marshal(*r)
}