Merge pull request #25 from devgopher/release/0.8

devgopher · web-flow · commit b84adebffa21 · 2026-01-26T11:01:08.000+03:00
Release/0.8
diff --git a/Botticelli.AI.YaGpt/Message/YaGpt/YaGptInputMessage.cs b/Botticelli.AI.YaGpt/Message/YaGpt/YaGptInputMessage.cs
@@ -4,7 +4,7 @@ namespace Botticelli.AI.YaGpt.Message.YaGpt;
 
 public class YaGptInputMessage
 {
-    [JsonPropertyName("modelUri")]
+    [JsonPropertyName("model_uri")]
     public string ModelUri { get; set; }
 
     [JsonPropertyName("completionOptions")]
@@ -22,7 +22,7 @@ public class CompletionOptions
     [JsonPropertyName("temperature")]
     public double Temperature { get; set; }
 
-    [JsonPropertyName("maxTokens")]
+    [JsonPropertyName("max_tokens")]
     public int MaxTokens { get; set; }
 }
 
diff --git a/Botticelli.AI.YaGpt/Provider/YaGptProvider.cs b/Botticelli.AI.YaGpt/Provider/YaGptProvider.cs
@@ -96,11 +96,10 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
                     Role = SystemRole,
                     Text = Settings.Value.Instruction
                 },
-
                 new()
                 {
                     Role = UserRole,
-                    Text = message.Body
+                    Text = message.Body ?? string.Empty
                 }
             ],
             CompletionOptions = new CompletionOptions
@@ -114,7 +113,7 @@ protected override async Task<HttpResponseMessage> GetGptResponse(AiMessage mess
         yaGptMessage.Messages.AddRange(message.AdditionalMessages?.Select(m => new YaGptMessage
                                        {
                                            Role = UserRole,
-                                           Text = m.Body
+                                           Text = m.Body ?? string.Empty,
                                        }) ??
                                        new List<YaGptMessage>());
 
diff --git a/Botticelli.AI.YaGpt/Settings/YaGptSettings.cs b/Botticelli.AI.YaGpt/Settings/YaGptSettings.cs
@@ -4,7 +4,6 @@ namespace Botticelli.AI.YaGpt.Settings;
 
 public class YaGptSettings : AiSettings
 {
-    public string ApiKey { get; set; }
     public string Model { get; set; }
     public double Temperature { get; set; }
     public string Instruction { get; set; }
diff --git a/Botticelli.AI/AIProvider/ChatGptProvider.cs b/Botticelli.AI/AIProvider/ChatGptProvider.cs
@@ -95,7 +95,7 @@ private HttpClient GetClient()
 
         client.BaseAddress = new Uri(Settings.Value.Url);
         client.DefaultRequestHeaders.Authorization =
-                new AuthenticationHeaderValue("Bearer", Settings.Value.ApiKey);
+                new AuthenticationHeaderValue(Settings.Value.AuthMethod, Settings.Value.ApiKey);
 
         return client;
     }
diff --git a/Botticelli.AI/Message/AIMessage.cs b/Botticelli.AI/Message/AIMessage.cs
@@ -10,7 +10,16 @@ public AiMessage(string uid) : base(uid)
     {
     }
 
-    public string Instruction { get; set; }
+    public string Instruction { get; set; } = string.Empty;
 
-    public List<AiMessage> AdditionalMessages { get; set; }
+    public List<AiMessage> AdditionalMessages { get; set; } = new List<AiMessage>();
+    
+    public override Shared.ValueObjects.Message Copy()
+    {
+        var newMessage = (AiMessage)(base.Copy());
+        newMessage.Instruction = Instruction;
+        newMessage.AdditionalMessages = AdditionalMessages;
+        
+        return newMessage;
+    }
 }
diff --git a/Botticelli.AI/Settings/AISettings.cs b/Botticelli.AI/Settings/AISettings.cs
@@ -3,7 +3,8 @@
 public class AiSettings : ProviderSettings
 {
     public string? Url { get; set; }
-    public string AiName { get; set; }
+    public required string AiName { get; set; }
     public bool StreamGeneration { get; set; }
-    public string ApiKey { get; set; }
+    public string AuthMethod { get; set; } = "Bearer";
+    public string? ApiKey { get; set; }
 }
diff --git a/Botticelli.Bot.Interfaces/Processors/IFluentCommandProcessor.cs b/Botticelli.Bot.Interfaces/Processors/IFluentCommandProcessor.cs
diff --git a/Botticelli.Bus/Agent/PassAgent.cs b/Botticelli.Bus/Agent/PassAgent.cs
@@ -43,20 +43,24 @@ public Task SendResponseAsync(SendMessageResponse response,
 
     public Task StartAsync(CancellationToken token)
     {
-        return Task.Run(async () => await InnerProcess(_handler, token));
+        Task.Run(() => InnerProcess(_handler, token), token);
+        
+        return Task.CompletedTask;
     }
 
     public Task StopAsync(CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }
 
-    private async Task InnerProcess(THandler handler, CancellationToken token)
+    private void InnerProcess(THandler handler, CancellationToken token)
     {
         while (!token.IsCancellationRequested)
         {
-            if (NoneBus.SendMessageRequests.TryDequeue(out var request)) await handler.Handle(request, token);
-            Thread.Sleep(5);
+            if (NoneBus.SendMessageRequests.TryDequeue(out var request)) 
+                handler.Handle(request, token).Wait(token);
+            
+            Task.Delay(5, token).Wait(token);
         }
     }
 }
diff --git a/Botticelli.Controls.Layouts/Inlines/InlineButtonMenu.cs b/Botticelli.Controls.Layouts/Inlines/InlineButtonMenu.cs
@@ -10,8 +10,8 @@ public class InlineButtonMenu : ILayout
 
     public InlineButtonMenu(int rows, int columns)
     {
-        if (rows < 1) throw new InvalidDataException("rows count should be  > 1!");
-        if (columns < 1) throw new InvalidDataException("columns count should be  > 1!");
+        if (rows < 1) throw new InvalidDataException("rows count should be  > 0!");
+        if (columns < 1) throw new InvalidDataException("columns count should be  > 0!");
 
         _rows = rows;
         _columns = columns;
diff --git a/Botticelli.Controls/BasicControls/Button.cs b/Botticelli.Controls/BasicControls/Button.cs
@@ -2,6 +2,15 @@
 
 public class Button : IControl
 {
+    public Button()
+    {
+    }
+
+    public Button(string? content)
+    {
+        Content = content;
+    }
+
     public string? Image { get; set; }
     public string? Content { get; set; }
 
diff --git a/Botticelli.Controls/Layouts/Item.cs b/Botticelli.Controls/Layouts/Item.cs
@@ -4,6 +4,15 @@ namespace Botticelli.Controls.Layouts;
 
 public class Item
 {
+    public Item()
+    {
+    }
+
+    public Item(IControl? control)
+    {
+        Control = control;
+    }
+
     public IControl? Control { get; set; }
 
     public ItemParams? Params { get; set; }
diff --git a/Botticelli.Controls/Parsers/JsonLayoutParser.cs b/Botticelli.Controls/Parsers/JsonLayoutParser.cs
@@ -68,9 +68,12 @@ private static void ResolveControlType(JsonElement itemElement, Item item)
     {
         if (itemElement.TryGetProperty("Button", out var buttonElement))
         {
+            var hasCallback = buttonElement.TryGetProperty("Callback", out var callbackElement);
             var button = new Button
             {
-                Content = buttonElement.GetProperty("Content").GetString()
+                Content = buttonElement.GetProperty("Content")
+                    .GetString(),
+                CallbackData = hasCallback ? callbackElement.GetString() : null
             };
 
             item.Control = button;
diff --git a/Botticelli.Framework.Telegram/Builders/TelegramBotBuilder.cs b/Botticelli.Framework.Telegram/Builders/TelegramBotBuilder.cs
@@ -1,3 +1,4 @@
+using System.Configuration;
 using Botticelli.Bot.Data;
 using Botticelli.Bot.Data.Repositories;
 using Botticelli.Bot.Data.Settings;
@@ -18,6 +19,7 @@
 using Botticelli.Framework.Telegram.Layout;
 using Botticelli.Framework.Telegram.Options;
 using Botticelli.Framework.Telegram.Utils;
+using Botticelli.Interfaces;
 using Botticelli.Shared.Utils;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -171,8 +173,8 @@ public TelegramBotBuilder<TBot, TBotBuilder> Prepare()
         #region Data
 
         Services.AddDbContext<BotInfoContext>(o =>
-            o.UseSqlite($"Data source={BotDataAccessSettingsBuilder!.Build().ConnectionString}"));
-        Services.AddScoped<IBotDataAccess, BotDataAccess>();
+            o.UseSqlite($"Data source={BotDataAccessSettingsBuilder!.Build().ConnectionString}"), ServiceLifetime.Singleton);
+        Services.AddSingleton<IBotDataAccess, BotDataAccess>();
 
         #endregion
 
@@ -197,6 +199,19 @@ public TelegramBotBuilder<TBot, TBotBuilder> Prepare()
             .AddBotticelliFramework()
             .AddSingleton<IBotUpdateHandler, BotUpdateHandler>()
             .AddSingleton(client);
+
+        if (_isStandalone)
+        {
+            Services.AddHttpClient<BotStandaloneService>()
+                .AddServerCertificates(BotSettings);
+
+            if (BotData == null) throw new ConfigurationErrorsException("BotData is null!");
+
+            Services.AddHostedService<BotStandaloneService>()
+                .AddSingleton(BotData);
+            
+            Services.AddSingleton<IBot>(sp => this .Build(sp)!);
+        }
         
         return this;
     }
diff --git a/Botticelli.Framework.Telegram/Builders/TelegramStandaloneBotBuilder.cs b/Botticelli.Framework.Telegram/Builders/TelegramStandaloneBotBuilder.cs
@@ -45,19 +45,13 @@ public TelegramStandaloneBotBuilder<TBot> AddBotData(BotDataSettingsBuilder<BotD
 
         AddToken(BotData.BotKey);
 
+        Services.AddSingleton(BotData);
+        
         return this;
     }
 
     protected override TBot? InnerBuild(IServiceProvider serviceProvider)
     {
-        Services.AddHttpClient<BotStandaloneService>()
-                .AddServerCertificates(BotSettings);
-
-        if (BotData == null) throw new ConfigurationErrorsException("BotData is null!");
-
-        Services.AddHostedService<BotStandaloneService>()
-                .AddSingleton(BotData);
-
         return base.InnerBuild(serviceProvider);
     }
 }
diff --git a/Botticelli.Framework.Telegram/Extensions/ServiceCollectionExtensions.cs b/Botticelli.Framework.Telegram/Extensions/ServiceCollectionExtensions.cs
@@ -217,6 +217,8 @@ public static IServiceCollection AddTelegramLayoutsSupport(this IServiceCollecti
         services.AddSingleton<ILayoutParser, JsonLayoutParser>()
             .AddSingleton<ILayoutSupplier<ReplyKeyboardMarkup>, ReplyTelegramLayoutSupplier>()
             .AddSingleton<ILayoutSupplier<InlineKeyboardMarkup>, InlineTelegramLayoutSupplier>()
+            .AddSingleton<IReplyTelegramLayoutSupplier, ReplyTelegramLayoutSupplier>()
+            .AddSingleton<IInlineTelegramLayoutSupplier, InlineTelegramLayoutSupplier>()
             .AddSingleton<ILayoutLoader<ReplyKeyboardMarkup>, LayoutLoader<ILayoutParser,
                 ILayoutSupplier<ReplyKeyboardMarkup>, ReplyKeyboardMarkup>>()
             .AddSingleton<ILayoutLoader<InlineKeyboardMarkup>, LayoutLoader<ILayoutParser,
diff --git a/Botticelli.Framework.Telegram/TelegramBot.cs b/Botticelli.Framework.Telegram/TelegramBot.cs
@@ -159,6 +159,8 @@ protected override async Task<SendMessageResponse> InnerSendMessageAsync<TSendOp
         {
             if (optionsBuilder.Build() is ReplyMarkup markup)
                 replyMarkup = markup;
+            else if (optionsBuilder.Build() is InlineKeyboardMarkup keyboardMarkup)
+                replyMarkup = keyboardMarkup;
             else
                 replyMarkup = null;
         }
diff --git a/Botticelli.Framework/Commands/Processors/CommandChainFirstElementProcessor.cs b/Botticelli.Framework/Commands/Processors/CommandChainFirstElementProcessor.cs
@@ -23,11 +23,18 @@ public CommandChainFirstElementProcessor(ILogger<CommandChainProcessor<TInputCom
 
     public override async Task ProcessAsync(Message message, CancellationToken token)
     {
-        Logger.LogDebug(Next == null ?
-                                $"{nameof(CommandChainProcessor<TInputCommand>)} : no next step, returning" :
-                                $"{nameof(CommandChainProcessor<TInputCommand>)} : next step is '{Next?.GetType().Name}'");
+        Logger.LogDebug(Next == null
+            ? $"{nameof(CommandChainProcessor<TInputCommand>)} : no next step, returning"
+            : $"{nameof(CommandChainProcessor<TInputCommand>)} : next step is '{Next?.GetType().Name}'");
 
-        if (Next != null) await Next.ProcessAsync(message, token)!;
+        if (_bot != null)
+        {
+            if (Next != null)
+            {
+                Next.SetBot(_bot);
+                await Next.ProcessAsync(message, token)!;
+            }
+        }
     }
 
     protected override Task InnerProcess(Message message, CancellationToken token)
diff --git a/Botticelli.Framework/Commands/Processors/CommandChainProcessorBuilder.cs b/Botticelli.Framework/Commands/Processors/CommandChainProcessorBuilder.cs
@@ -15,14 +15,29 @@ public CommandChainProcessorBuilder(IServiceCollection services)
 
         _typesChain.Add(typeof(CommandChainFirstElementProcessor<TInputCommand>));
         _services.AddSingleton<CommandChainFirstElementProcessor<TInputCommand>>();
+
         ProcessorFactoryBuilder.AddProcessor<CommandChainFirstElementProcessor<TInputCommand>>(_services);
     }
 
-    public CommandChainProcessorBuilder<TInputCommand> AddNext<TNextProcessor>()
+    public CommandChainProcessorBuilder<TInputCommand> AddNext<TNextProcessor>(ServiceLifetime serviceLifetime = ServiceLifetime.Scoped)
             where TNextProcessor : class, ICommandChainProcessor<TInputCommand>
     {
         _typesChain.Add(typeof(TNextProcessor));
-        _services.AddSingleton<TNextProcessor>();
+        switch (serviceLifetime)
+        {
+            case ServiceLifetime.Singleton:
+                _services.AddSingleton<TNextProcessor>();
+                break;
+            case ServiceLifetime.Scoped:
+                _services.AddScoped<TNextProcessor>();
+                break;
+            case ServiceLifetime.Transient:
+                _services.AddTransient<TNextProcessor>();
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(serviceLifetime), serviceLifetime, null);
+        } 
+        
         ProcessorFactoryBuilder.AddProcessor<TNextProcessor>(_services);
 
         return this;
@@ -31,6 +46,7 @@ public CommandChainProcessorBuilder<TInputCommand> AddNext<TNextProcessor>()
     public ICommandChainProcessor<TInputCommand>? Build(IServiceProvider sp)
     {
         if (_typesChain.Count == 0) return null;
+        var scope = sp.CreateScope();
 
         // initializing chain processors...
 
@@ -41,7 +57,7 @@ public CommandChainProcessorBuilder<TInputCommand> AddNext<TNextProcessor>()
 
         foreach (var type in _typesChain.Skip(1))
         {
-            var proc = sp.GetRequiredService(type) as ICommandChainProcessor<TInputCommand>;
+            var proc = scope.ServiceProvider.GetRequiredService(type) as ICommandChainProcessor<TInputCommand>;
 
             if (prev != null) prev.Next = proc;
 
diff --git a/Botticelli.Framework/Commands/Processors/CommandProcessor.cs b/Botticelli.Framework/Commands/Processors/CommandProcessor.cs
@@ -21,7 +21,7 @@ public abstract class CommandProcessor<TCommand> : ICommandProcessor
     private readonly IValidator<Message> _messageValidator;
     private readonly MetricsProcessor? _metricsProcessor;
     protected readonly ILogger Logger;
-    private IBot? _bot;
+    protected IBot? _bot;
 
     protected CommandProcessor(ILogger logger,
                                ICommandValidator<TCommand> commandValidator,
diff --git a/Botticelli.Framework/Commands/Processors/FluentCommandProcessor.cs b/Botticelli.Framework/Commands/Processors/FluentCommandProcessor.cs
@@ -13,12 +13,12 @@ namespace Botticelli.Framework.Commands.Processors;
 public abstract class FluentCommandProcessor<TCommand>(
         ILogger logger,
         MetricsProcessor metricsProcessor,
-        ICommandValidator<TCommand> commandValidator,
-        IBot bot)
+        ICommandValidator<TCommand> commandValidator)
         : ICommandProcessor
         where TCommand : class, IFluentCommand
 {
-    protected IBot Bot = bot;
+    protected IBot? Bot;
+    
     public string CommandText { get; init; }
 
     public async Task ProcessAsync(Message message, CancellationToken token)
diff --git a/Botticelli.Framework/Commands/Processors/WaitForClientResponseCommandChainProcessor.cs b/Botticelli.Framework/Commands/Processors/WaitForClientResponseCommandChainProcessor.cs
@@ -58,7 +58,11 @@ public override async Task ProcessAsync(Message message, CancellationToken token
         if (Next != null)
         {
             Next.ChainIds.Add(message.ChainId.Value);
-            await Next.ProcessAsync(message, token);
+            if (_bot != null)
+            {
+                Next.SetBot(_bot);
+                await Next.ProcessAsync(message, token);
+            }
         }
         else
         {
diff --git a/Botticelli.Framework/Extensions/CommandAddServices.cs b/Botticelli.Framework/Extensions/CommandAddServices.cs
diff --git a/Botticelli.Framework/Extensions/Processors/ProcessorFactoryBuilder.cs b/Botticelli.Framework/Extensions/Processors/ProcessorFactoryBuilder.cs
diff --git a/Botticelli.Framework/Extensions/StartupExtensions.cs b/Botticelli.Framework/Extensions/StartupExtensions.cs
diff --git a/Botticelli.Locations.Telegram/Extensions/ServiceCollectionExtensions.cs b/Botticelli.Locations.Telegram/Extensions/ServiceCollectionExtensions.cs
diff --git a/Botticelli.Locations/Botticelli.Locations.csproj b/Botticelli.Locations/Botticelli.Locations.csproj
diff --git a/Botticelli.Locations/Integration/ILocationProvider.cs b/Botticelli.Locations/Integration/ILocationProvider.cs
diff --git a/Botticelli.Locations/Integration/OsmLocationProvider.cs b/Botticelli.Locations/Integration/OsmLocationProvider.cs
diff --git a/Botticelli.Locations/Models/Address.cs b/Botticelli.Locations/Models/Address.cs
diff --git a/Botticelli.Shared/ValueObjects/Message.cs b/Botticelli.Shared/ValueObjects/Message.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace Botticelli.AI.YaGpt.Message.YaGpt;`
`4`	`4`
`5`	`5`	`public class YaGptInputMessage`
`6`	`6`	`{`
`7`		`- [JsonPropertyName("modelUri")]`
	`7`	`+ [JsonPropertyName("model_uri")]`
`8`	`8`	`public string ModelUri { get; set; }`
`9`	`9`
`10`	`10`	`[JsonPropertyName("completionOptions")]`
`@@ -22,7 +22,7 @@ public class CompletionOptions`
`22`	`22`	`[JsonPropertyName("temperature")]`
`23`	`23`	`public double Temperature { get; set; }`
`24`	`24`
`25`		`- [JsonPropertyName("maxTokens")]`
	`25`	`+ [JsonPropertyName("max_tokens")]`
`26`	`26`	`public int MaxTokens { get; set; }`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ namespace Botticelli.AI.YaGpt.Settings;`
`4`	`4`
`5`	`5`	`public class YaGptSettings : AiSettings`
`6`	`6`	`{`
`7`		`- public string ApiKey { get; set; }`
`8`	`7`	`public string Model { get; set; }`
`9`	`8`	`public double Temperature { get; set; }`
`10`	`9`	`public string Instruction { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private HttpClient GetClient()`
`95`	`95`
`96`	`96`	`client.BaseAddress = new Uri(Settings.Value.Url);`
`97`	`97`	`client.DefaultRequestHeaders.Authorization =`
`98`		`- new AuthenticationHeaderValue("Bearer", Settings.Value.ApiKey);`
	`98`	`+ new AuthenticationHeaderValue(Settings.Value.AuthMethod, Settings.Value.ApiKey);`
`99`	`99`
`100`	`100`	`return client;`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,16 @@ public AiMessage(string uid) : base(uid)`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`13`		`- public string Instruction { get; set; }`
	`13`	`+ public string Instruction { get; set; } = string.Empty;`
`14`	`14`
`15`		`- public List<AiMessage> AdditionalMessages { get; set; }`
	`15`	`+ public List<AiMessage> AdditionalMessages { get; set; } = new List<AiMessage>();`
	`16`	`+`
	`17`	`+ public override Shared.ValueObjects.Message Copy()`
	`18`	`+ {`
	`19`	`+ var newMessage = (AiMessage)(base.Copy());`
	`20`	`+ newMessage.Instruction = Instruction;`
	`21`	`+ newMessage.AdditionalMessages = AdditionalMessages;`
	`22`	`+`
	`23`	`+ return newMessage;`
	`24`	`+ }`
`16`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`public class AiSettings : ProviderSettings`
`4`	`4`	`{`
`5`	`5`	`public string? Url { get; set; }`
`6`		`- public string AiName { get; set; }`
	`6`	`+ public required string AiName { get; set; }`
`7`	`7`	`public bool StreamGeneration { get; set; }`
`8`		`- public string ApiKey { get; set; }`
	`8`	`+ public string AuthMethod { get; set; } = "Bearer";`
	`9`	`+ public string? ApiKey { get; set; }`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,20 +43,24 @@ public Task SendResponseAsync(SendMessageResponse response,`
`43`	`43`
`44`	`44`	`public Task StartAsync(CancellationToken token)`
`45`	`45`	`{`
`46`		`- return Task.Run(async () => await InnerProcess(_handler, token));`
	`46`	`+ Task.Run(() => InnerProcess(_handler, token), token);`
	`47`	`+`
	`48`	`+ return Task.CompletedTask;`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`public Task StopAsync(CancellationToken cancellationToken)`
`50`	`52`	`{`
`51`	`53`	`throw new NotImplementedException();`
`52`	`54`	`}`
`53`	`55`
`54`		`- private async Task InnerProcess(THandler handler, CancellationToken token)`
	`56`	`+ private void InnerProcess(THandler handler, CancellationToken token)`
`55`	`57`	`{`
`56`	`58`	`while (!token.IsCancellationRequested)`
`57`	`59`	`{`
`58`		`- if (NoneBus.SendMessageRequests.TryDequeue(out var request)) await handler.Handle(request, token);`
`59`		`- Thread.Sleep(5);`
	`60`	`+ if (NoneBus.SendMessageRequests.TryDequeue(out var request))`
	`61`	`+ handler.Handle(request, token).Wait(token);`
	`62`	`+`
	`63`	`+ Task.Delay(5, token).Wait(token);`
`60`	`64`	`}`
`61`	`65`	`}`
`62`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public class InlineButtonMenu : ILayout`
`10`	`10`
`11`	`11`	`public InlineButtonMenu(int rows, int columns)`
`12`	`12`	`{`
`13`		`- if (rows < 1) throw new InvalidDataException("rows count should be > 1!");`
`14`		`- if (columns < 1) throw new InvalidDataException("columns count should be > 1!");`
	`13`	`+ if (rows < 1) throw new InvalidDataException("rows count should be > 0!");`
	`14`	`+ if (columns < 1) throw new InvalidDataException("columns count should be > 0!");`
`15`	`15`
`16`	`16`	`_rows = rows;`
`17`	`17`	`_columns = columns;`