Skip to content

Fix Max Upload Size handling #893

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

Closed
marcominerva wants to merge 2 commits into from
Closed

Fix Max Upload Size handling #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e229b1
Fix Max Upload Size handling
marcominerva Nov 15, 2024
4e78f14
Refactor config access and remove unused namespaces
marcominerva Nov 15, 2024
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
15 changes: 2 additions & 13 deletions service/Core/Configuration/ServiceConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) Microsoft. All rights reserved.

using System;
using System.Collections.Generic;

namespace Microsoft.KernelMemory.Configuration;
Expand Down Expand Up @@ -30,18 +29,8 @@ public class ServiceConfig
public Dictionary<string, HandlerConfig> Handlers { get; set; } = new();

/// <summary>
/// The maximum allowed size in megabytes for a request body posted to the upload endpoint.
/// The maximum allowed size in bytes for a request body posted to the upload endpoint.
Copy link
Collaborator

@dluc dluc Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per conversation, I'd prefer sticking to "megabytes"

/// If not set the solution defaults to 30,000,000 bytes (~28.6 MB) (ASP.NET default).
/// </summary>
public long? MaxUploadSizeMb { get; set; } = null;

public long? GetMaxUploadSizeInBytes()
{
if (this.MaxUploadSizeMb.HasValue)
{
return Math.Min(10, this.MaxUploadSizeMb.Value) * 1024 * 1024;
Copy link
Collaborator

@dluc dluc Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the only line that needs fixing, using Math.Max. I'd keep also the min of 10Mb in place.

Copy link
Contributor Author

@marcominerva marcominerva Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So don't you want to handle scenarios where, for example, I need to limit the upload to 1 MB?

}

return null;
}
public long? MaxUploadSize { get; set; } = null;
}
2 changes: 1 addition & 1 deletion service/Service.AspNetCore/WebAPIEndpoints.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static IEndpointRouteBuilder AddKernelMemoryEndpoints(
KernelMemoryConfig? kmConfig = null,
IEndpointFilter? authFilter = null)
{
builder.AddPostUploadEndpoint(apiPrefix, authFilter, kmConfig?.Service.GetMaxUploadSizeInBytes());
builder.AddPostUploadEndpoint(apiPrefix, authFilter, kmConfig?.Service.MaxUploadSize);
builder.AddGetIndexesEndpoint(apiPrefix, authFilter);
builder.AddDeleteIndexesEndpoint(apiPrefix, authFilter);
builder.AddDeleteDocumentsEndpoint(apiPrefix, authFilter);
Expand Down
2 changes: 1 addition & 1 deletion service/Service/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static void Main(string[] args)
},
services =>
{
long? maxSize = config.Service.GetMaxUploadSizeInBytes();
long? maxSize = config.Service.MaxUploadSize;
if (!maxSize.HasValue) { return; }

services.Configure<IISServerOptions>(x => { x.MaxRequestBodySize = maxSize.Value; });
Expand Down
4 changes: 2 additions & 2 deletions service/Service/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"RunWebService": true,
// Whether to expose OpenAPI swagger UI at http://127.0.0.1:9001/swagger/index.html
"OpenApiEnabled": false,
// The maximum allowed size in MB for the payload posted to the upload endpoint
// The maximum allowed size in bytes for the payload posted to the upload endpoint
// If not set the solution defaults to 30,000,000 bytes (~28.6 MB)
"MaxUploadSizeMb": null,
"MaxUploadSize": null,
// Whether to run the asynchronous pipeline handlers
// Use these booleans to deploy the web service and the handlers on same/different VMs
"RunHandlers": true,
Expand Down
Loading