add lora and model download attributes

Author: amakropoulos

Editor/LLMEditor.cs

@@ -86,15 +86,14 @@ public void AddModelAddonLoaders(SerializedObject llmScriptSO, LLM llmScript, bo
         public void AddModelSettings(SerializedObject llmScriptSO)
         {
             List<Type> attributeClasses = new List<Type> { typeof(ModelAttribute) };
+            List<Type> excludeAttributeClasses = new List<Type> { typeof(ModelDownloadAttribute), typeof(ModelDownloadAdvancedAttribute) };
+            if (llmScriptSO.FindProperty("downloadOnBuild").boolValue) excludeAttributeClasses.Remove(typeof(ModelDownloadAttribute));
             if (llmScriptSO.FindProperty("advancedOptions").boolValue)
             {
                 attributeClasses.Add(typeof(ModelAdvancedAttribute));
+                if (llmScriptSO.FindProperty("downloadOnBuild").boolValue) excludeAttributeClasses.Remove(typeof(ModelDownloadAdvancedAttribute));
             }
-            if (llmScriptSO.FindProperty("downloadOnBuild").boolValue)
-            {
-                attributeClasses.Add(typeof(ModelDownloadAttribute));
-            }
-            ShowPropertiesOfClass("", llmScriptSO, attributeClasses, false);
+            ShowPropertiesOfClass("", llmScriptSO, attributeClasses, false, excludeAttributeClasses);
             Space();
         }
 

Editor/PropertyEditor.cs

@@ -94,10 +94,23 @@ public List<SerializedProperty> GetPropertiesOfClass(SerializedObject so, List<T
             return properties;
         }
 
-        public void ShowPropertiesOfClass(string title, SerializedObject so, List<Type> attributeClasses, bool addSpace = true)
+        public void ShowPropertiesOfClass(string title, SerializedObject so, List<Type> attributeClasses, bool addSpace = true, List<Type> excludeAttributeClasses = null)
         {
             // display a property if it belongs to a certain class and/or has a specific attribute class
             List<SerializedProperty> properties = GetPropertiesOfClass(so, attributeClasses);
+            if (excludeAttributeClasses != null)
+            {
+                List<SerializedProperty> excludeProperties = GetPropertiesOfClass(so, excludeAttributeClasses);
+                List<SerializedProperty> removeProperties = new List<SerializedProperty>();
+                foreach (SerializedProperty excprop in excludeProperties)
+                {
+                    foreach (SerializedProperty prop in properties)
+                    {
+                        if (prop.displayName == excprop.displayName) removeProperties.Add(prop);
+                    }
+                }
+                foreach (SerializedProperty prop in removeProperties) properties.Remove(prop);
+            }
             if (properties.Count == 0) return;
             if (title != "") EditorGUILayout.LabelField(title, EditorStyles.boldLabel);
             foreach (SerializedProperty prop in properties)
@@ -141,7 +154,7 @@ public Attribute GetPropertyAttribute(SerializedProperty prop, Type attributeCla
                     {
                         foreach (Attribute attr in fieldInfo.GetCustomAttributes(attributeClass, true))
                         {
-                            if (attr.GetType() == attributeClass)
+                            if (attributeClass.IsAssignableFrom(attr.GetType()))
                                 return attr;
                         }
                     }

Runtime/LLMUnitySetup.cs

@@ -45,7 +45,8 @@ public class LocalRemoteAttribute : PropertyAttribute {}
     public class RemoteAttribute : PropertyAttribute {}
     public class LocalAttribute : PropertyAttribute {}
     public class ModelAttribute : PropertyAttribute {}
-    public class ModelDownloadAttribute : PropertyAttribute {}
+    public class ModelDownloadAttribute : ModelAttribute {}
+    public class ModelDownloadAdvancedAttribute : ModelAdvancedAttribute {}
     public class ModelAdvancedAttribute : PropertyAttribute {}
     public class ChatAttribute : PropertyAttribute {}
     public class ChatAdvancedAttribute : PropertyAttribute {}