bk/2024-07-26-0227

Author: Cesar4D

Package/DelphiAIDeveloper.dpk

@@ -49,7 +49,7 @@ contains
   DelphiAIDev.MainMenu in '..\Src\MainMenu\DelphiAIDev.MainMenu.pas',
   DelphiAIDev.MainMenu.Clicks in '..\Src\MainMenu\DelphiAIDev.MainMenu.Clicks.pas',
   DelphiAIDev.View.About in '..\Src\View\DelphiAIDev.View.About.pas' {DelphiAIDevViewAbout},
-  Test in '..\Src\Test\Test.pas',
+  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',

Package/DelphiAIDeveloper.dproj

@@ -146,7 +146,7 @@
         <DCCReference Include="..\Src\View\DelphiAIDev.View.About.pas">
             <Form>DelphiAIDevViewAbout</Form>
         </DCCReference>
-        <DCCReference Include="..\Src\Test\Test.pas"/>
+        <DCCReference Include="..\Src\Test\DelphiAIDev.Test.pas"/>
         <DCCReference Include="..\Src\Settings\DelphiAIDev.Settings.View.pas">
             <Form>DelphiAIDevSettingsView</Form>
             <FormType>dfm</FormType>

Src/AI/DelphiAIDev.AI.ChatGPT.pas

@@ -39,7 +39,6 @@ constructor TDelphiAIDevAIChatGPT.Create(const ASettings: TDelphiAIDevSettings);
 
 function TDelphiAIDevAIChatGPT.GetResponse(const AQuestion: string): string;
 var
-  LApiUrl: string;
   LQuestion: string;
   LResponse: IResponse;
   LJsonValueAll: TJSONValue;
@@ -51,11 +50,10 @@ function TDelphiAIDevAIChatGPT.GetResponse(const AQuestion: string): string;
   LItemChoices: Integer;
 begin
   Result := '';
-  LApiUrl := FSettings.BaseUrlOpenAI;
   LQuestion := TUtils.AdjustQuestionToJson(AQuestion); //AQuestion.Replace(sLineBreak, '\n', [rfReplaceAll, rfIgnoreCase]);
 
   LResponse := TRequest.New
-    .BaseURL(LApiUrl)
+    .BaseURL(FSettings.BaseUrlOpenAI)
     .ContentType('application/json')
     .Accept('application/json')
     .Token('Bearer ' + FSettings.ApiKeyOpenAI)

Src/AI/DelphiAIDev.AI.Groq.pas

@@ -39,7 +39,6 @@ constructor TDelphiAIDevAIGroq.Create(const ASettings: TDelphiAIDevSettings);
 
 function TDelphiAIDevAIGroq.GetResponse(const AQuestion: string): string;
 var
-  LApiUrl: string;
   LQuestion: string;
   LResponse: IResponse;
   LJsonValueAll: TJSONVALUE;
@@ -49,18 +48,14 @@ function TDelphiAIDevAIGroq.GetResponse(const AQuestion: string): string;
   LItemChoices: Integer;
 begin
   Result := '';
-  //LApiUrl := FSettings.BaseUrlGemini + FSettings.ModelGemini + '?key=' + FSettings.ApiKeyGemini;
-  LApiUrl := 'https://api.groq.com/openai/v1/chat/completions';
   LQuestion := TUtils.AdjustQuestionToJson(AQuestion);
 
   LResponse := TRequest.New
-    .BaseURL(LApiUrl)
+    .BaseURL(FSettings.BaseUrlGroq)
     .ContentType('application/json')
     .Accept('application/json')
-    //.Token('Bearer ' + FSettings.ApiKeyOpenAI)
-    .Token('Bearer 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')
-    //.AddBody(Format(API_JSON_BODY_BASE, [FSettings.ModelOpenAI, LQuestion]))
-    .AddBody(Format(API_JSON_BODY_BASE, [LQuestion, 'Llama3-8b-8192']))
+    .Token('Bearer ' + FSettings.ApiKeyGroq)
+    .AddBody(Format(API_JSON_BODY_BASE, [LQuestion, FSettings.ModelGroq]))
     .Post;
 
   if LResponse.StatusCode <> 200 then

Src/Consts/DelphiAIDev.Consts.pas

@@ -25,7 +25,7 @@   TConsts = class
     BASE_URL_GEMINI_DEFAULT = 'https://generativelanguage.googleapis.com/';
     MODEL_GEMINI_DEFAULT = 'v1/models/gemini-1.5-flash:generateContent';
     BASE_URL_OPEN_AI = 'https://api.openai.com/v1/chat/completions/';
-    API_AI_TIMEOUT_DEFAULT = 20;
+    BASE_URL_GROQ = 'https://api.groq.com/openai/v1/chat/completions';
 
     //NAMES FILES .INI
     FILE_INI_GENERAL_SETTINGS = 'delphi-ai-developer.ini';

Src/IDE/Shortcuts/DelphiAIDev.IDE.Shortcuts.pas

@@ -14,7 +14,7 @@ interface
 type
   TDelphiAIDevIDEShortcuts = class(TNotifierObject, IOTAKeyboardBinding)
   private
-    procedure KeyProcBlockReturn(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
+    //procedure KeyProcBlockReturn(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
     procedure KeyProcBlockReturnAndAlt(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
   protected
     function GetBindingType: TBindingType;
@@ -38,8 +38,8 @@ implementation
 
 procedure RegisterSelf;
 begin
-//  if Index < 0 then
-//    Index := TUtilsOTA.GetIOTAKeyboardServices.AddKeyboardBinding(TDelphiAIDevIDEShortcuts.New);
+  if Index < 0 then
+    Index := TUtilsOTA.GetIOTAKeyboardServices.AddKeyboardBinding(TDelphiAIDevIDEShortcuts.New);
 end;
 
 procedure UnRegisterSelf;
@@ -79,36 +79,41 @@ function TDelphiAIDevIDEShortcuts.GetName: string;
 
 procedure TDelphiAIDevIDEShortcuts.BindKeyboard(const BindingServices: IOTAKeyBindingServices);
 begin
-  if TUtilsOTA.CurrentProjectIsDelphiAIDeveloperDPROJ then
-    Exit;
+//  if TUtilsOTA.CurrentProjectIsDelphiAIDeveloperDPROJ then
+//    Exit;
 
-  Exit;
-  BindingServices.AddKeyBinding([Shortcut(VK_RETURN, [])], Self.KeyProcBlockReturn, nil);
+  //BindingServices.AddKeyBinding([Shortcut(VK_RETURN, [])], Self.KeyProcBlockReturn, nil);
   BindingServices.AddKeyBinding([Shortcut(VK_RETURN, [ssAlt])], Self.KeyProcBlockReturnAndAlt, nil);
 end;
 
-procedure TDelphiAIDevIDEShortcuts.KeyProcBlockReturn(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
-begin
-  Exit;
-
-  TUtils.AddLog(GetCurrentLineOrBlock(CnOtaGetTopMostEditView));
-  BindingResult := krNextProc; //krUnhandled;
-end;
+//procedure TDelphiAIDevIDEShortcuts.KeyProcBlockReturn(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
+//begin
+//  if KeyCode <> Shortcut(VK_RETURN, []) then
+//    Exit;
+//
+//  TUtils.AddLog(GetCurrentLineOrBlock(CnOtaGetTopMostEditView));
+//  BindingResult := TKeyBindingResult.krNextProc; //krUnhandled;
+//end;
 
 procedure TDelphiAIDevIDEShortcuts.KeyProcBlockReturnAndAlt(const Context: IOTAKeyContext; KeyCode: TShortcut; var BindingResult: TKeyBindingResult);
 var
   LTextCurrentLineOrBlock: string;
 begin
-  //TUtils.AddLog('Enter and Alt' + GetCurrentLineOrBlock(CnOtaGetTopMostEditView));
+  if KeyCode <> Shortcut(VK_RETURN, [ssAlt]) then
+    Exit;
 
-  LTextCurrentLineOrBlock := GetCurrentLineOrBlock(CnOtaGetTopMostEditView);
+  //LTextCurrentLineOrBlock := Context.EditBuffer.EditBlock.Text;
+  LTextCurrentLineOrBlock := GetCurrentLineOrBlock(CnOtaGetTopMostEditView).Trim;
   if LTextCurrentLineOrBlock.Trim.IsEmpty then
     Exit;
 
+  if copy(LTextCurrentLineOrBlock, 1, 2) = '//' then
+    LTextCurrentLineOrBlock := copy(LTextCurrentLineOrBlock, 3, LTextCurrentLineOrBlock.Length);
+
   DelphiAIDev.Chat.View.DelphiAIDevChatView.QuestionOnShow := LTextCurrentLineOrBlock;
   DelphiAIDev.Chat.View.DelphiAIDevChatViewShowDockableForm;
 
-  BindingResult := krNextProc; //krUnhandled;
+  BindingResult := TKeyBindingResult.krUnhandled; //krNextProc;
 end;
 
 initialization