Address PR feedback

Author: stephentoub

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/AIAnnotation.cs

@@ -29,16 +29,6 @@ public AIAnnotation()
     /// </summary>
     public int? EndIndex { get; set; }
 
-    /// <summary>
-    /// Gets or sets an optional placeholder or marker text that was present in the original content
-    /// to indicate the citation (e.g., "〖4:0+source.json〗" or "[1]").
-    /// </summary>
-    /// <remarks>
-    /// This is useful for UI rendering or when the original content contained inline citation markers
-    /// that need to be preserved or reconstructed.
-    /// </remarks>
-    public string? Placeholder { get; set; }
-
     /// <summary>Gets or sets the raw representation of the annotation from an underlying implementation.</summary>
     /// <remarks>
     /// If an <see cref="AIAnnotation"/> is created to represent some underlying object from another object

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/CitationAnnotation.cs

@@ -18,11 +18,6 @@ public CitationAnnotation()
     {
     }
 
-    /// <summary>
-    /// Gets or sets the location within the source that contains the cited content.
-    /// </summary>
-    public CitationSourceLocation? Location { get; set; }
-
     /// <summary>
     /// Gets or sets the title or name of the source.
     /// </summary>
@@ -51,9 +46,6 @@ public CitationAnnotation()
     /// </remarks>
     public string? ToolName { get; set; }
 
-    /// <summary>Gets or sets an associated ID of a tool call that produced the cited content.</summary>
-    public string? ToolCallId { get; set; }
-
     /// <summary>
     /// Gets or sets a snippet or excerpt from the source that was cited.
     /// </summary>

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/CitationSourceLocation.cs

@@ -141,10 +141,6 @@
           "Member": "object? Microsoft.Extensions.AI.AIAnnotation.RawRepresentation { get; set; }",
           "Stage": "Stable"
         },
-        {
-          "Member": "string? Microsoft.Extensions.AI.AIAnnotation.Placeholder { get; set; }",
-          "Stage": "Stable"
-        },
         {
           "Member": "int? Microsoft.Extensions.AI.AIAnnotation.StartIndex { get; set; }",
           "Stage": "Stable"
@@ -1369,10 +1365,6 @@
           "Member": "string? Microsoft.Extensions.AI.CitationAnnotation.ToolName { get; set; }",
           "Stage": "Stable"
         },
-        {
-          "Member": "string? Microsoft.Extensions.AI.CitationAnnotation.ToolCallId { get; set; }",
-          "Stage": "Stable"
-        },
         {
           "Member": "System.Uri? Microsoft.Extensions.AI.CitationAnnotation.Url { get; set; }",
           "Stage": "Stable"
@@ -1381,52 +1373,12 @@
           "Member": "string? Microsoft.Extensions.AI.CitationAnnotation.FileId { get; set; }",
           "Stage": "Stable"
         },
-        {
-          "Member": "Microsoft.Extensions.AI.CitationSourceLocation? Microsoft.Extensions.AI.CitationAnnotation.Location { get; set; }",
-          "Stage": "Stable"
-        },
         {
           "Member": "string? Microsoft.Extensions.AI.CitationAnnotation.Snippet { get; set; }",
           "Stage": "Stable"
         }
       ]
     },
-    {
-      "Type": "class Microsoft.Extensions.AI.CitationSourceLocation",
-      "Stage": "Stable",
-      "Methods": [
-        {
-          "Member": "Microsoft.Extensions.AI.CitationSourceLocation.CitationSourceLocation();",
-          "Stage": "Stable"
-        }
-      ],
-      "Properties": [
-        {
-          "Member": "int? Microsoft.Extensions.AI.CitationSourceLocation.PageStart { get; set; }",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "int? Microsoft.Extensions.AI.CitationSourceLocation.PageEnd { get; set; }",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "int? Microsoft.Extensions.AI.CitationSourceLocation.BlockStart { get; set; }",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "int? Microsoft.Extensions.AI.CitationSourceLocation.BlockEnd { get; set; }",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "int? Microsoft.Extensions.AI.CitationSourceLocation.CharacterStart { get; set; }",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "int? Microsoft.Extensions.AI.CitationSourceLocation.CharacterEnd { get; set; }",
-          "Stage": "Stable"
-        }
-      ]
-    },
     {
       "Type": "class Microsoft.Extensions.AI.DataContent : Microsoft.Extensions.AI.AIContent",
       "Stage": "Stable",

src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.json

@@ -237,7 +237,6 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
                                 RawRepresentation = tau,
                                 StartIndex = tau.StartIndex,
                                 EndIndex = tau.EndIndex,
-                                Placeholder = tau.TextToReplace,
 
                                 FileId = fileId,
                                 ToolName = toolName,

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIAssistantChatClient.cs

@@ -15,7 +15,6 @@ public void Constructor_PropsDefault()
         AIAnnotation a = new();
         Assert.Null(a.AdditionalProperties);
         Assert.Null(a.EndIndex);
-        Assert.Null(a.Placeholder);
         Assert.Null(a.RawRepresentation);
         Assert.Null(a.StartIndex);
     }
@@ -34,10 +33,6 @@ public void Constructor_PropsRoundtrip()
         a.EndIndex = 42;
         Assert.Equal(42, a.EndIndex);
 
-        Assert.Null(a.Placeholder);
-        a.Placeholder = "placeholder";
-        Assert.Equal("placeholder", a.Placeholder);
-
         Assert.Null(a.RawRepresentation);
         object raw = new();
         a.RawRepresentation = raw;
@@ -55,7 +50,6 @@ public void Serialization_Roundtrips()
         {
             AdditionalProperties = new AdditionalPropertiesDictionary { { "key", "value" } },
             EndIndex = 42,
-            Placeholder = "placeholder",
             RawRepresentation = new object(),
             StartIndex = 10,
         };
@@ -71,7 +65,6 @@ public void Serialization_Roundtrips()
         Assert.Equal(JsonSerializer.Deserialize<JsonElement>("\"value\"", AIJsonUtilities.DefaultOptions).ToString(), deserialized.AdditionalProperties["key"]!.ToString());
 
         Assert.Equal(42, deserialized.EndIndex);
-        Assert.Equal("placeholder", deserialized.Placeholder);
         Assert.Null(deserialized.RawRepresentation);
         Assert.Equal(10, deserialized.StartIndex);
     }

test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Contents/AIAnnotationTests.cs

@@ -15,8 +15,6 @@ public void Constructor_PropsDefault()
         CitationAnnotation a = new();
         Assert.Null(a.AdditionalProperties);
         Assert.Null(a.EndIndex);
-        Assert.Null(a.Location);
-        Assert.Null(a.Placeholder);
         Assert.Null(a.RawRepresentation);
         Assert.Null(a.Snippet);
         Assert.Null(a.StartIndex);
@@ -39,15 +37,6 @@ public void Constructor_PropsRoundtrip()
         a.EndIndex = 42;
         Assert.Equal(42, a.EndIndex);
 
-        Assert.Null(a.Location);
-        CitationSourceLocation loc = new();
-        a.Location = loc;
-        Assert.Same(loc, a.Location);
-
-        Assert.Null(a.Placeholder);
-        a.Placeholder = "placeholder";
-        Assert.Equal("placeholder", a.Placeholder);
-
         Assert.Null(a.RawRepresentation);
         object raw = new();
         a.RawRepresentation = raw;
@@ -82,16 +71,6 @@ public void Serialization_Roundtrips()
         {
             AdditionalProperties = new AdditionalPropertiesDictionary { { "key", "value" } },
             EndIndex = 42,
-            Location = new()
-            {
-                PageStart = 1,
-                PageEnd = 2,
-                BlockStart = 3,
-                BlockEnd = 4,
-                CharacterStart = 5,
-                CharacterEnd = 6
-            },
-            Placeholder = "placeholder",
             RawRepresentation = new object(),
             Snippet = "snippet",
             StartIndex = 10,
@@ -103,22 +82,14 @@ public void Serialization_Roundtrips()
         string json = JsonSerializer.Serialize(original, AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(CitationAnnotation)));
         Assert.NotNull(json);
 
-        CitationAnnotation? deserialized = (CitationAnnotation?)JsonSerializer.Deserialize(json, AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(CitationAnnotation)));
+        var deserialized = (CitationAnnotation?)JsonSerializer.Deserialize(json, AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(CitationAnnotation)));
         Assert.NotNull(deserialized);
 
         Assert.NotNull(deserialized.AdditionalProperties);
         Assert.Single(deserialized.AdditionalProperties);
         Assert.Equal(JsonSerializer.Deserialize<JsonElement>("\"value\"", AIJsonUtilities.DefaultOptions).ToString(), deserialized.AdditionalProperties["key"]!.ToString());
 
         Assert.Equal(42, deserialized.EndIndex);
-        Assert.NotNull(deserialized.Location);
-        Assert.Equal(1, deserialized.Location.PageStart);
-        Assert.Equal(2, deserialized.Location.PageEnd);
-        Assert.Equal(3, deserialized.Location.BlockStart);
-        Assert.Equal(4, deserialized.Location.BlockEnd);
-        Assert.Equal(5, deserialized.Location.CharacterStart);
-        Assert.Equal(6, deserialized.Location.CharacterEnd);
-        Assert.Equal("placeholder", deserialized.Placeholder);
         Assert.Null(deserialized.RawRepresentation);
         Assert.Equal("snippet", deserialized.Snippet);
         Assert.Equal(10, deserialized.StartIndex);
@@ -127,6 +98,5 @@ public void Serialization_Roundtrips()
 
         Assert.NotNull(deserialized.Url);
         Assert.Equal(original.Url, deserialized.Url);
-
     }
 }