@adaptic/utils 0.1.3 → 0.1.4

package/dist/index.mjs

@@ -368,21 +368,21 @@ function validateAlphaVantageApiKey(apiKey) {
 async function validateAuth(auth) {
     if (auth.adapticAccountId) {
         const client = await getSharedApolloClient();
-        const alpacaAccount = (await adaptic$1.alpacaAccount.get({
+        const brokerageAccount = (await adaptic$1.brokerageAccount.get({
             id: auth.adapticAccountId,
         }, client));
-        if (!alpacaAccount || !alpacaAccount.APIKey || !alpacaAccount.APISecret) {
+        if (!brokerageAccount || !brokerageAccount.apiKey || !brokerageAccount.apiSecret) {
             throw new Error("Alpaca account not found or incomplete");
         }
         validateAlpacaCredentials({
-            apiKey: alpacaAccount.APIKey,
-            apiSecret: alpacaAccount.APISecret,
-            isPaper: alpacaAccount.type === "PAPER",
+            apiKey: brokerageAccount.apiKey,
+            apiSecret: brokerageAccount.apiSecret,
+            isPaper: brokerageAccount.type === "PAPER",
         });
         return {
-            APIKey: alpacaAccount.APIKey,
-            APISecret: alpacaAccount.APISecret,
-            type: alpacaAccount.type,
+            apiKey: brokerageAccount.apiKey,
+            apiSecret: brokerageAccount.apiSecret,
+            type: brokerageAccount.type,
         };
     }
     else if (auth.alpacaApiKey && auth.alpacaApiSecret) {
@@ -391,8 +391,8 @@ async function validateAuth(auth) {
             apiKey: auth.alpacaApiKey,
             apiSecret: auth.alpacaApiSecret});
         return {
-            APIKey: auth.alpacaApiKey,
-            APISecret: auth.alpacaApiSecret,
+            apiKey: auth.alpacaApiKey,
+            apiSecret: auth.alpacaApiSecret,
             type: accountType,
         };
     }
@@ -563,11 +563,11 @@ const ORDER_CHUNK_SIZE = 500;
 async function makeRequest(auth, params) {
     const { endpoint, method, body, queryString, apiBaseUrl } = params;
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrlInner = apiBaseUrl
             ? apiBaseUrl
             : getTradingApiUrl(type);
-        if (!APIKey || !APISecret) {
+        if (!apiKey || !apiSecret) {
             throw new Error("No valid Alpaca authentication found. Please provide either auth object or set ALPACA_API_KEY and ALPACA_API_SECRET environment variables.");
         }
         const url = `${apiBaseUrlInner}${endpoint}${queryString || ""}`;
@@ -578,8 +578,8 @@ async function makeRequest(auth, params) {
         const fetchOptions = {
             method,
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
             },
         };
         // Only add Content-Type and body for non-GET/HEAD requests that have a body
@@ -623,13 +623,13 @@ async function makeRequest(auth, params) {
  */
 async function createOrder$1(auth, params) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const response = await fetch(`${apiBaseUrl}/v2/orders`, {
             method: "POST",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
             },
             body: JSON.stringify(params),
@@ -654,7 +654,7 @@ async function createOrder$1(auth, params) {
  */
 async function getOrders$1(auth, params = {}) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const allOrders = [];
         let currentUntil = params.until ? params.until : new Date().toISOString();
@@ -677,8 +677,8 @@ async function getOrders$1(auth, params = {}) {
             const response = await fetch(`${apiBaseUrl}/v2/orders?${queryParams}`, {
                 method: "GET",
                 headers: {
-                    "APCA-API-KEY-ID": APIKey,
-                    "APCA-API-SECRET-KEY": APISecret,
+                    "APCA-API-KEY-ID": apiKey,
+                    "APCA-API-SECRET-KEY": apiSecret,
                 },
                 signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
             });
@@ -710,13 +710,13 @@ async function getOrders$1(auth, params = {}) {
  */
 async function cancelAllOrders$1(auth) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const response = await fetch(`${apiBaseUrl}/v2/orders`, {
             method: "DELETE",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
         });
@@ -740,7 +740,7 @@ async function cancelAllOrders$1(auth) {
  */
 async function getOrder$1(auth, orderId, nested) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const queryParams = new URLSearchParams();
         if (nested)
@@ -748,8 +748,8 @@ async function getOrder$1(auth, orderId, nested) {
         const response = await fetch(`${apiBaseUrl}/v2/orders/${orderId}?${queryParams}`, {
             method: "GET",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
         });
@@ -773,13 +773,13 @@ async function getOrder$1(auth, orderId, nested) {
  */
 async function replaceOrder$1(auth, orderId, params) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const response = await fetch(`${apiBaseUrl}/v2/orders/${orderId}`, {
             method: "PATCH",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
                 accept: "application/json",
             },
@@ -805,13 +805,13 @@ async function replaceOrder$1(auth, orderId, params) {
  */
 async function cancelOrder$1(auth, orderId) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const response = await fetch(`${apiBaseUrl}/v2/orders/${orderId}`, {
             method: "DELETE",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
         });
@@ -1393,14 +1393,14 @@ async function fetchNews$1(symbols, params) {
         }
         else if (mergedParams.auth.adapticAccountId) {
             const client = await getSharedApolloClient();
-            const alpacaAccount = (await adaptic$1.alpacaAccount.get({
+            const brokerageAccount = (await adaptic$1.brokerageAccount.get({
                 id: mergedParams.auth.adapticAccountId,
             }, client));
-            if (!alpacaAccount || !alpacaAccount.APIKey || !alpacaAccount.APISecret) {
+            if (!brokerageAccount || !brokerageAccount.apiKey || !brokerageAccount.apiSecret) {
                 throw new Error("Alpaca account not found or incomplete");
             }
-            APIKey = alpacaAccount.APIKey;
-            APISecret = alpacaAccount.APISecret;
+            APIKey = brokerageAccount.apiKey;
+            APISecret = brokerageAccount.apiSecret;
         }
     }
     else {
@@ -1493,14 +1493,14 @@ async function fetchNews$1(symbols, params) {
  */
 async function fetchAllPositions(auth) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const apiUrl = `${apiBaseUrl}/v2/positions`;
         const response = await fetch(apiUrl, {
             method: "GET",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
@@ -1524,13 +1524,13 @@ async function fetchAllPositions(auth) {
  */
 async function fetchPosition(auth, symbolOrAssetId) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const response = await fetch(`${apiBaseUrl}/v2/positions/${symbolOrAssetId}`, {
             method: "GET",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
@@ -1564,7 +1564,7 @@ async function fetchPosition(auth, symbolOrAssetId) {
  */
 async function closePosition$1(auth, symbolOrAssetId, params) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         const useLimitOrder = params?.useLimitOrder ?? false;
         const cancelOrdersFlag = params?.cancelOrders ?? true;
@@ -1647,8 +1647,8 @@ async function closePosition$1(auth, symbolOrAssetId, params) {
             const response = await fetch(url, {
                 method: "DELETE",
                 headers: {
-                    "APCA-API-KEY-ID": APIKey,
-                    "APCA-API-SECRET-KEY": APISecret,
+                    "APCA-API-KEY-ID": apiKey,
+                    "APCA-API-SECRET-KEY": apiSecret,
                 },
             });
             if (!response.ok) {
@@ -1839,20 +1839,20 @@ async function closeAllPositionsAfterHours$1(auth, params = { cancel_orders: tru
  * @param props - The properties for fetching account details
  * @returns The account details
  */
-async function fetchAccountDetails({ accountId, client, alpacaAccount, auth, }) {
-    let alpacaAccountObj = alpacaAccount ? alpacaAccount : null;
-    if (!alpacaAccountObj && auth) {
+async function fetchAccountDetails({ accountId, client, brokerageAccount, auth, }) {
+    let brokerageAccountObj = brokerageAccount ? brokerageAccount : null;
+    if (!brokerageAccountObj && auth) {
         const validatedAuth = await validateAuth(auth);
-        alpacaAccountObj = {
-            APIKey: validatedAuth.APIKey,
-            APISecret: validatedAuth.APISecret,
+        brokerageAccountObj = {
+            apiKey: validatedAuth.apiKey,
+            apiSecret: validatedAuth.apiSecret,
             type: validatedAuth.type,
         };
     }
-    if (!alpacaAccountObj) {
+    if (!brokerageAccountObj) {
         try {
             const apolloClient = client || (await getSharedApolloClient());
-            alpacaAccountObj = (await adaptic$1.alpacaAccount.get({
+            brokerageAccountObj = (await adaptic$1.brokerageAccount.get({
                 id: accountId,
             }, apolloClient));
         }
@@ -1861,19 +1861,19 @@ async function fetchAccountDetails({ accountId, client, alpacaAccount, auth, })
             throw error;
         }
     }
-    if (!alpacaAccountObj ||
-        !alpacaAccountObj.APIKey ||
-        !alpacaAccountObj.APISecret) {
+    if (!brokerageAccountObj ||
+        !brokerageAccountObj.apiKey ||
+        !brokerageAccountObj.apiSecret) {
         throw new Error("[fetchAccountDetails] Alpaca account not found or incomplete");
     }
-    const { APIKey, APISecret, type } = alpacaAccountObj;
+    const { apiKey, apiSecret, type } = brokerageAccountObj;
     const apiUrl = `${getTradingApiUrl(type)}/account`;
     try {
         const response = await fetch(apiUrl, {
             method: "GET",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
@@ -1894,12 +1894,12 @@ async function fetchAccountDetails({ accountId, client, alpacaAccount, auth, })
  * @param props - The properties for fetching portfolio history
  * @returns The portfolio history
  */
-async function fetchPortfolioHistory({ params, accountId, client, alpacaAccount, }) {
-    let alpacaAccountObj = alpacaAccount ? alpacaAccount : null;
-    if (!alpacaAccountObj) {
+async function fetchPortfolioHistory({ params, accountId, client, brokerageAccount, }) {
+    let brokerageAccountObj = brokerageAccount ? brokerageAccount : null;
+    if (!brokerageAccountObj) {
         try {
             const apolloClient = client || (await getSharedApolloClient());
-            alpacaAccountObj = (await adaptic$1.alpacaAccount.get({
+            brokerageAccountObj = (await adaptic$1.brokerageAccount.get({
                 id: accountId,
             }, apolloClient));
         }
@@ -1908,12 +1908,12 @@ async function fetchPortfolioHistory({ params, accountId, client, alpacaAccount,
             throw error;
         }
     }
-    if (!alpacaAccountObj ||
-        !alpacaAccountObj.APIKey ||
-        !alpacaAccountObj.APISecret) {
+    if (!brokerageAccountObj ||
+        !brokerageAccountObj.apiKey ||
+        !brokerageAccountObj.apiSecret) {
         throw new Error("[fetchPortfolioHistory] Alpaca account not found or incomplete");
     }
-    const { APIKey, APISecret, type } = alpacaAccountObj;
+    const { apiKey, apiSecret, type } = brokerageAccountObj;
     const apiBaseUrl = getTradingApiUrl(type);
     const apiUrl = `${apiBaseUrl}/v2/account/portfolio/history`;
     const { start, end, period } = params;
@@ -1939,8 +1939,8 @@ async function fetchPortfolioHistory({ params, accountId, client, alpacaAccount,
         const response = await fetch(fullUrl, {
             method: "GET",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
@@ -1967,31 +1967,31 @@ async function getConfiguration(account) {
         if (!account) {
             throw new Error(`Account is missing.`);
         }
-        const { APIKey, APISecret } = account;
-        if (!APIKey || !APISecret) {
-            throw new Error("User APIKey or APISecret is missing.");
+        const { apiKey, apiSecret } = account;
+        if (!apiKey || !apiSecret) {
+            throw new Error("Account apiKey or apiSecret is missing.");
         }
         const apiUrl = getTradingApiUrl(account.type);
         const client = await getSharedApolloClient();
-        const [alpacaResponse, freshAlpacaAccount] = await Promise.all([
+        const [alpacaResponse, freshBrokerageAccount] = await Promise.all([
             fetch(`${apiUrl}/account/configurations`, {
                 method: "GET",
                 headers: {
-                    "APCA-API-KEY-ID": APIKey,
-                    "APCA-API-SECRET-KEY": APISecret,
+                    "APCA-API-KEY-ID": apiKey,
+                    "APCA-API-SECRET-KEY": apiSecret,
                     accept: "application/json",
                 },
             }),
-            adaptic$1.alpacaAccount.get({ id: account.id }, client),
+            adaptic$1.brokerageAccount.get({ id: account.id }, client),
         ]);
         if (!alpacaResponse.ok) {
             throw new Error(`Failed to fetch account configuration: ${alpacaResponse.statusText}`);
         }
-        if (!freshAlpacaAccount) {
+        if (!freshBrokerageAccount) {
             throw new Error("Failed to get Alpaca Account from @adaptic/backend-legacy.");
         }
         const dataFromAlpaca = (await alpacaResponse.json());
-        const accountWithAllocation = freshAlpacaAccount;
+        const accountWithAllocation = freshBrokerageAccount;
         const allocationData = accountWithAllocation.allocation || {
             stocks: 70,
             options: 0,
@@ -2002,26 +2002,26 @@ async function getConfiguration(account) {
         };
         const combinedConfig = {
             ...dataFromAlpaca,
-            marketOpen: freshAlpacaAccount.marketOpen,
-            realTime: freshAlpacaAccount.realTime,
-            tradeAllocationPct: freshAlpacaAccount.tradeAllocationPct,
-            minPercentageChange: freshAlpacaAccount.minPercentageChange,
-            volumeThreshold: freshAlpacaAccount.volumeThreshold,
-            cryptoTradingEnabled: freshAlpacaAccount.cryptoTradingEnabled ?? false,
-            cryptoTradingPairs: freshAlpacaAccount.cryptoTradingPairs ?? [],
-            cryptoTradeAllocationPct: freshAlpacaAccount.cryptoTradeAllocationPct ?? 5.0,
+            marketOpen: freshBrokerageAccount.marketOpen,
+            realTime: freshBrokerageAccount.realTime,
+            tradeAllocationPct: freshBrokerageAccount.tradeAllocationPct,
+            minPercentageChange: freshBrokerageAccount.minPercentageChange,
+            volumeThreshold: freshBrokerageAccount.volumeThreshold,
+            cryptoTradingEnabled: freshBrokerageAccount.cryptoTradingEnabled ?? false,
+            cryptoTradingPairs: freshBrokerageAccount.cryptoTradingPairs ?? [],
+            cryptoTradeAllocationPct: freshBrokerageAccount.cryptoTradeAllocationPct ?? 5.0,
             autoAllocation: accountWithAllocation.autoAllocation ?? false,
             allocation: allocationData,
-            enablePortfolioTrailingStop: freshAlpacaAccount.enablePortfolioTrailingStop,
-            portfolioTrailPercent: freshAlpacaAccount.portfolioTrailPercent,
-            portfolioProfitThresholdPercent: freshAlpacaAccount.portfolioProfitThresholdPercent,
-            reducedPortfolioTrailPercent: freshAlpacaAccount.reducedPortfolioTrailPercent,
-            defaultTrailingStopPercentage100: freshAlpacaAccount.defaultTrailingStopPercentage100 ?? 4.0,
-            firstTrailReductionThreshold100: freshAlpacaAccount.firstTrailReductionThreshold100 ?? 2.0,
-            secondTrailReductionThreshold100: freshAlpacaAccount.secondTrailReductionThreshold100 ?? 5.0,
-            firstReducedTrailPercentage100: freshAlpacaAccount.firstReducedTrailPercentage100 ?? 1.0,
-            secondReducedTrailPercentage100: freshAlpacaAccount.secondReducedTrailPercentage100 ?? 0.5,
-            minimumPriceChangePercent100: freshAlpacaAccount.minimumPriceChangePercent100 ?? 0.5,
+            enablePortfolioTrailingStop: freshBrokerageAccount.enablePortfolioTrailingStop,
+            portfolioTrailPercent: freshBrokerageAccount.portfolioTrailPercent,
+            portfolioProfitThresholdPercent: freshBrokerageAccount.portfolioProfitThresholdPercent,
+            reducedPortfolioTrailPercent: freshBrokerageAccount.reducedPortfolioTrailPercent,
+            defaultTrailingStopPercentage100: freshBrokerageAccount.defaultTrailingStopPercentage100 ?? 4.0,
+            firstTrailReductionThreshold100: freshBrokerageAccount.firstTrailReductionThreshold100 ?? 2.0,
+            secondTrailReductionThreshold100: freshBrokerageAccount.secondTrailReductionThreshold100 ?? 5.0,
+            firstReducedTrailPercentage100: freshBrokerageAccount.firstReducedTrailPercentage100 ?? 1.0,
+            secondReducedTrailPercentage100: freshBrokerageAccount.secondReducedTrailPercentage100 ?? 0.5,
+            minimumPriceChangePercent100: freshBrokerageAccount.minimumPriceChangePercent100 ?? 0.5,
         };
         return combinedConfig;
     }
@@ -2042,9 +2042,9 @@ async function updateConfiguration(user, account, updatedConfig) {
         if (!account) {
             throw new Error(`Account is missing.`);
         }
-        const { APIKey, APISecret } = account;
-        if (!APIKey || !APISecret) {
-            throw new Error("User APIKey or APISecret is missing.");
+        const { apiKey, apiSecret } = account;
+        if (!apiKey || !apiSecret) {
+            throw new Error("Account apiKey or apiSecret is missing.");
         }
         const apiUrl = getTradingApiUrl(account.type);
         // Prepare the config object for Alpaca by removing DB-only fields
@@ -2072,8 +2072,8 @@ async function updateConfiguration(user, account, updatedConfig) {
         const alpacaUpdatePromise = fetch(`${apiUrl}/account/configurations`, {
             method: "PATCH",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
                 accept: "application/json",
             },
@@ -2094,10 +2094,10 @@ async function updateConfiguration(user, account, updatedConfig) {
             if (account.allocation) {
                 allocUpdatePromise = adaptic$1.allocation.update({
                     id: account.allocation.id,
-                    alpacaAccount: {
+                    brokerageAccount: {
                         id: account.id,
                     },
-                    alpacaAccountId: account.id,
+                    brokerageAccountId: account.id,
                     stocks: updatedConfig.allocation.stocks ?? 0,
                     options: updatedConfig.allocation.options ?? 0,
                     futures: updatedConfig.allocation.futures ?? 0,
@@ -2114,14 +2114,14 @@ async function updateConfiguration(user, account, updatedConfig) {
                     etfs: updatedConfig.allocation.etfs ?? 0,
                     forex: updatedConfig.allocation.forex ?? 0,
                     crypto: updatedConfig.allocation.crypto ?? 0,
-                    alpacaAccount: {
+                    brokerageAccount: {
                         id: account.id,
                     },
-                    alpacaAccountId: account.id,
+                    brokerageAccountId: account.id,
                 }, client);
             }
         }
-        const adapticUpdatePromise = adaptic$1.alpacaAccount.update({
+        const adapticUpdatePromise = adaptic$1.brokerageAccount.update({
             id: account.id,
             user: {
                 id: user.id,
@@ -2148,7 +2148,7 @@ async function updateConfiguration(user, account, updatedConfig) {
             secondReducedTrailPercentage100: updatedConfig.secondReducedTrailPercentage100 ?? 0,
             minimumPriceChangePercent100: updatedConfig.minimumPriceChangePercent100 ?? 0,
         }, client);
-        const [alpacaResponse, updatedAlpacaAccount, updatedAllocation] = await Promise.all([
+        const [alpacaResponse, updatedBrokerageAccount, updatedAllocation] = await Promise.all([
             alpacaUpdatePromise,
             adapticUpdatePromise,
             allocUpdatePromise,
@@ -2168,10 +2168,10 @@ async function updateConfiguration(user, account, updatedConfig) {
             throw new Error(`Failed to update account config at Alpaca: ${alpacaResponse.statusText}`);
         }
         const alpacaData = (await alpacaResponse.json());
-        if (!updatedAlpacaAccount) {
+        if (!updatedBrokerageAccount) {
             throw new Error("Failed to update Alpaca Account in @adaptic/backend-legacy.");
         }
-        const updatedAccountWithAllocation = updatedAlpacaAccount;
+        const updatedAccountWithAllocation = updatedBrokerageAccount;
         const selectedAllocation = (updatedConfig.allocation ||
             updatedAllocation ||
             updatedAccountWithAllocation.allocation);
@@ -2181,26 +2181,26 @@ async function updateConfiguration(user, account, updatedConfig) {
         getLogger().info("Final allocation:", selectedAllocation);
         const finalConfig = {
             ...alpacaData,
-            marketOpen: updatedAlpacaAccount.marketOpen,
-            realTime: updatedAlpacaAccount.realTime,
-            tradeAllocationPct: updatedAlpacaAccount.tradeAllocationPct,
-            minPercentageChange: updatedAlpacaAccount.minPercentageChange,
-            volumeThreshold: updatedAlpacaAccount.volumeThreshold,
-            cryptoTradingEnabled: updatedAlpacaAccount.cryptoTradingEnabled,
-            cryptoTradingPairs: updatedAlpacaAccount.cryptoTradingPairs,
-            cryptoTradeAllocationPct: updatedAlpacaAccount.cryptoTradeAllocationPct,
+            marketOpen: updatedBrokerageAccount.marketOpen,
+            realTime: updatedBrokerageAccount.realTime,
+            tradeAllocationPct: updatedBrokerageAccount.tradeAllocationPct,
+            minPercentageChange: updatedBrokerageAccount.minPercentageChange,
+            volumeThreshold: updatedBrokerageAccount.volumeThreshold,
+            cryptoTradingEnabled: updatedBrokerageAccount.cryptoTradingEnabled,
+            cryptoTradingPairs: updatedBrokerageAccount.cryptoTradingPairs,
+            cryptoTradeAllocationPct: updatedBrokerageAccount.cryptoTradeAllocationPct,
             autoAllocation: updatedAccountWithAllocation.autoAllocation,
             allocation: selectedAllocation,
-            enablePortfolioTrailingStop: updatedAlpacaAccount.enablePortfolioTrailingStop,
-            portfolioTrailPercent: updatedAlpacaAccount.portfolioTrailPercent,
-            portfolioProfitThresholdPercent: updatedAlpacaAccount.portfolioProfitThresholdPercent,
-            reducedPortfolioTrailPercent: updatedAlpacaAccount.reducedPortfolioTrailPercent,
-            defaultTrailingStopPercentage100: updatedAlpacaAccount.defaultTrailingStopPercentage100,
-            firstTrailReductionThreshold100: updatedAlpacaAccount.firstTrailReductionThreshold100,
-            secondTrailReductionThreshold100: updatedAlpacaAccount.secondTrailReductionThreshold100,
-            firstReducedTrailPercentage100: updatedAlpacaAccount.firstReducedTrailPercentage100,
-            secondReducedTrailPercentage100: updatedAlpacaAccount.secondReducedTrailPercentage100,
-            minimumPriceChangePercent100: updatedAlpacaAccount.minimumPriceChangePercent100,
+            enablePortfolioTrailingStop: updatedBrokerageAccount.enablePortfolioTrailingStop,
+            portfolioTrailPercent: updatedBrokerageAccount.portfolioTrailPercent,
+            portfolioProfitThresholdPercent: updatedBrokerageAccount.portfolioProfitThresholdPercent,
+            reducedPortfolioTrailPercent: updatedBrokerageAccount.reducedPortfolioTrailPercent,
+            defaultTrailingStopPercentage100: updatedBrokerageAccount.defaultTrailingStopPercentage100,
+            firstTrailReductionThreshold100: updatedBrokerageAccount.firstTrailReductionThreshold100,
+            secondTrailReductionThreshold100: updatedBrokerageAccount.secondTrailReductionThreshold100,
+            firstReducedTrailPercentage100: updatedBrokerageAccount.firstReducedTrailPercentage100,
+            secondReducedTrailPercentage100: updatedBrokerageAccount.secondReducedTrailPercentage100,
+            minimumPriceChangePercent100: updatedBrokerageAccount.minimumPriceChangePercent100,
         };
         return finalConfig;
     }
@@ -2218,15 +2218,15 @@ async function updateConfiguration(user, account, updatedConfig) {
  */
 async function getAsset(auth, symbolOrAssetId) {
     try {
-        const { APIKey, APISecret, type } = await validateAuth(auth);
+        const { apiKey, apiSecret, type } = await validateAuth(auth);
         const apiBaseUrl = getTradingApiUrl(type);
         // Use encodeURIComponent to handle special characters in symbols (e.g., BTC/USDT)
         const encodedSymbolOrAssetId = encodeURIComponent(symbolOrAssetId);
         const response = await fetch(`${apiBaseUrl}/v2/assets/${encodedSymbolOrAssetId}`, {
             method: "GET",
             headers: {
-                "APCA-API-KEY-ID": APIKey,
-                "APCA-API-SECRET-KEY": APISecret,
+                "APCA-API-KEY-ID": apiKey,
+                "APCA-API-SECRET-KEY": apiSecret,
                 "Content-Type": "application/json",
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
@@ -3283,24 +3283,24 @@ async function calculateTotalReturnYTD(portfolioHistory) {
  * Calculates the expense ratio for a given Alpaca account.
  * @param accountId - The ID of the Alpaca account.
  * @param client - The Apollo client instance.
- * @param alpacaAccount - The Alpaca account object.
+ * @param brokerageAccount - The Alpaca account object.
  * @returns A promise that resolves to a string representing the expense ratio in percentage format.
  */
-async function calculateExpenseRatio$1({ accountId, client, alpacaAccount, }) {
-    if (!accountId && !alpacaAccount && !client) {
+async function calculateExpenseRatio$1({ accountId, client, brokerageAccount, }) {
+    if (!accountId && !brokerageAccount && !client) {
         getLogger().warn("Missing account ID or client to calculate expense ratio.");
         return "N/A";
     }
-    let alpacaAccountId = accountId || (alpacaAccount && alpacaAccount.id) || "";
+    let brokerageAccountId = accountId || (brokerageAccount && brokerageAccount.id) || "";
     let accountDetails;
-    if (!alpacaAccountId) {
+    if (!brokerageAccountId) {
         getLogger().warn("Invalid account ID.");
         return "N/A";
     }
-    if (alpacaAccount) {
+    if (brokerageAccount) {
         // Use Alpaca account object to get accountDetails
         accountDetails = (await fetchAccountDetails({
-            alpacaAccount: alpacaAccount,
+            brokerageAccount: brokerageAccount,
         }));
         if (!accountDetails) {
             getLogger().warn("Failed to fetch account details inside calculateExpenseRatio.");
@@ -3339,24 +3339,24 @@ async function getPortfolioExpensesFromYourSystem(accountId) {
  * Calculates the liquidity ratio for a given Alpaca account.
  * @param accountId - The ID of the Alpaca account.
  * @param client - The Apollo client instance.
- * @param alpacaAccount - The Alpaca account object.
+ * @param brokerageAccount - The Alpaca account object.
  * @returns A promise that resolves to a string representing the liquidity ratio in the format "1:ratio".
  */
-async function calculateLiquidityRatio({ accountId, client, alpacaAccount, }) {
-    if (!accountId && !alpacaAccount && !client) {
+async function calculateLiquidityRatio({ accountId, client, brokerageAccount, }) {
+    if (!accountId && !brokerageAccount && !client) {
         getLogger().warn("Missing account ID or client to calculateLiquidityRatio.");
         return "N/A";
     }
-    let alpacaAccountId = accountId || (alpacaAccount && alpacaAccount.id) || "";
+    let brokerageAccountId = accountId || (brokerageAccount && brokerageAccount.id) || "";
     let accountDetails;
-    if (!alpacaAccountId) {
+    if (!brokerageAccountId) {
         getLogger().warn("Invalid account ID.");
         return "N/A";
     }
-    if (alpacaAccount) {
+    if (brokerageAccount) {
         // Use Alpaca account object to get accountDetails
         accountDetails = (await fetchAccountDetails({
-            alpacaAccount: alpacaAccount,
+            brokerageAccount: brokerageAccount,
         }));
         if (!accountDetails) {
             getLogger().warn("Failed to fetch account details inside calculateLiquidityRatio.");
@@ -3984,11 +3984,11 @@ async function calculateInformationRatio$1(portfolioHistory, benchmarkBars) {
  * @param params - The parameters for fetching performance metrics.
  * @param client - The Apollo client instance.
  * @param accountId - The ID of the Alpaca account.
- * @param alpacaAccount - The Alpaca account object.
+ * @param brokerageAccount - The Alpaca account object.
  * @returns A promise that resolves to an object containing various performance metrics.
  * @throws Will throw an error if required parameters are missing or if fetching fails.
  */
-async function fetchPerformanceMetrics({ params, client, accountId, alpacaAccount, }) {
+async function fetchPerformanceMetrics({ params, client, accountId, brokerageAccount, }) {
     // Default response for error cases
     const defaultMetrics = {
         totalReturnYTD: "N/A",
@@ -4011,12 +4011,12 @@ async function fetchPerformanceMetrics({ params, client, accountId, alpacaAccoun
             throw new Error("Missing required timeframe or period parameters");
         }
         // Obtain Alpaca account
-        let alpacaAccountObj = alpacaAccount ? alpacaAccount : null;
-        if (!alpacaAccountObj && accountId) {
+        let brokerageAccountObj = brokerageAccount ? brokerageAccount : null;
+        if (!brokerageAccountObj && accountId) {
             try {
                 // Use provided client or get the shared client
                 const apolloClient = client || (await getSharedApolloClient());
-                alpacaAccountObj = (await adaptic$1.alpacaAccount.get({
+                brokerageAccountObj = (await adaptic$1.brokerageAccount.get({
                     id: accountId,
                 }, apolloClient));
             }
@@ -4026,9 +4026,9 @@ async function fetchPerformanceMetrics({ params, client, accountId, alpacaAccoun
             }
         }
         // Validate Alpaca account
-        if (!alpacaAccountObj ||
-            !alpacaAccountObj.APIKey ||
-            !alpacaAccountObj.APISecret) {
+        if (!brokerageAccountObj ||
+            !brokerageAccountObj.apiKey ||
+            !brokerageAccountObj.apiSecret) {
             throw new Error("Alpaca account not found or credentials missing");
         }
         // Fetch portfolio history with structured error handling
@@ -4036,7 +4036,7 @@ async function fetchPerformanceMetrics({ params, client, accountId, alpacaAccoun
         try {
             portfolioHistory = await fetchPortfolioHistory({
                 params: params,
-                alpacaAccount: alpacaAccountObj,
+                brokerageAccount: brokerageAccountObj,
             });
         }
         catch (error) {
@@ -4086,10 +4086,10 @@ async function fetchPerformanceMetrics({ params, client, accountId, alpacaAccoun
             calculateInformationRatio$1(portfolioHistory, benchmarkBars),
             calculateRiskAdjustedReturn$1(portfolioHistory),
             calculateLiquidityRatio({
-                alpacaAccount: alpacaAccountObj,
+                brokerageAccount: brokerageAccountObj,
             }),
             calculateExpenseRatio$1({
-                alpacaAccount: alpacaAccountObj,
+                brokerageAccount: brokerageAccountObj,
             }),
             getDividendYield(),
             calculateMaxDrawdown$1(portfolioHistory.equity),
@@ -4309,15 +4309,15 @@ const timeDiffString = (milliseconds) => {
 };
 
 // price-utils.ts
-const calculateFees = async (action, trade, alpacaAccount) => {
+const calculateFees = async (action, trade, brokerageAccount) => {
     let fee = 0;
     const alpacaOrderId = action.alpacaOrderId;
     if (!alpacaOrderId)
         return fee;
     const order = await getOrder$1({
-        adapticAccountId: trade.alpacaAccountId,
-        alpacaApiKey: alpacaAccount.APIKey,
-        alpacaApiSecret: alpacaAccount.APISecret,
+        adapticAccountId: trade.brokerageAccountId,
+        alpacaApiKey: brokerageAccount.apiKey,
+        alpacaApiSecret: brokerageAccount.apiSecret,
     }, alpacaOrderId);
     if (!order)
         return fee;
@@ -4355,13 +4355,13 @@ const calculateFees = async (action, trade, alpacaAccount) => {
 };
 const computeTotalFees = async (trade) => {
     let totalFees = 0;
-    // fetch alpaca account details using adaptic.alpacaAccount.get({id: trade.alpacaAccountId})
-    const alpacaAccount = (await adaptic$1.alpacaAccount.get({
-        id: trade.alpacaAccountId,
+    // fetch alpaca account details using adaptic.brokerageAccount.get({id: trade.brokerageAccountId})
+    const brokerageAccount = (await adaptic$1.brokerageAccount.get({
+        id: trade.brokerageAccountId,
     }));
-    if (!alpacaAccount)
+    if (!brokerageAccount)
         return totalFees;
-    const feePromises = trade?.actions?.map((action) => calculateFees(action, trade, alpacaAccount));
+    const feePromises = trade?.actions?.map((action) => calculateFees(action, trade, brokerageAccount));
     const fees = await Promise.all(feePromises || []);
     totalFees = fees.reduce((acc, fee) => acc + fee, 0);
     return totalFees;
@@ -6108,7 +6108,7 @@ async function fetchBars(params) {
  */
 async function fetchNews(params, auth) {
     const { symbol, start = new Date(Date.now() - 24 * 60 * 60 * 1000), sort = "desc", includeContent = false, limit = 1000, } = params;
-    if (!auth.APIKey || !auth.APISecret) {
+    if (!auth.alpacaApiKey || !auth.alpacaApiSecret) {
         throw new Error("Alpaca API key and secret are required");
     }
     if (!symbol) {
@@ -6176,7 +6176,7 @@ async function fetchNews(params, auth) {
  */
 async function fetchLatestTrades(params, auth) {
     const { symbols, loc = "us" } = params;
-    if (!auth.APIKey || !auth.APISecret) {
+    if (!auth.alpacaApiKey || !auth.alpacaApiSecret) {
         throw new Error("Alpaca API key and secret are required");
     }
     if (!symbols || symbols.length === 0) {
@@ -6192,8 +6192,8 @@ async function fetchLatestTrades(params, auth) {
     return withRetry(async () => {
         const response = await fetch(url, {
             headers: {
-                "APCA-API-KEY-ID": auth.APIKey,
-                "APCA-API-SECRET-KEY": auth.APISecret,
+                "APCA-API-KEY-ID": auth.alpacaApiKey,
+                "APCA-API-SECRET-KEY": auth.alpacaApiSecret,
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
         });
@@ -6219,7 +6219,7 @@ async function fetchLatestTrades(params, auth) {
  */
 async function fetchLatestQuotes(params, auth) {
     const { symbols, loc = "us" } = params;
-    if (!auth.APIKey || !auth.APISecret) {
+    if (!auth.alpacaApiKey || !auth.alpacaApiSecret) {
         throw new Error("Alpaca API key and secret are required");
     }
     if (!symbols || symbols.length === 0) {
@@ -6235,8 +6235,8 @@ async function fetchLatestQuotes(params, auth) {
     return withRetry(async () => {
         const response = await fetch(url, {
             headers: {
-                "APCA-API-KEY-ID": auth.APIKey,
-                "APCA-API-SECRET-KEY": auth.APISecret,
+                "APCA-API-KEY-ID": auth.alpacaApiKey,
+                "APCA-API-SECRET-KEY": auth.alpacaApiSecret,
             },
             signal: createTimeoutSignal(DEFAULT_TIMEOUTS.ALPACA_API),
         });