2024-04-20 15:02:56 -04:00
|
|
|
const { Constants, EModelEndpoint, actionDomainSeparator } = require('librechat-data-provider');
|
|
|
|
const { domainParser } = require('./ActionService');
|
|
|
|
|
|
|
|
jest.mock('keyv');
|
2024-12-12 12:52:42 -05:00
|
|
|
jest.mock('~/server/services/Config', () => ({
|
|
|
|
getCustomConfig: jest.fn(),
|
|
|
|
}));
|
2024-04-20 15:02:56 -04:00
|
|
|
|
|
|
|
const globalCache = {};
|
|
|
|
jest.mock('~/cache/getLogStores', () => {
|
|
|
|
return jest.fn().mockImplementation(() => {
|
|
|
|
const EventEmitter = require('events');
|
|
|
|
const { CacheKeys } = require('librechat-data-provider');
|
|
|
|
|
|
|
|
class KeyvMongo extends EventEmitter {
|
|
|
|
constructor(url = 'mongodb://127.0.0.1:27017', options) {
|
|
|
|
super();
|
|
|
|
this.ttlSupport = false;
|
|
|
|
url = url ?? {};
|
|
|
|
if (typeof url === 'string') {
|
|
|
|
url = { url };
|
|
|
|
}
|
|
|
|
if (url.uri) {
|
|
|
|
url = { url: url.uri, ...url };
|
|
|
|
}
|
|
|
|
this.opts = {
|
|
|
|
url,
|
|
|
|
collection: 'keyv',
|
|
|
|
...url,
|
|
|
|
...options,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
get = async (key) => {
|
|
|
|
return new Promise((resolve) => {
|
|
|
|
resolve(globalCache[key] || null);
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
set = async (key, value) => {
|
|
|
|
return new Promise((resolve) => {
|
|
|
|
globalCache[key] = value;
|
|
|
|
resolve(true);
|
|
|
|
});
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
return new KeyvMongo('', {
|
|
|
|
namespace: CacheKeys.ENCODED_DOMAINS,
|
|
|
|
ttl: 0,
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('domainParser', () => {
|
|
|
|
const req = {
|
|
|
|
app: {
|
|
|
|
locals: {
|
|
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
|
|
assistants: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const reqNoAzure = {
|
|
|
|
app: {
|
|
|
|
locals: {
|
|
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
|
|
assistants: false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const TLD = '.com';
|
|
|
|
|
|
|
|
// Non-azure request
|
🤖 feat: OpenAI Assistants v2 (initial support) (#2781)
* 🤖 Assistants V2 Support: Part 1
- Separated Azure Assistants to its own endpoint
- File Search / Vector Store integration is incomplete, but can toggle and use storage from playground
- Code Interpreter resource files can be added but not deleted
- GPT-4o is supported
- Many improvements to the Assistants Endpoint overall
data-provider v2 changes
copy existing route as v1
chore: rename new endpoint to reduce comparison operations and add new azure filesource
api: add azureAssistants part 1
force use of version for assistants/assistantsAzure
chore: switch name back to azureAssistants
refactor type version: string | number
Ensure assistants endpoints have version set
fix: isArchived type issue in ConversationListParams
refactor: update assistants mutations/queries with endpoint/version definitions, update Assistants Map structure
chore: FilePreview component ExtendedFile type assertion
feat: isAssistantsEndpoint helper
chore: remove unused useGenerations
chore(buildTree): type issue
chore(Advanced): type issue (unused component, maybe in future)
first pass for multi-assistant endpoint rewrite
fix(listAssistants): pass params correctly
feat: list separate assistants by endpoint
fix(useTextarea): access assistantMap correctly
fix: assistant endpoint switching, resetting ID
fix: broken during rewrite, selecting assistant mention
fix: set/invalidate assistants endpoint query data correctly
feat: Fix issue with assistant ID not being reset correctly
getOpenAIClient helper function
feat: add toast for assistant deletion
fix: assistants delete right after create issue for azure
fix: assistant patching
refactor: actions to use getOpenAIClient
refactor: consolidate logic into helpers file
fix: issue where conversation data was not initially available
v1 chat support
refactor(spendTokens): only early return if completionTokens isNaN
fix(OpenAIClient): ensure spendTokens has all necessary params
refactor: route/controller logic
fix(assistants/initializeClient): use defaultHeaders field
fix: sanitize default operation id
chore: bump openai package
first pass v2 action service
feat: retroactive domain parsing for actions added via v1
feat: delete db records of actions/assistants on openai assistant deletion
chore: remove vision tools from v2 assistants
feat: v2 upload and delete assistant vision images
WIP first pass, thread attachments
fix: show assistant vision files (save local/firebase copy)
v2 image continue
fix: annotations
fix: refine annotations
show analyze as error if is no longer submitting before progress reaches 1 and show file_search as retrieval tool
fix: abort run, undefined endpoint issue
refactor: consolidate capabilities logic and anticipate versioning
frontend version 2 changes
fix: query selection and filter
add endpoint to unknown filepath
add file ids to resource, deleting in progress
enable/disable file search
remove version log
* 🤖 Assistants V2 Support: Part 2
🎹 fix: Autocompletion Chrome Bug on Action API Key Input
chore: remove `useOriginNavigate`
chore: set correct OpenAI Storage Source
fix: azure file deletions, instantiate clients by source for deletion
update code interpret files info
feat: deleteResourceFileId
chore: increase poll interval as azure easily rate limits
fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records
file source icons
update table file filters
chore: file search info and versioning
fix: retrieval update with necessary tool_resources if specified
fix(useMentions): add optional chaining in case listMap value is undefined
fix: force assistant avatar roundedness
fix: azure assistants, check correct flag
chore: bump data-provider
* fix: merge conflict
* ci: fix backend tests due to new updates
* chore: update .env.example
* meilisearch improvements
* localization updates
* chore: update comparisons
* feat: add additional metadata: endpoint, author ID
* chore: azureAssistants ENDPOINTS exclusion warning
2024-05-19 12:56:55 -04:00
|
|
|
it('does not return domain as is if not azure', async () => {
|
2024-04-20 15:02:56 -04:00
|
|
|
const domain = `example.com${actionDomainSeparator}test${actionDomainSeparator}`;
|
2025-04-12 18:46:36 -04:00
|
|
|
const result1 = await domainParser(domain, false);
|
|
|
|
const result2 = await domainParser(domain, true);
|
🤖 feat: OpenAI Assistants v2 (initial support) (#2781)
* 🤖 Assistants V2 Support: Part 1
- Separated Azure Assistants to its own endpoint
- File Search / Vector Store integration is incomplete, but can toggle and use storage from playground
- Code Interpreter resource files can be added but not deleted
- GPT-4o is supported
- Many improvements to the Assistants Endpoint overall
data-provider v2 changes
copy existing route as v1
chore: rename new endpoint to reduce comparison operations and add new azure filesource
api: add azureAssistants part 1
force use of version for assistants/assistantsAzure
chore: switch name back to azureAssistants
refactor type version: string | number
Ensure assistants endpoints have version set
fix: isArchived type issue in ConversationListParams
refactor: update assistants mutations/queries with endpoint/version definitions, update Assistants Map structure
chore: FilePreview component ExtendedFile type assertion
feat: isAssistantsEndpoint helper
chore: remove unused useGenerations
chore(buildTree): type issue
chore(Advanced): type issue (unused component, maybe in future)
first pass for multi-assistant endpoint rewrite
fix(listAssistants): pass params correctly
feat: list separate assistants by endpoint
fix(useTextarea): access assistantMap correctly
fix: assistant endpoint switching, resetting ID
fix: broken during rewrite, selecting assistant mention
fix: set/invalidate assistants endpoint query data correctly
feat: Fix issue with assistant ID not being reset correctly
getOpenAIClient helper function
feat: add toast for assistant deletion
fix: assistants delete right after create issue for azure
fix: assistant patching
refactor: actions to use getOpenAIClient
refactor: consolidate logic into helpers file
fix: issue where conversation data was not initially available
v1 chat support
refactor(spendTokens): only early return if completionTokens isNaN
fix(OpenAIClient): ensure spendTokens has all necessary params
refactor: route/controller logic
fix(assistants/initializeClient): use defaultHeaders field
fix: sanitize default operation id
chore: bump openai package
first pass v2 action service
feat: retroactive domain parsing for actions added via v1
feat: delete db records of actions/assistants on openai assistant deletion
chore: remove vision tools from v2 assistants
feat: v2 upload and delete assistant vision images
WIP first pass, thread attachments
fix: show assistant vision files (save local/firebase copy)
v2 image continue
fix: annotations
fix: refine annotations
show analyze as error if is no longer submitting before progress reaches 1 and show file_search as retrieval tool
fix: abort run, undefined endpoint issue
refactor: consolidate capabilities logic and anticipate versioning
frontend version 2 changes
fix: query selection and filter
add endpoint to unknown filepath
add file ids to resource, deleting in progress
enable/disable file search
remove version log
* 🤖 Assistants V2 Support: Part 2
🎹 fix: Autocompletion Chrome Bug on Action API Key Input
chore: remove `useOriginNavigate`
chore: set correct OpenAI Storage Source
fix: azure file deletions, instantiate clients by source for deletion
update code interpret files info
feat: deleteResourceFileId
chore: increase poll interval as azure easily rate limits
fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records
file source icons
update table file filters
chore: file search info and versioning
fix: retrieval update with necessary tool_resources if specified
fix(useMentions): add optional chaining in case listMap value is undefined
fix: force assistant avatar roundedness
fix: azure assistants, check correct flag
chore: bump data-provider
* fix: merge conflict
* ci: fix backend tests due to new updates
* chore: update .env.example
* meilisearch improvements
* localization updates
* chore: update comparisons
* feat: add additional metadata: endpoint, author ID
* chore: azureAssistants ENDPOINTS exclusion warning
2024-05-19 12:56:55 -04:00
|
|
|
expect(result1).not.toEqual(domain);
|
|
|
|
expect(result2).not.toEqual(domain);
|
2024-04-20 15:02:56 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
// Test for Empty or Null Inputs
|
|
|
|
it('returns undefined for null domain input', async () => {
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(null, true);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toBeUndefined();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('returns undefined for empty domain input', async () => {
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser('', true);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toBeUndefined();
|
|
|
|
});
|
|
|
|
|
|
|
|
// Verify Correct Caching Behavior
|
|
|
|
it('caches encoded domain correctly', async () => {
|
|
|
|
const domain = 'longdomainname.com';
|
|
|
|
const encodedDomain = Buffer.from(domain)
|
|
|
|
.toString('base64')
|
|
|
|
.substring(0, Constants.ENCODED_DOMAIN_LENGTH);
|
|
|
|
|
2025-04-12 18:46:36 -04:00
|
|
|
await domainParser(domain, true);
|
2024-04-20 15:02:56 -04:00
|
|
|
|
|
|
|
const cachedValue = await globalCache[encodedDomain];
|
|
|
|
expect(cachedValue).toEqual(Buffer.from(domain).toString('base64'));
|
|
|
|
});
|
|
|
|
|
|
|
|
// Test for Edge Cases Around Length Threshold
|
|
|
|
it('encodes domain exactly at threshold without modification', async () => {
|
|
|
|
const domain = 'a'.repeat(Constants.ENCODED_DOMAIN_LENGTH - TLD.length) + TLD;
|
|
|
|
const expected = domain.replace(/\./g, actionDomainSeparator);
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(domain, true);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(expected);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('encodes domain just below threshold without modification', async () => {
|
|
|
|
const domain = 'a'.repeat(Constants.ENCODED_DOMAIN_LENGTH - 1 - TLD.length) + TLD;
|
|
|
|
const expected = domain.replace(/\./g, actionDomainSeparator);
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(domain, true);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(expected);
|
|
|
|
});
|
|
|
|
|
|
|
|
// Test for Unicode Domain Names
|
|
|
|
it('handles unicode characters in domain names correctly when encoding', async () => {
|
|
|
|
const unicodeDomain = 'täst.example.com';
|
|
|
|
const encodedDomain = Buffer.from(unicodeDomain)
|
|
|
|
.toString('base64')
|
|
|
|
.substring(0, Constants.ENCODED_DOMAIN_LENGTH);
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(unicodeDomain, true);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(encodedDomain);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('decodes unicode domain names correctly', async () => {
|
|
|
|
const unicodeDomain = 'täst.example.com';
|
|
|
|
const encodedDomain = Buffer.from(unicodeDomain).toString('base64');
|
|
|
|
globalCache[encodedDomain.substring(0, Constants.ENCODED_DOMAIN_LENGTH)] = encodedDomain; // Simulate caching
|
|
|
|
|
|
|
|
const result = await domainParser(
|
|
|
|
encodedDomain.substring(0, Constants.ENCODED_DOMAIN_LENGTH),
|
|
|
|
false,
|
|
|
|
);
|
|
|
|
expect(result).toEqual(unicodeDomain);
|
|
|
|
});
|
|
|
|
|
|
|
|
// Core Functionality Tests
|
|
|
|
it('returns domain with replaced separators if no cached domain exists', async () => {
|
|
|
|
const domain = 'example.com';
|
|
|
|
const withSeparator = domain.replace(/\./g, actionDomainSeparator);
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(withSeparator, false);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(domain);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('returns domain with replaced separators when inverse is false and under encoding length', async () => {
|
|
|
|
const domain = 'examp.com';
|
|
|
|
const withSeparator = domain.replace(/\./g, actionDomainSeparator);
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(withSeparator, false);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(domain);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('replaces periods with actionDomainSeparator when inverse is true and under encoding length', async () => {
|
|
|
|
const domain = 'examp.com';
|
|
|
|
const expected = domain.replace(/\./g, actionDomainSeparator);
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(domain, true);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(expected);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('encodes domain when length is above threshold and inverse is true', async () => {
|
|
|
|
const domain = 'a'.repeat(Constants.ENCODED_DOMAIN_LENGTH + 1).concat('.com');
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(domain, true);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).not.toEqual(domain);
|
|
|
|
expect(result.length).toBeLessThanOrEqual(Constants.ENCODED_DOMAIN_LENGTH);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('returns encoded value if no encoded value is cached, and inverse is false', async () => {
|
|
|
|
const originalDomain = 'example.com';
|
|
|
|
const encodedDomain = Buffer.from(
|
|
|
|
originalDomain.replace(/\./g, actionDomainSeparator),
|
|
|
|
).toString('base64');
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(encodedDomain, false);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(encodedDomain);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('decodes encoded value if cached and encoded value is provided, and inverse is false', async () => {
|
|
|
|
const originalDomain = 'example.com';
|
2025-04-12 18:46:36 -04:00
|
|
|
const encodedDomain = await domainParser(originalDomain, true);
|
|
|
|
const result = await domainParser(encodedDomain, false);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(originalDomain);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('handles invalid base64 encoded values gracefully', async () => {
|
|
|
|
const invalidBase64Domain = 'not_base64_encoded';
|
2025-04-12 18:46:36 -04:00
|
|
|
const result = await domainParser(invalidBase64Domain, false);
|
2024-04-20 15:02:56 -04:00
|
|
|
expect(result).toEqual(invalidBase64Domain);
|
|
|
|
});
|
|
|
|
});
|