Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement support for gpt-4. #46

Merged
merged 3 commits into from
May 31, 2023
Merged

Implement support for gpt-4. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31c5b96
Update UChatGPTThread.pas
cddigi May 30, 2023
4ba2132
Update UChatGPTSetting.dfm
cddigi May 30, 2023
ffe2700
Update UChatGPTSetting.pas
cddigi May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Forms/UChatGPTSetting.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ object Frm_Setting: TFrm_Setting
'code-davinci-002'
'text-davinci-002'
'gpt-4'
'gpt-4-32k'
'gpt-4-0314')
end
object chk_AnimatedLetters: TCheckBox
Expand Down
8 changes: 4 additions & 4 deletions Forms/UChatGPTSetting.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,19 +773,19 @@ procedure TFrm_Setting.Btn_RemoveQuestionClick(Sender: TObject);
procedure TFrm_Setting.cbbModelChange(Sender: TObject);
begin
HasChanges := True;
if (cbbModel.ItemIndex in [4, 5]) and (edt_Url.Text = DefaultChatGPTURL) then
if (Copy(cbbModel.Text, 1, 4) = 'gpt-') and (edt_Url.Text = DefaultChatGPTURL) then
begin
if MessageDlg('gpt-3.5-turbo uses a different base URL, would you like me to set it automatically?' + #13 +
if MessageDlg('Chat API uses a different base URL, would you like me to set it automatically?' + #13 +
'The base URL should be something like the following URL but in case it doesn''t work ' + #13 +
'Please visit the online documentation from OpenAI in this regard' + #13 +
'Base URL: https://api.openai.com/v1/chat/completions',
mtConfirmation, [mbYes, mbNo], 0) = mrYes then
edt_Url.Text := DefaultChatGPT3_5TurboURL;
end;

if not(cbbModel.ItemIndex in [4, 5]) and (edt_Url.Text = DefaultChatGPT3_5TurboURL) then
if (Copy(cbbModel.Text, 1, 4) <> 'gpt-') and (edt_Url.Text = DefaultChatGPT3_5TurboURL) then
begin
if MessageDlg('Any model except "gpt-3.5-turbo" uses a different base URL, would you like me to set it automatically?' + #13 +
if MessageDlg('Any models except "gpt-3.5-turbo" and "gpt-4" use a different base URL, would you like me to set it automatically?' + #13 +
'The base URL should be something like the following URL but in case it doesn''t work ' + #13 +
'Please visit the online documentation from OpenAI in this regard' + #13 +
'Base URL: https://api.openai.com/v1/completions',
Expand Down
76 changes: 38 additions & 38 deletions Utils/UChatGPTThread.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ TRequestJSON = class
property temperature: Integer read FTemperature write FTemperature;
end;

T3_5TurboMessages = class
TChatMessages = class
private
FRole: string;
FContent: string;
Expand All @@ -60,15 +60,15 @@ T3_5TurboMessages = class
property content: string read FContent write FContent;
end;

TRequestJSON3_5Turbo = class
TRequestJSONChat = class
private
FModel: string;
FMessages: TObjectList<T3_5TurboMessages>;
FMessages: TObjectList<TChatMessages>;
public
constructor Create;
destructor Destroy; override;
property model: string read FModel write FModel;
property messages: TObjectList<T3_5TurboMessages> read FMessages write FMessages;
property messages: TObjectList<TChatMessages> read FMessages write FMessages;
end;

TChoice = class
Expand Down Expand Up @@ -121,7 +121,7 @@ TOpenAIAPI = class
FUrl: string;
FProxySetting: TProxySetting;
FTimeOut: Integer;
function Is3_5Turbo(AModel: string): Boolean;
function IsChatModel(AModel: string): Boolean;
public
constructor Create(const AAccessToken, AUrl: string; AProxySetting: TProxySetting; ATimeOut: Integer);
function QueryStreamIndy(const AModel: string; const APrompt: string; AMaxToken: Integer; ATemperature: Integer): string;
Expand All @@ -141,9 +141,9 @@ constructor TOpenAIAPI.Create(const AAccessToken, AUrl: string; AProxySetting: T
FTimeOut := ATimeOut;
end;

function TOpenAIAPI.Is3_5Turbo(AModel: string): Boolean;
function TOpenAIAPI.IsChatModel(AModel: string): Boolean;
begin
Result := AModel.Contains('gpt-3.5-turbo');
Result := AModel.Contains('gpt-3.5-turbo') or AModel.Contains('gpt-4');
end;

function TOpenAIAPI.QueryStreamIndy(const AModel: string; const APrompt: string; AMaxToken: Integer; ATemperature: Integer): string;
Expand All @@ -153,7 +153,7 @@ function TOpenAIAPI.QueryStreamIndy(const AModel: string; const APrompt: string;
LvParamStream: TStringStream;
LvRequestJSON: TRequestJSON;
LvResponseStream: TStringStream;
LvRequestJSON3_5Turbo: TRequestJSON3_5Turbo;
LvRequestJSONChat: TRequestJSONChat;
begin
LvHttpClient := TIdHTTP.Create(nil);
LvHttpClient.ConnectTimeout := FTimeOut * 1000;
Expand All @@ -169,12 +169,12 @@ function TOpenAIAPI.QueryStreamIndy(const AModel: string; const APrompt: string;

LvSslIOHandler := TIdSSLIOHandlerSocketOpenSSL.Create(nil);

if Is3_5Turbo(AModel) then
if IsChatModel(AModel) then
begin
LvRequestJSON3_5Turbo := TRequestJSON3_5Turbo.Create;
LvRequestJSON3_5Turbo.model := AModel;
LvRequestJSON3_5Turbo.messages.Add(T3_5TurboMessages.Create('user', APrompt));
LvParamStream := TStringStream.Create(LvRequestJSON3_5Turbo.AsJSON(True), TEncoding.UTF8);
LvRequestJSONChat := TRequestJSONChat.Create;
LvRequestJSONChat.model := AModel;
LvRequestJSONChat.messages.Add(TChatMessages.Create('user', APrompt));
LvParamStream := TStringStream.Create(LvRequestJSONChat.AsJSON(True), TEncoding.UTF8);
end
else
begin
Expand Down Expand Up @@ -211,8 +211,8 @@ function TOpenAIAPI.QueryStreamIndy(const AModel: string; const APrompt: string;
Result := 'Error in function QueryStreamIndy.' + #13 + E.Message;
end;
finally
if Is3_5Turbo(AModel) then
LvRequestJSON3_5Turbo.Free
if IsChatModel(AModel) then
LvRequestJSONChat.Free
else
LvRequestJSON.Free;
LvResponseStream.Free;
Expand All @@ -229,20 +229,20 @@ function TOpenAIAPI.QueryStreamNative(const AModel, APrompt: string; AMaxToken,
LvResponseContent: string;
LvRequestJSON: TRequestJSON;
LvParamStream: TStringStream;
LvRequestJSON3_5Turbo: TRequestJSON3_5Turbo;
LvRequestJSONChat: TRequestJSONChat;
LvResponseXObject: ISuperObject;
begin
LvResponseContent := '';
LvHttpClient := THTTPClient.Create;
LvHttpClient.ConnectionTimeout := FTimeOut * 1000;
LvHttpClient.ResponseTimeout := (FTimeOut * 1000) * 2;

if Is3_5Turbo(AModel) then
if IsChatModel(AModel) then
begin
LvRequestJSON3_5Turbo := TRequestJSON3_5Turbo.Create;
LvRequestJSON3_5Turbo.model := AModel;
LvRequestJSON3_5Turbo.messages.Add(T3_5TurboMessages.Create('user', APrompt));
LvParamStream := TStringStream.Create(LvRequestJSON3_5Turbo.AsJSON(True), TEncoding.UTF8);
LvRequestJSONChat := TRequestJSONChat.Create;
LvRequestJSONChat.model := AModel;
LvRequestJSONChat.messages.Add(TChatMessages.Create('user', APrompt));
LvParamStream := TStringStream.Create(LvRequestJSONChat.AsJSON(True), TEncoding.UTF8);
end
else
begin
Expand Down Expand Up @@ -280,7 +280,7 @@ function TOpenAIAPI.QueryStreamNative(const AModel, APrompt: string; AMaxToken,
Result := AdjustLineBreaks(LvResponseXObject['error.message'].AsString.Trim)
else
begin
if Is3_5Turbo(AModel) then
if IsChatModel(AModel) then
Result := AdjustLineBreaks(LvResponseXObject['choices[0].message.content'].AsString.Trim)
else
Result := AdjustLineBreaks(LvResponseXObject['Choices[0].Text'].AsString.Trim);
Expand All @@ -295,8 +295,8 @@ function TOpenAIAPI.QueryStreamNative(const AModel, APrompt: string; AMaxToken,
Result := E.Message;
end;
finally
if Is3_5Turbo(AModel) then
LvRequestJSON3_5Turbo.Free
if IsChatModel(AModel) then
LvRequestJSONChat.Free
else
LvRequestJSON.Free;
LvParamStream.Free;
Expand All @@ -311,7 +311,7 @@ function TOpenAIAPI.QueryStringIndy(const AModel: string; const APrompt: string;
LvParamStream: TStringStream;
LvResponse: string;
LvRequestJSON: TRequestJSON;
LvRequestJSON3_5Turbo: TRequestJSON3_5Turbo;
LvRequestJSONChat: TRequestJSONChat;
begin
LvHttpClient := TIdHTTP.Create(nil);
LvHttpClient.ConnectTimeout := FTimeOut * 1000;
Expand All @@ -324,12 +324,12 @@ function TOpenAIAPI.QueryStringIndy(const AModel: string; const APrompt: string;
LvHttpClient.Request.CustomHeaders.AddValue('Authorization', 'Bearer ' + FAccessToken);
LvHttpClient.Request.ContentType := 'application/json';

if Is3_5Turbo(AModel) then
if IsChatModel(AModel) then
begin
LvRequestJSON3_5Turbo := TRequestJSON3_5Turbo.Create;
LvRequestJSON3_5Turbo.model := AModel;
LvRequestJSON3_5Turbo.messages.Add(T3_5TurboMessages.Create('user', APrompt));
LvParamStream := TStringStream.Create(LvRequestJSON3_5Turbo.AsJSON(True), TEncoding.UTF8);
LvRequestJSONChat := TRequestJSONChat.Create;
LvRequestJSONChat.model := AModel;
LvRequestJSONChat.messages.Add(TChatMessages.Create('user', APrompt));
LvParamStream := TStringStream.Create(LvRequestJSONChat.AsJSON(True), TEncoding.UTF8);
end
else
begin
Expand All @@ -354,8 +354,8 @@ function TOpenAIAPI.QueryStringIndy(const AModel: string; const APrompt: string;
Result := 'Error in function QueryStringIndy.' + #13 + E.Message;
end;
finally
if Is3_5Turbo(AModel) then
LvRequestJSON3_5Turbo.Free
if IsChatModel(AModel) then
LvRequestJSONChat.Free
else
LvRequestJSON.Free;
LvParamStream.Free;
Expand Down Expand Up @@ -493,22 +493,22 @@ procedure TExecutorTrd.Execute;
end;
end;

{ TRequestJSON3_5Turbo }
{ TRequestJSONChat }

constructor TRequestJSON3_5Turbo.Create;
constructor TRequestJSONChat.Create;
begin
FMessages := TObjectList<T3_5TurboMessages>.Create;
FMessages := TObjectList<TChatMessages>.Create;
end;

destructor TRequestJSON3_5Turbo.Destroy;
destructor TRequestJSONChat.Destroy;
begin
FMessages.Free;
inherited;
end;

{ T3_5TurboMessages }
{ TChatMessages }

constructor T3_5TurboMessages.Create(ARole, AContent: string);
constructor TChatMessages.Create(ARole, AContent: string);
begin
FRole := ARole;
FContent := AContent;
Expand Down