Skip to content

SmythOS Studio: Open-Source Visual AI Agent Builder and deployable runtime stack from SmythOS. Start with an intuitive drag-and-drop workspace, extend with custom code, and deploy your agents anywhere — local, cloud, or edge — with full governance and control.

provide separate cache key based on UI Server to have different version between local and staging

Forhad Hosain6d2b6b2f3ddf
diff --git a/packages/app/.env.sample b/packages/app/.env.sample
index 4dcd35b5..d80b3ce7 100644
--- a/packages/app/.env.sample
+++ b/packages/app/.env.sample
@@ -9,7 +9,3 @@ SMYTH_API_SERVER=
DATA_PATH=
SMYTH_VAULT_API_BASE_URL= #vault server url
-
-# Prevent using the same cache key on both the local and staging servers.
-STANDARD_MODELS_CACHE_KEY="_local_llm_standard_models"
-CUSTOM_MODELS_CACHE_KEY="_local_llm_custom_models"
\ No newline at end of file
diff --git a/packages/app/src/backend/config.ts b/packages/app/src/backend/config.ts
index 5a2c2b20..b8291c7e 100644
--- a/packages/app/src/backend/config.ts
+++ b/packages/app/src/backend/config.ts
@@ -1,3 +1,4 @@
+import crypto from 'crypto';
import dotenv from 'dotenv';
import Joi from 'joi';
import os from 'os';
@@ -68,10 +69,6 @@ const config = {
// NEEDS TO BE REMOVED SINCE IT IS USED BY A NON-USED COMPONENT
GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
-
- // It's okay to not have these variables in the .env file in staging or production, we just have it to differentiate local and staging cache key to avoid unexpected value set from locally
- STANDARD_MODELS_CACHE_KEY: process.env.STANDARD_MODELS_CACHE_KEY || '__llm_standard_models',
- CUSTOM_MODELS_CACHE_KEY: process.env.CUSTOM_MODELS_CACHE_KEY || '__llm_custom_models',
},
api: {
SMYTH_USER_API_URL: `${process.env.SMYTH_API_SERVER}/v1`,
@@ -81,6 +78,11 @@ const config = {
flags: {
useRedis: Boolean(process.env.REDIS_SENTINEL_HOSTS),
},
+
+ cache: {
+ STANDARD_MODELS_CACHE_KEY: `__llm_smod_cache_${_generateHash(process.env.UI_SERVER)}`,
+ getCustomModelsCacheKey: (teamId: string) => `__llm_cmod_cache_${teamId}`,
+ },
};
export const supportedHfTasks = [
@@ -142,4 +144,10 @@ if (error) {
console.warn('config validation error: ', error.message);
}
+function _generateHash(str, algorithm = 'md5') {
+ const hash = crypto.createHash(algorithm);
+ hash.update(str);
+ return hash.digest('hex');
+}
+
export default config;
diff --git a/packages/app/src/backend/routes/api/page/builder.ts b/packages/app/src/backend/routes/api/page/builder.ts
index e04d411b..8532a3c2 100644
--- a/packages/app/src/backend/routes/api/page/builder.ts
+++ b/packages/app/src/backend/routes/api/page/builder.ts
@@ -762,7 +762,7 @@ router.put('/custom-llm', includeTeamDetails, customLLMAccessMw, async (req, res
});
// delete the custom LLM model cache
- await cacheClient.del(`${config.env.CUSTOM_MODELS_CACHE_KEY}:${teamId}`).catch((error) => {
+ await cacheClient.del(config.cache.getCustomModelsCacheKey(teamId)).catch((error) => {
console.warn('Error deleting custom LLM model cache:', error);
});
@@ -843,7 +843,7 @@ router.delete(
const deleteModel = await teamData.deleteTeamSettingsObj(req, CUSTOM_LLM_SETTINGS_KEY, id);
// delete the custom LLM model cache
- await cacheClient.del(`${config.env.CUSTOM_MODELS_CACHE_KEY}:${teamId}`).catch((error) => {
+ await cacheClient.del(config.cache.getCustomModelsCacheKey(teamId)).catch((error) => {
console.warn('Error deleting custom LLM model cache:', error);
});
diff --git a/packages/app/src/backend/routes/api/page/vault.ts b/packages/app/src/backend/routes/api/page/vault.ts
index d068e660..640bac8f 100644
--- a/packages/app/src/backend/routes/api/page/vault.ts
+++ b/packages/app/src/backend/routes/api/page/vault.ts
@@ -205,7 +205,7 @@ const handleCustomLLMSave = async (req, res) => {
});
// delete the custom LLM model cache
- await cacheClient.del(`${config.env.CUSTOM_MODELS_CACHE_KEY}:${teamId}`).catch((error) => {
+ await cacheClient.del(config.cache.getCustomModelsCacheKey(teamId)).catch((error) => {
console.warn('Error deleting custom LLM model cache:', error);
});
@@ -285,7 +285,7 @@ router.delete('/custom-llm/:provider/:id', customLLMRouteMiddlewares, async (req
const deleteModel = await deleteTeamSettingsObj(req, CUSTOM_LLM_SETTINGS_KEY, id);
// delete the custom LLM model cache
- await cacheClient.del(`${config.env.CUSTOM_MODELS_CACHE_KEY}:${teamId}`).catch((error) => {
+ await cacheClient.del(config.cache.getCustomModelsCacheKey(teamId)).catch((error) => {
console.warn('Error deleting custom LLM model cache:', error);
});
diff --git a/packages/app/src/backend/services/LLMHelper/LLMService.class.ts b/packages/app/src/backend/services/LLMHelper/LLMService.class.ts
index 574415b3..579485ca 100644
--- a/packages/app/src/backend/services/LLMHelper/LLMService.class.ts
+++ b/packages/app/src/backend/services/LLMHelper/LLMService.class.ts
@@ -32,7 +32,7 @@ export class LLMService {
try {
const cachedModels = await this.getModelsFromCache(
- `${config.env.CUSTOM_MODELS_CACHE_KEY}:${teamId}`,
+ config.cache.getCustomModelsCacheKey(teamId),
);
if (Object.keys(cachedModels).length > 0) {
@@ -41,7 +41,7 @@ export class LLMService {
const latestModels = await this.getFreshCustomModels(req);
- this.cacheModels(latestModels, `${config.env.CUSTOM_MODELS_CACHE_KEY}:${teamId}`).catch(
+ this.cacheModels(latestModels, config.cache.getCustomModelsCacheKey(teamId)).catch(
(error) => {
console.error('Error caching models', error);
},
@@ -87,7 +87,7 @@ export class LLMService {
private async getStandardModels() {
try {
- const cachedModels = await this.getModelsFromCache(config.env.STANDARD_MODELS_CACHE_KEY);
+ const cachedModels = await this.getModelsFromCache(config.cache.STANDARD_MODELS_CACHE_KEY);
if (Object.keys(cachedModels).length > 0) {
return cachedModels;
@@ -96,7 +96,7 @@ export class LLMService {
const latestModels = await this.getFreshStandardModels();
if (latestModels && Object.keys(latestModels).length > 0) {
- this.cacheModels(latestModels, config.env.STANDARD_MODELS_CACHE_KEY).catch((error) => {
+ this.cacheModels(latestModels, config.cache.STANDARD_MODELS_CACHE_KEY).catch((error) => {
console.error('Error caching models', error);
});
}
diff --git a/packages/app/src/backend/services/ModelsPolling.service.ts b/packages/app/src/backend/services/ModelsPolling.service.ts
index 894b7545..0ae41826 100644
--- a/packages/app/src/backend/services/ModelsPolling.service.ts
+++ b/packages/app/src/backend/services/ModelsPolling.service.ts
@@ -41,7 +41,7 @@ export class ModelsPollingService {
const latestModels = await llmService.getFreshStandardModels();
if (latestModels && Object.keys(latestModels).length > 0) {
- await llmService.cacheModels(latestModels, config.env.STANDARD_MODELS_CACHE_KEY);
+ await llmService.cacheModels(latestModels, config.cache.STANDARD_MODELS_CACHE_KEY);
console.log('♻️ ModelsPollingService: refreshed');
}