Reduce Microsoft Graph full import memory

Rhys Sullivan committed 4 months ago

Commit 12b09311 parent 1f696d02 files · +56 −12Browse files

Unified · Split

2 files

packages/plugins/microsoft/src/sdk/graph.ts +47 −10
packages/plugins/microsoft/src/sdk/plugin.ts +9 −2

packages/plugins/microsoft/src/sdk/graph.ts+47−10

   OpenApiParseError,
   type Authentication,
   type OpenApiIntegrationConfig,
+  type ParsedDocument,
 } from "@executor-js/plugin-openapi";
 import {
 export interface MicrosoftGraphSpecBuild {
   readonly specText: string;
+  readonly parsedDocument?: ParsedDocument;
   readonly specUrl: string;
   readonly baseUrl?: string;
   readonly authorizationUrl: string;
 const decodeMicrosoftConfig = Schema.decodeUnknownOption(MicrosoftGraphIntegrationConfigSchema);
+type MicrosoftGraphOpenApiDocument = ParsedDocument & Record<string, unknown>;
 export const decodeMicrosoftGraphIntegrationConfig = (
   value: unknown,
 ): MicrosoftGraphIntegrationConfig | null =>
 const parseMicrosoftGraphOpenApiDocument = (
   specText: string,
-): Effect.Effect<Record<string, unknown>, OpenApiParseError> =>
+): Effect.Effect<MicrosoftGraphOpenApiDocument, OpenApiParseError> =>
   Effect.gen(function* () {
     const parsed = yield* Effect.try({
       try: () => YAML.parse(specText) as unknown,
         message: "Microsoft Graph OpenAPI document must be an object",
       });
     }
-    return parsed;
+    if (typeof parsed.openapi !== "string" || !parsed.openapi.startsWith("3.")) {
+      return yield* new OpenApiParseError({
+        message: "Microsoft Graph OpenAPI document must be OpenAPI 3.x",
+      });
+    }
+    return parsed as MicrosoftGraphOpenApiDocument;
   });
-export const buildFilteredMicrosoftGraphOpenApiSpec = (
+export const buildFilteredMicrosoftGraphOpenApiSpecFromDocument = (
-  specText: string,
+  parsed: MicrosoftGraphOpenApiDocument,
   options: {
     readonly scopes: readonly string[];
     readonly exactPaths: readonly string[];
   },
 ): Effect.Effect<MicrosoftGraphFilterResult, OpenApiParseError> =>
   Effect.gen(function* () {
-    const parsed = yield* parseMicrosoftGraphOpenApiDocument(specText);
     const paths = parsed.paths;
     if (!isRecord(paths)) {
       return yield* new OpenApiParseError({
     return { specText: filteredSpecText, scopes };
   });
+export const buildFilteredMicrosoftGraphOpenApiSpec = (
+  specText: string,
+  options: Parameters<typeof buildFilteredMicrosoftGraphOpenApiSpecFromDocument>[1],
+): Effect.Effect<MicrosoftGraphFilterResult, OpenApiParseError> =>
+  Effect.gen(function* () {
+    const parsed = yield* parseMicrosoftGraphOpenApiDocument(specText);
+    return yield* buildFilteredMicrosoftGraphOpenApiSpecFromDocument(parsed, options);
+  });
 export const filterMicrosoftGraphOpenApiSpec = (
   specText: string,
   options: Parameters<typeof buildFilteredMicrosoftGraphOpenApiSpec>[1],
       : [];
     const parsed = yield* parseMicrosoftGraphOpenApiDocument(sourceText);
     const endpoints = resolveOAuthEndpoints(parsed, selection);
-    const filtered = yield* buildFilteredMicrosoftGraphOpenApiSpec(sourceText, {
+    const graphPaths = parsed.paths;
+    if (!isRecord(graphPaths)) {
+      return yield* new OpenApiParseError({
+        message: "Microsoft Graph OpenAPI document is missing paths",
+      });
+    }
+    if (selection.coversFullGraph === true) {
+      const scopes = selectedOAuthScopesForPaths(
+        graphPaths,
+        uniqueStrings([...MICROSOFT_GRAPH_BASE_SCOPES, ...selection.customScopes]),
+        fullGraphScopes,
+      );
+      return {
+        ...selection,
+        specText: sourceText,
+        parsedDocument: parsed,
+        scopes,
+        authorizationUrl: endpoints.authorizationUrl,
+        tokenUrl: endpoints.tokenUrl,
+        clientCredentialsTokenUrl: endpoints.clientCredentialsTokenUrl,
+        authenticationTemplate: microsoftOAuthTemplate(scopes, endpoints),
+      };
+    }
+    const filtered = yield* buildFilteredMicrosoftGraphOpenApiSpecFromDocument(parsed, {
       ...selection,
-      scopes:
+      scopes: selection.scopes,
-        selection.coversFullGraph === true
-          ? uniqueStrings([...MICROSOFT_GRAPH_BASE_SCOPES, ...selection.customScopes])
-          : selection.scopes,
       fullGraphScopes,
     });
     return {

packages/plugins/microsoft/src/sdk/plugin.ts+9−2

 } from "@executor-js/sdk/core";
 import { describeApiKeyAuthMethod } from "@executor-js/sdk/http-auth";
 import {
+  compileOpenApiDocument,
   compileOpenApiSpec,
   decodeOpenApiIntegrationConfig,
   invokeOpenApiBackedTool,
   const addGraph = (config: MicrosoftGraphConfig) =>
     Effect.gen(function* () {
       const graph = yield* buildMicrosoftGraphOpenApiSpec(config, httpClientLayer);
-      const compiled = yield* compileOpenApiSpec(graph.specText);
+      const compiled =
+        graph.parsedDocument !== undefined
+          ? yield* compileOpenApiDocument(graph.parsedDocument)
+          : yield* compileOpenApiSpec(graph.specText);
       const slug = IntegrationSlug.make(config.slug?.trim() || DEFAULT_MICROSOFT_SLUG);
       const existing = yield* ctx.core.integrations.get(slug);
         },
         httpClientLayer,
       );
-      const compiled = yield* compileOpenApiSpec(graph.specText);
+      const compiled =
+        graph.parsedDocument !== undefined
+          ? yield* compileOpenApiDocument(graph.parsedDocument)
+          : yield* compileOpenApiSpec(graph.specText);
       const previousOperations = yield* ctx.storage.listOperations(rawSlug);
       const previousNames = new Set(previousOperations.map((op) => op.toolName));