Code Review

saddam213 · saddam213 · commit 6c8f47dcf6b2 · 2025-10-04T17:23:29.000+13:00
diff --git a/TensorStack.TextGeneration/Cache/IKVCache.cs b/TensorStack.TextGeneration/Cache/IKVCache.cs
@@ -3,7 +3,7 @@
 using Microsoft.ML.OnnxRuntime;
 using System;
 
-namespace TensorStack.TextGeneration.Processing
+namespace TensorStack.TextGeneration.Cache
 {
     public interface IKVCache : IDisposable
     {
diff --git a/TensorStack.TextGeneration/Cache/KVCacheDecoder.cs b/TensorStack.TextGeneration/Cache/KVCacheDecoder.cs
@@ -4,7 +4,7 @@
 using TensorStack.Common;
 using Metadata = TensorStack.Common.ModelMetadata;
 
-namespace TensorStack.TextGeneration.Processing
+namespace TensorStack.TextGeneration.Cache
 {
     public sealed class KVCacheDecoder : IKVCache
     {
diff --git a/TensorStack.TextGeneration/Cache/KVCacheEncoderDecoder.cs b/TensorStack.TextGeneration/Cache/KVCacheEncoderDecoder.cs
@@ -4,7 +4,7 @@
 using TensorStack.Common;
 using Metadata = TensorStack.Common.ModelMetadata;
 
-namespace TensorStack.TextGeneration.Processing
+namespace TensorStack.TextGeneration.Cache
 {
     public sealed class KVCacheEncoderDecoder : IKVCache
     {
diff --git a/TensorStack.TextGeneration/Common/GenerateProgress.cs b/TensorStack.TextGeneration/Common/GenerateProgress.cs
@@ -1,10 +1,5 @@
 // Copyright (c) TensorStack. All rights reserved.
 // Licensed under the Apache 2.0 License.
-
-
-// Copyright (c) TensorStack. All rights reserved.
-// Licensed under the Apache 2.0 License.
-
 using TensorStack.Common.Pipeline;
 
 namespace TensorStack.TextGeneration.Common
diff --git a/TensorStack.TextGeneration/Common/VisionResult.cs b/TensorStack.TextGeneration/Common/VisionResult.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 License.
 using TensorStack.Common.Tensor;
 
-namespace TensorStack.TextGeneration.Processing
+namespace TensorStack.TextGeneration.Common
 {
     public record VisionResult(Tensor<float> Embeds, Tensor<long> Mask);
 }
diff --git a/TensorStack.TextGeneration/ITextGeneration.cs b/TensorStack.TextGeneration/ITextGeneration.cs
diff --git a/TensorStack.TextGeneration/Pipelines/DecoderPipeline.cs b/TensorStack.TextGeneration/Pipelines/DecoderPipeline.cs
@@ -11,7 +11,7 @@
 using TensorStack.TextGeneration.Common;
 using TensorStack.TextGeneration.Pipelines.Phi;
 using TensorStack.TextGeneration.Processing;
-using TensorStack.TextGeneration.Processing.Sampler;
+using TensorStack.TextGeneration.Sampler;
 using TensorStack.TextGeneration.Tokenizers;
 
 namespace TensorStack.TextGeneration.Pipelines
@@ -105,7 +105,7 @@ protected virtual async Task TokenizePromptAsync(O options)
         /// Gets the sampler.
         /// </summary>
         /// <param name="options">The options.</param>
-        protected virtual Sampler GetSampler(O options, bool isBeamSerach)
+        protected virtual SamplerBase GetSampler(O options, bool isBeamSerach)
         {
             return isBeamSerach
                 ? new MultinomialSampler(options)
diff --git a/TensorStack.TextGeneration/Pipelines/EncoderDecoderPipeline.cs b/TensorStack.TextGeneration/Pipelines/EncoderDecoderPipeline.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using TensorStack.Common;
 using TensorStack.Common.Tensor;
+using TensorStack.TextGeneration.Cache;
 using TensorStack.TextGeneration.Common;
 using TensorStack.TextGeneration.Processing;
 
diff --git a/TensorStack.TextGeneration/Pipelines/Florence/FlorencePipeline.cs b/TensorStack.TextGeneration/Pipelines/Florence/FlorencePipeline.cs
@@ -12,7 +12,6 @@
 using TensorStack.Common.Pipeline;
 using TensorStack.Common.Tensor;
 using TensorStack.TextGeneration.Common;
-using TensorStack.TextGeneration.Processing;
 using TensorStack.TextGeneration.Tokenizers;
 
 namespace TensorStack.TextGeneration.Pipelines.Florence
diff --git a/TensorStack.TextGeneration/Pipelines/Other/SummaryPipeline.cs b/TensorStack.TextGeneration/Pipelines/Other/SummaryPipeline.cs
@@ -11,7 +11,9 @@
 
 namespace TensorStack.TextGeneration.Pipelines.Other
 {
-    public class SummaryPipeline : EncoderDecoderPipeline<GenerateOptions>, ITextGeneration
+    public class SummaryPipeline : EncoderDecoderPipeline<GenerateOptions>, 
+        IPipeline<GenerateResult, GenerateOptions, GenerateProgress>,
+        IPipeline<GenerateResult[], SearchOptions, GenerateProgress>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SummaryPipeline"/> class.
diff --git a/TensorStack.TextGeneration/Pipelines/Phi/Phi3Pipeline.cs b/TensorStack.TextGeneration/Pipelines/Phi/Phi3Pipeline.cs
@@ -9,13 +9,16 @@
 using TensorStack.Common;
 using TensorStack.Common.Pipeline;
 using TensorStack.Common.Tensor;
+using TensorStack.TextGeneration.Cache;
 using TensorStack.TextGeneration.Common;
 using TensorStack.TextGeneration.Processing;
 using TensorStack.TextGeneration.Tokenizers;
 
 namespace TensorStack.TextGeneration.Pipelines.Phi
 {
-    public class Phi3Pipeline : DecoderPipeline<GenerateOptions>, ITextGeneration
+    public class Phi3Pipeline : DecoderPipeline<GenerateOptions>,
+        IPipeline<GenerateResult, GenerateOptions, GenerateProgress>,
+        IPipeline<GenerateResult[], SearchOptions, GenerateProgress>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Phi3Pipeline"/> class.
diff --git a/TensorStack.TextGeneration/Pipelines/Whisper/WhisperPipeline.cs b/TensorStack.TextGeneration/Pipelines/Whisper/WhisperPipeline.cs
@@ -9,6 +9,7 @@
 using TensorStack.Common;
 using TensorStack.Common.Pipeline;
 using TensorStack.Common.Tensor;
+using TensorStack.TextGeneration.Cache;
 using TensorStack.TextGeneration.Common;
 using TensorStack.TextGeneration.Pipelines.Florence;
 using TensorStack.TextGeneration.Processing;
diff --git a/TensorStack.TextGeneration/Processing/BOSLogitsProcessor.cs b/TensorStack.TextGeneration/Processing/BOSLogitsProcessor.cs
diff --git a/TensorStack.TextGeneration/Processing/EOSTokenProcessor.cs b/TensorStack.TextGeneration/Processing/EOSTokenProcessor.cs
diff --git a/TensorStack.TextGeneration/Processing/ILogitsProcessor.cs b/TensorStack.TextGeneration/Processing/ILogitsProcessor.cs
diff --git a/TensorStack.TextGeneration/Processing/ITokenProcessor.cs b/TensorStack.TextGeneration/Processing/ITokenProcessor.cs
diff --git a/TensorStack.TextGeneration/Processing/MaxLengthTokenProcessor.cs b/TensorStack.TextGeneration/Processing/MaxLengthTokenProcessor.cs
diff --git a/TensorStack.TextGeneration/Processing/NoRepeatNGramLogitsProcessor.cs b/TensorStack.TextGeneration/Processing/NoRepeatNGramLogitsProcessor.cs
diff --git a/TensorStack.TextGeneration/Processing/SupressTokenLogitsProcessor.cs b/TensorStack.TextGeneration/Processing/SupressTokenLogitsProcessor.cs
diff --git a/TensorStack.TextGeneration/Sampler/GreedySampler.cs b/TensorStack.TextGeneration/Sampler/GreedySampler.cs
@@ -2,9 +2,9 @@
 using TensorStack.Common.Tensor;
 using TensorStack.TextGeneration.Common;
 
-namespace TensorStack.TextGeneration.Processing.Sampler
+namespace TensorStack.TextGeneration.Sampler
 {
-    public class GreedySampler : Sampler
+    public class GreedySampler : SamplerBase
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GreedySampler"/> class.
diff --git a/TensorStack.TextGeneration/Sampler/MultinomialSampler.cs b/TensorStack.TextGeneration/Sampler/MultinomialSampler.cs
@@ -4,9 +4,9 @@
 using TensorStack.TextGeneration;
 using TensorStack.TextGeneration.Common;
 
-namespace TensorStack.TextGeneration.Processing.Sampler
+namespace TensorStack.TextGeneration.Sampler
 {
-    public class MultinomialSampler : Sampler
+    public class MultinomialSampler : SamplerBase
     {
         private readonly Random _random;
 
diff --git a/TensorStack.TextGeneration/Sampler/SamplerBase.cs b/TensorStack.TextGeneration/Sampler/SamplerBase.cs
@@ -3,27 +3,43 @@
 using System.Collections.Generic;
 using TensorStack.Common;
 using TensorStack.Common.Tensor;
+using TensorStack.TextGeneration;
 using TensorStack.TextGeneration.Common;
 
-namespace TensorStack.TextGeneration.Processing.Sampler
+namespace TensorStack.TextGeneration.Sampler
 {
-    public abstract class Sampler
+    public abstract class SamplerBase
     {
-        public Sampler(GenerateOptions options)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SamplerBase"/> class.
+        /// </summary>
+        /// <param name="options">The options.</param>
+        protected SamplerBase(GenerateOptions options)
         {
             Options = options;
         }
 
+        /// <summary>
+        /// Gets the options.
+        /// </summary>
         protected GenerateOptions Options { get; }
 
+        /// <summary>
+        /// Samples the specified logits.
+        /// </summary>
+        /// <param name="logits">The logits.</param>
+        /// <param name="topK">The top k.</param>
+        /// <param name="topP">The top p.</param>
+        /// <param name="temperature">The temperature.</param>
         public abstract LogitResult[] Sample(Tensor<float> logits, int topK = 1, float topP = 1f, float temperature = 1f);
 
+
         /// <summary>
         /// Gets the probabilities.
         /// </summary>
         /// <param name="topkLogits">The topk logits.</param>
         /// <returns>Span&lt;LogitResult&gt;.</returns>
-        protected Span<LogitResult> GetProbabilities(TopkResult topkLogits)
+        protected static Span<LogitResult> GetProbabilities(TopkResult topkLogits)
         {
             var probabilities = topkLogits.V.SoftMax();
             var logitProbabilities = new LogitResult[probabilities.Dimensions[1]].AsSpan();
@@ -40,7 +56,7 @@ protected Span<LogitResult> GetProbabilities(TopkResult topkLogits)
         /// <param name="logits">The logits.</param>
         /// <param name="topk">The topk.</param>
         /// <returns>TopkResult.</returns>
-        protected TopkResult SelectTopK(Tensor<float> logits, int topk)
+        protected static TopkResult SelectTopK(Tensor<float> logits, int topk)
         {
             var indices = new Tensor<long>([1, topk]);
             var topKLogits = new Tensor<float>([1, topk]);
@@ -69,7 +85,7 @@ protected TopkResult SelectTopK(Tensor<float> logits, int topk)
         /// <param name="candidates">The candidates.</param>
         /// <param name="topP">The top p.</param>
         /// <returns>Span&lt;LogitResult&gt;.</returns>
-        protected Span<LogitResult> SelectTopP(Span<LogitResult> candidates, float topP)
+        protected static Span<LogitResult> SelectTopP(Span<LogitResult> candidates, float topP)
         {
             if (topP < 1f)
             {
diff --git a/TensorStack.TextGeneration/Sequence.cs b/TensorStack.TextGeneration/Sequence.cs
@@ -3,8 +3,9 @@
 using Microsoft.ML.OnnxRuntime;
 using System;
 using System.Collections.Generic;
+using TensorStack.TextGeneration.Cache;
 
-namespace TensorStack.TextGeneration.Processing
+namespace TensorStack.TextGeneration
 {
     public sealed class Sequence : IDisposable
     {
diff --git a/TensorStack.TextGeneration/SequenceCollection.cs b/TensorStack.TextGeneration/SequenceCollection.cs
@@ -3,7 +3,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace TensorStack.TextGeneration.Processing
+namespace TensorStack.TextGeneration
 {
     public class SequenceCollection : IEnumerable<Sequence>
     {
diff --git a/TensorStack.TextGeneration/SequenceComparer.cs b/TensorStack.TextGeneration/SequenceComparer.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TensorStack.TextGeneration.Processing
+namespace TensorStack.TextGeneration
 {
     public sealed class SequenceComparer : IEqualityComparer<Sequence>
     {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Microsoft.ML.OnnxRuntime;`
`4`	`4`	`using System;`
`5`	`5`
`6`		`-namespace TensorStack.TextGeneration.Processing`
	`6`	`+namespace TensorStack.TextGeneration.Cache`
`7`	`7`	`{`
`8`	`8`	`public interface IKVCache : IDisposable`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using TensorStack.Common;`
`5`	`5`	`using Metadata = TensorStack.Common.ModelMetadata;`
`6`	`6`
`7`		`-namespace TensorStack.TextGeneration.Processing`
	`7`	`+namespace TensorStack.TextGeneration.Cache`
`8`	`8`	`{`
`9`	`9`	`public sealed class KVCacheDecoder : IKVCache`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// Licensed under the Apache 2.0 License.`
`3`	`3`	`using TensorStack.Common.Tensor;`
`4`	`4`
`5`		`-namespace TensorStack.TextGeneration.Processing`
	`5`	`+namespace TensorStack.TextGeneration.Common`
`6`	`6`	`{`
`7`	`7`	`public record VisionResult(Tensor<float> Embeds, Tensor<long> Mask);`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace TensorStack.TextGeneration.Pipelines.Other`
`13`	`13`	`{`
`14`		`- public class SummaryPipeline : EncoderDecoderPipeline<GenerateOptions>, ITextGeneration`
	`14`	`+ public class SummaryPipeline : EncoderDecoderPipeline<GenerateOptions>,`
	`15`	`+ IPipeline<GenerateResult, GenerateOptions, GenerateProgress>,`
	`16`	`+ IPipeline<GenerateResult[], SearchOptions, GenerateProgress>`
`15`	`17`	`{`
`16`	`18`	`/// <summary>`
`17`	`19`	`/// Initializes a new instance of the <see cref="SummaryPipeline"/> class.`