Merge pull request #81 from aws-samples/media-catalog

Thomas Moore · web-flow · commit 39994d19a6a6 · 2023-04-19T17:07:11.000-04:00
Updates to allow for SSO auth via IAM Identity Center. Updates to mak…
diff --git a/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Controllers/FileManagementController.cs b/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Controllers/FileManagementController.cs
@@ -14,16 +14,14 @@ public class FileManagementController : Controller
         private readonly IFileMetadataService _metadataService;
         private readonly IImageMetadataService _imageService;
         private readonly IImageLookupService _imageLookupService;
-        private readonly IModerationService _moderationService;
         private readonly ILogger _logger;
-        public FileManagementController (IStorageService storage, IOptions<AwsSettings> options, IFileMetadataService metadataService, IImageMetadataService imageService, ILogger<FileManagementController> logger, IImageLookupService imageLookupService, IModerationService moderationService)
+        public FileManagementController (IStorageService storage, IOptions<AwsSettings> options, IFileMetadataService metadataService, IImageMetadataService imageService, ILogger<FileManagementController> logger, IImageLookupService imageLookupService)
         {
             _storage = storage;
             _configuration = options.Value;
             _metadataService = metadataService;
             _imageService = imageService;
             _imageLookupService = imageLookupService;
-            _moderationService = moderationService;
             _logger = logger;
         }
         // We need to store the files in S3 and then push the metadata into a Dynamo DB Table.
@@ -63,6 +61,8 @@ public async Task<IActionResult> Upload(IFormFile file)
                 string s3KeyName = _storage.SaveFile(file);
                 _logger.Log(LogLevel.Information, "Saved file {0} to S3 bucket as {1}", file.FileName, s3KeyName );
 
+                IModerationService _moderationService = new RekognitionModerationService (_configuration, _logger);
+
                 var moderationResults = await _moderationService.IsContentAllowed(s3KeyName);
                 if (moderationResults.ImageAllowed)
                 {
diff --git a/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Controllers/RekognitionController.cs b/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Controllers/RekognitionController.cs
@@ -9,14 +9,14 @@ namespace MediaLibrary.Controllers
 {
     public class RekognitionController : Controller
     {
-        
+
         private readonly AwsSettings _configuration;
         private readonly IFileMetadataService _metadataService;
         private readonly IImageMetadataService _imageMetadataService;
         private readonly IImageLookupService _imageLookupService;
         private readonly ILogger _logger;
 
-        public RekognitionController (IOptions<AwsSettings> options, IFileMetadataService metadataService, IImageMetadataService imageMetadataService, ILogger<RekognitionController> logger, IImageLookupService imageLookupService)
+        public RekognitionController(IOptions<AwsSettings> options, IFileMetadataService metadataService, IImageMetadataService imageMetadataService, ILogger<RekognitionController> logger, IImageLookupService imageLookupService)
         {
             _configuration = options.Value;
             _metadataService = metadataService;
@@ -58,7 +58,7 @@ public async Task<IActionResult> ViewItem(string item)
             }
         }
 
-        public async Task<IActionResult> Process (string item)
+        public async Task<IActionResult> Process(string item)
         {
             _logger.Log(LogLevel.Information, "RekognitionController::Process", null);
             AWSXRayRecorder.Instance.BeginSubsegment("RekognitionController::Process - Getting File Metadata");
@@ -93,7 +93,7 @@ public async Task<IActionResult> Process (string item)
                 };
 
                 var labels = await client.DetectLabelsAsync(detectLabelsRequest);
-                
+
                 // Store the new data in a new dynamo DB Table
                 foreach (var label in labels.Labels)
                 {
@@ -111,7 +111,7 @@ public async Task<IActionResult> Process (string item)
                 AWSXRayRecorder.Instance.EndSubsegment();
             }
             // Sore individual indexes 
-            return View (viewModel); 
+            return View(viewModel);
         }
         [HttpPost]
         public async Task<IActionResult> Process(ImageProcessingModel model, IFormCollection collection)
@@ -162,7 +162,7 @@ public async Task<IActionResult> Process(ImageProcessingModel model, IFormCollec
             return RedirectToAction("Index", "FileManagement");
         }
 
-        public async Task<IActionResult> Search (string filter)
+        public async Task<IActionResult> Search(string filter)
         {
             var fullLabelData = await _imageLookupService.GetLabelData();
             ImageLookupDataModel imageLookupList;
@@ -189,7 +189,7 @@ where x.Label.ToLower() == filter.ToLower()
             {
                 viewModel.CurrentValue = "---Choose Label---";
             }
-           
+
             viewModel.Labels = new List<string>();
 
             foreach (var item in fullLabelData)
@@ -200,9 +200,9 @@ where x.Label.ToLower() == filter.ToLower()
                 }
             }
 
-            
+
 
             return View(viewModel);
         }
     }
-}
+}
diff --git a/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/MediaLibrary.csproj b/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/MediaLibrary.csproj
@@ -10,17 +10,19 @@
 
   <ItemGroup>
     <PackageReference Include="AWS.Logger.AspNetCore" Version="3.3.0" />
-    <PackageReference Include="AWSSDK.Core" Version="3.7.12.6" />
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.54" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.2" />
-    <PackageReference Include="AWSSDK.Rekognition" Version="3.7.8.29" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.9.22" />
-    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.17.24" />
-    <PackageReference Include="AWSXRayRecorder" Version="2.10.1" />
-    <PackageReference Include="AWSXRayRecorder.Core" Version="2.10.1" />
-    <PackageReference Include="AWSXRayRecorder.Handlers.AspNetCore" Version="2.7.3" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />
+    <PackageReference Include="AWSSDK.Core" Version="3.7.106.21" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.102.28" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.5" />
+    <PackageReference Include="AWSSDK.Rekognition" Version="3.7.103.5" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.103.51" />
+    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.104.17" />
+    <PackageReference Include="AWSSDK.SSO" Version="3.7.100.114" />
+    <PackageReference Include="AWSSDK.SSOOIDC" Version="3.7.100.114" />
+    <PackageReference Include="AWSXRayRecorder" Version="2.14.0" />
+    <PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
+    <PackageReference Include="AWSXRayRecorder.Handlers.AspNetCore" Version="2.11.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.7" />
   </ItemGroup>
 
diff --git a/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Program.cs b/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Program.cs
@@ -15,7 +15,7 @@
 builder.Services.AddScoped<IFileMetadataService, DynamoFileMetadataService>();
 builder.Services.AddScoped<IImageMetadataService, DynamoImageMetadataService>();
 builder.Services.AddScoped<IImageLookupService, DynamoImageLookupService>();
-builder.Services.AddScoped<IModerationService, RekognitionModerationService>();
+
 
 
 builder.Services.Configure<AwsSettings>(builder.Configuration.GetSection("AWSConfig"));
diff --git a/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Services/RekognitionModerationService.cs b/SampleApplications/2022/MediaCatalog/MediaLibrary6.0/MediaLibrary/Services/RekognitionModerationService.cs
@@ -6,20 +6,23 @@ namespace MediaLibrary.Services
     public class RekognitionModerationService : IModerationService
     {
         private readonly AwsSettings _configuration;
-        private readonly ILogger<RekognitionModerationService> _logger;
+        private readonly ILogger _logger;
 
-        public RekognitionModerationService (IOptions<AwsSettings> options, ILogger<RekognitionModerationService> logger)
+
+
+        public RekognitionModerationService(AwsSettings options, ILogger logger)
         {
-            _configuration = options.Value;
+            _configuration = options;
             _logger = logger;
         }
+
         public async Task<ModerationResultsViewModel> IsContentAllowed(string objectLocation)
         {
             Amazon.Rekognition.AmazonRekognitionClient client = new Amazon.Rekognition.AmazonRekognitionClient();
 
             var results = await client.DetectModerationLabelsAsync(new Amazon.Rekognition.Model.DetectModerationLabelsRequest()
             {
-                MinConfidence = 75F,
+                MinConfidence = 50F,
                 Image = new Amazon.Rekognition.Model.Image()
                 {
                     S3Object = new Amazon.Rekognition.Model.S3Object()

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ namespace MediaLibrary.Controllers`
`9`	`9`	`{`
`10`	`10`	`public class RekognitionController : Controller`
`11`	`11`	`{`
`12`		`-`
	`12`	`+`
`13`	`13`	`private readonly AwsSettings _configuration;`
`14`	`14`	`private readonly IFileMetadataService _metadataService;`
`15`	`15`	`private readonly IImageMetadataService _imageMetadataService;`
`16`	`16`	`private readonly IImageLookupService _imageLookupService;`
`17`	`17`	`private readonly ILogger _logger;`
`18`	`18`
`19`		`- public RekognitionController (IOptions<AwsSettings> options, IFileMetadataService metadataService, IImageMetadataService imageMetadataService, ILogger<RekognitionController> logger, IImageLookupService imageLookupService)`
	`19`	`+ public RekognitionController(IOptions<AwsSettings> options, IFileMetadataService metadataService, IImageMetadataService imageMetadataService, ILogger<RekognitionController> logger, IImageLookupService imageLookupService)`
`20`	`20`	`{`
`21`	`21`	`_configuration = options.Value;`
`22`	`22`	`_metadataService = metadataService;`
`@@ -58,7 +58,7 @@ public async Task<IActionResult> ViewItem(string item)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- public async Task<IActionResult> Process (string item)`
	`61`	`+ public async Task<IActionResult> Process(string item)`
`62`	`62`	`{`
`63`	`63`	`_logger.Log(LogLevel.Information, "RekognitionController::Process", null);`
`64`	`64`	`AWSXRayRecorder.Instance.BeginSubsegment("RekognitionController::Process - Getting File Metadata");`
`@@ -93,7 +93,7 @@ public async Task<IActionResult> Process (string item)`
`93`	`93`	`};`
`94`	`94`
`95`	`95`	`var labels = await client.DetectLabelsAsync(detectLabelsRequest);`
`96`		`-`
	`96`	`+`
`97`	`97`	`// Store the new data in a new dynamo DB Table`
`98`	`98`	`foreach (var label in labels.Labels)`
`99`	`99`	`{`
`@@ -111,7 +111,7 @@ public async Task<IActionResult> Process (string item)`
`111`	`111`	`AWSXRayRecorder.Instance.EndSubsegment();`
`112`	`112`	`}`
`113`	`113`	`// Sore individual indexes`
`114`		`- return View (viewModel);`
	`114`	`+ return View(viewModel);`
`115`	`115`	`}`
`116`	`116`	`[HttpPost]`
`117`	`117`	`public async Task<IActionResult> Process(ImageProcessingModel model, IFormCollection collection)`
`@@ -162,7 +162,7 @@ public async Task<IActionResult> Process(ImageProcessingModel model, IFormCollec`
`162`	`162`	`return RedirectToAction("Index", "FileManagement");`
`163`	`163`	`}`
`164`	`164`
`165`		`- public async Task<IActionResult> Search (string filter)`
	`165`	`+ public async Task<IActionResult> Search(string filter)`
`166`	`166`	`{`
`167`	`167`	`var fullLabelData = await _imageLookupService.GetLabelData();`
`168`	`168`	`ImageLookupDataModel imageLookupList;`
`@@ -189,7 +189,7 @@ where x.Label.ToLower() == filter.ToLower()`
`189`	`189`	`{`
`190`	`190`	`viewModel.CurrentValue = "---Choose Label---";`
`191`	`191`	`}`
`192`		`-`
	`192`	`+`
`193`	`193`	`viewModel.Labels = new List<string>();`
`194`	`194`
`195`	`195`	`foreach (var item in fullLabelData)`
`@@ -200,9 +200,9 @@ where x.Label.ToLower() == filter.ToLower()`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`		`-`
	`203`	`+`
`204`	`204`
`205`	`205`	`return View(viewModel);`
`206`	`206`	`}`
`207`	`207`	`}`
`208`		`-}`
	`208`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,23 @@ namespace MediaLibrary.Services`
`6`	`6`	`public class RekognitionModerationService : IModerationService`
`7`	`7`	`{`
`8`	`8`	`private readonly AwsSettings _configuration;`
`9`		`- private readonly ILogger<RekognitionModerationService> _logger;`
	`9`	`+ private readonly ILogger _logger;`
`10`	`10`
`11`		`- public RekognitionModerationService (IOptions<AwsSettings> options, ILogger<RekognitionModerationService> logger)`
	`11`	`+`
	`12`	`+`
	`13`	`+ public RekognitionModerationService(AwsSettings options, ILogger logger)`
`12`	`14`	`{`
`13`		`- _configuration = options.Value;`
	`15`	`+ _configuration = options;`
`14`	`16`	`_logger = logger;`
`15`	`17`	`}`
	`18`	`+`
`16`	`19`	`public async Task<ModerationResultsViewModel> IsContentAllowed(string objectLocation)`
`17`	`20`	`{`
`18`	`21`	`Amazon.Rekognition.AmazonRekognitionClient client = new Amazon.Rekognition.AmazonRekognitionClient();`
`19`	`22`
`20`	`23`	`var results = await client.DetectModerationLabelsAsync(new Amazon.Rekognition.Model.DetectModerationLabelsRequest()`
`21`	`24`	`{`
`22`		`- MinConfidence = 75F,`
	`25`	`+ MinConfidence = 50F,`
`23`	`26`	`Image = new Amazon.Rekognition.Model.Image()`
`24`	`27`	`{`
`25`	`28`	`S3Object = new Amazon.Rekognition.Model.S3Object()`