feat(graph): expand thumbnails on search hits

Honor $expand=thumbnails on POST /v1beta1/search/query: hits whose
resource has a preview (unconditional mimetypes, or embedded cover art
signalled by the indexed preview dimensions) carry a thumbnails set with
small/medium/large URLs plus an exact-size source thumbnail. Source
dimensions come from the index (oc.preview for embedded previews, the
image facet for images) instead of a stat, so no extra gateway calls are
needed. Also catches the search test stub up with the streaming
IndexSpace signature.

Author: claude

services/graph/pkg/service/v0/searchquery.go

@@ -20,6 +20,7 @@ import (
 	searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/search/v0"
 	"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
 	"github.com/opencloud-eu/opencloud/services/search/pkg/search"
+	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail"
 )
 
 // SearchQuery runs the search requests and returns results grouped by request
@@ -48,9 +49,11 @@ func (g Graph) SearchQuery(w http.ResponseWriter, r *http.Request) {
 	ctx := revaCtx.ContextSetToken(r.Context(), th)
 	ctx = metadata.Set(ctx, revaCtx.TokenHeader, th)
 
+	expandThumbnails := shouldExpand(r, "thumbnails")
+
 	responses := make([]libregraph.SearchResponse, 0, len(req.Requests))
 	for _, sr := range req.Requests {
-		sresp, err := g.runSingleSearch(ctx, sr)
+		sresp, err := g.runSingleSearch(ctx, sr, expandThumbnails)
 		if err != nil {
 			g.renderSearchError(w, r, err)
 			return
@@ -62,7 +65,7 @@ func (g Graph) SearchQuery(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, libregraph.SearchQuery200Response{Value: responses})
 }
 
-func (g Graph) runSingleSearch(ctx context.Context, sr libregraph.SearchRequest) (libregraph.SearchResponse, error) {
+func (g Graph) runSingleSearch(ctx context.Context, sr libregraph.SearchRequest, expandThumbnails bool) (libregraph.SearchResponse, error) {
 	from, size := clampPagination(sr.From, sr.Size)
 
 	// The gRPC layer has no from field: request from+size matches and slice
@@ -86,7 +89,7 @@ func (g Graph) runSingleSearch(ctx context.Context, sr libregraph.SearchRequest)
 		start := min(int(from), len(rsp.Matches))
 		end := min(start+int(size), len(rsp.Matches))
 		for i := start; i < end; i++ {
-			hits = append(hits, matchToSearchHit(rsp.Matches[i], int32(i+1)))
+			hits = append(hits, g.matchToSearchHit(rsp.Matches[i], int32(i+1), expandThumbnails))
 		}
 	}
 
@@ -305,7 +308,7 @@ func (g Graph) renderSearchError(w http.ResponseWriter, r *http.Request, err err
 	}
 }
 
-func matchToSearchHit(m *searchmsg.Match, rank int32) libregraph.SearchHit {
+func (g Graph) matchToSearchHit(m *searchmsg.Match, rank int32, expandThumbnails bool) libregraph.SearchHit {
 	hit := libregraph.SearchHit{
 		HitId: libregraph.PtrString(searchEntityHitID(m.GetEntity())),
 		Rank:  &rank,
@@ -314,10 +317,34 @@ func matchToSearchHit(m *searchmsg.Match, rank int32) libregraph.SearchHit {
 		hit.Summary = libregraph.PtrString(h)
 	}
 	di := searchEntityToDriveItem(m.GetEntity())
+	if expandThumbnails {
+		if set := searchEntityThumbnailSet(m.GetEntity(), g.config.Commons.OpenCloudURL); set != nil {
+			di.SetThumbnails([]libregraph.ThumbnailSet{*set})
+		}
+	}
 	hit.Resource = di
 	return hit
 }
 
+// searchEntityThumbnailSet is previewThumbnailSet for search hits: preview
+// presence and source dimensions come from the index instead of a stat.
+func searchEntityThumbnailSet(e *searchmsg.Entity, baseURL string) *libregraph.ThumbnailSet {
+	if !thumbnail.HasPreviewForMimeType(e.GetMimeType(), e.GetPreview() != nil) {
+		return nil
+	}
+	w, h := searchEntitySourceDimensions(e)
+	return buildThumbnailSet(previewBaseURL(baseURL, searchEntityHitID(e)), w, h)
+}
+
+// searchEntitySourceDimensions mirrors previewSourceDimensions on index data:
+// audio cover art from the indexed preview, images from the image facet.
+func searchEntitySourceDimensions(e *searchmsg.Entity) (int32, int32) {
+	if p := e.GetPreview(); p.GetWidth() > 0 && p.GetHeight() > 0 {
+		return p.GetWidth(), p.GetHeight()
+	}
+	return e.GetImage().GetWidth(), e.GetImage().GetHeight()
+}
+
 func searchEntityHitID(e *searchmsg.Entity) string {
 	return storagespace.FormatResourceID(&storageprovider.ResourceId{
 		StorageId: e.GetId().GetStorageId(),

services/graph/pkg/service/v0/searchquery_test.go

@@ -14,7 +14,10 @@ import (
 	"go-micro.dev/v4/client"
 
 	"github.com/opencloud-eu/opencloud/pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/shared"
+	searchmsg "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/messages/search/v0"
 	searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/search/v0"
+	"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
 )
 
 type stubSearchService struct {
@@ -25,20 +28,25 @@ func (s stubSearchService) Search(_ context.Context, req *searchsvc.SearchReques
 	return s.search(req)
 }
 
-func (s stubSearchService) IndexSpace(_ context.Context, _ *searchsvc.IndexSpaceRequest, _ ...client.CallOption) (*searchsvc.IndexSpaceResponse, error) {
+func (s stubSearchService) IndexSpace(_ context.Context, _ *searchsvc.IndexSpaceRequest, _ ...client.CallOption) (searchsvc.SearchProvider_IndexSpaceService, error) {
 	return nil, nil
 }
 
 func graphWithSearch(stub stubSearchService) Graph {
 	logger := log.NewLogger()
+	cfg := &config.Config{Commons: &shared.Commons{OpenCloudURL: "https://cloud.example"}}
 	return Graph{
-		BaseGraphService: BaseGraphService{logger: &logger},
+		BaseGraphService: BaseGraphService{logger: &logger, config: cfg},
 		searchService:    stub,
 	}
 }
 
 func postSearchQuery(g Graph, body string) *httptest.ResponseRecorder {
-	req := httptest.NewRequest(http.MethodPost, "/search/query", bytes.NewBufferString(body))
+	return postSearchQueryTarget(g, "/search/query", body)
+}
+
+func postSearchQueryTarget(g Graph, target, body string) *httptest.ResponseRecorder {
+	req := httptest.NewRequest(http.MethodPost, target, bytes.NewBufferString(body))
 	req.Header.Set("Content-Type", "application/json")
 	rr := httptest.NewRecorder()
 	g.SearchQuery(rr, req)
@@ -164,4 +172,83 @@ var _ = ginkgo.Describe("SearchQuery", func() {
 		Expect(rr.Code).To(Equal(http.StatusOK), rr.Body.String())
 		Expect(called).To(BeTrue())
 	})
+
+	ginkgo.It("expands thumbnails on hits when $expand=thumbnails is requested", func() {
+		coverW, coverH := int32(500), int32(500)
+		g := graphWithSearch(stubSearchService{
+			search: func(*searchsvc.SearchRequest) (*searchsvc.SearchResponse, error) {
+				return &searchsvc.SearchResponse{
+					TotalMatches: 3,
+					Matches: []*searchmsg.Match{
+						{Entity: &searchmsg.Entity{
+							Id:       &searchmsg.ResourceID{StorageId: "s", SpaceId: "sp", OpaqueId: "audio-with-cover"},
+							Name:     "song.flac",
+							MimeType: "audio/flac",
+							Preview:  &searchmsg.Preview{Width: &coverW, Height: &coverH},
+						}},
+						{Entity: &searchmsg.Entity{
+							Id:       &searchmsg.ResourceID{StorageId: "s", SpaceId: "sp", OpaqueId: "audio-plain"},
+							Name:     "plain.flac",
+							MimeType: "audio/flac",
+						}},
+						{Entity: &searchmsg.Entity{
+							Id:       &searchmsg.ResourceID{StorageId: "s", SpaceId: "sp", OpaqueId: "image"},
+							Name:     "pic.png",
+							MimeType: "image/png",
+							Image:    &searchmsg.Image{Width: int32Ptr(1024), Height: int32Ptr(768)},
+						}},
+					},
+				}, nil
+			},
+		})
+
+		body := `{"requests": [{"entityTypes": ["driveItem"], "query": {"queryString": "*"}}]}`
+
+		rr := postSearchQueryTarget(g, "/search/query?$expand=thumbnails", body)
+		Expect(rr.Code).To(Equal(http.StatusOK), rr.Body.String())
+
+		var resp struct {
+			Value []struct {
+				HitsContainers []struct {
+					Hits []struct {
+						Resource struct {
+							Name       string `json:"name"`
+							Thumbnails []struct {
+								Small  *struct{ Url string } `json:"small"`
+								Source *struct {
+									Url           string
+									Width, Height int32
+								} `json:"source"`
+							} `json:"thumbnails"`
+						} `json:"resource"`
+					} `json:"hits"`
+				} `json:"hitsContainers"`
+			} `json:"value"`
+		}
+		Expect(json.Unmarshal(rr.Body.Bytes(), &resp)).To(Succeed())
+		hits := resp.Value[0].HitsContainers[0].Hits
+		Expect(hits).To(HaveLen(3))
+
+		// audio with indexed cover art: thumbnails incl. exact-size source
+		withCover := hits[0].Resource
+		Expect(withCover.Thumbnails).To(HaveLen(1))
+		Expect(withCover.Thumbnails[0].Small.Url).To(ContainSubstring("https://cloud.example/dav/spaces/"))
+		Expect(withCover.Thumbnails[0].Source).NotTo(BeNil())
+		Expect(withCover.Thumbnails[0].Source.Width).To(Equal(int32(500)))
+
+		// audio without indexed cover art: no preview, no thumbnails
+		Expect(hits[1].Resource.Thumbnails).To(BeEmpty())
+
+		// image: unconditional preview, source dimensions from the image facet
+		image := hits[2].Resource
+		Expect(image.Thumbnails).To(HaveLen(1))
+		Expect(image.Thumbnails[0].Source).NotTo(BeNil())
+		Expect(image.Thumbnails[0].Source.Width).To(Equal(int32(1024)))
+		Expect(image.Thumbnails[0].Source.Height).To(Equal(int32(768)))
+
+		// without $expand the hits stay bare
+		rr = postSearchQueryTarget(g, "/search/query", body)
+		Expect(rr.Code).To(Equal(http.StatusOK), rr.Body.String())
+		Expect(rr.Body.String()).NotTo(ContainSubstring("thumbnails"))
+	})
 })

services/graph/pkg/service/v0/thumbnails.go

@@ -48,16 +48,23 @@ func previewThumbnailSet(res *provider.ResourceInfo, baseURL string) *libregraph
 	if !thumbnail.HasPreview(res) {
 		return nil
 	}
+	w, h := previewSourceDimensions(res)
+	return buildThumbnailSet(previewBaseURL(baseURL, storagespace.FormatResourceID(res.GetId())), w, h)
+}
 
-	base := fmt.Sprintf("%s/dav/spaces/%s?scalingup=0&preview=1&processor=thumbnail",
-		baseURL, storagespace.FormatResourceID(res.GetId()))
+func previewBaseURL(baseURL, resourceID string) string {
+	return fmt.Sprintf("%s/dav/spaces/%s?scalingup=0&preview=1&processor=thumbnail", baseURL, resourceID)
+}
 
+// buildThumbnailSet assembles the small/medium/large thumbnails plus, when the
+// source dimensions are known, the exact-size source thumbnail.
+func buildThumbnailSet(base string, w, h int32) *libregraph.ThumbnailSet {
 	set := &libregraph.ThumbnailSet{
 		Small:  previewThumbnail(base, thumbnailBoxSmall),
 		Medium: previewThumbnail(base, thumbnailBoxMedium),
 		Large:  previewThumbnail(base, thumbnailBoxLarge),
 	}
-	if w, h := previewSourceDimensions(res); w > 0 && h > 0 {
+	if w > 0 && h > 0 {
 		url := fmt.Sprintf("%s&x=%d&y=%d", base, w, h)
 		set.Source = &libregraph.Thumbnail{Url: &url, Width: &w, Height: &h}
 	}