fix(JobPathArgument): improve ToUserFriendlyString()

pollination · Nov 10, 2023 · 43edf46 · 43edf46
1 parent 53f8095
commit 43edf46
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/PollinationSDK/ManuallyAdded/Model/JobPathArgument.cs b/src/PollinationSDK/ManuallyAdded/Model/JobPathArgument.cs
@@ -59,12 +59,26 @@ public string CloudProjectSlug()
             return null;
         }
 
-        public string ToUserFriendlyString()
+        public string ToUserFriendlyString(bool withProjectSlug)
         {
             var uploaded = this.IsAssetUploaded();
-            var hint = uploaded ? "CLOUD" : "PATH";
+
             var p = (this.Source.Obj as ProjectFolder)?.Path;
-            p = uploaded ? p : System.IO.Path.GetFileName(p);
+            var hint = "PATH";
+            if (uploaded)
+            {
+                hint = "CLOUD";
+                if (withProjectSlug)
+                {
+                    var slug = this.CloudProjectSlug();
+                    hint = string.IsNullOrEmpty(slug) ? hint : $"{hint}:{slug}";
+                }
+            }
+            else
+            {
+                p = System.IO.Path.GetFileName(p);
+            }
+
             return $"#{this.Name}:${hint}/{p}";
 
         }

diff --git a/src/PollinationSDK/Wrapper/JobRunner.cs b/src/PollinationSDK/Wrapper/JobRunner.cs
@@ -60,7 +60,7 @@ public async Task<CloudJob> RunOnCloudAsync(Project project, Action<string> prog
         {
 
             // check if all cloud path artifacts are within the same project
-            var invalidCloudAssets = job.Arguments.SelectMany(_ => _.OfType<JobPathArgument>()).Where(_ => _.IsAssetUploaded() && _.CloudProjectSlug() != project.Slug).Select(_=> $"{_.ToUserFriendlyString()}@{_.CloudProjectSlug()}").Distinct();
+            var invalidCloudAssets = job.Arguments.SelectMany(_ => _.OfType<JobPathArgument>()).Where(_ => _.IsAssetUploaded() && _.CloudProjectSlug() != project.Slug).Select(_=> $"{_.ToUserFriendlyString(true)}").Distinct();
             if (invalidCloudAssets.Any())
             {
                 var error = $"Following cloud assets cannot be uploaded to project {project.Slug}:\n\n{string.Join(Environment.NewLine, invalidCloudAssets)}";

diff --git a/src/PollinationSDK/Wrapper/LocalRunArguments.cs b/src/PollinationSDK/Wrapper/LocalRunArguments.cs
@@ -16,7 +16,7 @@ public class LocalRunArguments
         public LocalRunArguments(List<AnyOf<JobArgument, JobPathArgument>> arguments)
         {
             // check if there are any cloud path artifacts
-            var invalidCloudAssets = arguments.OfType<JobPathArgument>().Where(_ => _.IsAssetUploaded()).Select(_ => $"{_.ToUserFriendlyString()}@{_.CloudProjectSlug()}").Distinct();
+            var invalidCloudAssets = arguments.OfType<JobPathArgument>().Where(_ => _.IsAssetUploaded()).Select(_ => $"{_.ToUserFriendlyString(true)}").Distinct();
             if (invalidCloudAssets.Any())
             {
                 var error = $"Cannot run a local study with cloud assets:\n\n{string.Join(Environment.NewLine, invalidCloudAssets)}";