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.

remove logto dep & fixes

Ahmed Essam797d254da962
diff --git a/packages/runtime/nodemon.json b/packages/runtime/nodemon.json
index eeb59d6a..b79d92d9 100644
--- a/packages/runtime/nodemon.json
+++ b/packages/runtime/nodemon.json
@@ -8,7 +8,7 @@
"dist/**/*",
"node_modules/**/*"
],
- "exec": "npm run build:dev && npm run start:dev",
+ "exec": "npm run build && npm run start:prod",
"env": {
"NODE_ENV": "development"
}
diff --git a/packages/runtime/src/core/connectors/SmythOSSAgentDataConnector.class.ts b/packages/runtime/src/core/connectors/SmythOSSAgentDataConnector.class.ts
index 13e20980..33f8ab2c 100644
--- a/packages/runtime/src/core/connectors/SmythOSSAgentDataConnector.class.ts
+++ b/packages/runtime/src/core/connectors/SmythOSSAgentDataConnector.class.ts
@@ -1,12 +1,11 @@
-import axios, { AxiosInstance } from "axios";
+import axios, { AxiosInstance } from 'axios';
-import { AgentDataConnector, OAuthConfig } from "@smythos/sre";
+import { AgentDataConnector, OAuthConfig } from '@smythos/sre';
-import { getM2MToken } from "@core/helpers/logto.helper";
-import { SmythConfigs } from "@core/types/general.types";
+import { SmythConfigs } from '@core/types/general.types';
export class SmythOSSAgentDataConnector extends AgentDataConnector {
- public name: string = "SmythOSSAgentData";
+ public name: string = 'SmythOSSAgentData';
private oAuthAppId: string;
private oAuthAppSecret: string;
private oAuthBaseUrl: string;
@@ -16,17 +15,14 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
private agentStageDomain: string;
private agentProdDomain: string;
- constructor(
- private config: SmythConfigs &
- OAuthConfig & { agentStageDomain: string; agentProdDomain: string }
- ) {
+ constructor(private config: SmythConfigs & OAuthConfig & { agentStageDomain: string; agentProdDomain: string }) {
super();
//if (!SmythRuntime.Instance) throw new Error('SRE not initialized');
this.oAuthAppId = config.oAuthAppID;
this.oAuthAppSecret = config.oAuthAppSecret;
this.oAuthBaseUrl = config.oAuthBaseUrl;
- this.oAuthResource = config.oAuthResource || "";
- this.oAuthScope = config.oAuthScope || "";
+ this.oAuthResource = config.oAuthResource || '';
+ this.oAuthScope = config.oAuthScope || '';
this.smythAPI = axios.create({
baseURL: `${config.smythAPIBaseUrl}`,
});
@@ -47,49 +43,36 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
//FIXME : once we have the agent name in deployment api response, we can skip this call
// const response = await mwSysAPI.get(`/ai-agent/${agentID}?include=team.subscription`, includeAuth(token));
- const response = await this.smythAPI.get(
- `/v1/ai-agent/${agentId}?include=team.subscription`,
- {
- headers: await this.getSmythRequestHeaders(),
- }
- );
+ const response = await this.smythAPI.get(`/v1/ai-agent/${agentId}?include=team.subscription`, {
+ headers: await this.getSmythRequestHeaders(),
+ });
agentObj = response.data.agent;
const authData = agentObj.data.auth; //use most up to date auth data
// const tasksResponse = await mwSysAPI.get(`/quota/team/${agentObj.teamId}/tasks/subscription`, includeAuth(token));
- const tasksResponse = await this.smythAPI.get(
- `/v1/quota/team/${agentObj.teamId}/tasks/subscription`,
- {
- headers: await this.getSmythRequestHeaders(),
- }
- );
- agentObj.taskData = tasksResponse.data;
- agentObj.data.debugSessionEnabled =
- agentObj?.data?.debugSessionEnabled && agentObj?.isLocked; //disable debug session if agent is not locked (locked agent means that it's open in the Agent builder)
+ agentObj.taskData = {
+ tasks: 0,
+ maxTasks: Infinity,
+ isFreeUser: false,
+ };
+
+ agentObj.data.debugSessionEnabled = agentObj?.data?.debugSessionEnabled && agentObj?.isLocked; //disable debug session if agent is not locked (locked agent means that it's open in the Agent builder)
if (version) {
// const deploymentsList = await mwSysAPI.get(`/ai-agent/${agentID}/deployments`, includeAuth(token));
- const deploymentsList = await this.smythAPI.get(
- `/v1/ai-agent/${agentId}/deployments`,
- {
- headers: await this.getSmythRequestHeaders(),
- }
- );
+ const deploymentsList = await this.smythAPI.get(`/v1/ai-agent/${agentId}/deployments`, {
+ headers: await this.getSmythRequestHeaders(),
+ });
const deployment =
- version == "latest"
+ version == 'latest'
? deploymentsList?.data?.deployments[0]
- : deploymentsList?.data?.deployments?.find(
- (deployment) => deployment.version === version
- );
+ : deploymentsList?.data?.deployments?.find(deployment => deployment.version === version);
if (deployment) {
// const deployResponse = await mwSysAPI.get(`/ai-agent/deployments/${deployment.id}`, includeAuth(token));
- const deployResponse = await this.smythAPI.get(
- `/v1/ai-agent/deployments/${deployment.id}`,
- {
- headers: await this.getSmythRequestHeaders(),
- }
- );
+ const deployResponse = await this.smythAPI.get(`/v1/ai-agent/deployments/${deployment.id}`, {
+ headers: await this.getSmythRequestHeaders(),
+ });
agentObj.data = deployResponse?.data?.deployment?.aiAgentData;
agentObj.data.debugSessionEnabled = false; //never enable debug session when using a deployed version
agentObj.data.agentVersion = deployment.version;
@@ -104,23 +87,15 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
//TODO: Also include team and subscription info
//agentObj.data.auth = authData;
- if (
- !agentObj?.data?.auth?.method ||
- agentObj?.data?.auth?.method == "none"
- )
- agentObj.data.auth = authData;
+ if (!agentObj?.data?.auth?.method || agentObj?.data?.auth?.method == 'none') agentObj.data.auth = authData;
agentObj.data = this.migrateAgentData(agentObj.data);
return agentObj;
} catch (error: any) {
console.error(error.response?.data, error.message);
- console.log(
- `Error getting agent data for agentId=${agentId}: ${error?.message}`
- );
- throw new Error(
- `Error getting agent data for agentId=${agentId}: ${error?.message}`
- );
+ console.log(`Error getting agent data for agentId=${agentId}: ${error?.message}`);
+ throw new Error(`Error getting agent data for agentId=${agentId}: ${error?.message}`);
}
}
@@ -131,12 +106,9 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
const isProdWildcardDomain = domain.includes(this.agentProdDomain);
if (isStageWildcardDomain || isProdWildcardDomain) {
//console.log('Internal agent domain detected', domain);
- agentId = domain.split(".")[0];
+ agentId = domain.split('.')[0];
//sanity check
- if (
- `${agentId}.${this.agentStageDomain}` !== domain &&
- `${agentId}.${this.agentProdDomain}` !== domain
- ) {
+ if (`${agentId}.${this.agentStageDomain}` !== domain && `${agentId}.${this.agentProdDomain}` !== domain) {
throw new Error(`Invalid agent domain: ${domain}`);
}
@@ -149,24 +121,20 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
.get(`/v1/domains?verified=true`, {
headers: await this.getSmythRequestHeaders(),
})
- .catch((error) => ({ error }));
+ .catch(error => ({ error }));
if (result.error) {
- throw new Error("Error getting domain info");
+ throw new Error('Error getting domain info');
}
//we have an agentId from the wildcard domain, if this domain is already associated with
if (agentId) {
- const hasDomain = result.data.domains.find(
- (domainEntry: any) => domainEntry?.aiAgent?.id === agentId
- );
+ const hasDomain = result.data.domains.find((domainEntry: any) => domainEntry?.aiAgent?.id === agentId);
if (hasDomain) {
- throw new Error("Wrong domain");
+ throw new Error('Wrong domain');
}
} else {
- agentId = result.data.domains.find(
- (domainEntry: any) => domainEntry.name === domain
- )?.aiAgent?.id;
+ agentId = result.data.domains.find((domainEntry: any) => domainEntry.name === domain)?.aiAgent?.id;
}
//if a custom domain is found, use it, otherwise use the agentId from the wildcard domain
@@ -174,95 +142,59 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
return agentId;
}
- public async getAgentSettings(
- agentId: string,
- version?: string
- ): Promise<any> {
+ public async getAgentSettings(agentId: string, version?: string): Promise<any> {
try {
// If no matching deployment found or no deployments at all, return the current live settings
- const response = await this.smythAPI.get(
- `/v1/ai-agent/${agentId}/settings`,
- {
- headers: await this.getSmythRequestHeaders(),
- }
- );
- const formattedSettings = response.data.settings.reduce(
- (acc, setting) => ({ ...acc, [setting.key]: setting.value }),
- {}
- );
+ const response = await this.smythAPI.get(`/v1/ai-agent/${agentId}/settings`, {
+ headers: await this.getSmythRequestHeaders(),
+ });
+ const formattedSettings = response.data.settings.reduce((acc, setting) => ({ ...acc, [setting.key]: setting.value }), {});
return formattedSettings;
} catch (error) {
- console.error(
- `Error getting agent settings for agentId=${agentId}: ${error?.message}`
- );
- throw new Error(
- `Error getting agent settings for agentId=${agentId}: ${error?.message}`
- );
+ console.error(`Error getting agent settings for agentId=${agentId}: ${error?.message}`);
+ throw new Error(`Error getting agent settings for agentId=${agentId}: ${error?.message}`);
}
}
- public async getAgentEmbodiments(
- agentId: string,
- version?: string
- ): Promise<any> {
+ public async getAgentEmbodiments(agentId: string, version?: string): Promise<any> {
try {
// If no matching deployment found or no deployments at all, return the current live settings
- const response = await this.smythAPI.get(
- `/v1/embodiments?aiAgentId=${agentId}`,
- {
- headers: await this.getSmythRequestHeaders(),
- }
- );
+ const response = await this.smythAPI.get(`/v1/embodiments?aiAgentId=${agentId}`, {
+ headers: await this.getSmythRequestHeaders(),
+ });
return response?.data?.embodiments || [];
} catch (error) {
- console.error(
- `Error getting agent embodiments for agentId=${agentId}: ${error?.message}`
- );
- throw new Error(
- `Error getting agent embodiments for agentId=${agentId}: ${error?.message}`
- );
+ console.error(`Error getting agent embodiments for agentId=${agentId}: ${error?.message}`);
+ throw new Error(`Error getting agent embodiments for agentId=${agentId}: ${error?.message}`);
}
}
- public async listTeamAgents(
- teamId: string,
- deployedOnly?: boolean,
- includeData?: boolean
- ): Promise<any[]> {
+ public async listTeamAgents(teamId: string, deployedOnly?: boolean, includeData?: boolean): Promise<any[]> {
try {
const headers = await this.getSmythRequestHeaders();
// If no matching deployment found or no deployments at all, return the current live settings
const response = await this.smythAPI.get(
- `/v1/ai-agent/teams/${teamId}/?deployedOnly=${
- deployedOnly ? "true" : "false"
- }&includeData=${includeData ? "true" : "false"}`,
+ `/v1/ai-agent/teams/${teamId}/?deployedOnly=${deployedOnly ? 'true' : 'false'}&includeData=${includeData ? 'true' : 'false'}`,
{
headers,
- }
+ },
);
const agentsList = response?.data?.agents;
return agentsList;
} catch (error) {
- console.error(
- `Error listing team agents for teamId=${teamId}: ${error?.message}`
- );
- throw new Error(
- `Error listing team agents for teamId=${teamId}: ${error?.message}`
- );
+ console.error(`Error listing team agents for teamId=${teamId}: ${error?.message}`);
+ throw new Error(`Error listing team agents for teamId=${teamId}: ${error?.message}`);
}
}
public async isDeployed(agentId: string): Promise<boolean> {
try {
- const deploymentsList = await this.smythAPI.get(
- `/v1/ai-agent/${agentId}/deployments`,
- {
- headers: await this.getSmythRequestHeaders(),
- }
- );
+ const deploymentsList = await this.smythAPI.get(`/v1/ai-agent/${agentId}/deployments`, {
+ headers: await this.getSmythRequestHeaders(),
+ });
return deploymentsList?.data?.deployments?.length > 0;
} catch (error) {
console.error(error);
@@ -271,22 +203,14 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
}
private async getSmythRequestHeaders() {
- return {
- Authorization: `Bearer ${await getM2MToken({
- baseUrl: this.oAuthBaseUrl,
- oauthAppId: this.oAuthAppId,
- oauthAppSecret: this.oAuthAppSecret,
- resource: this.oAuthResource,
- scope: this.oAuthScope,
- })}`,
- };
+ return Promise.resolve({
+ Authorization: `Bearer M2M_TOKEN`,
+ });
}
private migrateAgentData(data) {
if (!data.version) {
- console.log(
- `Agent [${data.name}] has an old schema. Migrating to latest version...`
- );
+ console.log(`Agent [${data.name}] has an old schema. Migrating to latest version...`);
// version 0 ===> migrate from receptors/connectors to inputs/outputs
const newData = JSON.parse(JSON.stringify(data));
for (let component of newData.components) {
@@ -302,7 +226,7 @@ export class SmythOSSAgentDataConnector extends AgentDataConnector {
return newData;
}
- if (data.version === "1.0.0") {
+ if (data.version === '1.0.0') {
//migrate .description to .behavior
if (data.description && !data.behavior) {
data.behavior = data.description;
diff --git a/packages/runtime/src/core/connectors/SmythOSSVault.class.ts b/packages/runtime/src/core/connectors/SmythOSSVault.class.ts
deleted file mode 100644
index b3eca2b2..00000000
--- a/packages/runtime/src/core/connectors/SmythOSSVault.class.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import axios, { AxiosInstance } from "axios";
-
-import {
- AccessRequest,
- ACL,
- ConnectorService,
- IAccessCandidate,
- Logger,
- OAuthConfig,
- SecureConnector,
- TAccessLevel,
- TAccessRole,
- VaultConnector,
-} from "@smythos/sre";
-
-import { getM2MToken } from "@core/helpers/logto.helper";
-
-export type SmythVaultConfig = {
- vaultAPIBaseUrl: string;
-};
-
-const console = Logger("SmythOSSVault");
-export class SmythOSSVault extends VaultConnector {
- public name: string = "SmythOSSVault";
- private oAuthAppId: string;
- private oAuthAppSecret: string;
- private oAuthBaseUrl: string;
- private oAuthResource?: string;
- private oAuthScope?: string;
- private vaultAPI: AxiosInstance;
-
- constructor(protected _settings: SmythVaultConfig & OAuthConfig) {
- super(_settings);
- //if (!SmythRuntime.Instance) throw new Error('SRE not initialized');
-
- this.oAuthAppId = _settings.oAuthAppID;
- this.oAuthAppSecret = _settings.oAuthAppSecret;
- this.oAuthBaseUrl = _settings.oAuthBaseUrl;
- this.oAuthResource = _settings.oAuthResource || "";
- this.oAuthScope = _settings.oAuthScope || "";
- this.vaultAPI = axios.create({
- baseURL: `${_settings.vaultAPIBaseUrl}/v1/api`,
- });
- }
-
- @SecureConnector.AccessControl
- protected async get(acRequest: AccessRequest, keyId: string) {
- const accountConnector = ConnectorService.getAccountConnector();
- const teamId = await accountConnector.getCandidateTeam(acRequest.candidate);
- const vaultAPIHeaders = await this.getVaultRequestHeaders();
-
- let key = "";
- try {
- const vaultResponse = await this.vaultAPI.get(
- `/vault/${teamId}/secrets/${keyId}`,
- { headers: vaultAPIHeaders }
- );
- key = vaultResponse?.data?.secret?.value || null;
- } catch (error) {
- console.warn(
- `Warn: Failed to get key "${keyId}" from SmythVault, trying to get it from the legacy vault`
- );
- }
-
- if (!key) {
- const vaultResponse = await this.vaultAPI.get(
- `/vault/${teamId}/secrets/name/${keyId}`,
- { headers: vaultAPIHeaders }
- );
-
- key = vaultResponse?.data?.secret?.value || null;
- }
-
- if (!key) {
- // * Note: Adjustment for legacy global vault keys, we can remove it after migrating all keys in Hashicorp Vault with proper key ID such as 'googleai' -> 'GoogleAI'
- const legacyGlobalVaultKey = keyId.toLowerCase();
- const globalVaultKey =
- legacyGlobalVaultKey === "anthropic" ? "claude" : legacyGlobalVaultKey; // Ensure backward compatibility: In SaaS the key was stored under 'claude';
- const vaultResponse = await this.vaultAPI.get(
- `/vault/${teamId}/secrets/${globalVaultKey}`,
- { headers: vaultAPIHeaders }
- );
-
- return vaultResponse?.data?.secret?.value;
- }
-
- return key || null;
- }
-
- @SecureConnector.AccessControl
- protected async exists(acRequest: AccessRequest, keyId: string) {
- const accountConnector = ConnectorService.getAccountConnector();
- const teamId = await accountConnector.getCandidateTeam(acRequest.candidate);
- const vaultAPIHeaders = await this.getVaultRequestHeaders();
- const vaultResponse = await this.vaultAPI.get(
- `/vault/${teamId}/secrets/${keyId}`,
- { headers: vaultAPIHeaders }
- );
- return vaultResponse?.data?.secret ? true : false;
- }
-
- @SecureConnector.AccessControl
- protected async listKeys(acRequest: AccessRequest) {
- //const accountConnector = ConnectorService.getAccountConnector();
- const teamId = acRequest.candidate.id;
- const vaultAPIHeaders = await this.getVaultRequestHeaders();
- const vaultResponse = await this.vaultAPI.get(`/vault/${teamId}/secrets`, {
- headers: vaultAPIHeaders,
- });
- if (vaultResponse?.data?.secrets) {
- vaultResponse?.data?.secrets?.forEach((secret: any) => {
- if (secret?.metadata?.scope) {
- try {
- secret.metadata.scope = JSON.parse(secret.metadata.scope);
- } catch (error) {
- secret.metadata.scope = [];
- console.error("Error:", error);
- }
- }
- });
- }
-
- return vaultResponse?.data?.secrets || [];
- }
-
- public async getResourceACL(resourceId: string, candidate: IAccessCandidate) {
- const accountConnector = ConnectorService.getAccountConnector();
- const teamId = await accountConnector.getCandidateTeam(candidate);
-
- const acl = new ACL();
-
- acl
- .addAccess(TAccessRole.Team, teamId, TAccessLevel.Owner)
- .addAccess(TAccessRole.Team, teamId, TAccessLevel.Read)
- .addAccess(TAccessRole.Team, teamId, TAccessLevel.Write);
-
- return acl;
- }
-
- private async getVaultRequestHeaders() {
- return {
- Authorization: `Bearer ${await getM2MToken({
- baseUrl: this.oAuthBaseUrl,
- oauthAppId: this.oAuthAppId,
- oauthAppSecret: this.oAuthAppSecret,
- resource: this.oAuthResource,
- scope: this.oAuthScope,
- })}`,
- };
- }
-}
diff --git a/packages/runtime/src/core/connectors/connectorRegistry.ts b/packages/runtime/src/core/connectors/connectorRegistry.ts
index ab330359..645e2caf 100644
--- a/packages/runtime/src/core/connectors/connectorRegistry.ts
+++ b/packages/runtime/src/core/connectors/connectorRegistry.ts
@@ -6,7 +6,6 @@ import {
import { SmythOSSAccount } from "./SmythOSSAccount.class";
import { SmythOSSAgentDataConnector } from "./SmythOSSAgentDataConnector.class";
-import { SmythOSSVault } from "./SmythOSSVault.class";
const CONNECTORS = [
[
@@ -15,7 +14,6 @@ const CONNECTORS = [
SmythOSSAgentDataConnector,
],
[TConnectorService.Account, "SmythOSSAccount", SmythOSSAccount],
- [TConnectorService.Vault, "SmythOSSVault", SmythOSSVault],
[TConnectorService.ModelsProvider, "SmythModelsProvider", JSONModelsProvider],
] as const;
diff --git a/packages/runtime/src/core/helpers/agent.helper.ts b/packages/runtime/src/core/helpers/agent.helper.ts
index f5b80380..5a1a7b00 100644
--- a/packages/runtime/src/core/helpers/agent.helper.ts
+++ b/packages/runtime/src/core/helpers/agent.helper.ts
@@ -1,21 +1,16 @@
-import axios from "axios";
-import config from "../config";
+import axios from 'axios';
+import config from '../config';
-import { Logger } from "@smythos/sre";
+import { Logger } from '@smythos/sre';
-import { includeAuth, mwSysAPI } from "../services/smythAPIReq";
-import { getM2MToken } from "./logto.helper";
+import { includeAuth, mwSysAPI } from '../services/smythAPIReq';
+import { getM2MToken } from './logto.helper';
-import {
- AGENT_AUTH_SETTINGS_KEY,
- MOCK_DATA_SETTINGS_KEY,
- PROD_VERSION_VALUES,
- TEST_VERSION_VALUES,
-} from "@core/constants";
-import { AccessCandidate, ConnectorService } from "@smythos/sre";
-import { defaultFileParsingAgent } from "../default-file-parsing-agent";
+import { AGENT_AUTH_SETTINGS_KEY, MOCK_DATA_SETTINGS_KEY, PROD_VERSION_VALUES, TEST_VERSION_VALUES } from '@core/constants';
+import { AccessCandidate, ConnectorService } from '@smythos/sre';
+import { defaultFileParsingAgent } from '../default-file-parsing-agent';
-const logger = Logger("(Core) Service: Agent Helper");
+const logger = Logger('(Core) Service: Agent Helper');
export function extractAgentVerionsAndPath(url) {
const regex = /^\/v(\d+(\.\d+)?)?(\/api\/.+)/;
@@ -24,33 +19,29 @@ export function extractAgentVerionsAndPath(url) {
if (match) {
return {
path: match[3],
- version: match[1] || "",
+ version: match[1] || '',
};
} else {
return {
path: url,
- version: "",
+ version: '',
};
}
}
export async function getAgentDomainById(agentId: string) {
- const token = (await getM2MToken("https://api.smyth.ai")) as string;
+ const token = (await getM2MToken('https://api.smyth.ai')) as string;
const agentDataConnector = ConnectorService.getAgentDataConnector();
const Authorization = `Bearer ${token}`;
- const result: any = await mwSysAPI
- .get("/domains?verified=true", { headers: { Authorization } })
- .catch((error) => ({ error }));
+ const result: any = await mwSysAPI.get('/domains?verified=true', { headers: { Authorization } }).catch(error => ({ error }));
if (result.error) {
- throw new Error("Error getting domain info");
+ throw new Error('Error getting domain info');
}
- const domain = result.data.domains.find(
- (domainEntry: any) => domainEntry?.aiAgent?.id === agentId
- )?.name;
+ const domain = result.data.domains.find((domainEntry: any) => domainEntry?.aiAgent?.id === agentId)?.name;
if (!domain) {
const deployed = await agentDataConnector.isDeployed(agentId);
@@ -73,9 +64,7 @@ export async function readAgentOAuthConfig(agentData) {
const authOIDCConfigURL = provider.OIDCConfigURL;
const clientID = provider.clientID;
const clientSecret = provider.clientSecret;
- const openid: any = await axios
- .get(authOIDCConfigURL)
- .catch((error) => ({ error }));
+ const openid: any = await axios.get(authOIDCConfigURL).catch(error => ({ error }));
const tokenURL = openid?.data?.token_endpoint;
const authorizationURL = openid?.data?.authorization_endpoint;
@@ -91,13 +80,13 @@ export async function readAgentOAuthConfig(agentData) {
}
export function getAgentIdAndVersion(model: string) {
- const [agentId, version] = model.split("@");
+ const [agentId, version] = model.split('@');
let agentVersion = version?.trim() || undefined;
if (TEST_VERSION_VALUES.includes(agentVersion)) {
- agentVersion = "";
+ agentVersion = '';
}
if (PROD_VERSION_VALUES.includes(agentVersion)) {
- agentVersion = "latest";
+ agentVersion = 'latest';
}
return { agentId, agentVersion };
@@ -105,63 +94,47 @@ export function getAgentIdAndVersion(model: string) {
export async function getAgentEmbodiments(agentID) {
try {
- const token = (await getM2MToken("https://api.smyth.ai")) as string;
- const response = await axios.get(
- `${config.env.MIDDLEWARE_API_BASE_URL}/_sysapi/v1/embodiments?aiAgentId=${agentID}`,
- {
- headers: {
- Authorization: `Bearer ${token}`,
- },
- }
- );
+ const token = (await getM2MToken('https://api.smyth.ai')) as string;
+ const response = await axios.get(`${config.env.MIDDLEWARE_API_BASE_URL}/_sysapi/v1/embodiments?aiAgentId=${agentID}`, {
+ headers: {
+ Authorization: `Bearer ${token}`,
+ },
+ });
return response.data.embodiments;
} catch (error: any) {
logger.error(error.response?.data, error.message);
- throw new Error(
- `Error getting embodiments for agentId=${agentID}: ${error?.message}`
- );
+ throw new Error(`Error getting embodiments for agentId=${agentID}: ${error?.message}`);
}
}
-export async function getAgentIdByDomain(domain = "") {
+export async function getAgentIdByDomain(domain = '') {
let agentId;
//first check if this is the internal wildcard agents domain
- const isStageWildcardDomain = domain.includes(
- config.env.DEFAULT_AGENT_DOMAIN
- );
+ const isStageWildcardDomain = domain.includes(config.env.DEFAULT_AGENT_DOMAIN);
const isProdWildcardDomain = domain.includes(config.env.PROD_AGENT_DOMAIN);
if (isStageWildcardDomain || isProdWildcardDomain) {
- agentId = domain.split(".")[0];
- if (
- `${agentId}.${config.env.DEFAULT_AGENT_DOMAIN}` !== domain &&
- `${agentId}.${config.env.PROD_AGENT_DOMAIN}` !== domain
- ) {
+ agentId = domain.split('.')[0];
+ if (`${agentId}.${config.env.DEFAULT_AGENT_DOMAIN}` !== domain && `${agentId}.${config.env.PROD_AGENT_DOMAIN}` !== domain) {
throw new Error(`Invalid agent domain: ${domain}`);
}
if (isStageWildcardDomain) return agentId;
}
- const token = (await getM2MToken("https://api.smyth.ai")) as string;
+ const token = (await getM2MToken('https://api.smyth.ai')) as string;
const Authorization = `Bearer ${token}`;
- const result: any = await mwSysAPI
- .get("/domains?verified=true", { headers: { Authorization } })
- .catch((error) => ({ error }));
+ const result: any = await mwSysAPI.get('/domains?verified=true', { headers: { Authorization } }).catch(error => ({ error }));
if (result.error) {
- throw new Error("Error getting domain info");
+ throw new Error('Error getting domain info');
}
if (agentId) {
- const hasDomain = result.data.domains.find(
- (domainEntry: any) => domainEntry?.aiAgent?.id === agentId
- );
+ const hasDomain = result.data.domains.find((domainEntry: any) => domainEntry?.aiAgent?.id === agentId);
if (hasDomain) {
- throw new Error("Wrong domain");
+ throw new Error('Wrong domain');
}
} else {
- agentId = result.data.domains.find(
- (domainEntry: any) => domainEntry.name === domain
- )?.aiAgent?.id;
+ agentId = result.data.domains.find((domainEntry: any) => domainEntry.name === domain)?.aiAgent?.id;
}
return agentId;
@@ -183,7 +156,7 @@ function migrateAgentData(data) {
return newData;
}
- if (data.version === "1.0.0") {
+ if (data.version === '1.0.0') {
if (data.description && !data.behavior) {
data.behavior = data.description;
}
@@ -194,42 +167,34 @@ function migrateAgentData(data) {
export async function getAgentDataById(agentID, version) {
try {
- const token = (await getM2MToken("https://api.smyth.ai")) as string;
+ const token = (await getM2MToken('https://api.smyth.ai')) as string;
let agentObj;
- const response = await mwSysAPI.get(
- `/ai-agent/${agentID}?include=team.subscription`,
- includeAuth(token)
- );
+ const response = await mwSysAPI.get(`/ai-agent/${agentID}?include=team.subscription`, includeAuth(token));
agentObj = response.data.agent;
const authData = agentObj.data.auth;
- const tasksResponse = await mwSysAPI.get(
- `/quota/team/${agentObj.teamId}/tasks/subscription`,
- includeAuth(token)
- );
- agentObj.taskData = tasksResponse.data;
+ // const tasksResponse = await mwSysAPI.get(
+ // `/quota/team/${agentObj.teamId}/tasks/subscription`,
+ // includeAuth(token)
+ // );
+ agentObj.taskData = {
+ tasks: 0,
+ maxTasks: Infinity,
+ isFreeUser: false,
+ };
- agentObj.data.debugSessionEnabled =
- agentObj?.data?.debugSessionEnabled && agentObj?.isLocked;
+ agentObj.data.debugSessionEnabled = agentObj?.data?.debugSessionEnabled && agentObj?.isLocked;
if (version) {
- const deploymentsList = await mwSysAPI.get(
- `/ai-agent/${agentID}/deployments`,
- includeAuth(token)
- );
+ const deploymentsList = await mwSysAPI.get(`/ai-agent/${agentID}/deployments`, includeAuth(token));
const deployment =
- version == "latest"
+ version == 'latest'
? deploymentsList?.data?.deployments[0]
- : deploymentsList?.data?.deployments?.find(
- (deployment) => deployment.version === version
- );
+ : deploymentsList?.data?.deployments?.find(deployment => deployment.version === version);
if (deployment) {
- const deployResponse = await mwSysAPI.get(
- `/ai-agent/deployments/${deployment.id}`,
- includeAuth(token)
- );
+ const deployResponse = await mwSysAPI.get(`/ai-agent/deployments/${deployment.id}`, includeAuth(token));
agentObj.data = deployResponse?.data?.deployment?.aiAgentData;
agentObj.data.debugSessionEnabled = false;
agentObj.data.agentVersion = deployment.version;
@@ -238,17 +203,14 @@ export async function getAgentDataById(agentID, version) {
}
}
- if (!agentObj?.data?.auth?.method || agentObj?.data?.auth?.method == "none")
- agentObj.data.auth = authData;
+ if (!agentObj?.data?.auth?.method || agentObj?.data?.auth?.method == 'none') agentObj.data.auth = authData;
agentObj.data = migrateAgentData(agentObj.data);
return agentObj;
} catch (error: any) {
logger.error(error.response?.data, error.message);
- throw new Error(
- `Error getting agent data for agentId=${agentID}: ${error?.message}`
- );
+ throw new Error(`Error getting agent data for agentId=${agentID}: ${error?.message}`);
}
}
@@ -259,20 +221,16 @@ export function addDefaultComponentsAndConnections(agentData) {
async function fetchAgentAuthData(agentId: string) {
const accountConnector = ConnectorService.getAccountConnector();
- return await accountConnector
- .user(AccessCandidate.agent(agentId))
- .getAgentSetting(AGENT_AUTH_SETTINGS_KEY);
+ return await accountConnector.user(AccessCandidate.agent(agentId)).getAgentSetting(AGENT_AUTH_SETTINGS_KEY);
}
export async function getAgentAuthData(agentId: string) {
const freshSettings = await fetchAgentAuthData(agentId);
- return JSON.parse(freshSettings || "{}");
+ return JSON.parse(freshSettings || '{}');
}
export async function getMockData(agentId: string) {
const accountConnector = ConnectorService.getAccountConnector();
- const mockData = await accountConnector
- .user(AccessCandidate.agent(agentId))
- .getAgentSetting(MOCK_DATA_SETTINGS_KEY);
- return JSON.parse(mockData || "{}");
+ const mockData = await accountConnector.user(AccessCandidate.agent(agentId)).getAgentSetting(MOCK_DATA_SETTINGS_KEY);
+ return JSON.parse(mockData || '{}');
}
diff --git a/packages/runtime/src/core/helpers/logto.helper.ts b/packages/runtime/src/core/helpers/logto.helper.ts
index 3fbf055e..1905bdf9 100644
--- a/packages/runtime/src/core/helpers/logto.helper.ts
+++ b/packages/runtime/src/core/helpers/logto.helper.ts
@@ -1,68 +1,8 @@
-import axios from 'axios';
-import qs from 'querystring';
-import config from '../config';
-//M2M test
-const postData = {
- grant_type: 'client_credentials',
- resource: 'https://default.logto.app/api',
- scope: 'all',
-};
-const base64Credentials = Buffer.from(`${config.env.LOGTO_M2M_APP_ID}:${config.env.LOGTO_M2M_APP_SECRET}`, 'utf8').toString('base64');
-
-let tokenData = {
- access_token: null,
-};
export function getM2MToken(resource?, scope?) {
return new Promise((resolve, reject) => {
- if (tokenData.access_token) {
- return resolve(tokenData.access_token);
- }
-
- const body = {
- grant_type: 'client_credentials',
- resource: resource || config.env.LOGTO_API_RESOURCE,
- scope: scope || '',
- };
- axios({
- method: 'post',
- url: `${config.env.LOGTO_SERVER}/oidc/token`,
- headers: {
- Authorization: 'Basic ' + base64Credentials,
- 'Content-Type': 'application/x-www-form-urlencoded',
- },
- data: qs.stringify(body),
- })
- .then((response) => {
- tokenData.access_token = response.data.access_token;
- setTimeout(
- () => {
- tokenData.access_token = null;
- },
- (response.data.expires_in - 100) * 1000,
- );
- resolve(tokenData.access_token);
- })
- .catch((error) => {
- reject({ error: error.response.data });
- });
+ resolve('M2M_TOKEN'); // static token
});
}
-export async function getUserInfo(userId: string) {
- const token = await getM2MToken('https://default.logto.app/api', 'all');
-
- const response: any = await axios({
- method: 'get',
- url: `${config.env.LOGTO_SERVER}/api/users/${userId}`,
- headers: {
- Authorization: `Bearer ${token}`,
- },
- }).catch((error) => ({ error }));
- if (response.error) {
- return null;
- }
-
- return response.data;
-}
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index 6ed2d938..01c49cb4 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -45,11 +45,6 @@ const sre = SmythRuntime.Instance.init({
Account: {
Connector: "SmythOSSAccount",
Settings: {
- oAuthAppID: config.env.LOGTO_M2M_APP_ID,
- oAuthAppSecret: config.env.LOGTO_M2M_APP_SECRET,
- oAuthBaseUrl: `${config.env.LOGTO_SERVER}/oidc/token`,
- oAuthResource: config.env.LOGTO_API_RESOURCE,
- oAuthScope: "",
smythAPIBaseUrl: config.env.MIDDLEWARE_API_BASE_URL + "/_sysapi",
},
},
@@ -74,11 +69,6 @@ const sre = SmythRuntime.Instance.init({
Settings: {
agentStageDomain: config.env.DEFAULT_AGENT_DOMAIN || "",
agentProdDomain: config.env.PROD_AGENT_DOMAIN || "",
- oAuthAppID: config.env.LOGTO_M2M_APP_ID,
- oAuthAppSecret: config.env.LOGTO_M2M_APP_SECRET,
- oAuthBaseUrl: `${config.env.LOGTO_SERVER}/oidc/token`,
- oAuthResource: config.env.LOGTO_API_RESOURCE,
- oAuthScope: "",
smythAPIBaseUrl: config.env.MIDDLEWARE_API_BASE_URL + "/_sysapi",
},
},
@@ -243,3 +233,4 @@ process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
process.on("SIGINT", () => gracefulShutdown("SIGINT"));
export { app };
+
diff --git a/packages/runtime/src/modules/embodiment/helpers/agentChat.helper.ts b/packages/runtime/src/modules/embodiment/helpers/agentChat.helper.ts
index 66a50315..f2436fc6 100644
--- a/packages/runtime/src/modules/embodiment/helpers/agentChat.helper.ts
+++ b/packages/runtime/src/modules/embodiment/helpers/agentChat.helper.ts
@@ -1,6 +1,6 @@
-import { IMetadataFile } from '../types/chat.types';
-import { getM2MToken } from './logto.helper';
+import { getM2MToken } from '@/core/helpers/logto.helper';
import { includeAuth, mwSysAPI } from '@core/services/smythAPIReq';
+import { IMetadataFile } from '../types/chat.types';
export async function updateConversation({ data, conversationId }: { conversationId: string; data: IMetadataFile }) {
const token = (await getM2MToken('https://api.smyth.ai')) as string;
diff --git a/packages/runtime/src/modules/embodiment/helpers/logto.helper.ts b/packages/runtime/src/modules/embodiment/helpers/logto.helper.ts
deleted file mode 100644
index 2e6c9cce..00000000
--- a/packages/runtime/src/modules/embodiment/helpers/logto.helper.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import axios from "axios";
-import qs from "querystring";
-
-import config from "@core/config";
-
-//M2M test
-const postData = {
- grant_type: "client_credentials",
- resource: "https://default.logto.app/api",
- scope: "all",
-};
-
-const base64Credentials = Buffer.from(
- `${config.env.LOGTO_M2M_APP_ID}:${config.env.LOGTO_M2M_APP_SECRET}`,
- "utf8"
-).toString("base64");
-
-let tokenData = {
- access_token: null,
-};
-export function getM2MToken(resource?, scope?) {
- return new Promise((resolve, reject) => {
- if (tokenData.access_token) {
- return resolve(tokenData.access_token);
- }
-
- const body = {
- grant_type: "client_credentials",
- resource: resource || config.env.LOGTO_API_RESOURCE,
- scope: scope || "",
- };
- axios({
- method: "post",
- url: `${config.env.LOGTO_SERVER}/oidc/token`,
- headers: {
- Authorization: "Basic " + base64Credentials,
- "Content-Type": "application/x-www-form-urlencoded",
- },
- data: qs.stringify(body),
- })
- .then((response) => {
- tokenData.access_token = response.data.access_token;
- setTimeout(() => {
- tokenData.access_token = null;
- }, (response.data.expires_in - 100) * 1000);
- resolve(tokenData.access_token);
- })
- .catch((error) => {
- reject({ error: error.response.data });
- });
- });
-}
-
-export async function getUserInfo(userId: string) {
- const token = await getM2MToken("https://default.logto.app/api", "all");
-
- const response: any = await axios({
- method: "get",
- url: `${config.env.LOGTO_SERVER}/api/users/${userId}`,
- headers: {
- Authorization: `Bearer ${token}`,
- },
- }).catch((error) => ({ error }));
-
- if (response.error) {
- return null;
- }
-
- return response.data;
-}