RestAPI: Move to Skills.OpenApi package (#887)

### Description Moving the RestAPI* classes back into the Skills.OpenAPI package, where they can remain as internals. This aligns with the Skills.Grpc format as well.
microsoft · May 10, 2023 · b274f6d · b274f6d
1 parent 1a78633
commit b274f6d
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 50 deletions.
diff --git a/dotnet/src/SemanticKernel.Abstractions/Connectors/WebApi/Rest/IRestApiOperationRunner.cs b/dotnet/src/SemanticKernel.Abstractions/Connectors/WebApi/Rest/IRestApiOperationRunner.cs
diff --git a/.../Rest/AuthenticateRequestAsyncCallback.cs → ...ation/AuthenticateRequestAsyncCallback.cs b/.../Rest/AuthenticateRequestAsyncCallback.cs → ...ation/AuthenticateRequestAsyncCallback.cs
@@ -3,6 +3,6 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Authentication;
 
 public delegate Task AuthenticateRequestAsyncCallback(HttpRequestMessage request);
diff --git a/dotnet/src/Skills/Skills.OpenAPI/Authentication/README.md b/dotnet/src/Skills/Skills.OpenAPI/Authentication/README.md
@@ -4,7 +4,7 @@ The Semantic Kernel OpenAPI Skill enables developers to take any REST API that f
 
 ## The `AuthenticateRequestAsyncCallback` delegate
 
-[`AuthenticateRequestAsyncCallback`](../../../SemanticKernel.Abstractions/Connectors/WebApi/Rest/AuthenticateRequestAsyncCallback.cs) is a delegate type that serves as a callback function for adding authentication information to HTTP requests sent by the OpenAPI skill.
+[`AuthenticateRequestAsyncCallback`](AuthenticateRequestAsyncCallback.cs) is a delegate type that serves as a callback function for adding authentication information to HTTP requests sent by the OpenAPI skill.
 
 ```csharp
 public delegate Task AuthenticateRequestAsyncCallback(HttpRequestMessage request);

diff --git a/dotnet/src/Skills/Skills.OpenAPI/Extensions/KernelChatGptPluginExtensions.cs b/dotnet/src/Skills/Skills.OpenAPI/Extensions/KernelChatGptPluginExtensions.cs
@@ -9,10 +9,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest;
 using Microsoft.SemanticKernel.Diagnostics;
 using Microsoft.SemanticKernel.Reliability;
 using Microsoft.SemanticKernel.SkillDefinition;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Authentication;
 using Microsoft.SemanticKernel.Skills.OpenAPI.Skills;
 
 #pragma warning disable IDE0130

diff --git a/dotnet/src/Skills/Skills.OpenAPI/Extensions/KernelOpenApiExtensions.cs b/dotnet/src/Skills/Skills.OpenAPI/Extensions/KernelOpenApiExtensions.cs
@@ -9,12 +9,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
 using Microsoft.SemanticKernel.Diagnostics;
 using Microsoft.SemanticKernel.Orchestration;
 using Microsoft.SemanticKernel.Reliability;
 using Microsoft.SemanticKernel.SkillDefinition;
+using Microsoft.SemanticKernel.Skills.OpenAPI;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Authentication;
 using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 using Microsoft.SemanticKernel.Skills.OpenAPI.OpenApi;
 using Microsoft.SemanticKernel.Skills.OpenAPI.Skills;

diff --git a/dotnet/src/Skills/Skills.OpenAPI/Extensions/RestApiOperationExtensions.cs b/dotnet/src/Skills/Skills.OpenAPI/Extensions/RestApiOperationExtensions.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text.RegularExpressions;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
 
 #pragma warning disable IDE0130
 // ReSharper disable once CheckNamespace

diff --git a/...ors/WebApi/Rest/Model/RestApiOperation.cs → .../Skills.OpenAPI/Model/RestApiOperation.cs b/...ors/WebApi/Rest/Model/RestApiOperation.cs → .../Skills.OpenAPI/Model/RestApiOperation.cs
@@ -7,7 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Web;
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 /// <summary>
 /// The REST API operation.

diff --git a/...i/Rest/Model/RestApiOperationException.cs → ...penAPI/Model/RestApiOperationException.cs b/...i/Rest/Model/RestApiOperationException.cs → ...penAPI/Model/RestApiOperationException.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 /// <summary>
 /// Exception to be throw if a REST API operation has failed. E.g. mandatory property is missing or empty, value is out of range

diff --git a/...i/Rest/Model/RestApiOperationParameter.cs → ...penAPI/Model/RestApiOperationParameter.cs b/...i/Rest/Model/RestApiOperationParameter.cs → ...penAPI/Model/RestApiOperationParameter.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 /// <summary>
 /// The REST API operation parameter.

diff --git a/...odel/RestApiOperationParameterLocation.cs → ...odel/RestApiOperationParameterLocation.cs b/...odel/RestApiOperationParameterLocation.cs → ...odel/RestApiOperationParameterLocation.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 /// <summary>
 /// The REST API operation parameter location.

diff --git a/...t/Model/RestApiOperationParameterStyle.cs → ...I/Model/RestApiOperationParameterStyle.cs b/...t/Model/RestApiOperationParameterStyle.cs → ...I/Model/RestApiOperationParameterStyle.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 /// <summary>
 /// The REST API operation parameter style.

diff --git a/...Api/Rest/Model/RestApiOperationPayload.cs → ....OpenAPI/Model/RestApiOperationPayload.cs b/...Api/Rest/Model/RestApiOperationPayload.cs → ....OpenAPI/Model/RestApiOperationPayload.cs
@@ -2,7 +2,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 /// <summary>
 /// The REST API operation payload.

diff --git a/.../Model/RestApiOperationPayloadProperty.cs → .../Model/RestApiOperationPayloadProperty.cs b/.../Model/RestApiOperationPayloadProperty.cs → .../Model/RestApiOperationPayloadProperty.cs
@@ -2,7 +2,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 /// <summary>
 /// The REST API operation payload property.

diff --git a/dotnet/src/Skills/Skills.OpenAPI/OpenApi/IOpenApiDocumentParser.cs b/dotnet/src/Skills/Skills.OpenAPI/OpenApi/IOpenApiDocumentParser.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
 namespace Microsoft.SemanticKernel.Skills.OpenAPI.OpenApi;
 

diff --git a/dotnet/src/Skills/Skills.OpenAPI/OpenApi/OpenApiDocumentParser.cs b/dotnet/src/Skills/Skills.OpenAPI/OpenApi/OpenApiDocumentParser.cs
@@ -15,8 +15,8 @@
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
 using Microsoft.SemanticKernel.Diagnostics;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 using Microsoft.SemanticKernel.Text;
 
 namespace Microsoft.SemanticKernel.Skills.OpenAPI.OpenApi;

diff --git a/...ors/WebApi/Rest/RestApiOperationRunner.cs → .../Skills.OpenAPI/RestApiOperationRunner.cs b/...ors/WebApi/Rest/RestApiOperationRunner.cs → .../Skills.OpenAPI/RestApiOperationRunner.cs
@@ -7,14 +7,15 @@
 using System.Text.Json.Nodes;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Authentication;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 
-namespace Microsoft.SemanticKernel.Connectors.WebApi.Rest;
+namespace Microsoft.SemanticKernel.Skills.OpenAPI;
 
 /// <summary>
 /// Runs REST API operation represented by RestApiOperation model class.
 /// </summary>
-public sealed class RestApiOperationRunner : IRestApiOperationRunner
+internal sealed class RestApiOperationRunner
 {
     private const string MediaTypeApplicationJson = "application/json";
     private const string MediaTypeTextPlain = "text/plain";

diff --git a/...ebApi/Rest/RestApiOperationRunnerTests.cs → ...ebApi/Rest/RestApiOperationRunnerTests.cs b/...ebApi/Rest/RestApiOperationRunnerTests.cs → ...ebApi/Rest/RestApiOperationRunnerTests.cs
@@ -11,12 +11,13 @@
 using System.Text.Json.Nodes;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+using Microsoft.SemanticKernel.Skills.OpenAPI;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Authentication;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 using Moq;
 using Xunit;
 
-namespace SemanticKernel.UnitTests.Connectors.WebApi.Rest;
+namespace SemanticKernel.Skills.UnitTests.Connectors.WebApi.Rest;
 
 public sealed class RestApiOperationRunnerTests : IDisposable
 {

diff --git a/...tors/WebApi/Rest/RestApiOperationTests.cs → ...tors/WebApi/Rest/RestApiOperationTests.cs b/...tors/WebApi/Rest/RestApiOperationTests.cs → ...tors/WebApi/Rest/RestApiOperationTests.cs
@@ -4,10 +4,10 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Web;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
+using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 using Xunit;
 
-namespace SemanticKernel.UnitTests.Connectors.WebApi.Rest;
+namespace SemanticKernel.Skills.UnitTests.Connectors.WebApi.Rest;
 
 public class RestApiOperationTests
 {

diff --git a/dotnet/src/Skills/Skills.UnitTests/OpenAPI/OpenApiDocumentParserV20Tests.cs b/dotnet/src/Skills/Skills.UnitTests/OpenAPI/OpenApiDocumentParserV20Tests.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
 using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 using Microsoft.SemanticKernel.Skills.OpenAPI.OpenApi;
 using SemanticKernel.Skills.UnitTests.OpenAPI.TestSkills;

diff --git a/dotnet/src/Skills/Skills.UnitTests/OpenAPI/OpenApiDocumentParserV30Tests.cs b/dotnet/src/Skills/Skills.UnitTests/OpenAPI/OpenApiDocumentParserV30Tests.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
 using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 using Microsoft.SemanticKernel.Skills.OpenAPI.OpenApi;
 using SemanticKernel.Skills.UnitTests.OpenAPI.TestSkills;

diff --git a/dotnet/src/Skills/Skills.UnitTests/OpenAPI/OpenApiDocumentParserV31Tests.cs b/dotnet/src/Skills/Skills.UnitTests/OpenAPI/OpenApiDocumentParserV31Tests.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.SemanticKernel.Connectors.WebApi.Rest.Model;
 using Microsoft.SemanticKernel.Skills.OpenAPI.Model;
 using Microsoft.SemanticKernel.Skills.OpenAPI.OpenApi;
 using SemanticKernel.Skills.UnitTests.OpenAPI.TestSkills;