Skip to content

APP-14806: Update the how RDK handles MIME Type during File Upload #5636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gloriacai01 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

APP-14806: Update the how RDK handles MIME Type during File Upload #5636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23869cf
add string method
gloriacai01 Jan 2, 2026
daab336
set mime type metadata
gloriacai01 Jan 8, 2026
55581d5
bump api
gloriacai01 Jan 13, 2026
6d6303d
Merge branch 'main' of github.com:viamrobotics/rdk into app-14806
gloriacai01 Jan 14, 2026
ddfd721
fix lint
gloriacai01 Jan 14, 2026
be91235
pass test
gloriacai01 Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions data/collector_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,24 @@ const (
MimeTypeVideoMP4
)

// ToString converts the MimeType enum to the mime type string it represents.
func (mt MimeType) ToString() string {
switch mt {
case MimeTypeImageJpeg:
return rutils.MimeTypeJPEG
case MimeTypeImagePng:
return rutils.MimeTypePNG
case MimeTypeApplicationPcd:
return rutils.MimeTypePCD
case MimeTypeVideoMP4:
return rutils.MimeTypeVideoMP4
case MimeTypeUnspecified:
fallthrough
default:
return ""
}
}

// ToProto converts MimeType to datasyncPB.
func (mt MimeType) ToProto() datasyncPB.MimeType {
switch mt {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ require (
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
go.viam.com/api v0.1.503
go.viam.com/api v0.1.508
go.viam.com/test v1.2.4
go.viam.com/utils v0.4.3
goji.io v2.0.2+incompatible
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,8 +1122,8 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
go.viam.com/api v0.1.503 h1:/AEnTDD09RQuB8ExQQct/C3xGYTMqClyraMM7IfVC/I=
go.viam.com/api v0.1.503/go.mod h1:qSrz3j4+QlXvw7ANs1G2fsX532vUQzLBbgaTxMu3lAw=
go.viam.com/api v0.1.508 h1:X3JT5crkEHDq7767AeH3jNufFrZbAnD6twWDlynh7Oc=
go.viam.com/api v0.1.508/go.mod h1:qSrz3j4+QlXvw7ANs1G2fsX532vUQzLBbgaTxMu3lAw=
go.viam.com/test v1.2.4 h1:JYgZhsuGAQ8sL9jWkziAXN9VJJiKbjoi9BsO33TW3ug=
go.viam.com/test v1.2.4/go.mod h1:zI2xzosHdqXAJ/kFqcN+OIF78kQuTV2nIhGZ8EzvaJI=
go.viam.com/utils v0.4.3 h1:jhx78k4MpVpg2kueBE/1L+ZRfsUs1FsUynYCQe6NV6Q=
Expand Down
8 changes: 6 additions & 2 deletions services/datamanager/builtin/sync/upload_data_capture_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,9 @@ func uploadBinarySensorData(
) error {
// if the binary sensor data has a mime type, set the file extension
// to match
fileExtensionFromMimeType := getFileExtFromMimeType(sd.GetMetadata().GetMimeType())
mimeType := sd.GetMetadata().GetMimeType()
md.MimeType = data.MimeTypeFromProto(mimeType).ToString()
fileExtensionFromMimeType := getFileExtFromMimeType(mimeType)
if fileExtensionFromMimeType != "" {
md.FileExtension = fileExtensionFromMimeType
}
Expand Down Expand Up @@ -308,7 +310,9 @@ func uploadLargeBinarySensorData(
// if the binary sensor data has a mime type, set the file extension
// to match
smd := sd.GetMetadata()
fileExtensionFromMimeType := getFileExtFromMimeType(smd.GetMimeType())
mimeType := smd.GetMimeType()
md.MimeType = data.MimeTypeFromProto(mimeType).ToString()
fileExtensionFromMimeType := getFileExtFromMimeType(mimeType)
if fileExtensionFromMimeType != "" {
md.FileExtension = fileExtensionFromMimeType
}
Expand Down
10 changes: 10 additions & 0 deletions services/datamanager/builtin/sync/upload_data_capture_file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypeJPEG,
},
sd: smallBinaryJpegResult.ToProto(),
},
Expand Down Expand Up @@ -351,6 +352,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypePNG,
},
sd: smallBinaryPngResult.ToProto(),
},
Expand Down Expand Up @@ -404,6 +406,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypePNG,
},
sd: largeBinaryResult.ToProto(),
},
Expand Down Expand Up @@ -552,6 +555,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypePNG,
},
sd: largeBinaryResult.ToProto(),
},
Expand Down Expand Up @@ -593,6 +597,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypeJPEG,
},
sd: []*v1.SensorData{smallGetImagesResult.ToProto()[0]},
},
Expand All @@ -605,6 +610,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypePNG,
},
sd: []*v1.SensorData{smallGetImagesResult.ToProto()[1]},
},
Expand Down Expand Up @@ -660,6 +666,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypeJPEG,
},
sd: []*v1.SensorData{largeGetImagesResult.ToProto()[0]},
},
Expand All @@ -672,6 +679,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypePNG,
},
sd: []*v1.SensorData{largeGetImagesResult.ToProto()[1]},
},
Expand Down Expand Up @@ -713,6 +721,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypeJPEG,
},
sd: smallVisionCaptureAllFromCamera.ToProto(),
},
Expand Down Expand Up @@ -768,6 +777,7 @@ func TestUploadDataCaptureFile(t *testing.T) {
PartId: partID,
Tags: []string{"tag1", "tag2"},
Type: v1.DataType_DATA_TYPE_BINARY_SENSOR,
MimeType: utils.MimeTypePNG,
},
sd: largeVisionCaptureAllFromCamera.ToProto(),
},
Expand Down