Release v3.0.0

.github/FUNDING.yml

@@ -1 +1,2 @@
 github: [amakropoulos]
+ko_fi: amakropoulos

.github/doxygen/Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "LLM for Unity"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = v2.5.2
+PROJECT_NUMBER = v3.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Editor/LLMBuildProcessor.cs

@@ -2,7 +2,8 @@
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
-#if UNITY_IOS || UNITY_VISIONOS
+using System.Collections.Generic;
+#if UNITY_STANDALONE_OSX || UNITY_IOS || UNITY_VISIONOS
 using System.IO;
 using UnityEditor.iOS.Xcode;
 #endif
@@ -27,56 +28,83 @@ private void OnBuildError(string condition, string stacktrace, LogType type)
             if (type == LogType.Error) BuildCompleted();
         }
 
-#if UNITY_IOS || UNITY_VISIONOS
+#if UNITY_STANDALONE_OSX || UNITY_IOS || UNITY_VISIONOS
         /// <summary>
         /// Postprocess the iOS Build
         /// </summary>
         public static void PostprocessIOSBuild(BuildTarget buildTarget, string outputPath)
         {
+            List<string> libraryFileNames = new List<string>();
+#if UNITY_IOS
             string projPath = PBXProject.GetPBXProjectPath(outputPath);
-#if UNITY_VISIONOS
-            projPath = projPath.Replace("Unity-iPhone", "Unity-VisionOS");
+            libraryFileNames.Add("libllamalib_ios-arm64.a");
+#elif UNITY_VISIONOS
+            string projPath = PBXProject.GetPBXProjectPath(outputPath).Replace("Unity-iPhone", "Unity-VisionOS");
+            libraryFileNames.Add("libllamalib_visionos-arm64.a");
+#else
+            string projPath = Path.Combine(outputPath, Path.GetFileName(outputPath) + ".xcodeproj", "project.pbxproj");
+            if (!File.Exists(projPath)) return;
+            libraryFileNames.Add("libllamalib_osx-universal_acc.dylib");
+            libraryFileNames.Add("libllamalib_osx-universal_no-acc.dylib");
 #endif
+
             PBXProject project = new PBXProject();
             project.ReadFromFile(projPath);
 
-            string targetGuid = project.GetUnityFrameworkTargetGuid();
-            string frameworkTargetGuid = project.GetUnityFrameworkTargetGuid();
             string unityMainTargetGuid = project.GetUnityMainTargetGuid();
-            string embedFrameworksGuid = project.GetResourcesBuildPhaseByTarget(frameworkTargetGuid);
+            string targetGuid = project.GetUnityFrameworkTargetGuid();
 
             // Add Accelerate framework
             project.AddFrameworkToProject(unityMainTargetGuid, "Accelerate.framework", false);
-            project.AddFrameworkToProject(targetGuid, "Accelerate.framework", false);
+            if (targetGuid != null) project.AddFrameworkToProject(targetGuid, "Accelerate.framework", false);
+
+            List<string> libraryFiles = new List<string>();
+            foreach (string libraryFileName in libraryFileNames)
+            {
+                string lib = LLMUnitySetup.SearchDirectory(outputPath, libraryFileName);
+                if (lib != null) libraryFiles.Add(lib);
+            }
 
-            string libraryFile = LLMUnitySetup.RelativePath(LLMUnitySetup.SearchDirectory(outputPath, $"libundreamai_{buildTarget.ToString().ToLower()}.a"), outputPath);
-            string fileGuid = project.FindFileGuidByProjectPath(libraryFile);
-            if (string.IsNullOrEmpty(fileGuid)) Debug.LogError($"Library file {libraryFile} not found in project");
+            if (libraryFiles.Count == 0)
+            {
+                Debug.LogError($"No library files found for the build");
+            }
             else
             {
-                foreach (var phaseGuid in project.GetAllBuildPhasesForTarget(unityMainTargetGuid))
+                foreach (string libraryFile in libraryFiles)
                 {
-                    if (project.GetBuildPhaseName(phaseGuid) == "Embed Frameworks")
+                    string relLibraryFile = LLMUnitySetup.RelativePath(libraryFile, outputPath);
+                    string fileGuid = project.FindFileGuidByProjectPath(relLibraryFile);
+                    if (string.IsNullOrEmpty(fileGuid))
                     {
-                        project.RemoveFileFromBuild(phaseGuid, fileGuid);
-                        break;
+                        Debug.LogError($"Library file {relLibraryFile} not found in project");
                     }
-                }
+                    else
+                    {
+                        foreach (var phaseGuid in project.GetAllBuildPhasesForTarget(unityMainTargetGuid))
+                        {
+                            if (project.GetBuildPhaseName(phaseGuid) == "Embed Frameworks")
+                            {
+                                project.RemoveFileFromBuild(phaseGuid, fileGuid);
+                                break;
+                            }
+                        }
 
-                project.AddFileToBuild(unityMainTargetGuid, fileGuid);
-                project.AddFileToBuild(targetGuid, fileGuid);
+                        project.AddFileToBuild(unityMainTargetGuid, fileGuid);
+                        if (targetGuid != null) project.AddFileToBuild(targetGuid, fileGuid);
+                    }
+                }
             }
 
             project.WriteToFile(projPath);
-            AssetDatabase.ImportAsset(projPath);
         }
 
 #endif
 
         // called after the build
         public void OnPostprocessBuild(BuildReport report)
         {
-#if UNITY_IOS || UNITY_VISIONOS
+#if UNITY_STANDALONE_OSX || UNITY_IOS || UNITY_VISIONOS
             PostprocessIOSBuild(report.summary.platform, report.summary.outputPath);
 #endif
             EditorApplication.delayCall += () =>

Editor/LLMCallerEditor.cs → Editor/LLMClientEditor.cs

@@ -5,11 +5,11 @@
 
 namespace LLMUnity
 {
-    [CustomEditor(typeof(LLMCaller), true)]
+    [CustomEditor(typeof(LLMClient), true)]
     public class LLMCallerEditor : PropertyEditor {}
 
-    [CustomEditor(typeof(LLMCharacter), true)]
-    public class LLMCharacterEditor : LLMCallerEditor
+    [CustomEditor(typeof(LLMAgent), true)]
+    public class LLMAgentEditor : LLMCallerEditor
     {
         public override void AddModelSettings(SerializedObject llmScriptSO)
         {
@@ -23,26 +23,14 @@ public override void AddModelSettings(SerializedObject llmScriptSO)
                 ShowPropertiesOfClass("", llmScriptSO, new List<Type> { typeof(ModelAttribute) }, false);
 
                 EditorGUILayout.BeginHorizontal();
-                GUILayout.Label("Grammar", GUILayout.Width(EditorGUIUtility.labelWidth));
                 if (GUILayout.Button("Load grammar", GUILayout.Width(buttonWidth)))
                 {
                     EditorApplication.delayCall += () =>
                     {
-                        string path = EditorUtility.OpenFilePanelWithFilters("Select a gbnf grammar file", "", new string[] { "Grammar Files", "gbnf" });
+                        string path = EditorUtility.OpenFilePanelWithFilters("Select a grammar file", "", new string[] { "Grammar Files", "json,gbnf" });
                         if (!string.IsNullOrEmpty(path))
                         {
-                            ((LLMCharacter)target).SetGrammar(path);
-                        }
-                    };
-                }
-                if (GUILayout.Button("Load JSON grammar", GUILayout.Width(buttonWidth)))
-                {
-                    EditorApplication.delayCall += () =>
-                    {
-                        string path = EditorUtility.OpenFilePanelWithFilters("Select a json schema grammar file", "", new string[] { "Grammar Files", "json" });
-                        if (!string.IsNullOrEmpty(path))
-                        {
-                            ((LLMCharacter)target).SetJSONGrammar(path);
+                            ((LLMAgent)target).LoadGrammar(path);
                         }
                     };
                 }

Editor/LLMEditor.cs

@@ -13,7 +13,6 @@ public class LLMEditor : PropertyEditor
     {
         private ReorderableList modelList;
         static float nameColumnWidth = 150f;
-        static float templateColumnWidth = 150f;
         static float textColumnWidth = 150f;
         static float includeInBuildColumnWidth = 30f;
         static float actionColumnWidth = 20f;
@@ -32,7 +31,7 @@ public class LLMEditor : PropertyEditor
 
         public void AddSecuritySettings(SerializedObject llmScriptSO, LLM llmScript)
         {
-            void AddSSLLoad(string type, Callback<string> setterCallback)
+            void AddSSLLoad(string type, Action<string> setterCallback)
             {
                 if (GUILayout.Button("Load SSL " + type, GUILayout.Width(buttonWidth)))
                 {
@@ -44,29 +43,17 @@ void AddSSLLoad(string type, Callback<string> setterCallback)
                 }
             }
 
-            void AddSSLInfo(string propertyName, string type, Callback<string> setterCallback)
-            {
-                string path = llmScriptSO.FindProperty(propertyName).stringValue;
-                if (path != "")
-                {
-                    EditorGUILayout.BeginHorizontal();
-                    EditorGUILayout.LabelField("SSL " + type + " path", path);
-                    if (GUILayout.Button(trashIcon, GUILayout.Height(actionColumnWidth), GUILayout.Width(actionColumnWidth))) setterCallback("");
-                    EditorGUILayout.EndHorizontal();
-                }
-            }
-
             EditorGUILayout.LabelField("Server Security Settings", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(llmScriptSO.FindProperty("APIKey"));
+            EditorGUILayout.PropertyField(llmScriptSO.FindProperty("_APIKey"));
 
             if (llmScriptSO.FindProperty("advancedOptions").boolValue)
             {
                 EditorGUILayout.BeginHorizontal();
-                AddSSLLoad("certificate", llmScript.SetSSLCert);
-                AddSSLLoad("key", llmScript.SetSSLKey);
+                AddSSLLoad("certificate", llmScript.SetSSLCertFromFile);
+                AddSSLLoad("key", llmScript.SetSSLKeyFromFile);
                 EditorGUILayout.EndHorizontal();
-                AddSSLInfo("SSLCertPath", "certificate", llmScript.SetSSLCert);
-                AddSSLInfo("SSLKeyPath", "key", llmScript.SetSSLKey);
+                EditorGUILayout.PropertyField(llmScriptSO.FindProperty("_SSLCert"));
+                EditorGUILayout.PropertyField(llmScriptSO.FindProperty("_SSLKey"));
             }
             Space();
         }
@@ -111,7 +98,7 @@ public override void AddModelSettings(SerializedObject llmScriptSO)
             if (llmScriptSO.FindProperty("advancedOptions").boolValue)
             {
                 attributeClasses.Add(typeof(ModelAdvancedAttribute));
-                if (LLMUnitySetup.FullLlamaLib) attributeClasses.Add(typeof(ModelExtrasAttribute));
+                attributeClasses.Add(typeof(ModelExtrasAttribute));
             }
             ShowPropertiesOfClass("", llmScriptSO, attributeClasses, false);
             Space();
@@ -126,10 +113,10 @@ static void ResetModelOptions()
         {
             List<string> existingOptions = new List<string>();
             foreach (ModelEntry entry in LLMManager.modelEntries) existingOptions.Add(entry.url);
-            modelOptions = new List<string>(){"Download model", "Custom URL"};
-            modelNames = new List<string>(){null, null};
-            modelURLs = new List<string>(){null, null};
-            modelLicenses = new List<string>(){null, null};
+            modelOptions = new List<string>() { "Download model", "Custom URL" };
+            modelNames = new List<string>() { null, null };
+            modelURLs = new List<string>() { null, null };
+            modelLicenses = new List<string>() { null, null };
             foreach (var entry in LLMUnitySetup.modelOptions)
             {
                 string category = entry.Key;
@@ -146,9 +133,9 @@ static void ResetModelOptions()
 
         float[] GetColumnWidths(bool expandedView)
         {
-            List<float> widths = new List<float>(){actionColumnWidth, nameColumnWidth, templateColumnWidth};
-            if (expandedView) widths.AddRange(new List<float>(){textColumnWidth, textColumnWidth});
-            widths.AddRange(new List<float>(){includeInBuildColumnWidth, actionColumnWidth});
+            List<float> widths = new List<float>() { actionColumnWidth, nameColumnWidth };
+            if (expandedView) widths.AddRange(new List<float>() { textColumnWidth, textColumnWidth });
+            widths.AddRange(new List<float>() { includeInBuildColumnWidth, actionColumnWidth });
             return widths.ToArray();
         }
 
@@ -320,7 +307,6 @@ void OnEnable()
                     int col = 0;
                     Rect selectRect = rects[col++];
                     Rect nameRect = rects[col++];
-                    Rect templateRect = rects[col++];
                     Rect urlRect = new Rect();
                     Rect pathRect = new Rect();
                     if (expandedView)
@@ -351,19 +337,6 @@ void OnEnable()
 
                     DrawCopyableLabel(nameRect, entry.label, entry.filename);
 
-                    if (!entry.lora)
-                    {
-                        string[] templateDescriptions = ChatTemplate.templatesDescription.Keys.ToList().ToArray();
-                        string[] templates = ChatTemplate.templatesDescription.Values.ToList().ToArray();
-                        int templateIndex = Array.IndexOf(templates, entry.chatTemplate);
-                        int newTemplateIndex = EditorGUI.Popup(templateRect, templateIndex, templateDescriptions);
-                        if (newTemplateIndex != templateIndex)
-                        {
-                            LLMManager.SetTemplate(entry.filename, templates[newTemplateIndex]);
-                            UpdateModels();
-                        }
-                    }
-
                     if (expandedView)
                     {
                         if (hasURL)
@@ -411,7 +384,6 @@ void OnEnable()
                     int col = 0;
                     EditorGUI.LabelField(rects[col++], "");
                     EditorGUI.LabelField(rects[col++], "Model");
-                    EditorGUI.LabelField(rects[col++], "Chat template");
                     if (expandedView)
                     {
                         EditorGUI.LabelField(rects[col++], "URL");
@@ -440,14 +412,14 @@ private void DrawCopyableLabel(Rect rect, string label, string text = "")
 
         private void CopyToClipboard(string text)
         {
-            TextEditor te = new TextEditor {text = text};
+            TextEditor te = new TextEditor { text = text };
             te.SelectAll();
             te.Copy();
         }
 
         public void AddExtrasToggle()
         {
-            if (ToggleButton("Use extras", LLMUnitySetup.FullLlamaLib)) LLMUnitySetup.SetFullLlamaLib(!LLMUnitySetup.FullLlamaLib);
+            if (ToggleButton("Use cuBLAS", LLMUnitySetup.CUBLAS)) LLMUnitySetup.SetCUBLAS(!LLMUnitySetup.CUBLAS);
         }
 
         public override void AddOptionsToggles(SerializedObject llmScriptSO)
@@ -481,7 +453,7 @@ public override void OnInspectorGUI()
 
             AddOptionsToggles(llmScriptSO);
             AddSetupSettings(llmScriptSO);
-            if (llmScriptSO.FindProperty("remote").boolValue) AddSecuritySettings(llmScriptSO, llmScript);
+            if (llmScriptSO.FindProperty("_remote").boolValue) AddSecuritySettings(llmScriptSO, llmScript);
             AddModelLoadersSettings(llmScriptSO, llmScript);
             AddChatSettings(llmScriptSO);
 

Editor/PropertyEditor.cs

@@ -26,7 +26,7 @@ public virtual bool ToggleButton(string text, bool activated)
         public virtual void AddSetupSettings(SerializedObject llmScriptSO)
         {
             List<Type> attributeClasses = new List<Type>(){typeof(LocalRemoteAttribute)};
-            SerializedProperty remoteProperty = llmScriptSO.FindProperty("remote");
+            SerializedProperty remoteProperty = llmScriptSO.FindProperty("_remote");
             if (remoteProperty != null) attributeClasses.Add(remoteProperty.boolValue ? typeof(RemoteAttribute) : typeof(LocalAttribute));
             attributeClasses.Add(typeof(LLMAttribute));
             if (llmScriptSO.FindProperty("advancedOptions").boolValue)