Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
feat(cli): add API metrics to monitor HTTP requests and data downloaded
jkomyno178defdfa061
diff --git a/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts b/ts/packages/cli/src/commands/py/commands/py.generate.cmd.tsindex 9857c6895..8e777b8e4 100644--- a/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts+++ b/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts@@ -2,6 +2,7 @@ import { Command, Options } from '@effect/cli';import { pipe, Console, Effect, Option, Array } from 'effect';import { FileSystem } from '@effect/platform';import { ComposioToolkitsRepository } from 'src/services/composio-clients';+import { logMetrics } from 'src/effects/log-metrics';import type { GetCmdParams } from 'src/type-utils';import { NodeProcess } from 'src/services/node-process';import { createToolkitIndex } from 'src/generation/create-toolkit-index';@@ -136,6 +137,10 @@ export function generatePythonTypeStubs({`Generated files are available at: ${outputDir}`);+ // Log API metrics+ const metrics = yield* client.getMetrics();+ yield* logMetrics(metrics);+return outputDir;});}diff --git a/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.ts b/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.tsindex 89cf7771a..e8984ac04 100644--- a/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.ts+++ b/ts/packages/cli/src/commands/ts/commands/ts.generate.cmd.ts@@ -21,6 +21,7 @@ import { Console, Effect, Option, pipe, Array } from 'effect';import { Match } from 'effect';import { FileSystem } from '@effect/platform';import { ComposioToolkitsRepository } from 'src/services/composio-clients';+import { logMetrics } from 'src/effects/log-metrics';import { NodeProcess } from 'src/services/node-process';import { createToolkitIndex } from 'src/generation/create-toolkit-index';import type { GetCmdParams } from 'src/type-utils';@@ -247,6 +248,10 @@ export function generateTypescriptTypeStubs({`Generated files are available at: ${outputDir}`);+ // Log API metrics+ const metrics = yield* client.getMetrics();+ yield* logMetrics(metrics);+return outputDir;});}diff --git a/ts/packages/cli/src/effects/log-metrics.ts b/ts/packages/cli/src/effects/log-metrics.tsnew file mode 100644index 000000000..bf316c34f--- /dev/null+++ b/ts/packages/cli/src/effects/log-metrics.ts@@ -0,0 +1,36 @@+import { Effect } from 'effect';++/**+ * Metrics from API calls.+ */+export type Metrics = {+ readonly byteSize: number;+ readonly requests: number;+};++/**+ * Formats byte size into a human-readable string.+ * @param bytes - Number of bytes to format+ * @returns A string like "1.23 KB" or "456 B"+ */+const formatBytes = (bytes: number): string => {+ if (bytes < 1024) {+ return `${bytes} B`;+ }+ const kb = bytes / 1024;+ if (kb < 1024) {+ return `${kb.toFixed(2)} KB`;+ }+ const mb = kb / 1024;+ return `${mb.toFixed(2)} MB`;+};++/**+ * Logs API metrics (request count and total bytes downloaded) at debug level.+ * @param metrics - The metrics to log+ * @returns An Effect that logs the metrics+ */+export const logMetrics = (metrics: Metrics): Effect.Effect<void> =>+ Effect.logDebug(+ `API metrics: ${metrics.requests} request(s), ${formatBytes(metrics.byteSize)} downloaded`+ );diff --git a/ts/packages/cli/src/services/composio-clients-cached.ts b/ts/packages/cli/src/services/composio-clients-cached.tsindex 9179426c7..29855d7f1 100644--- a/ts/packages/cli/src/services/composio-clients-cached.ts+++ b/ts/packages/cli/src/services/composio-clients-cached.ts@@ -164,6 +164,7 @@ export const ComposioToolkitsRepositoryCached = Layer.effect(// These methods don't need caching as they operate on already fetched data// or perform validation that should always be fresh+ getMetrics: () => underlyingRepository.getMetrics(),validateToolkits: toolkitSlugs => underlyingRepository.validateToolkits(toolkitSlugs),filterToolkitsBySlugs: (toolkits, toolkitSlugs) =>underlyingRepository.filterToolkitsBySlugs(toolkits, toolkitSlugs),diff --git a/ts/packages/cli/src/services/composio-clients.ts b/ts/packages/cli/src/services/composio-clients.tsindex 340a56b42..0dae3cb38 100644--- a/ts/packages/cli/src/services/composio-clients.ts+++ b/ts/packages/cli/src/services/composio-clients.ts@@ -1,6 +1,19 @@-import { pipe, Data, Effect, Option, Schema, Array, Order, ParseResult, String } from 'effect';-import { Composio as _RawComposioClient } from '@composio/client';-import { Toolkit, Toolkits, ToolkitName } from 'src/models/toolkits';+import {+ pipe,+ Data,+ Effect,+ Option,+ Schema,+ Array,+ Order,+ ParseResult,+ String,+ Stream,+ Sink,+ SynchronizedRef,+} from 'effect';+import { Composio as _RawComposioClient, APIPromise } from '@composio/client';+import { Toolkit, Toolkits } from 'src/models/toolkits';import { ToolsAsEnums, Tools, Tool } from 'src/models/tools';import { Session, RetrievedSession } from 'src/models/session';import { TriggerType, TriggerTypes, TriggerTypesAsEnums } from 'src/models/trigger-types';@@ -88,20 +101,96 @@ export const HttpErrorResponse = Schema.Struct({export type HttpErrorResponse = Schema.Schema.Type<typeof HttpErrorResponse>;/**- * Utilities+ * Result of streaming a response with byte counting.*/+interface StreamedResponse {+ /** The parsed JSON data from the response body */+ readonly json: unknown;+ /** The exact byte size of the response body */+ readonly byteSize: number;+}++type Metrics = {+ readonly byteSize: number;+ readonly requests: number;+};++/**+ * Streams a Fetch Response body, counting bytes precisely and parsing JSON in a single pass.+ * Uses streaming to avoid loading the entire response into memory at once.+ *+ * @param response - The Fetch API Response object+ * @returns An Effect that yields the parsed JSON data and byte count+ */+const streamResponseWithByteCount = (+ response: Response+): Effect.Effect<StreamedResponse, HttpServerError> =>+ Effect.gen(function* () {+ const body = response.body;+ if (!body) {+ return yield* Effect.fail(+ new HttpServerError({+ cause: 'Response body is null',+ })+ );+ }++ // Convert the ReadableStream to an Effect Stream+ const byteStream = Stream.fromReadableStream(+ () => body,+ (error: unknown) =>+ new HttpServerError({+ cause: error,+ })+ );++ // Collect all chunks while counting bytes+ const [chunks, byteSize] = yield* pipe(+ byteStream,+ Stream.run(+ Sink.fold<[Uint8Array[], number], Uint8Array>(+ [[], 0],+ () => true,+ ([chunks, size], chunk) => [[...chunks, chunk], size + chunk.byteLength]+ )+ )+ );++ // Merge chunks into a single Uint8Array+ const merged = new Uint8Array(byteSize);+ let offset = 0;+ for (const chunk of chunks) {+ merged.set(chunk, offset);+ offset += chunk.byteLength;+ }++ // Decode and parse JSON+ const text = new TextDecoder().decode(merged);+ const json = yield* Effect.try({+ try: () => JSON.parse(text) as unknown,+ catch: error =>+ new HttpServerError({+ cause: `Failed to parse JSON response: ${error}`,+ }),+ });++ return { json, byteSize };+ });// Utility function for calling the Composio API and decoding its response.// eslint-disable-next-line @typescript-eslint/no-explicit-anyconst callClient = <T, S extends Schema.Schema<any, any>>(clientSingleton: ComposioClientSingleton,- apiCall: (client: _RawComposioClient) => Promise<T>,+ apiCall: (client: _RawComposioClient) => APIPromise<T>,responseSchema: S-): Effect.Effect<Schema.Schema.Type<S>, HttpError | NoSuchElementException> =>+): Effect.Effect<+ { data: Schema.Schema.Type<S>; metrics: Metrics },+ HttpError | NoSuchElementException+> =>Effect.gen(function* () {const client = yield* clientSingleton.get();- const json = yield* Effect.tryPromise({- try: () => apiCall(client),+ const response = yield* Effect.tryPromise({+ try: () => apiCall(client).asResponse(),catch: e => {const decodedOpt = Schema.decodeUnknownOption(HttpErrorResponse)(e);@@ -127,7 +216,11 @@ const callClient = <T, S extends Schema.Schema<any, any>>(},});- return yield* pipe(+ // Stream the response body with byte counting+ const { json, byteSize } = yield* streamResponseWithByteCount(response);+ const metrics = { byteSize, requests: 1 };++ const typedJson = yield* pipe(Schema.decodeUnknown(responseSchema)(json),Effect.catchTag('ParseError', e => {const message = ParseResult.TreeFormatter.formatErrorSync(e);@@ -137,6 +230,8 @@ const callClient = <T, S extends Schema.Schema<any, any>>(});}));++ return { metrics, data: typedJson };});// Schema constraint for paginated responses@@ -155,39 +250,49 @@ type PaginatedSchema = Schema.Schema<// Automatically fetches all pages until the specified limit is reached.const callClientWithPagination = <T, S extends PaginatedSchema>(clientSingleton: ComposioClientSingleton,- apiCall: (client: _RawComposioClient, cursor?: string) => Promise<T>,+ apiCall: (client: _RawComposioClient, cursor?: string) => APIPromise<T>,responseSchema: S,limit: number-): Effect.Effect<Schema.Schema.Type<S>, HttpError | NoSuchElementException> =>+): Effect.Effect<+ { data: Schema.Schema.Type<S>; metrics: Metrics },+ HttpError | NoSuchElementException+> =>Effect.gen(function* () {const client = yield* clientSingleton.get();+ let totalByteSize = 0;+ let totalRequests = 0;++ const fetchPage = (cursor?: string): Effect.Effect<StreamedResponse, HttpServerError> =>+ Effect.gen(function* () {+ const response = yield* Effect.tryPromise({+ try: () => apiCall(client, cursor).asResponse(),+ catch: e => {+ const decodedOpt = Schema.decodeUnknownOption(HttpErrorResponse)(e);++ if (Option.isNone(decodedOpt)) {+ return new HttpServerError({+ cause: e,+ });+ }- const fetchPage = (cursor?: string): Effect.Effect<T, HttpServerError> =>- Effect.tryPromise({- try: () => apiCall(client, cursor),- catch: e => {- const decodedOpt = Schema.decodeUnknownOption(HttpErrorResponse)(e);+ const {+ status,+ error: { error },+ } = decodedOpt.value;+ const pretty = renderPrettyError([+ ['code', error.code],+ ['message', error.message],+ ['suggested fix', error.suggested_fix],+ ]);- if (Option.isNone(decodedOpt)) {return new HttpServerError({- cause: e,+ cause: `HTTP ${status}\n${pretty}`,});- }-- const {- status,- error: { error },- } = decodedOpt.value;- const pretty = renderPrettyError([- ['code', error.code],- ['message', error.message],- ['suggested fix', error.suggested_fix],- ]);+ },+ });- return new HttpServerError({- cause: `HTTP ${status}\n${pretty}`,- });- },+ // Stream the response body with byte counting+ return yield* streamResponseWithByteCount(response);});type DecodedPage = Schema.Schema.Type<S>;@@ -209,26 +314,32 @@ const callClientWithPagination = <T, S extends PaginatedSchema>(let totalPages = 0;while (allItems.length < limit) {- const json: T = yield* fetchPage(currentCursor ?? undefined);+ const { json, byteSize } = yield* fetchPage(currentCursor ?? undefined);+ totalByteSize += byteSize;+ totalRequests += 1;+const decoded: DecodedPage = yield* decodeResponse(json);allItems = allItems.concat(decoded.items);totalPages = decoded.total_pages;currentCursor = decoded.next_cursor;- yield* Effect.logDebug(` Total items fetched: ${allItems.length}/${limit}`);-// Stop if no more pagesif (currentCursor === null) {break;}}+ const metrics = { byteSize: totalByteSize, requests: totalRequests };+return {- items: allItems.slice(0, limit),- total_pages: totalPages,- next_cursor: currentCursor,- } as DecodedPage;+ data: {+ items: allItems.slice(0, limit),+ total_pages: totalPages,+ next_cursor: currentCursor,+ } as DecodedPage,+ metrics,+ };});/**@@ -276,7 +387,27 @@ export class ComposioClientLive extends Effect.Service<ComposioClientLive>()(effect: Effect.gen(function* () {const clientSingleton = yield* ComposioClientSingleton;+ // Initialize metrics tracking via SynchronizedRef+ const metricsRef = yield* SynchronizedRef.make<Metrics>({ byteSize: 0, requests: 0 });++ // Helper to update metrics and return just the data+ const withMetrics = <A, E, R>(+ effect: Effect.Effect<{ data: A; metrics: Metrics }, E, R>+ ): Effect.Effect<A, E, R> =>+ Effect.gen(function* () {+ const { data, metrics } = yield* effect;+ yield* SynchronizedRef.update(metricsRef, current => ({+ byteSize: current.byteSize + metrics.byteSize,+ requests: current.requests + metrics.requests,+ }));+ return data;+ });+return {+ /**+ * Returns a snapshot of the current accumulated metrics (total bytes received and request count).+ */+ getMetrics: () => SynchronizedRef.get(metricsRef),toolkits: {/*** Retrieves a comprehensive list of toolkits that are available to the authenticated project.@@ -284,34 +415,42 @@ export class ComposioClientLive extends Effect.Service<ComposioClientLive>()(*/list: (params?: { limit?: number }) =>params?.limit- ? callClientWithPagination(- clientSingleton,- (client, cursor) => client.toolkits.list({ cursor }),- ToolkitsResponse,- params.limit+ ? withMetrics(+ callClientWithPagination(+ clientSingleton,+ (client, cursor) => client.toolkits.list({ cursor }),+ ToolkitsResponse,+ params.limit+ ))- : callClient(clientSingleton, client => client.toolkits.list(), ToolkitsResponse),+ : withMetrics(+ callClient(clientSingleton, client => client.toolkits.list(), ToolkitsResponse)+ ),},tools: {/*** Retrieve a list of all available tool enumeration values (tool slugs) for the project.*/retrieveEnum: () =>- callClient(- clientSingleton,- client => client.tools.retrieveEnum(),- ToolsAsEnumsResponse+ withMetrics(+ callClient(+ clientSingleton,+ client => client.tools.retrieveEnum(),+ ToolsAsEnumsResponse+ )),/*** Retrieve a list of tools, automatically handling pagination to fetch up to $limit items.*/list: (params: { limit: number }) =>- callClientWithPagination(- clientSingleton,- (client, cursor) =>- client.tools.list({ cursor, limit: params.limit, toolkit_versions: 'latest' }),- ToolsResponse,- params.limit+ withMetrics(+ callClientWithPagination(+ clientSingleton,+ (client, cursor) =>+ client.tools.list({ cursor, limit: params.limit, toolkit_versions: 'latest' }),+ ToolsResponse,+ params.limit+ )),},triggersTypes: {@@ -319,20 +458,24 @@ export class ComposioClientLive extends Effect.Service<ComposioClientLive>()(* Retrieves a list of all available trigger type enum values that can be used across the API.*/retrieveEnum: () =>- callClient(- clientSingleton,- client => client.triggersTypes.retrieveEnum(),- TriggerTypesAsEnumsResponse+ withMetrics(+ callClient(+ clientSingleton,+ client => client.triggersTypes.retrieveEnum(),+ TriggerTypesAsEnumsResponse+ )),/*** Retrieve a list of trigger types, automatically handling pagination to fetch up to $limit items.*/list: (params: { limit: number }) =>- callClientWithPagination(- clientSingleton,- (client, cursor) => client.triggersTypes.list({ cursor, limit: params.limit }),- TriggerTypesResponse,- params.limit+ withMetrics(+ callClientWithPagination(+ clientSingleton,+ (client, cursor) => client.triggersTypes.list({ cursor, limit: params.limit }),+ TriggerTypesResponse,+ params.limit+ )),},cli: {@@ -340,20 +483,24 @@ export class ComposioClientLive extends Effect.Service<ComposioClientLive>()(* Generates a new CLI session with a random 6-character code.*/createSession: () =>- callClient(- clientSingleton,- client => client.cli.createSession(),- CliCreateSessionResponse+ withMetrics(+ callClient(+ clientSingleton,+ client => client.cli.createSession(),+ CliCreateSessionResponse+ )),/*** Retrieves the current state of a CLI session using either the session ID (UUID) or the 6-character code.*/getSession: (session: { id: string }) =>- callClient(- clientSingleton,- client => client.cli.getSession(session),- CliGetSessionResponse+ withMetrics(+ callClient(+ clientSingleton,+ client => client.cli.getSession(session),+ CliGetSessionResponse+ )),},};@@ -383,6 +530,7 @@ export class ComposioToolkitsRepository extends Effect.Service<ComposioToolkitsRreturn {getToolkits,+ getMetrics: () => client.getMetrics(),getToolsAsEnums: () => client.tools.retrieveEnum(),getTools: (limit: number) =>client.tools.list({ limit }).pipe(diff --git a/ts/packages/cli/test/__utils__/services/test-layer.ts b/ts/packages/cli/test/__utils__/services/test-layer.tsindex 0fad5e717..e6e26bfd4 100644--- a/ts/packages/cli/test/__utils__/services/test-layer.ts+++ b/ts/packages/cli/test/__utils__/services/test-layer.ts@@ -92,6 +92,7 @@ export const TestLayer = (input?: TestLiveInput) =>ComposioToolkitsRepository,new ComposioToolkitsRepository({getToolkits: () => Effect.succeed(toolkitsData.toolkits),+ getMetrics: () => Effect.succeed({ byteSize: 0, requests: 0 }),getToolsAsEnums: () => Effect.succeed(toolkitsData.tools.map(tool => tool.slug)),getTriggerTypesAsEnums: () => Effect.succeed(toolkitsData.triggerTypesAsEnums),getTriggerTypes: limit => Effect.succeed(toolkitsData.triggerTypes.slice(0, limit)),@@ -120,7 +121,6 @@ export const TestLayer = (input?: TestLiveInput) =>},}));-const ComposioSessionRepositoryTest = yield* setupComposioSessionRepository();// Mock `node:os`