Alter handling of start/endtime to be simpler and limit to minutes + …

…seconds.
ServiceStack · Oct 9, 2024 · 3f0a1c5 · 3f0a1c5
1 parent 999a409
commit 3f0a1c5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/AiServer.ServiceInterface/Generation/ComfyProvider.cs b/AiServer.ServiceInterface/Generation/ComfyProvider.cs
@@ -99,6 +99,19 @@ private ComfyClient GetClient(MediaProvider provider)
         // Last check for null seed
         request.Seed ??= Random.Shared.Next();
         var comfyWorkflowReq = request.ConvertTo<ComfyWorkflowRequest>();
+        // Ensure task type is set
+        comfyWorkflowReq.TaskType = request.TaskType switch
+        {
+            AiTaskType.TextToImage => ComfyTaskType.TextToImage,
+            AiTaskType.ImageToImage => ComfyTaskType.ImageToImage,
+            AiTaskType.ImageUpscale => ComfyTaskType.ImageUpscale,
+            AiTaskType.ImageWithMask => ComfyTaskType.ImageWithMask,
+            AiTaskType.ImageToText => ComfyTaskType.ImageToText,
+            AiTaskType.TextToAudio => ComfyTaskType.TextToAudio,
+            AiTaskType.TextToSpeech => ComfyTaskType.TextToSpeech,
+            AiTaskType.SpeechToText => ComfyTaskType.SpeechToText,
+            _ => throw new ArgumentOutOfRangeException()
+        };
         comfyWorkflowReq =
             comfyWorkflowReq.ApplyModelDefaults(AppConfig.Instance, modelSettings.ConvertTo<ComfyApiModelSettings>());
         var response = await comfyClient.PromptGenerationAsync(comfyWorkflowReq, token, waitResult: true);

diff --git a/AiServer.ServiceInterface/VideoServices.cs b/AiServer.ServiceInterface/VideoServices.cs
@@ -124,9 +124,9 @@ public async Task<object> Any(TrimVideo request)
 
     private void ValidateTimeFormat(string time, string fieldName)
     {
-        if (!Regex.IsMatch(time, @"^\d{2}:\d{2}$"))
+        if (!Regex.IsMatch(time, @"^(\d{1,3}):([0-5]\d)$"))
         {
-            throw new ArgumentException($"Invalid {fieldName} format. Expected format: mm:ss");
+            throw new ArgumentException($"Invalid {fieldName} format. Expected format: m:ss, mm:ss, or mmm:ss");
         }
     }
 

diff --git a/AiServer.ServiceModel/MediaTransforms.cs b/AiServer.ServiceModel/MediaTransforms.cs
@@ -266,13 +266,13 @@ public class CropVideo : IMediaTransform, IReturn<MediaTransformResponse>
 [ValidateApiKey]
 public class TrimVideo : IMediaTransform, IReturn<MediaTransformResponse>
 {
-    [ApiMember(Description = "The start time of the trimmed video (format: HH:MM:SS)")]
-    [Description("The start time of the trimmed video (format: HH:MM:SS)")]
+    [ApiMember(Description = "The start time of the trimmed video (format: MM:SS)")]
+    [Description("The start time of the trimmed video (format: MM:SS)")]
     [Required]
     public string StartTime { get; set; }
 
-    [ApiMember(Description = "The end time of the trimmed video (format: HH:MM:SS)")]
-    [Description("The end time of the trimmed video (format: HH:MM:SS)")]
+    [ApiMember(Description = "The end time of the trimmed video (format: MM:SS)")]
+    [Description("The end time of the trimmed video (format: MM:SS)")]
     public string? EndTime { get; set; }
 
     [Required]