added basic support for text files

Author: 0xdeafcafe

services/airelay/internal/app/files.go

@@ -0,0 +1,78 @@
+package app
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"runtime"
+	"sync"
+
+	"github.com/0xdeafcafe/bloefish/services/airelay"
+	"github.com/0xdeafcafe/bloefish/services/fileupload"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+	"golang.org/x/sync/errgroup"
+)
+
+type downloadedFile struct {
+	fileupload.File
+	Content []byte
+}
+
+func (a *App) downloadFiles(ctx context.Context, owner *airelay.Actor, fileIDs []string) (map[string]*downloadedFile, error) {
+	if len(fileIDs) == 0 {
+		return map[string]*downloadedFile{}, nil
+	}
+
+	files, err := a.FileUploadService.GetManyFiles(ctx, &fileupload.GetManyFilesRequest{
+		FileIDs: fileIDs,
+		Owner: &fileupload.Actor{
+			Type:       fileupload.ActorType(owner.Type),
+			Identifier: owner.Identifier,
+		},
+		AllowDeleted:     false,
+		IncludeAccessURL: true,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	egGroup, egCtx := errgroup.WithContext(ctx)
+	egGroup.SetLimit(runtime.NumCPU() * 4)
+
+	client := http.Client{
+		Transport: otelhttp.NewTransport(http.DefaultTransport),
+	}
+	downloadedFiles := make(map[string]*downloadedFile, len(files.Files))
+	mu := sync.Mutex{}
+
+	for _, file := range files.Files {
+		egGroup.Go(func() error {
+			req, err := http.NewRequestWithContext(egCtx, http.MethodGet, *file.PresignedAccessURL, nil)
+			if err != nil {
+				return err
+			}
+
+			resp, err := client.Do(req)
+			if err != nil {
+				return err
+			}
+			defer resp.Body.Close()
+
+			content, err := io.ReadAll(resp.Body)
+			if err != nil {
+				return err
+			}
+
+			mu.Lock()
+			defer mu.Unlock()
+			downloadedFiles[file.ID] = &downloadedFile{
+				File:    *file,
+				Content: content,
+			}
+
+			return nil
+		})
+	}
+
+	return nil, nil
+}

services/airelay/internal/app/invoke_streaming_conversation_message.go

@@ -15,18 +15,41 @@ import (
 )
 
 func (a *App) InvokeStreamingConversationMessage(ctx context.Context, req *airelay.InvokeStreamingConversationMessageRequest) (*airelay.InvokeStreamingConversationMessageResponse, error) {
+	fileIDs := make([]string, 0, len(req.Messages))
+	for _, msg := range req.Messages {
+		fileIDs = append(fileIDs, msg.FileIDs...)
+	}
+
+	downloadedFiles, err := a.downloadFiles(ctx, req.Owner, fileIDs)
+	if err != nil {
+		return nil, err
+	}
+
 	messages := make([]relay.Message, len(req.Messages))
 	for i, msg := range req.Messages {
+		fileContent := ""
+
+		if len(msg.FileIDs) > 0 {
+			file := downloadedFiles[msg.FileIDs[0]]
+			if file == nil {
+				return nil, cher.New("file_not_found", cher.M{
+					"file_id": msg.FileIDs[0],
+				})
+			}
+
+			fileContent = fmt.Sprintf("\n\nFile name: %s\nFile content:\n%s", file.Name, string(file.Content))
+		}
+
 		switch msg.Owner.Type {
 		case airelay.ActorTypeBot:
 			messages[i] = relay.Message{
 				Role:    relay.RoleAssistant,
-				Content: msg.Content,
+				Content: msg.Content + fileContent,
 			}
 		case airelay.ActorTypeUser:
 			messages[i] = relay.Message{
 				Role:    relay.RoleUser,
-				Content: msg.Content,
+				Content: msg.Content + fileContent,
 			}
 		}
 	}

services/conversation/internal/app/create_conversation_message_reply.go

@@ -44,7 +44,7 @@ func (a *App) createConversationMessageReply(
 					Type:       airelay.ActorType(skillSet.Owner.Type),
 					Identifier: skillSet.Owner.Identifier,
 				},
-				FileIDs: []string{}, // Skill sets current can't have files
+				FileIDs: []string{}, // Skill sets currently can't have files
 				Content: fmt.Sprintf(
 					"Use the following instructions to guide your responses or to learn more context about the subject: %s",
 					skillSet.Prompt,
@@ -63,7 +63,7 @@ func (a *App) createConversationMessageReply(
 				Type:       airelay.ActorType(interaction.Owner.Type),
 				Identifier: interaction.Owner.Identifier,
 			},
-			FileIDs: []string{}, // TODO(afr): Handle files
+			FileIDs: interaction.FileIDs,
 			Content: interaction.MessageContent,
 		})
 	}

services/conversation/internal/app/generate_conversation_title.go

@@ -43,7 +43,7 @@ func (a *App) generateConversationTitle(
 			cmd.Interaction.MessageContent,
 		),
 		Owner:   cmd.Owner,
-		FileIDs: []string{},
+		FileIDs: []string{}, // Titles should not support files
 	}}
 
 	if cmd.UseStreaming {

services/fileupload/README.md

@@ -85,6 +85,49 @@ interface Response {
 }
 ```
 
+#### `get_many_files`
+
+Gets many files by ID.
+
+If `include_access_url` is set to `true`, then the `presigned_access_url` will be included in the response.
+
+If `access_url_expiry_seconds` is set to a number, then the `presigned_access_url` will expire after that many seconds. If it is set to `null`, then the URL will have a default expiry time of 15 minutes.
+
+If `allow_deleted` is `true` then deleted files will be included. If `false`, then if a deleted file is requested an error will be returned.
+
+If `owner` is provided it will filter the results to only include file owned by the specified user.
+
+**Contract**
+
+```typescript
+interface Request {
+	file_ids: string[];
+	owner: {
+		type: 'user';
+		identifier: string;
+	} | null;
+
+	allow_deleted: boolean | null;
+	include_access_url: boolean;
+	access_url_expiry_seconds: number | null;
+}
+
+interface Response {
+	files: {
+		id: string;
+		name: string;
+		size: number;
+		mime_type: string;
+		owner: {
+			type: 'user';
+			identifier: string;
+		};
+
+		presigned_access_url: string | null;
+	}[];
+}
+```
+
 
 ## Uploading to an upload url
 

services/fileupload/fileupload.go

@@ -8,6 +8,7 @@ type Service interface {
 	CreateUpload(ctx context.Context, req *CreateUploadRequest) (*CreateUploadResponse, error)
 	ConfirmUpload(ctx context.Context, req *ConfirmUploadRequest) error
 	GetFile(ctx context.Context, req *GetFileRequest) (*GetFileResponse, error)
+	GetManyFiles(ctx context.Context, req *GetManyFilesRequest) (*GetManyFilesResponse, error)
 }
 
 type ActorType string
@@ -21,6 +22,15 @@ type Actor struct {
 	Identifier string    `json:"identifier"`
 }
 
+type File struct {
+	ID                 string  `json:"id"`
+	Name               string  `json:"name"`
+	Size               int64   `json:"size"`
+	MIMEType           string  `json:"mime_type"`
+	Owner              *Actor  `json:"owner"`
+	PresignedAccessURL *string `json:"presigned_access_url"`
+}
+
 type CreateUploadRequest struct {
 	Name     string `json:"name"`
 	Size     int64  `json:"size"`
@@ -44,10 +54,17 @@ type GetFileRequest struct {
 }
 
 type GetFileResponse struct {
-	ID                 string  `json:"id"`
-	Name               string  `json:"name"`
-	Size               int64   `json:"size"`
-	MIMEType           string  `json:"mime_type"`
-	Owner              *Actor  `json:"owner"`
-	PresignedAccessURL *string `json:"presigned_access_url"`
+	File
+}
+
+type GetManyFilesRequest struct {
+	FileIDs                []string `json:"file_ids"`
+	Owner                  *Actor   `json:"owner"`
+	AllowDeleted           bool     `json:"allow_deleted"`
+	IncludeAccessURL       bool     `json:"include_access_url"`
+	AccessURLExpirySeconds *int     `json:"access_url_expiry_seconds"`
+}
+
+type GetManyFilesResponse struct {
+	Files []*File `json:"files"`
 }

services/fileupload/internal/app/app.go

@@ -2,7 +2,6 @@ package app
 
 import (
 	"context"
-	"time"
 
 	"github.com/0xdeafcafe/bloefish/libraries/cher"
 	"github.com/0xdeafcafe/bloefish/services/fileupload"
@@ -64,38 +63,3 @@ func (a *App) ConfirmUpload(ctx context.Context, req *fileupload.ConfirmUploadRe
 
 	return nil
 }
-
-func (a *App) GetFile(ctx context.Context, req *fileupload.GetFileRequest) (*fileupload.GetFileResponse, error) {
-	file, err := a.FileRepository.Get(ctx, req.FileID)
-	if err != nil {
-		return nil, err
-	}
-
-	var presignedAccessURL *string
-	if req.IncludeAccessURL {
-		expiry := time.Minute * 15
-		if req.AccessURLExpirySeconds != nil {
-			expirySeconds := *req.AccessURLExpirySeconds
-			expiry = time.Second * time.Duration(expirySeconds)
-		}
-
-		presignedURL, err := a.FileObjectService.CreatePresignedDownloadURL(ctx, file.ID, expiry)
-		if err != nil {
-			return nil, err
-		}
-
-		presignedAccessURL = &presignedURL
-	}
-
-	return &fileupload.GetFileResponse{
-		ID:       file.ID,
-		Name:     file.Name,
-		Size:     file.Size,
-		MIMEType: file.MIMEType,
-		Owner: &fileupload.Actor{
-			Type:       fileupload.ActorType(file.Owner.Type),
-			Identifier: file.Owner.Identifier,
-		},
-		PresignedAccessURL: presignedAccessURL,
-	}, nil
-}

services/fileupload/internal/app/get_file.go

@@ -0,0 +1,45 @@
+package app
+
+import (
+	"context"
+	"time"
+
+	"github.com/0xdeafcafe/bloefish/services/fileupload"
+)
+
+func (a *App) GetFile(ctx context.Context, req *fileupload.GetFileRequest) (*fileupload.GetFileResponse, error) {
+	file, err := a.FileRepository.Get(ctx, req.FileID)
+	if err != nil {
+		return nil, err
+	}
+
+	var presignedAccessURL *string
+	if req.IncludeAccessURL {
+		expiry := time.Minute * 15
+		if req.AccessURLExpirySeconds != nil {
+			expirySeconds := *req.AccessURLExpirySeconds
+			expiry = time.Second * time.Duration(expirySeconds)
+		}
+
+		presignedURL, err := a.FileObjectService.CreatePresignedDownloadURL(ctx, file.ID, expiry)
+		if err != nil {
+			return nil, err
+		}
+
+		presignedAccessURL = &presignedURL
+	}
+
+	return &fileupload.GetFileResponse{
+		File: fileupload.File{
+			ID:       file.ID,
+			Name:     file.Name,
+			Size:     file.Size,
+			MIMEType: file.MIMEType,
+			Owner: &fileupload.Actor{
+				Type:       fileupload.ActorType(file.Owner.Type),
+				Identifier: file.Owner.Identifier,
+			},
+			PresignedAccessURL: presignedAccessURL,
+		},
+	}, nil
+}