Fix issue with resource reference types

solliancenet · Sep 18, 2024 · 0bcaa4b · 0bcaa4b
1 parent ce1c92e
commit 0bcaa4b
Show file tree

Hide file tree

Showing 11 changed files with 650 additions and 298 deletions.
diff --git a/src/dotnet/AIModel/Models/AIModelReference.cs b/src/dotnet/AIModel/Models/AIModelReference.cs
@@ -15,7 +15,7 @@ public class AIModelReference : ResourceReference
         /// The object type of the data source.
         /// </summary>
         [JsonIgnore]
-        public Type AIModelType =>
+        public override Type ResourceType =>
             Type switch
             {
                 AIModelTypes.Basic => typeof(AIModelBase),

diff --git a/src/dotnet/AIModel/ResourceProviders/AIModelResourceProviderService.cs b/src/dotnet/AIModel/ResourceProviders/AIModelResourceProviderService.cs
@@ -121,7 +121,7 @@ private async Task<ResourceProviderUpsertResult> UpdateAIModel(ResourcePath reso
 
             aiModel.ObjectId = resourcePath.GetObjectId(_instanceSettings.Id, _name);
 
-            var validator = _resourceValidatorFactory.GetValidator(aiModelReference.AIModelType);
+            var validator = _resourceValidatorFactory.GetValidator(aiModelReference.ResourceType);
             if (validator is IValidator aiModelValidator)
             {
                 var context = new ValidationContext<object>(aiModel);

diff --git a/src/dotnet/Agent/Models/Resources/AgentReference.cs b/src/dotnet/Agent/Models/Resources/AgentReference.cs
@@ -14,7 +14,7 @@ public class AgentReference : ResourceReference
         /// The object type of the agent.
         /// </summary>
         [JsonIgnore]
-        public Type AgentType =>
+        public override Type ResourceType =>
             Type switch
             {
                 AgentTypes.Basic => typeof(AgentBase),

diff --git a/src/dotnet/Agent/Models/Resources/AgentReferenceStore.cs b/src/dotnet/Agent/Models/Resources/AgentReferenceStore.cs
diff --git a/src/dotnet/Agent/ResourceProviders/AgentResourceProviderService.cs b/src/dotnet/Agent/ResourceProviders/AgentResourceProviderService.cs
@@ -242,7 +242,7 @@ private async Task<ResourceProviderUpsertResult> UpdateAgent(ResourcePath resour
                         StatusCodes.Status500InternalServerError);
             }
 
-            var validator = _resourceValidatorFactory.GetValidator(agentReference.AgentType);
+            var validator = _resourceValidatorFactory.GetValidator(agentReference.ResourceType);
             if (validator is IValidator agentValidator)
             {
                 var context = new ValidationContext<object>(agent);

diff --git a/src/dotnet/DataSource/Models/DataSourceReference.cs b/src/dotnet/DataSource/Models/DataSourceReference.cs
@@ -15,7 +15,7 @@ public class DataSourceReference : ResourceReference
         /// The object type of the data source.
         /// </summary>
         [JsonIgnore]
-        public Type DataSourceType =>
+        public override Type ResourceType =>
             Type switch
             {
                 DataSourceTypes.Basic => typeof(DataSourceBase),

diff --git a/src/dotnet/DataSource/Models/DataSourceReferenceStore.cs b/src/dotnet/DataSource/Models/DataSourceReferenceStore.cs