remove vision support

Peter-Juhasz · Dec 28, 2024 · 1efb7a9 · 1efb7a9
1 parent 5a2a931
commit 1efb7a9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 34 deletions.
diff --git a/src/PhotoArchiver.Console/Program.cs b/src/PhotoArchiver.Console/Program.cs
@@ -1,5 +1,4 @@
 using Azure.Storage.Blobs;
-using Microsoft.Azure.CognitiveServices.Vision.ComputerVision;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -45,16 +44,6 @@
 
 		// vision
 		.Configure<ComputerVisionOptions>(configuration.GetSection("ComputerVision"))
-		.AddSingleton<IComputerVisionClient>(sp =>
-		{
-			var options = sp.GetRequiredService<IOptions<ComputerVisionOptions>>().Value;
-			var client = new ComputerVisionClient(new Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ApiKeyServiceClientCredentials(options.Key));
-			if (options.Endpoint != null)
-			{
-				client.Endpoint = options.Endpoint.ToString();
-			}
-			return client;
-		})
 
 		// face
 		.Configure<FaceOptions>(configuration.GetSection("Face"))

diff --git a/src/PhotoArchiver/Archiver.Upload.cs b/src/PhotoArchiver/Archiver.Upload.cs
@@ -4,8 +4,6 @@
 using Azure.Storage.Blobs.Specialized;
 using MetadataExtractor;
 using MetadataExtractor.Formats.QuickTime;
-using Microsoft.Azure.CognitiveServices.Vision.ComputerVision;
-using Microsoft.Azure.CognitiveServices.Vision.ComputerVision.Models;
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.Logging;
 using System.Diagnostics.CodeAnalysis;
@@ -130,23 +128,9 @@ public async Task<ArchiveResult> ArchiveAsync(IReadOnlyList<IFile> files, IProgr
 					{
 						try
 						{
-							// create thumbnail
-							using var thumbnail = await ThumbnailGenerator.GetThumbnailAsync(await item.OpenReadAsync(), 1024, 1024);
-
-							// describe
-							Logger.LogTrace($"Describing {file}...");
-							var description = await ComputerVisionClient.DescribeImageInStreamAsync(thumbnail, cancellationToken: cancellationToken);
-							CostEstimator.AddDescribe();
-							if (description.Captions.Any())
-							{
-								item.Metadata.Add("Caption", description.Captions.OrderByDescending(c => c.Confidence).First().Text);
-							}
-							if (description.Tags.Any())
-							{
-								item.Metadata.Add("Tags", String.Join(", ", description.Tags));
-							}
+							throw new NotImplementedException("Vision support has been temporarily removed.");
 						}
-						catch (ComputerVisionErrorResponseException ex)
+						catch (Exception ex)
 						{
 							Logger.LogWarning(ex, ex.Message);
 						}

diff --git a/src/PhotoArchiver/Archiver.cs b/src/PhotoArchiver/Archiver.cs
@@ -1,6 +1,5 @@
 using Azure.Storage;
 using Azure.Storage.Blobs;
-using Microsoft.Azure.CognitiveServices.Vision.ComputerVision;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Runtime.CompilerServices;
@@ -29,7 +28,6 @@ public Archiver(
 		BlobServiceClient client,
 		IThumbnailGenerator thumbnailGenerator,
 		IDeduplicationService deduplicationService,
-		IComputerVisionClient computerVisionClient,
 		CostEstimator costEstimator,
 		IProgressIndicator progressIndicator,
 		ILogger<Archiver> logger
@@ -43,7 +41,6 @@ ILogger<Archiver> logger
 		Client = client;
 		ThumbnailGenerator = thumbnailGenerator;
 		DeduplicationService = deduplicationService;
-		ComputerVisionClient = computerVisionClient;
 		CostEstimator = costEstimator;
 		ProgressIndicator = progressIndicator;
 		Logger = logger;
@@ -57,7 +54,6 @@ ILogger<Archiver> logger
 	protected BlobServiceClient Client { get; }
 	protected IThumbnailGenerator ThumbnailGenerator { get; }
 	protected IDeduplicationService DeduplicationService { get; }
-	protected IComputerVisionClient ComputerVisionClient { get; }
 	protected CostEstimator CostEstimator { get; }
 	protected IProgressIndicator ProgressIndicator { get; }
 	protected ILogger<Archiver> Logger { get; }

diff --git a/src/PhotoArchiver/PhotoArchiver.csproj b/src/PhotoArchiver/PhotoArchiver.csproj
@@ -11,7 +11,6 @@
 	<ItemGroup>
 		<PackageReference Include="Azure.Storage.Blobs" Version="*" />
 		<PackageReference Include="MetadataExtractor" Version="2.*" />
-		<PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.ComputerVision" Version="7.*" />
 		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="*">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>