Merge branch 'develop'

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',
@@ -72,6 +72,8 @@ contains
   DelphiAIDev.DefaultsQuestions.AddEdit.View in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.AddEdit.View.pas' {DelphiAIDevDefaultsQuestionsAddEditView},
   DelphiAIDev.DefaultsQuestions.PopupMenu in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.PopupMenu.pas',
   DelphiAIDev.Utils.ABMenuAction in '..\Src\Utils\DelphiAIDev.Utils.ABMenuAction.pas',
-  DelphiAIDev.IDE.Splash in '..\Src\IDE\Splash\DelphiAIDev.IDE.Splash.pas';
+  DelphiAIDev.IDE.Splash in '..\Src\IDE\Splash\DelphiAIDev.IDE.Splash.pas',
+  DelphiAIDev.Chat.ProcessResponse in '..\Src\Chat\DelphiAIDev.Chat.ProcessResponse.pas',
+  DelphiAIDev.AI.Groq in '..\Src\AI\DelphiAIDev.AI.Groq.pas';
 
 end.

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>
@@ -179,6 +179,8 @@
         <DCCReference Include="..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.PopupMenu.pas"/>
         <DCCReference Include="..\Src\Utils\DelphiAIDev.Utils.ABMenuAction.pas"/>
         <DCCReference Include="..\Src\IDE\Splash\DelphiAIDev.IDE.Splash.pas"/>
+        <DCCReference Include="..\Src\Chat\DelphiAIDev.Chat.ProcessResponse.pas"/>
+        <DCCReference Include="..\Src\AI\DelphiAIDev.AI.Groq.pas"/>
         <RcItem Include="Img\c4d_gear.bmp">
             <ResourceType>BITMAP</ResourceType>
             <ResourceId>c4d_gear</ResourceId>

Src/AI/DelphiAIDev.AI.ChatGPT.pas

@@ -39,23 +39,21 @@ constructor TDelphiAIDevAIChatGPT.Create(const ASettings: TDelphiAIDevSettings);
 
 function TDelphiAIDevAIChatGPT.GetResponse(const AQuestion: string): string;
 var
-  LApiUrl: string;
   LQuestion: string;
   LResponse: IResponse;
-  LReturnValue: TJSONValue;
-  LChoicesValue: TJSONValue;
-  LChoicesArray: TJSONArray;
-  LChoicesObj: TJSONObject;
-  LMessageValue: TJSONValue;
-  LMessageObj: TJSONObject;
-  I: Integer;
+  LJsonValueAll: TJSONValue;
+  LJsonValueChoices: TJSONValue;
+  LJsonArrayChoices: TJSONArray;
+  LJsonObjChoices: TJSONObject;
+  LJsonValueMessage: TJSONValue;
+  LJsonObjMessage: TJSONObject;
+  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)
@@ -65,37 +63,33 @@ function TDelphiAIDevAIChatGPT.GetResponse(const AQuestion: string): string;
   if LResponse.StatusCode <> 200 then
     Exit('Question cannot be answered' + sLineBreak + 'Return: ' + LResponse.Content);
 
-  //TJSONValue COMPLETE
-  LReturnValue := TJSONObject.ParseJSONValue(TEncoding.UTF8.GetBytes(LResponse.Content), 0);
-  if not(LReturnValue is TJSONObject) then
+  LJsonValueAll := TJSONObject.ParseJSONValue(TEncoding.UTF8.GetBytes(LResponse.Content), 0);
+  if not(LJsonValueAll is TJSONObject) then
     Exit('The question cannot be answered, return object not found.' + sLineBreak +
       'Return: ' + LResponse.Content);
 
-  //GET CHOICES LIKE TJSONValue
-  LChoicesValue := TJSONObject(LReturnValue).GetValue('choices');
-
-  if not(LChoicesValue is TJSONArray) then
+  LJsonValueChoices := TJSONObject(LJsonValueAll).GetValue('choices');
+  if not(LJsonValueChoices is TJSONArray) then
     Exit('The question cannot be answered, choices not found.' + sLineBreak +
       'Return: ' + LResponse.Content);
 
-  //CAST CHOICES LIKE TJSONArray
-  LChoicesArray := LChoicesValue as TJSONArray;
-  for I := 0 to Pred(LChoicesArray.Count) do
+  LJsonArrayChoices := LJsonValueChoices as TJSONArray;
+  for LItemChoices := 0 to Pred(LJsonArrayChoices.Count) do
   begin
-    if not(LChoicesArray.Items[I] is TJSONObject) then
+    if not(LJsonArrayChoices.Items[LItemChoices] is TJSONObject) then
       Continue;
 
     //CAST ITEM CHOICES LIKE TJSONObject
-    LChoicesObj := LChoicesArray.Items[I] as TJSONObject;
+    LJsonObjChoices := LJsonArrayChoices.Items[LItemChoices] as TJSONObject;
 
     //GET MESSAGE LIKE TJSONValue
-    LMessageValue := LChoicesObj.GetValue('message');
-    if not(LMessageValue is TJSONObject) then
+    LJsonValueMessage := LJsonObjChoices.GetValue('message');
+    if not(LJsonValueMessage is TJSONObject) then
       Continue;
 
     //GET MESSAGE LIKE TJSONObject
-    LMessageObj := LMessageValue as TJSONObject;
-    Result := Result + TJSONString(LMessageObj.GetValue('content')).Value + sLineBreak;
+    LJsonObjMessage := LJsonValueMessage as TJSONObject;
+    Result := Result + TJSONString(LJsonObjMessage.GetValue('content')).Value.Trim + sLineBreak;
   end;
 
   Result := Result.Trim;

Src/AI/DelphiAIDev.AI.Gemini.pas

@@ -42,13 +42,12 @@ function TDelphiAIDevAIGemini.GetResponse(const AQuestion: string): string;
   LApiUrl: string;
   LQuestion: string;
   LResponse: IResponse;
-  LJsonValue: TJSONVALUE;
-  LJsonArray: TJsonArray;
-  LPartsArray: TJsonArray;
-  LJsonObj: TJsonObject;
-  LPartsObj: TJsonObject;
-  LJsonText: string;
-  i, j: Integer;
+  LJsonValueAll: TJSONVALUE;
+  LJsonArrayCandidates: TJsonArray;
+  LJsonArrayParts: TJsonArray;
+  LJsonObjContent: TJsonObject;
+  LJsonObjParts: TJsonObject;
+  LItemCandidates, LItemParts: Integer;
 begin
   Result := '';
   LApiUrl := FSettings.BaseUrlGemini + FSettings.ModelGemini + '?key=' + FSettings.ApiKeyGemini;
@@ -61,28 +60,26 @@ function TDelphiAIDevAIGemini.GetResponse(const AQuestion: string): string;
     .Post;
 
   if LResponse.StatusCode <> 200 then
-  begin
-    Result := 'Question cannot be answered' + sLineBreak +
-      'Return: ' + LResponse.Content;
-    Exit;
-  end;
+    Exit('Question cannot be answered' + sLineBreak + 'Return: ' + LResponse.Content);
 
-  LJsonValue := TJsonObject.ParseJSONValue(LResponse.Content);
-  if LJsonValue is TJsonObject then
+  LJsonValueAll := TJsonObject.ParseJSONValue(LResponse.Content);
+  if not(LJsonValueAll is TJSONObject) then
+    Exit('The question cannot be answered, return object not found.' + sLineBreak +
+      'Return: ' + LResponse.Content);
+
+  LJsonArrayCandidates := (LJsonValueAll as TJsonObject).GetValue<TJsonArray>('candidates');
+  for LItemCandidates := 0 to Pred(LJsonArrayCandidates.Count) do
   begin
-    LJsonArray := (LJsonValue as TJsonObject).GetValue<TJsonArray>('candidates');
-    for i := 0 to Pred(LJsonArray.Count) do
+    LJsonObjContent := LJsonArrayCandidates.Items[LItemCandidates].GetValue<TJsonObject>('content');
+    LJsonArrayParts := LJsonObjContent.GetValue<TJsonArray>('parts');
+    for LItemParts := 0 to Pred(LJsonArrayParts.Count) do
     begin
-      LJsonObj := LJsonArray.Items[i].GetValue<TJsonObject>('content');
-      LPartsArray := LJsonObj.GetValue<TJsonArray>('parts');
-      for j := 0 to Pred(LPartsArray.Count) do
-      begin
-        LPartsObj := LPartsArray.Items[j] as TJsonObject;
-        LJsonText := LPartsObj.GetValue<string>('text');
-        Result := LJsonText.Trim;
-      end;
+      LJsonObjParts := LJsonArrayParts.Items[LItemParts] as TJsonObject;
+      Result := Result + LJsonObjParts.GetValue<string>('text').Trim + sLineBreak;
     end;
   end;
+
+  Result := Result.Trim;
 end;
 
 end.

Src/AI/DelphiAIDev.AI.Groq.pas

@@ -0,0 +1,80 @@
+unit DelphiAIDev.AI.Groq;
+
+interface
+
+uses
+  System.SysUtils,
+  System.JSON,
+  System.Classes,
+  RESTRequest4D,
+  DelphiAIDev.Utils,
+  DelphiAIDev.Settings,
+  DelphiAIDev.AI.Interfaces;
+
+type
+  TDelphiAIDevAIGroq = class(TInterfacedObject, IDelphiAIDevAI)
+  private
+    FSettings: TDelphiAIDevSettings;
+  protected
+    function GetResponse(const AQuestion: string): string;
+  public
+    class function New(const ASettings: TDelphiAIDevSettings): IDelphiAIDevAI;
+    constructor Create(const ASettings: TDelphiAIDevSettings);
+  end;
+
+implementation
+
+const
+  API_JSON_BODY_BASE = '{"messages": [{"role": "user", "content": "%s"}], "model": "%s"}';
+
+class function TDelphiAIDevAIGroq.New(const ASettings: TDelphiAIDevSettings): IDelphiAIDevAI;
+begin
+  Result := Self.Create(ASettings);
+end;
+
+constructor TDelphiAIDevAIGroq.Create(const ASettings: TDelphiAIDevSettings);
+begin
+  FSettings := ASettings;
+end;
+
+function TDelphiAIDevAIGroq.GetResponse(const AQuestion: string): string;
+var
+  LQuestion: string;
+  LResponse: IResponse;
+  LJsonValueAll: TJSONVALUE;
+  LJsonArrayChoices: TJsonArray;
+  LJsonObjMessage: TJsonObject;
+  LContent: string;
+  LItemChoices: Integer;
+begin
+  Result := '';
+  LQuestion := TUtils.AdjustQuestionToJson(AQuestion);
+
+  LResponse := TRequest.New
+    .BaseURL(FSettings.BaseUrlGroq)
+    .ContentType('application/json')
+    .Accept('application/json')
+    .Token('Bearer ' + FSettings.ApiKeyGroq)
+    .AddBody(Format(API_JSON_BODY_BASE, [LQuestion, FSettings.ModelGroq]))
+    .Post;
+
+  if LResponse.StatusCode <> 200 then
+    Exit('Question cannot be answered' + sLineBreak + 'Return: ' + LResponse.Content);
+
+  LJsonValueAll := TJsonObject.ParseJSONValue(LResponse.Content);
+  if not(LJsonValueAll is TJSONObject) then
+    Exit('The question cannot be answered, return object not found.' + sLineBreak +
+      'Return: ' + LResponse.Content);
+
+  LJsonArrayChoices := (LJsonValueAll as TJsonObject).GetValue<TJsonArray>('choices');
+  for LItemChoices := 0 to Pred(LJsonArrayChoices.Count) do
+  begin
+    LJsonObjMessage := LJsonArrayChoices.Items[LItemChoices].GetValue<TJsonObject>('message');
+    LContent := LJsonObjMessage.GetValue<string>('content');
+    Result := Result + LContent.Trim + sLineBreak;
+  end;
+
+  Result := Result.Trim;
+end;
+
+end.