Simplify the model classes for the declarative agent definition

Author: markwallace-microsoft

dotnet/src/Agents/Abstractions/Definition/AgentDefinition.cs

@@ -14,171 +14,60 @@ public sealed class AgentDefinition
     /// <summary>
     /// Gets or sets the version of the schema being used.
     /// </summary>
-    public string? Version
-    {
-        get => this._version;
-        set
-        {
-            Verify.NotNull(value);
-            this._version = value;
-        }
-    }
+    public string? Version { get; set; }
 
     /// <summary>
     /// Gets or sets the id of the deployed agent.
     /// </summary>
-    public string? Id
-    {
-        get => this._id;
-        set
-        {
-            Verify.NotNull(value);
-            this._id = value;
-        }
-    }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Gets or sets the type of the  agent.
     /// </summary>
-    public string? Type
-    {
-        get => this._type;
-        set
-        {
-            Verify.NotNull(value);
-            this._type = value;
-        }
-    }
+    public string? Type { get; set; }
 
     /// <summary>
     /// Gets or sets the name of the  agent.
     /// </summary>
-    public string? Name
-    {
-        get => this._name;
-        set
-        {
-            Verify.NotNull(value);
-            this._name = value;
-        }
-    }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Gets or sets the description of the agent.
     /// </summary>
-    public string? Description
-    {
-        get => this._description;
-        set
-        {
-            Verify.NotNull(value);
-            this._description = value;
-        }
-    }
+    public string? Description { get; set; }
 
     /// <summary>
     /// Gets or sets the instructions for the agent to use.
     /// </summary>
-    public string? Instructions
-    {
-        get => this._instructions;
-        set
-        {
-            Verify.NotNull(value);
-            this._instructions = value;
-        }
-    }
+    public string? Instructions { get; set; }
 
     /// <summary>
     /// Gets or sets the metadata associated with the agent.
     /// </summary>
-    public IDictionary<string, object?>? Metadata
-    {
-        get => this._metadata;
-        set
-        {
-            Verify.NotNull(value);
-            this._metadata = value;
-        }
-    }
+    public IDictionary<string, object?>? Metadata { get; set; }
 
     /// <summary>
     /// Gets or sets the model used by the agent.
     /// </summary>
-    public ModelDefinition? Model
-    {
-        get => this._model;
-        set
-        {
-            Verify.NotNull(value);
-            this._model = value;
-        }
-    }
+    public ModelDefinition? Model { get; set; }
 
     /// <summary>
     /// Gets or sets the collection of input variables used by the agent.
     /// </summary>
-    public IList<InputVariable> Inputs
-    {
-        get => this._inputs ??= [];
-        set
-        {
-            Verify.NotNull(value);
-            this._inputs = value;
-        }
-    }
+    public IList<InputVariable>? Inputs { get; set; }
 
     /// <summary>
     /// Gets or sets the collection of output variables supported by the agent.
     /// </summary>
-    public IList<OutputVariable> Outputs
-    {
-        get => this._outputs ??= [];
-        set
-        {
-            Verify.NotNull(value);
-            this._outputs = value;
-        }
-    }
+    public IList<OutputVariable>? Outputs { get; set; }
 
     /// <summary>
     /// Gets or sets the template options used by the agent.
     /// </summary>
-    public TemplateOptions? Template
-    {
-        get => this._template;
-        set
-        {
-            Verify.NotNull(value);
-            this._template = value;
-        }
-    }
+    public TemplateOptions? Template { get; set; }
 
     /// <summary>
     /// Gets or sets the collection of tools used by the agent.
     /// </summary>
-    public IList<AgentToolDefinition> Tools
-    {
-        get => this._tools ??= [];
-        set
-        {
-            Verify.NotNull(value);
-            this._tools = value;
-        }
-    }
-
-    #region
-    private string? _version;
-    private string? _type;
-    private string? _id;
-    private string? _name;
-    private string? _description;
-    private string? _instructions;
-    private IDictionary<string, object?>? _metadata;
-    private ModelDefinition? _model;
-    private IList<InputVariable>? _inputs;
-    private IList<OutputVariable>? _outputs;
-    private TemplateOptions? _template;
-    private IList<AgentToolDefinition>? _tools;
-    #endregion
+    public IList<AgentToolDefinition>? Tools { get; set; }
 }

dotnet/src/Agents/Abstractions/Definition/AgentToolDefinition.cs

@@ -18,28 +18,12 @@ public sealed class AgentToolDefinition
     /// <remarks>
     /// Used to identify which type of tool is being used e.g., code interpreter, openapi, ...
     /// </remarks>
-    public string? Type
-    {
-        get => this._type;
-        set
-        {
-            Verify.NotNull(value);
-            this._type = value;
-        }
-    }
+    public string? Type { get; set; }
 
     /// <summary>
     /// The name of the tool.
     /// </summary>
-    public string? Name
-    {
-        get => this._name;
-        set
-        {
-            Verify.NotNull(value);
-            this._name = value;
-        }
-    }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Gets or sets the configuration for the tool.
@@ -48,19 +32,5 @@ public string? Name
     /// Used to store tool specific configuration e.g., files associated with the tool, etc.
     /// </remarks>
     [JsonExtensionData]
-    public IDictionary<string, object?>? Configuration
-    {
-        get => this._configuration;
-        set
-        {
-            Verify.NotNull(value);
-            this._configuration = value;
-        }
-    }
-
-    #region private
-    private string? _type;
-    private string? _name;
-    private IDictionary<string, object?>? _configuration;
-    #endregion
+    public IDictionary<string, object?>? Configuration { get; set; }
 }

dotnet/src/Agents/Abstractions/Definition/ModelConfiguration.cs

@@ -19,28 +19,12 @@ public sealed class ModelConfiguration
     /// Used to identify the type of deployment e.g., azure_openai, openai, ...
     /// This type will also be used for configuration hosting.
     /// </remarks>
-    public string? Type
-    {
-        get => this._type;
-        set
-        {
-            Verify.NotNull(value);
-            this._type = value;
-        }
-    }
+    public string? Type { get; set; }
 
     /// <summary>
     /// Gets or sets the Service ID of the model configuration.
     /// </summary>
-    public string? ServiceId
-    {
-        get => this._serviceId;
-        set
-        {
-            Verify.NotNull(value);
-            this._serviceId = value;
-        }
-    }
+    public string? ServiceId { get; set; }
 
     /// <summary>
     /// Extra properties that may be included in the serialized model configuration.
@@ -60,8 +44,6 @@ public string? ServiceId
     }
 
     #region private
-    private string? _type;
-    private string? _serviceId;
     private IDictionary<string, object?>? _extensionData;
     #endregion
 }

dotnet/src/Agents/Abstractions/Definition/ModelDefinition.cs

@@ -18,15 +18,7 @@ public sealed class ModelDefinition
     /// <summary>
     /// Gets or sets the ID of the model.
     /// </summary>
-    public string? Id
-    {
-        get => this._id;
-        set
-        {
-            Verify.NotNull(value);
-            this._id = value;
-        }
-    }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Gets or sets the type of API supported by the model.
@@ -44,33 +36,14 @@ public string Api
     /// <summary>
     /// Gets or sets the options used by the model.
     /// </summary>
-    public PromptExecutionSettings? Options
-    {
-        get => this._options;
-        set
-        {
-            Verify.NotNull(value);
-            this._options = value;
-        }
-    }
+    public PromptExecutionSettings? Options { get; set; }
 
     /// <summary>
     /// Gets or sets the options used by the model.
     /// </summary>
-    public ModelConfiguration? Configuration
-    {
-        get => this._configuration;
-        set
-        {
-            Verify.NotNull(value);
-            this._configuration = value;
-        }
-    }
+    public ModelConfiguration? Configuration { get; set; }
 
     #region
-    private string? _id;
     private string? _api;
-    private PromptExecutionSettings? _options;
-    private ModelConfiguration? _configuration;
     #endregion
 }

dotnet/src/Agents/Abstractions/Extensions/AgentDefinitionExtensions.cs

@@ -18,7 +18,7 @@ public static KernelArguments GetDefaultKernelArguments(this AgentDefinition age
         Verify.NotNull(agentDefinition);
 
         var arguments = new KernelArguments(agentDefinition?.Model?.Options);
-        if (agentDefinition is not null)
+        if (agentDefinition is not null && agentDefinition.Inputs is not null)
         {
             // Add default arguments for the agent
             foreach (var input in agentDefinition.Inputs)