Finalize 0.0.33

fxnai · Dec 31, 2024 · 758715a · 758715a
1 parent caf6002
commit 758715a
Show file tree

Hide file tree

Showing 55 changed files with 152 additions and 162 deletions.
diff --git a/Assets/Tests/Editor/PredictionTest.cs b/Assets/Tests/Editor/PredictionTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Editor/PredictorTest.cs b/Assets/Tests/Editor/PredictorTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Editor/UserTest.cs b/Assets/Tests/Editor/UserTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Runtime/AccessKeyTest.cs b/Assets/Tests/Runtime/AccessKeyTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Runtime/FxncVersionTest.cs b/Assets/Tests/Runtime/FxncVersionTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Runtime/GreetingTest.cs b/Assets/Tests/Runtime/GreetingTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Runtime/ImageTest.cs b/Assets/Tests/Runtime/ImageTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Runtime/InspectBuildCacheTest.cs b/Assets/Tests/Runtime/InspectBuildCacheTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Runtime/StreamingTest.cs b/Assets/Tests/Runtime/StreamingTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Runtime/SystemInfoTest.cs b/Assets/Tests/Runtime/SystemInfoTest.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Tests {

diff --git a/Assets/Tests/Tests.unity b/Assets/Tests/Tests.unity
@@ -493,7 +493,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1167683551}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5cf472ac7b4534dd8a7bed1e3714204d, type: 3}
   m_Name: 

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,5 @@
 ## 0.0.33
-*INCOMPLETE*
++ Fixed prediction embedding errors causing Unity build to fail.
 
 ## 0.0.32
 + Function can now make predictions fully offline after a predictor has been cached on-device.

diff --git a/Function.Editor.csproj b/Function.Editor.csproj
@@ -69,7 +69,6 @@
     <Compile Include="Packages/ai.fxn.fxn3d/Editor/Build/macOSBuildHandler.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Editor/Build/AndroidBuildHandler.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Editor/Build/WindowsBuildHandler.cs" />
-    <Compile Include="Packages/ai.fxn.fxn3d/Editor/FunctionInfo.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Editor/FunctionSettingsProvider.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Editor/Build/LinuxBuildHandler.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Editor/FunctionProjectSettings.cs" />

diff --git a/Function.Unity.csproj b/Function.Unity.csproj
@@ -67,7 +67,6 @@
   <ItemGroup>
     <Compile Include="Packages/ai.fxn.fxn3d/Unity/FunctionUnity.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Unity/Types/CachedPrediction.cs" />
-    <Compile Include="Packages/ai.fxn.fxn3d/Unity/Internal/FunctionInfo.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Unity/API/PredictionCacheClient.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Unity/Internal/FunctionSettings.cs" />
     <Compile Include="Packages/ai.fxn.fxn3d/Unity/API/UnityClient.cs" />

diff --git a/Packages/ai.fxn.fxn3d/Editor/Build/AndroidBuildHandler.cs b/Packages/ai.fxn.fxn3d/Editor/Build/AndroidBuildHandler.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Editor.Build {
@@ -51,7 +51,10 @@ protected override FunctionSettings CreateSettings (BuildReport report) {
                             )).Result;
                             return new CachedPrediction(prediction, clientId);
                         } catch (Exception ex) {
-                            Debug.LogWarning($"Function: Failed to embed {tag} with error: {ex.Message}. Edge predictions with this predictor will likely fail at runtime.");
+                            Debug.LogException(new InvalidOperationException(
+                                $"Function: Failed to embed {tag} predictor. Predictions with this predictor will likely fail at runtime.",
+                                ex
+                            ));
                             return null;
                         }
                     }));
@@ -75,14 +78,22 @@ void IPostGenerateGradleAndroidProject.OnPostGenerateGradleAndroidProject (strin
                     continue;
                 // Fetch resources
                 var client = new DotNetClient(Function.URL);
-                var resources = prediction.resources.Where(res => res.type == @"dso");
-                foreach (var resource in resources) {
-                    var baseName = Path.GetFileName(PredictionService.GetResourcePath(resource, libDir));
-                    var libName = $"lib{baseName}.so";
-                    var path = Path.Combine(libDir, libName);
-                    using var dsoStream = Task.Run(async () => await client.Download(resource.url)).Result;
-                    using var fileStream = File.Create(path);
-                    dsoStream.CopyTo(fileStream);
+                foreach (var resource in prediction.resources) {
+                    try {
+                        if (resource.type != @"dso")
+                            continue;
+                        var baseName = Path.GetFileName(PredictionService.GetResourcePath(resource, libDir));
+                        var libName = $"lib{baseName}.so";
+                        var path = Path.Combine(libDir, libName);
+                        using var dsoStream = Task.Run(() => client.Download(resource.url)).Result;
+                        using var fileStream = File.Create(path);
+                        dsoStream.CopyTo(fileStream);
+                    } catch (AggregateException ex) {
+                        Debug.LogException(new InvalidOperationException(
+                            $"Function: Failed to embed prediction resource for {prediction.tag} predictor. Predictions with this predictor will likely fail at runtime.",
+                            ex.InnerException
+                        ));
+                    }
                 }
             }
             cache = null;

diff --git a/Packages/ai.fxn.fxn3d/Editor/Build/BuildHandler.cs b/Packages/ai.fxn.fxn3d/Editor/Build/BuildHandler.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 #nullable enable

diff --git a/Packages/ai.fxn.fxn3d/Editor/Build/LinuxBuildHandler.cs b/Packages/ai.fxn.fxn3d/Editor/Build/LinuxBuildHandler.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Editor.Build {

diff --git a/Packages/ai.fxn.fxn3d/Editor/Build/WebGLBuildHandler.cs b/Packages/ai.fxn.fxn3d/Editor/Build/WebGLBuildHandler.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 #nullable enable

diff --git a/Packages/ai.fxn.fxn3d/Editor/Build/WindowsBuildHandler.cs b/Packages/ai.fxn.fxn3d/Editor/Build/WindowsBuildHandler.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Editor.Build {

diff --git a/Packages/ai.fxn.fxn3d/Editor/Build/iOSBuildHandler.cs b/Packages/ai.fxn.fxn3d/Editor/Build/iOSBuildHandler.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Editor.Build {
@@ -50,7 +50,10 @@ protected override FunctionSettings CreateSettings (BuildReport report) {
                             var cached = new CachedPrediction(prediction, ClientId);
                             return cached;
                         } catch (Exception ex) {
-                            Debug.LogWarning($"Function: Failed to embed {tag} with error: {ex.Message}. Edge predictions with this predictor will likely fail at runtime.");
+                            Debug.LogException(new InvalidOperationException(
+                                $"Function: Failed to embed {tag} predictor. Predictions with this predictor will likely fail at runtime.",
+                                ex
+                            ));
                             return null;
                         }
                     })
@@ -74,16 +77,23 @@ void IPostprocessBuildWithReport.OnPostprocessBuild (BuildReport report) {
             var frameworks = new List<string>();
             foreach (var prediction in cache)
                 foreach (var resource in prediction.resources) {
-                    if (resource.type != @"dso")
-                        continue;
-                    var dsoPath = Path.GetTempFileName();
-                    {
-                        using var dsoStream = Task.Run(async () => await client.Download(resource.url)).Result;
-                        using var fileStream = File.Create(dsoPath);
-                        dsoStream.CopyTo(fileStream);
+                    try {
+                        if (resource.type != @"dso")
+                            continue;
+                        var dsoPath = Path.GetTempFileName();
+                        {
+                            using var dsoStream = Task.Run(() => client.Download(resource.url)).Result;
+                            using var fileStream = File.Create(dsoPath);
+                            dsoStream.CopyTo(fileStream);
+                        }
+                        ZipFile.ExtractToDirectory(dsoPath, frameworkDir, true);
+                        frameworks.Add(resource.name);
+                    } catch (AggregateException ex) {
+                        Debug.LogException(new InvalidOperationException(
+                            $"Function: Failed to embed prediction resource for {prediction.tag} predictor. Predictions with this predictor will likely fail at runtime.",
+                            ex.InnerException
+                        ));
                     }
-                    ZipFile.ExtractToDirectory(dsoPath, frameworkDir, true);
-                    frameworks.Add(resource.name);
                 }
         #if UNITY_IOS
             var pbxPath = PBXProject.GetPBXProjectPath(report.summary.outputPath);

diff --git a/Packages/ai.fxn.fxn3d/Editor/Build/macOSBuildHandler.cs b/Packages/ai.fxn.fxn3d/Editor/Build/macOSBuildHandler.cs
@@ -1,6 +1,6 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Editor.Build {
@@ -56,7 +56,10 @@ protected override FunctionSettings CreateSettings (BuildReport report) {
                             var cached = new CachedPrediction(prediction, clientId);
                             return cached;
                         } catch (Exception ex) {
-                            Debug.LogWarning($"Function: Failed to embed {tag} with error: {ex.Message}. Edge predictions with this predictor will likely fail at runtime.");
+                            Debug.LogException(new InvalidOperationException(
+                                $"Function: Failed to embed {tag} predictor. Predictions with this predictor will likely fail at runtime.",
+                                ex
+                            ));
                             return null;
                         }
                     })
@@ -88,37 +91,46 @@ void IPostprocessBuildWithReport.OnPostprocessBuild (BuildReport report) {
             // Embed
             var frameworks = new List<string>();
             var client = new DotNetClient(Function.URL);
-            foreach (var prediction in cache) {
-                var dso = prediction.resources.First(res => res.type == @"dso");
-                var dsoName = Path.GetFileName(PredictionService.GetResourcePath(dso, outputPath));
-                var dsoPath = Path.Combine(frameworkDir, dsoName);
-                using var dsoStream = Task.Run(async () => await client.Download(dso.url)).Result;
-                using var fileStream = File.Create(dsoPath);
-                dsoStream.CopyTo(fileStream);
-                frameworks.Add(dsoName);
-            }
+            foreach (var prediction in cache)
+                foreach (var resource in prediction.resources) {
+                    try {
+                        if (resource.type != @"dso")
+                            continue;
+                        var dsoName = Path.GetFileName(PredictionService.GetResourcePath(resource, outputPath));
+                        var dsoPath = Path.Combine(frameworkDir, dsoName);
+                        using var dsoStream = Task.Run(() => client.Download(resource.url)).Result;
+                        using var fileStream = File.Create(dsoPath);
+                        dsoStream.CopyTo(fileStream);
+                        frameworks.Add(dsoName);
+                    } catch (AggregateException ex) {
+                        Debug.LogException(new InvalidOperationException(
+                            $"Function: Failed to embed prediction resource for {prediction.tag} predictor. Predictions with this predictor will likely fail at runtime.",
+                            ex.InnerException
+                        ));
+                    }
+                }
             // Check Xcode project
             if (isApp)
                 return;
-            #if UNITY_STANDALONE_OSX
-                // Load Xcode project
-                var projectName = new DirectoryInfo(outputPath).Name + ".xcodeproj";
-                var pbxPath = Path.Combine(outputPath, projectName,  @"project.pbxproj");
-                var project = new PBXProject();
-                project.ReadFromFile(pbxPath);
-                // Add frameworks
-                var targetGuid = project.GetUnityMainTargetGuid();
-                foreach (var framework in frameworks) {
-                    var frameworkGuid = project.AddFile(
-                        $"{Application.productName}/Frameworks/Function/" + framework,
-                        "Frameworks/" + framework,
-                        PBXSourceTree.Source
-                    );
-                    project.AddFileToEmbedFrameworks(targetGuid, frameworkGuid);
-                }
-                // Write
-                project.WriteToFile(pbxPath);
-            #endif
+        #if UNITY_STANDALONE_OSX
+            // Load Xcode project
+            var projectName = new DirectoryInfo(outputPath).Name + ".xcodeproj";
+            var pbxPath = Path.Combine(outputPath, projectName,  @"project.pbxproj");
+            var project = new PBXProject();
+            project.ReadFromFile(pbxPath);
+            // Add frameworks
+            var targetGuid = project.GetUnityMainTargetGuid();
+            foreach (var framework in frameworks) {
+                var frameworkGuid = project.AddFile(
+                    $"{Application.productName}/Frameworks/Function/" + framework,
+                    "Frameworks/" + framework,
+                    PBXSourceTree.Source
+                );
+                project.AddFileToEmbedFrameworks(targetGuid, frameworkGuid);
+            }
+            // Write
+            project.WriteToFile(pbxPath);
+        #endif
             // Empty cache
             cache = null;
         }

diff --git a/Packages/ai.fxn.fxn3d/Editor/FunctionInfo.cs b/Packages/ai.fxn.fxn3d/Editor/FunctionInfo.cs
diff --git a/Packages/ai.fxn.fxn3d/Editor/FunctionInfo.cs.meta b/Packages/ai.fxn.fxn3d/Editor/FunctionInfo.cs.meta
diff --git a/Packages/ai.fxn.fxn3d/Editor/FunctionMenu.cs b/Packages/ai.fxn.fxn3d/Editor/FunctionMenu.cs
@@ -1,13 +1,11 @@
 /* 
 *   Function
-*   Copyright © 2024 NatML Inc. All rights reserved.
+*   Copyright © 2025 NatML Inc. All rights reserved.
 */
 
 namespace Function.Editor {
 
-    using System.IO;
     using UnityEditor;
-    using UnityEngine;
 
     internal static class FunctionMenu {