.Net Removing IPlan interface

dotnet/src/SemanticKernel.Core/Planning/IPlan.cs

@@ -1,10 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System;
+
 namespace Microsoft.SemanticKernel.Planning;
 
 /// <summary>
 /// Interface for standard Semantic Kernel callable plan.
 /// </summary>
+[Obsolete("This interface is obsoleted, use ISKFunction interface instead")]
 public interface IPlan : ISKFunction
 {
 }

dotnet/src/SemanticKernel.Core/Planning/InstrumentedPlan.cs

@@ -17,7 +17,7 @@ namespace Microsoft.SemanticKernel.Planning;
 /// <summary>
 /// Standard Semantic Kernel callable plan with instrumentation.
 /// </summary>
-internal sealed class InstrumentedPlan : IPlan
+internal sealed class InstrumentedPlan : ISKFunction
 {
     /// <inheritdoc/>
     public string Name => this._plan.Name;
@@ -31,10 +31,10 @@ internal sealed class InstrumentedPlan : IPlan
     /// <summary>
     /// Initialize a new instance of the <see cref="InstrumentedPlan"/> class.
     /// </summary>
-    /// <param name="plan">Instance of <see cref="IPlan"/> to decorate.</param>
+    /// <param name="plan">Instance of <see cref="Plan"/> to decorate.</param>
     /// <param name="loggerFactory">The <see cref="ILoggerFactory"/> to use for logging. If null, no logging will be performed.</param>
     public InstrumentedPlan(
-        IPlan plan,
+        ISKFunction plan,
         ILoggerFactory? loggerFactory = null)
     {
         this._plan = plan;
@@ -59,7 +59,7 @@ public async Task<FunctionResult> InvokeAsync(
 
     #region private ================================================================================
 
-    private readonly IPlan _plan;
+    private readonly ISKFunction _plan;
     private readonly ILogger _logger;
 
     /// <summary>

dotnet/src/SemanticKernel.Core/Planning/Plan.cs

@@ -22,7 +22,7 @@ namespace Microsoft.SemanticKernel.Planning;
 /// Plan is used to create trees of <see cref="ISKFunction"/>s.
 /// </summary>
 [DebuggerDisplay("{DebuggerDisplay,nq}")]
-public sealed class Plan : IPlan
+public sealed class Plan : ISKFunction
 {
     /// <summary>
     /// State of the plan

dotnet/src/SemanticKernel.Core/Planning/PlanExtensions.cs

@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 
@@ -68,13 +69,24 @@ public static string ToPlanString(this Plan plan, string indent = " ")
         return planString;
     }
 
+    /// <summary>
+    /// Returns decorated instance of <see cref="ISKFunction"/> with plan enabled instrumentation.
+    /// </summary>
+    /// <param name="plan">Instance of <see cref="Plan"/> to decorate.</param>
+    /// <param name="loggerFactory">The <see cref="ILoggerFactory"/> to use for logging. If null, no logging will be performed.</param>
+    public static ISKFunction WithInstrumentation(this ISKFunction plan, ILoggerFactory? loggerFactory = null)
+    {
+        return new InstrumentedPlan(plan, loggerFactory);
+    }
+
     /// <summary>
     /// Returns decorated instance of <see cref="IPlan"/> with enabled instrumentation.
     /// </summary>
     /// <param name="plan">Instance of <see cref="IPlan"/> to decorate.</param>
     /// <param name="loggerFactory">The <see cref="ILoggerFactory"/> to use for logging. If null, no logging will be performed.</param>
+    [Obsolete("Use concrete class Plan WithInstrumentation instead")]
     public static IPlan WithInstrumentation(this IPlan plan, ILoggerFactory? loggerFactory = null)
     {
-        return new InstrumentedPlan(plan, loggerFactory);
+        throw new NotSupportedException("This method is obsolete, use concrete class Plan WithInstrumentation instead");
     }
 }