Android deployment

Editor/LLMBuildProcessor.cs

@@ -8,26 +8,28 @@
 
 namespace LLMUnity
 {
-    public class LLMBuildProcessor : IPreprocessBuildWithReport, IPostprocessBuildWithReport
+    public class LLMBuildProcessor : MonoBehaviour, IPreprocessBuildWithReport, IPostprocessBuildWithReport
     {
         public int callbackOrder => 0;
         static string tempDir = Path.Combine(Application.temporaryCachePath, "LLMBuildProcessor", Path.GetFileName(LLMUnitySetup.libraryPath));
-        static string foldersMovedCache = Path.Combine(tempDir, "moved.json");
+        static List<MovedPair> movedPairs = new List<MovedPair>();
+        static string movedCache = Path.Combine(tempDir, "moved.json");
 
         [InitializeOnLoadMethod]
         private static void InitializeOnLoad()
         {
             if (!Directory.Exists(tempDir)) Directory.CreateDirectory(tempDir);
-            else ResetLibraryPlatforms();
+            else ResetMoves();
         }
 
         // CALLED BEFORE THE BUILD
         public void OnPreprocessBuild(BuildReport report)
         {
             // Start listening for errors when build starts
             Application.logMessageReceived += OnBuildError;
-            List<string> platforms = GetLibraryPlatformsToHide(report.summary.platform);
-            HideLibraryPlatforms(platforms);
+            HideLibraryPlatforms(report.summary.platform);
+            HideModels();
+            if (movedPairs.Count > 0) AssetDatabase.Refresh();
         }
 
         // CALLED DURING BUILD TO CHECK FOR ERRORS
@@ -49,29 +51,10 @@ public void OnPostprocessBuild(BuildReport report)
         public void BuildCompleted()
         {
             Application.logMessageReceived -= OnBuildError;
-            ResetLibraryPlatforms();
+            ResetMoves();
         }
 
-        static List<string> GetLibraryPlatformsToHide(BuildTarget platform)
-        {
-            List<string> platforms = new List<string>(){ "windows", "macos", "linux" };
-            switch (platform)
-            {
-                case BuildTarget.StandaloneWindows:
-                case BuildTarget.StandaloneWindows64:
-                    platforms.Remove("windows");
-                    break;
-                case BuildTarget.StandaloneLinux64:
-                    platforms.Remove("linux");
-                    break;
-                case BuildTarget.StandaloneOSX:
-                    platforms.Remove("macos");
-                    break;
-            }
-            return platforms;
-        }
-
-        static bool MovePath(string source, string target, List<FoldersMovedPair> foldersMoved = null)
+        static bool MovePath(string source, string target)
         {
             bool moved = false;
             if (File.Exists(source))
@@ -84,45 +67,77 @@ static bool MovePath(string source, string target, List<FoldersMovedPair> folder
                 Directory.Move(source, target);
                 moved = true;
             }
-            if (moved && foldersMoved != null) foldersMoved.Add(new FoldersMovedPair {source = source, target = target});
+            if (moved)
+            {
+                movedPairs.Add(new MovedPair {source = source, target = target});
+                File.WriteAllText(movedCache, JsonUtility.ToJson(new FoldersMovedWrapper { movedPairs = movedPairs }));
+            }
             return moved;
         }
 
-        static void HideLibraryPlatforms(List<string> platforms)
+        static void MoveAssetAndMeta(string source, string target)
+        {
+            MovePath(source + ".meta", target + ".meta");
+            MovePath(source, target);
+        }
+
+        static void HideLibraryPlatforms(BuildTarget buildPlatform)
         {
-            List<FoldersMovedPair> foldersMoved = new List<FoldersMovedPair>();
+            List<string> platforms = new List<string>(){ "windows", "macos", "linux", "android" };
+            switch (buildPlatform)
+            {
+                case BuildTarget.StandaloneWindows:
+                case BuildTarget.StandaloneWindows64:
+                    platforms.Remove("windows");
+                    break;
+                case BuildTarget.StandaloneLinux64:
+                    platforms.Remove("linux");
+                    break;
+                case BuildTarget.StandaloneOSX:
+                    platforms.Remove("macos");
+                    break;
+                case BuildTarget.Android:
+                    platforms.Remove("android");
+                    break;
+            }
+
             foreach (string dirname in Directory.GetDirectories(LLMUnitySetup.libraryPath))
             {
                 foreach (string platform in platforms)
                 {
                     if (Path.GetFileName(dirname).StartsWith(platform))
                     {
-                        string movePath = Path.Combine(tempDir, Path.GetFileName(dirname));
-                        MovePath(dirname + ".meta", movePath + ".meta", foldersMoved);
-                        MovePath(dirname, movePath, foldersMoved);
-                        File.WriteAllText(foldersMovedCache, JsonUtility.ToJson(new FoldersMovedWrapper { foldersMoved = foldersMoved }));
+                        MoveAssetAndMeta(dirname, Path.Combine(tempDir, Path.GetFileName(dirname)));
                     }
                 }
             }
-            if (foldersMoved.Count > 0) AssetDatabase.Refresh();
         }
 
-        static void ResetLibraryPlatforms()
+        static void HideModels()
+        {
+            foreach (LLM llm in FindObjectsOfType<LLM>())
+            {
+                if (!llm.downloadOnBuild) continue;
+                if (llm.modelURL != "") MoveAssetAndMeta(LLMUnitySetup.GetAssetPath(llm.model), Path.Combine(tempDir, Path.GetFileName(llm.model)));
+                if (llm.loraURL != "") MoveAssetAndMeta(LLMUnitySetup.GetAssetPath(llm.lora), Path.Combine(tempDir, Path.GetFileName(llm.lora)));
+            }
+        }
+
+        static void ResetMoves()
         {
-            if (!File.Exists(foldersMovedCache)) return;
-            List<FoldersMovedPair> foldersMoved = JsonUtility.FromJson<FoldersMovedWrapper>(File.ReadAllText(foldersMovedCache)).foldersMoved;
-            if (foldersMoved == null) return;
+            if (!File.Exists(movedCache)) return;
+            List<MovedPair> movedPairs = JsonUtility.FromJson<FoldersMovedWrapper>(File.ReadAllText(movedCache)).movedPairs;
+            if (movedPairs == null) return;
 
             bool refresh = false;
-            foreach (var pair in foldersMoved) refresh |= MovePath(pair.target, pair.source);
+            foreach (var pair in movedPairs) refresh |= MovePath(pair.target, pair.source);
             if (refresh) AssetDatabase.Refresh();
-
-            File.Delete(foldersMovedCache);
+            File.Delete(movedCache);
         }
     }
 
     [Serializable]
-    public struct FoldersMovedPair
+    public struct MovedPair
     {
         public string source;
         public string target;
@@ -131,6 +146,6 @@ public struct FoldersMovedPair
     [Serializable]
     public class FoldersMovedWrapper
     {
-        public List<FoldersMovedPair> foldersMoved;
+        public List<MovedPair> movedPairs;
     }
 }

Editor/LLMEditor.cs

@@ -35,7 +35,7 @@ public void AddModelLoaders(SerializedObject llmScriptSO, LLM llmScript)
             int newIndex = EditorGUILayout.Popup("Model", llmScript.SelectedModel, options);
             if (newIndex != llmScript.SelectedModel)
             {
-                LLMUnitySetup.DownloadModel(llmScript, newIndex);
+                llmScript.DownloadDefaultModel(newIndex);
             }
 
             if (GUILayout.Button("Load model", GUILayout.Width(buttonWidth)))
@@ -45,7 +45,7 @@ public void AddModelLoaders(SerializedObject llmScriptSO, LLM llmScript)
                     string path = EditorUtility.OpenFilePanelWithFilters("Select a gguf model file", "", new string[] { "Model Files", "gguf" });
                     if (!string.IsNullOrEmpty(path))
                     {
-                        llmScript.SelectedModel = 0;
+                        llmScript.ResetSelectedModel();
                         llmScript.SetModel(path);
                     }
                 };
@@ -86,11 +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));
             }
-            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;
                         }
                     }