refactor/2024-08-30-0124

Author: Cesar4D

Package/DelphiAIDeveloper.dpk

@@ -57,7 +57,7 @@ contains
   DelphiAIDev.Test in '..\Src\Test\DelphiAIDev.Test.pas',
   DelphiAIDev.Settings.View in '..\Src\Settings\DelphiAIDev.Settings.View.pas' {DelphiAIDevSettingsView},
   DelphiAIDev.Settings in '..\Src\Settings\DelphiAIDev.Settings.pas',
-  DelphiAIDev.Chat in '..\Src\Chat\DelphiAIDev.Chat.pas',
+  DelphiAIDev.AI in '..\Src\AI\DelphiAIDev.AI.pas',
   DelphiAIDev.Chat.View in '..\Src\Chat\DelphiAIDev.Chat.View.pas' {DelphiAIDevChatView},
   DelphiAIDev.Chat.ProcessResponse in '..\Src\Chat\DelphiAIDev.Chat.ProcessResponse.pas',
   DelphiAIDev.AI.Gemini in '..\Src\AI\DelphiAIDev.AI.Gemini.pas',

Package/DelphiAIDeveloper.dproj

@@ -154,7 +154,7 @@
             <Form>DelphiAIDevSettingsView</Form>
         </DCCReference>
         <DCCReference Include="..\Src\Settings\DelphiAIDev.Settings.pas"/>
-        <DCCReference Include="..\Src\Chat\DelphiAIDev.Chat.pas"/>
+        <DCCReference Include="..\Src\AI\DelphiAIDev.AI.pas"/>
         <DCCReference Include="..\Src\Chat\DelphiAIDev.Chat.View.pas">
             <Form>DelphiAIDevChatView</Form>
         </DCCReference>

Src/Chat/DelphiAIDev.Chat.pas Src/AI/DelphiAIDev.AI.pasSrc/Chat/DelphiAIDev.Chat.pas renamed to Src/AI/DelphiAIDev.AI.pas

@@ -1,4 +1,4 @@
-unit DelphiAIDev.Chat;
+unit DelphiAIDev.AI;
 
 interface
 
@@ -14,40 +14,50 @@ interface
   DelphiAIDev.AI.Ollama;
 
 type
-  TDelphiAIDevChat = class
+  TDelphiAIDevAI = class
   private
+    FAiUse: TC4DAiAvailable;
     FSettings: TDelphiAIDevSettings;
     FResponse: TStrings;
   public
     constructor Create;
     destructor Destroy; override;
+    function AiUse(const Value: TC4DAiAvailable): TDelphiAIDevAI;
     procedure ProcessSend(const AQuestion: string);
     function Response: TStrings;
   end;
 
 implementation
 
-constructor TDelphiAIDevChat.Create;
+constructor TDelphiAIDevAI.Create;
 begin
   FSettings := TDelphiAIDevSettings.GetInstance;
   FSettings.LoadData;
+  FAiUse := FSettings.AIDefault;
   FResponse := TStringList.Create;
 end;
 
-destructor TDelphiAIDevChat.Destroy;
+destructor TDelphiAIDevAI.Destroy;
 begin
   FResponse.Free;
   inherited;
 end;
 
-procedure TDelphiAIDevChat.ProcessSend(const AQuestion: string);
+function TDelphiAIDevAI.AiUse(const Value: TC4DAiAvailable): TDelphiAIDevAI;
+begin
+  Result := Self;
+  FAiUse := Value;
+end;
+
+procedure TDelphiAIDevAI.ProcessSend(const AQuestion: string);
 var
   LQuestion: string;
 begin
   LQuestion := TUtils.AdjustQuestionToJson(AQuestion);
   FResponse.Clear;
 
-  case FSettings.AIDefault of
+  TUtils.ShowMsgSynchronize(FAiUse.ToString);
+  case FAiUse of
     TC4DAiAvailable.Gemini:
       FResponse.Text := TDelphiAIDevAIGemini.New(FSettings).GetResponse(LQuestion);
     TC4DAiAvailable.OpenAI:
@@ -61,7 +71,7 @@ procedure TDelphiAIDevChat.ProcessSend(const AQuestion: string);
   end;
 end;
 
-function TDelphiAIDevChat.Response: TStrings;
+function TDelphiAIDevAI.Response: TStrings;
 begin
   Result := FResponse;
 end;

Src/Chat/DelphiAIDev.Chat.View.dfm

@@ -138,7 +138,7 @@ object DelphiAIDevChatView: TDelphiAIDevChatView
         Left = 0
         Top = 3
         Width = 56
-        Height = 13
+        Height = 22
         Cursor = crHandPoint
         Hint = 'AI being used'
         Margins.Left = 0
@@ -149,6 +149,7 @@ object DelphiAIDevChatView: TDelphiAIDevChatView
         Caption = 'lbCurrentAI'
         PopupMenu = pMenuCurrentAI
         OnClick = lbCurrentAIClick
+        ExplicitHeight = 13
       end
       object btnSend: TButton
         AlignWithMargins = True
@@ -164,6 +165,7 @@ object DelphiAIDevChatView: TDelphiAIDevChatView
         Caption = 'Send'
         TabOrder = 0
         OnClick = btnSendClick
+        ExplicitTop = 0
       end
       object pnBackConfigurableButtons: TPanel
         Left = 395

Src/Chat/DelphiAIDev.Chat.View.pas

@@ -26,7 +26,7 @@ interface
   Clipbrd,
   DelphiAIDev.Types,
   DelphiAIDev.Consts,
-  DelphiAIDev.Chat,
+  DelphiAIDev.AI,
   DelphiAIDev.Settings,
   DelphiAIDev.ModuleCreator,
   DelphiAIDev.DefaultsQuestions.PopupMenu,
@@ -103,7 +103,7 @@   TDelphiAIDevChatView = class(TDockableForm)
     procedure Clear1Click(Sender: TObject);
     procedure btnCleanAllClick(Sender: TObject);
   private
-    FChat: TDelphiAIDevChat;
+    FAI: TDelphiAIDevAI;
     FSettings: TDelphiAIDevSettings;
     FProcessResponse: TDelphiAIDevChatProcessResponse;
     FPopupMenuQuestions: TDelphiAIDevDefaultsQuestionsPopupMenu;
@@ -188,7 +188,7 @@ constructor TDelphiAIDevChatView.Create(AOwner: TComponent);
   AutoSave := True;
   SaveStateNecessary := True;
 
-  FChat := TDelphiAIDevChat.Create;
+  FAI := TDelphiAIDevAI.Create;
   FSettings := TDelphiAIDevSettings.GetInstance;
   FProcessResponse := TDelphiAIDevChatProcessResponse.Create(mmReturn);
   FPopupMenuQuestions := TDelphiAIDevDefaultsQuestionsPopupMenu.Create;
@@ -203,7 +203,7 @@ destructor TDelphiAIDevChatView.Destroy;
   Self.SaveMemoReturnInFile;
   FPopupMenuQuestions.Free;
   FProcessResponse.Free;
-  FChat.Free;
+  FAI.Free;
   inherited;
 end;
 
@@ -443,7 +443,7 @@ procedure TDelphiAIDevChatView.ProcessSend;
     begin
       try
         try
-          FChat.ProcessSend(LQuestion);
+          FAI.AiUse(FSettings.AIDefault).ProcessSend(LQuestion);
         except
           on E: Exception do
             TThread.Synchronize(nil,
@@ -460,7 +460,7 @@ procedure TDelphiAIDevChatView.ProcessSend;
             mmReturn.Lines.BeginUpdate;
             try
               //Optional use of one of the following lines
-              FProcessResponse.AddResponseComplete(FChat.Response);
+              FProcessResponse.AddResponseComplete(FAI.Response);
               Self.Last;
               //Self.AddResponseSimple(FChat.Response.Text);
             finally

Src/CodeCompletion/DelphiAIDev.CodeCompletion.Search.pas

@@ -12,7 +12,7 @@ interface
   DelphiAIDev.Utils,
   DelphiAIDev.Utils.OTA,
   DelphiAIDev.CodeCompletion.Vars,
-  DelphiAIDev.Chat;
+  DelphiAIDev.AI;
 
 type
   IDelphiAIDevCodeCompletionSearch = interface
@@ -24,7 +24,7 @@   TDelphiAIDevCodeCompletionSearch = class(TInterfacedObject, IDelphiAIDevCodeCo
   private
     FSettings: TDelphiAIDevSettings;
     FQuestions: TStrings;
-    FChat: TDelphiAIDevChat;
+    FAI: TDelphiAIDevAI;
     FVars: TDelphiAIDevCodeCompletionVars;
   protected
     procedure Process(const AContext: IOTAKeyContext);
@@ -44,15 +44,15 @@ class function TDelphiAIDevCodeCompletionSearch.New: IDelphiAIDevCodeCompletionS
 constructor TDelphiAIDevCodeCompletionSearch.Create;
 begin
   FSettings := TDelphiAIDevSettings.GetInstance;
-  FChat := TDelphiAIDevChat.Create;
+  FAI := TDelphiAIDevAI.Create;
   FQuestions := TStringList.Create;
   FVars := TDelphiAIDevCodeCompletionVars.GetInstance;
 end;
 
 destructor TDelphiAIDevCodeCompletionSearch.Destroy;
 begin
   FQuestions.Free;
-  FChat.Free;
+  FAI.Free;
   inherited;
 end;
 
@@ -64,7 +64,7 @@ procedure TDelphiAIDevCodeCompletionSearch.Process(const AContext: IOTAKeyContex
   i: Integer;
   LIOTAEditPosition: IOTAEditPosition;
 begin
-  FSettings.ValidateFillingSelectedAI(TShowMsg.No);
+  FSettings.ValidateFillingSelectedAICodeCompletion(TShowMsg.No);
 
   FQuestions.Clear;
   FQuestions.Add(FSettings.LanguageQuestions.GetLanguageDefinition);
@@ -80,12 +80,12 @@ procedure TDelphiAIDevCodeCompletionSearch.Process(const AContext: IOTAKeyContex
   end;
 
   try
-    FChat.ProcessSend(FQuestions.Text);
+    FAI.AiUse(FSettings.CodeCompletionAIDefault).ProcessSend(FQuestions.Text);
   except
     Abort;
   end;
 
-  FVars.Contents.Text := TUtils.ConfReturnAI(FChat.Response.Text);
+  FVars.Contents.Text := TUtils.ConfReturnAI(FAI.Response.Text);
 
   LRow := LIOTAEditPosition.Row;
   LColumn := LIOTAEditPosition.Column;

Src/DB/Chat/DelphiAIDev.DB.Chat.View.dfm

@@ -381,7 +381,7 @@ object DelphiAIDevDBChatView: TDelphiAIDevDBChatView
         AlignWithMargins = True
         Left = 508
         Top = 0
-        Width = 58
+        Width = 61
         Height = 25
         Cursor = crHandPoint
         Margins.Left = 0
@@ -391,7 +391,6 @@ object DelphiAIDevDBChatView: TDelphiAIDevDBChatView
         Caption = 'Generate'
         TabOrder = 2
         OnClick = btnGenerateDatabaseReferenceClick
-        ExplicitLeft = 503
       end
     end
   end
@@ -445,8 +444,8 @@ object DelphiAIDevDBChatView: TDelphiAIDevDBChatView
       end>
   end
   object pnCommands: TPanel
-    Left = 936
-    Top = 184
+    Left = 947
+    Top = 174
     Width = 26
     Height = 115
     Margins.Left = 0

Src/DB/Chat/DelphiAIDev.DB.Chat.View.pas

@@ -26,7 +26,7 @@ interface
   Clipbrd,
   DelphiAIDev.Types,
   DelphiAIDev.Consts,
-  DelphiAIDev.Chat,
+  DelphiAIDev.AI,
   DelphiAIDev.Settings,
   DelphiAIDev.ModuleCreator,
   DelphiAIDev.DefaultsQuestions.PopupMenu,
@@ -143,7 +143,7 @@   TDelphiAIDevDBChatView = class(TDockableForm)
     procedure DBGrid1TitleClick(Column: TColumn);
     procedure btnGenerateDatabaseReferenceClick(Sender: TObject);
   private
-    FChat: TDelphiAIDevChat;
+    FAI: TDelphiAIDevAI;
     FSettings: TDelphiAIDevSettings;
     FProcessResponse: TDelphiAIDevChatProcessResponse;
     FPopupMenuQuestions: TDelphiAIDevDefaultsQuestionsPopupMenu;
@@ -236,7 +236,7 @@ constructor TDelphiAIDevDBChatView.Create(AOwner: TComponent);
   AutoSave := True;
   SaveStateNecessary := True;
 
-  FChat := TDelphiAIDevChat.Create;
+  FAI := TDelphiAIDevAI.Create;
   FSettings := TDelphiAIDevSettings.GetInstance;
   FProcessResponse := TDelphiAIDevChatProcessResponse.Create(mmReturn);
   FPopupMenuQuestions := TDelphiAIDevDefaultsQuestionsPopupMenu.Create;
@@ -261,7 +261,7 @@ destructor TDelphiAIDevDBChatView.Destroy;
   Self.SaveMemoReturnInFile;
   FPopupMenuQuestions.Free;
   FProcessResponse.Free;
-  FChat.Free;
+  FAI.Free;
   inherited;
 end;
 
@@ -742,7 +742,7 @@ procedure TDelphiAIDevDBChatView.ProcessSend;
     begin
       try
         try
-          FChat.ProcessSend(LQuestion);
+          FAI.AiUse(FSettings.AIDefault).ProcessSend(LQuestion);
         except
           on E: Exception do
             TThread.Synchronize(nil,
@@ -759,7 +759,7 @@ procedure TDelphiAIDevDBChatView.ProcessSend;
             mmReturn.Lines.BeginUpdate;
             try
               //Optional use of one of the following lines
-              FProcessResponse.AddResponseComplete(FChat.Response);
+              FProcessResponse.AddResponseComplete(FAI.Response);
               Self.Last;
               //Self.AddResponseSimple(FChat.Response.Text);
             finally

Src/Settings/DelphiAIDev.Settings.pas

@@ -65,12 +65,15 @@   TDelphiAIDevSettings = class
     FApiKeyOllama: string;
 
     constructor Create;
+    procedure ValidateFillingSelectedAIInternal(
+      const AShowMsg: TShowMsg; const AAiUse: TC4DAiAvailable);
   public
     class function GetInstance: TDelphiAIDevSettings;
     procedure LoadDefaults;
     procedure SaveData;
     procedure LoadData;
     procedure ValidateFillingSelectedAI(const AShowMsg: TShowMsg = TShowMsg.Yes);
+    procedure ValidateFillingSelectedAICodeCompletion(const AShowMsg: TShowMsg = TShowMsg.Yes);
 
     property LanguageQuestions: TC4DLanguage read FLanguageQuestions write FLanguageQuestions;
     property AIDefault: TC4DAiAvailable read FAIDefault write FAIDefault;
@@ -284,6 +287,17 @@ procedure TDelphiAIDevSettings.LoadData;
 end;
 
 procedure TDelphiAIDevSettings.ValidateFillingSelectedAI(const AShowMsg: TShowMsg = TShowMsg.Yes);
+begin
+  Self.ValidateFillingSelectedAIInternal(AShowMsg, FAIDefault);
+end;
+
+procedure TDelphiAIDevSettings.ValidateFillingSelectedAICodeCompletion(const AShowMsg: TShowMsg = TShowMsg.Yes);
+begin
+  Self.ValidateFillingSelectedAIInternal(AShowMsg, FCodeCompletionAIDefault);
+end;
+
+procedure TDelphiAIDevSettings.ValidateFillingSelectedAIInternal(
+  const AShowMsg: TShowMsg; const AAiUse: TC4DAiAvailable);
 const
   MSG = '"%s" for IA %s not specified in settings.' + sLineBreak + sLineBreak +
     'Access menu > AI Developer > Settings';
@@ -295,7 +309,7 @@ procedure TDelphiAIDevSettings.ValidateFillingSelectedAI(const AShowMsg: TShowMs
     Abort;
   end;
 begin
-  case FAIDefault of
+  case AAiUse of
     TC4DAiAvailable.Gemini:
     begin
       if FBaseUrlGemini.Trim.IsEmpty then