Remove flow_shift

Author: saddam213

TensorStack.Python/Common/PipelineOptions.cs

@@ -15,9 +15,8 @@ public record PipelineOptions
         public int Height { get; set; }
         public int Width { get; set; }
         public int Frames { get; set; }
-        public float OutputFrameRate { get; set; }
+        public float FrameRate { get; set; }
         public float Shift { get; set; }
-        public float FlowShift { get; set; }
         public float Strength { get; set; }
         public SchedulerType Scheduler { get; set; }
         public List<LoraOptions> LoraOptions { get; set; }

TensorStack.Python/Common/PipelineProgress.cs

@@ -14,6 +14,8 @@ public record PipelineProgress : IRunProgress
         public float Downloaded { get; set; }
         public float DownloadTotal { get; set; }
         public float DownloadSpeed { get; set; }
+        public bool IsLoading => Process == "Loading";
+        public bool IsGenerating => Process == "Generate" && Iterations > 0;
         public bool IsDownloading => DownloadTotal > 0 || Downloaded > 0 || DownloadSpeed > 0;
 
         public readonly static IProgress<PipelineProgress> ConsoleCallback = new Progress<PipelineProgress>(Console.WriteLine);

TensorStack.Python/Config/EnvironmentConfig.cs

@@ -1,4 +1,6 @@
-namespace TensorStack.Python.Config
+using System;
+
+namespace TensorStack.Python.Config
 {
     public record EnvironmentConfig
     {
@@ -8,13 +10,30 @@ public record EnvironmentConfig
         public string Directory { get; set; }
 
 
+        public static EnvironmentConfig Default(VendorType vendorType)
+        {
+            return vendorType switch
+            {
+                VendorType.AMD => DefaultROCM,
+                VendorType.Nvidia => DefaultCUDA,
+                _ => DefaultCPU
+            };
+        }
+
+        public static EnvironmentConfig Default(object vendor)
+        {
+            throw new NotImplementedException();
+        }
+
         public readonly static EnvironmentConfig DefaultCPU = new()
         {
             Environment = "default-cpu",
             Directory = "PythonRuntime",
             Requirements =
             [
-                "torchvision==0.22.0",
+                "torch==2.9.1",
+                "torchvaudio==2.9.1",
+                "torchvision==0.24.1",
 
                  // Default Packages
                 "typing",
@@ -24,11 +43,9 @@ public record EnvironmentConfig
                 "diffusers",
                 "protobuf",
                 "sentencepiece",
-                "pillow",
                 "ftfy",
                 "scipy",
-                "peft",
-                "pillow"
+                "peft"
             ]
         };
 
@@ -39,8 +56,10 @@ public record EnvironmentConfig
             Directory = "PythonRuntime",
             Requirements =
             [
-                "--extra-index-url https://download.pytorch.org/whl/cu118",
-                "torchvision==0.22.0+cu118",
+                "--extra-index-url https://download.pytorch.org/whl/cu128",
+                "torch==2.9.1+cu128",
+                "torchaudio==2.9.1+cu128",
+                "torchvision==0.24.1+cu128",
 
                  // Default Packages
                 "typing",
@@ -50,11 +69,9 @@ public record EnvironmentConfig
                 "diffusers",
                 "protobuf",
                 "sentencepiece",
-                "pillow",
                 "ftfy",
                 "scipy",
-                "peft",
-                "pillow"
+                "peft"
             ]
         };
 
@@ -80,12 +97,18 @@ public record EnvironmentConfig
                 "diffusers",
                 "protobuf",
                 "sentencepiece",
-                "pillow",
                 "ftfy",
                 "scipy",
-                "peft",
-                "pillow"
+                "peft"
             ]
         };
     }
+
+    public enum VendorType
+    {
+        Unknown = 0,
+        AMD = 4098,
+        Nvidia = 4318,
+        Intel = 32902
+    }
 }

TensorStack.Python/LogParser.cs

@@ -109,7 +109,7 @@ private static PipelineProgress ParsePythonLog(string logEntry)
                     DownloadTotal = megabytesTotal,
                     Downloaded = megabytesDownloaded,
                     DownloadSpeed = megabytesSecond,
-                    Process = "Generate"
+                    Process = messageSection.StartsWith("Loading") ? "Loading" : "Generate"
                 };
 
             }

TensorStack.Python/Pipelines/ChromaPipeline.py

@@ -115,7 +115,6 @@ def generate(
         scheduler: str,
         numFrames: int,
         shift: float,
-        flowShift: float,
         strength: float,
         loraOptions: Optional[Dict[str, float]] = None,
         inputData: Optional[Sequence[float]] = None,

TensorStack.Python/Pipelines/QwenImagePipeline.py

@@ -123,7 +123,6 @@ def generate(
         scheduler: str,
         numFrames: int,
         shift: float,
-        flowShift: float,
         strength: float,
         loraOptions: Optional[Dict[str, float]] = None,
         inputData: Optional[Sequence[float]] = None,

TensorStack.Python/Pipelines/WanPipeline.py

@@ -116,7 +116,6 @@ def generate(
         scheduler: str,
         numFrames: int,
         shift: float,
-        flowShift: float,
         strength: float,
         loraOptions: Optional[Dict[str, float]] = None,
         inputData: Optional[Sequence[float]] = None,
@@ -127,6 +126,7 @@ def generate(
     _reset()
 
     # scheduler
+    flowShift = 5.0 if height > 480 else 3.0 # 5.0 for 720P, 3.0 for 480P
     _pipeline.scheduler = UniPCMultistepScheduler.from_config(_pipeline.scheduler.config, flow_shift=flowShift)
 
     #Lora Adapters

TensorStack.Python/Pipelines/ZImagePipeline.py

@@ -115,7 +115,6 @@ def generate(
         scheduler: str,
         numFrames: int,
         shift: float,
-        flowShift: float,
         strength: float,
         loraOptions: Optional[Dict[str, float]] = None,
         inputData: Optional[Sequence[float]] = None,

TensorStack.Python/PythonPipeline.cs

@@ -172,12 +172,11 @@ public Task<Tensor<float>> GenerateAsync(PipelineOptions options, CancellationTo
                         using (var scheduler = PyObject.From(options.Scheduler.ToString()))
                         using (var numFrames = PyObject.From(options.Frames))
                         using (var shift = PyObject.From(options.Shift))
-                        using (var flowShift = PyObject.From(options.FlowShift))
                         using (var strength = PyObject.From(options.Strength))
                         using (var loraOptions = PyObject.From(loraConfig))
                         using (var inputData = PyObject.From(imageInput?.Memory.ToArray()))
                         using (var inputShape = PyObject.From(imageInput?.Dimensions.ToArray()))
-                        using (var pythonResult = _functionGenerate.Call(prompt, negativePrompt, guidance, guidance2, steps, steps2, height, width, seed, scheduler, numFrames, shift, flowShift, strength, loraOptions, inputData, inputShape))
+                        using (var pythonResult = _functionGenerate.Call(prompt, negativePrompt, guidance, guidance2, steps, steps2, height, width, seed, scheduler, numFrames, shift, strength, loraOptions, inputData, inputShape))
                         {
                             var result = pythonResult
                                  .BareImportAs<IPyBuffer, PyObjectImporters.Buffer>()
@@ -330,7 +329,7 @@ private async Task LoggingLoop(int refreshRate)
                 var logs = await GetLogsAsync();
                 foreach (var progress in LogParser.ParseLogs(logs))
                 {
-                    _logger?.LogInformation("[PythonRuntime] {message}", progress.Message);
+                    _logger?.LogInformation("[PythonRuntime] {Message}", progress.Message);
                     _progressCallback?.Report(progress);
                 }
                 await Task.Delay(refreshRate, _progressCancellation.Token);
@@ -347,6 +346,9 @@ private Exception HandlePythonException(PythonInvocationException ex)
         {
             if (ex.InnerException is PythonRuntimeException pyex)
             {
+                if (ex.InnerException.Message.Equals("Operation Canceled"))
+                    return new OperationCanceledException();
+
                 _logger?.LogError(pyex, "{PythonExceptionType} exception occured", ex.PythonExceptionType);
                 if (!pyex.PythonStackTrace.IsNullOrEmpty())
                     _logger?.LogError(string.Join(Environment.NewLine, pyex.PythonStackTrace));