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

.github/update_tooltips.py

@@ -31,7 +31,7 @@ def find_eligible_classes(file_paths):
             ret_classes.append(check_class)
         check_classes += child_classes.get(check_class, [])
     return ret_classes
-    
+
 
 
 def add_tooltips_to_unity_file(file_path, allowed_classes):
@@ -55,21 +55,21 @@ def add_tooltips_to_unity_file(file_path, allowed_classes):
             if '<summary>' in stripped_line:
                 in_summary = True
                 summary_text = ''
-            
+
             if in_summary:
                 if summary_text != "": summary_text += ' '
                 summary_text += stripped_line.replace("///", "").replace("<summary>", "").replace("</summary>", "").strip()
-            
+
             if '</summary>' in stripped_line:
                 in_summary = False
 
             if 'Tooltip' in stripped_line:
                 if ('Tooltip: ignore' not in stripped_line):
                     continue
 
-            include_terms = ['public', ';']
+            include_terms = ['public', 'private', 'protected']
             exclude_terms = ['{', 'static', 'abstract']
-            if all([x in stripped_line for x in include_terms]) and not any([x in stripped_line for x in exclude_terms]):
+            if any([x in stripped_line for x in include_terms]) and ';' in stripped_line and not any([x in stripped_line for x in exclude_terms]):
                 if summary_text != '':
                     num_spaces = len(line) - len(line.lstrip())
                     tooltip = ''.join([' '] * num_spaces + [f'[Tooltip("{summary_text}")]', '\n'])

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,89 @@ 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.a");
+#elif UNITY_VISIONOS
+            string projPath = PBXProject.GetPBXProjectPath(outputPath).Replace("Unity-iPhone", "Unity-VisionOS");
+            libraryFileNames.Add("libllamalib_visionos.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);
+                        string relLibraryDir = Path.GetDirectoryName(relLibraryFile);
+                        project.AddFileToBuild(unityMainTargetGuid, fileGuid);
+                        project.AddBuildProperty(unityMainTargetGuid, "LIBRARY_SEARCH_PATHS", "$(PROJECT_DIR)/" + relLibraryDir);
+                        if (targetGuid != null)
+                        {
+                            project.AddFileToBuild(targetGuid, fileGuid);
+                            project.AddBuildProperty(targetGuid, "LIBRARY_SEARCH_PATHS", "$(PROJECT_DIR)/" + relLibraryDir);
+                        }
+                    }
+                }
             }
 
             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);
                         }
                     };
                 }