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

refactor: Client Classes & Azure OpenAI as a separate Endpoint #532

Merged
merged 40 commits into from
Jul 3, 2023
Merged

refactor: Client Classes & Azure OpenAI as a separate Endpoint #532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
76d7511
refactor: start new client classes, test localAi support
danny-avila Jun 17, 2023
eadf871
feat: create base class, extend chatgpt from base
danny-avila Jun 17, 2023
05588fc
refactor(BaseClient.js): change userId parameter to user
danny-avila Jun 17, 2023
d9b6687
refactor(BaseClient.js): use optional chaining operator to access mes…
danny-avila Jun 18, 2023
4ac8e60
refactor: update import statements and remove unused imports in sever…
danny-avila Jun 18, 2023
d9c01ba
refactor(utils): rename migrateConversations to migrateDataToFirstUse…
danny-avila Jun 18, 2023
d831006
feat(chatgpt-client.js): add getAzureCredentials function to retrieve…
danny-avila Jun 18, 2023
f41abd3
chore: delete draft file
danny-avila Jun 18, 2023
b1913a3
refactor(OpenAIClient.js): extract sendCompletion method from sendMes…
danny-avila Jun 19, 2023
c2d263c
refactor(BaseClient.js): move sendMessage method to BaseClient class
danny-avila Jun 21, 2023
c25fe77
refactor(BaseClient.js): rename getBuildPromptOptions to getBuildMess…
danny-avila Jun 21, 2023
b9cce41
refactor(ChatGPTClient.js, OpenAIClient.js): improve code readability…
danny-avila Jun 21, 2023
2da5a95
refactor(OpenAIClient.js): extract instructions object to a separate …
danny-avila Jun 22, 2023
d0de53c
refactor(BaseClient.js): extract addInstructions method from sendMess…
danny-avila Jun 22, 2023
78cdec3
refactor(OpenAIClient.js): remove unnecessary condition for modelOpti…
danny-avila Jun 22, 2023
d4c603f
feat(BaseClient.js): add support for token count tracking and context…
danny-avila Jun 25, 2023
fc0c437
refactor(BaseClient.js): add support for refining messages based on t…
danny-avila Jun 25, 2023
b367266
refactor(BaseClient.js): change `remainingContext` to `remainingConte…
danny-avila Jun 25, 2023
e6d49b9
chore(openAI.js): comment out contextStrategy option in clientOptions
danny-avila Jun 25, 2023
d86c4ca
chore(openAI.js): comment out debug option in clientOptions object
danny-avila Jun 27, 2023
21bdc53
test: BaseClient tests in progress
danny-avila Jun 29, 2023
4d2e3f7
test: Complete OpenAIClient & BaseClient tests
danny-avila Jun 29, 2023
9fd7dcf
fix(OpenAIClient.js): remove unnecessary whitespace
danny-avila Jun 29, 2023
6dc60ab
chore(.eslintrc.js): add rule for maximum of 1 empty line
danny-avila Jun 29, 2023
223945e
test: complete additional tests
danny-avila Jun 29, 2023
5575d58
feat: Azure OpenAI as a separate endpoint
danny-avila Jul 2, 2023
3178419
chore: remove extraneous console logs
danny-avila Jul 2, 2023
4a6e039
fix(azureOpenAI): use chatCompletion endpoint
danny-avila Jul 2, 2023
5687597
chore(initializeClient.js): delete initializeClient.js file
danny-avila Jul 2, 2023
970e6c6
chore(chatgpt-client.js): remove unused chatgpt-client.js file
danny-avila Jul 2, 2023
800bc62
chore(chatgpt-client.tokens.js): update test script for memory usage …
danny-avila Jul 2, 2023
cb92113
feat(FakeClient.js): add a new class `FakeClient` that extends `BaseC…
danny-avila Jun 30, 2023
d8f7919
refactor(gptPlugins): refactor ChatAgent to PluginsClient, which exte…
danny-avila Jul 3, 2023
9f1f973
refactor: client paths
danny-avila Jul 3, 2023
a10daf4
chore(jest.config.js): remove jest.config.js file
danny-avila Jul 3, 2023
533e935
fix(PluginController.js): update file path to manifest.json
danny-avila Jul 3, 2023
bb8b3c2
fix(BaseClient.js): fix spacing in generateTextStream function signature
danny-avila Jul 3, 2023
3586b37
refactor(GoogleClient): GoogleClient now extends BaseClient
danny-avila Jul 3, 2023
9f0bb61
chore(.env.example): add AZURE_OPENAI_MODELS variable
danny-avila Jul 3, 2023
8108164
fix(e2e:popup): includes the icon + endpoint names in role, name prop…
danny-avila Jul 3, 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
Prev Previous commit
Next Next commit
refactor: client paths
  • Loading branch information
@danny-avila
danny-avila committed Jul 3, 2023
commit 9f1f973541df005ef6666484ab627eaac89aa25b
0 api/app/clients/bingai.js → api/app/bingai.js
View file
Open in desktop
File renamed without changes.
0 api/app/clients/chatgpt-browser.js → api/app/chatgpt-browser.js
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions api/app/clients/classes/BaseClient.js → api/app/clients/BaseClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const crypto = require('crypto');
const TextStream = require('./stream');
const TextStream = require('./TextStream');
const { RecursiveCharacterTextSplitter } = require('langchain/text_splitter');
const { ChatOpenAI } = require('langchain/chat_models/openai');
const { loadSummarizationChain } = require('langchain/chains');
const { refinePrompt } = require('./refinePrompt');
const { getConvo, getMessages, saveMessage, updateMessage, saveConvo } = require('../../../models');
const { refinePrompt } = require('./prompts/refinePrompt');
const { getConvo, getMessages, saveMessage, updateMessage, saveConvo } = require('../../models');

class BaseClient {
constructor(apiKey, options = {}) {
Expand Down
0 api/app/clients/classes/ChatGPTClient.js → api/app/clients/ChatGPTClient.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion api/app/clients/classes/OpenAIClient.js → api/app/clients/OpenAIClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const BaseClient = require('./BaseClient');
const ChatGPTClient = require('./ChatGPTClient');
const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('@dqbd/tiktoken');
const { maxTokensMap, genAzureChatCompletion } = require('../../../utils');
const { maxTokensMap, genAzureChatCompletion } = require('../../utils');

const tokenizersCache = {};

Expand Down
2 changes: 1 addition & 1 deletion api/app/clients/classes/PluginsClient.js → api/app/clients/PluginsClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const {
instructions,
imageInstructions,
errorInstructions,
} = require('./instructions');
} = require('./prompts/instructions');

class PluginsClient extends OpenAIClient {
constructor(apiKey, options = {}) {
Expand Down
0 api/app/clients/classes/stream.js → api/app/clients/TextStream.js
View file
Open in desktop
File renamed without changes.
0 ...classes/agents/CustomAgent/CustomAgent.js → ...clients/agents/CustomAgent/CustomAgent.js
View file
Open in desktop
File renamed without changes.
0 ...ents/CustomAgent/initializeCustomAgent.js → ...ents/CustomAgent/initializeCustomAgent.js
View file
Open in desktop
File renamed without changes.
0 ...lasses/agents/CustomAgent/instructions.js → ...lients/agents/CustomAgent/instructions.js
View file
Open in desktop
File renamed without changes.
0 ...lasses/agents/CustomAgent/outputParser.js → ...lients/agents/CustomAgent/outputParser.js
View file
Open in desktop
File renamed without changes.
0 ...lasses/agents/Functions/FunctionsAgent.js → ...lients/agents/Functions/FunctionsAgent.js
View file
Open in desktop
File renamed without changes.
0 ...nts/Functions/initializeFunctionsAgent.js → ...nts/Functions/initializeFunctionsAgent.js
View file
Open in desktop
File renamed without changes.
0 api/app/clients/classes/agents/index.js → api/app/clients/agents/index.js
View file
Open in desktop
File renamed without changes.
77 changes: 0 additions & 77 deletions api/app/clients/classes/agents/PlanAndExecute/initializePAEAgent.js
View file
Open in desktop

This file was deleted.

114 changes: 0 additions & 114 deletions api/app/clients/classes/tools/DALL-E.js
View file
Open in desktop

This file was deleted.

85 changes: 0 additions & 85 deletions api/app/clients/classes/tools/StableDiffusion.js
View file
Open in desktop

This file was deleted.

Loading