🐛 fix: fix openapi request body problem

lobehub · Dec 15, 2023 · 4aa19ef · 4aa19ef
1 parent a805932
commit 4aa19ef
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 351 deletions.
diff --git a/src/openapi/index.ts b/src/openapi/index.ts
@@ -5,6 +5,8 @@ import { OpenAPI, OpenAPIV3_1 } from 'openapi-types';
 import { pluginApiSchema } from '../schema/manifest';
 import { LobeChatPluginApi, PluginSchema } from '../types';
 
+export const OPENAPI_REQUEST_BODY_KEY = '_requestBody';
+
 export class OpenAPIConvertor {
   private readonly openapi: object;
   constructor(openapi: object) {
@@ -26,10 +28,13 @@ export class OpenAPIConvertor {
           const parametersSchema = convertParametersToJSONSchema(operation.parameters || []);
           const requestBodySchema = this.convertRequestBodyToSchema(operation.requestBody);
 
-          const parameters = this.mergeSchemas(
-            ...Object.values(parametersSchema),
-            requestBodySchema,
-          );
+          const parameters = this.mergeSchemas(...Object.values(parametersSchema));
+
+          if (requestBodySchema && Object.keys(requestBodySchema.properties).length > 0) {
+            console.log(requestBodySchema);
+            parameters.properties[OPENAPI_REQUEST_BODY_KEY] = requestBodySchema;
+            parameters.required?.push('_requestBody');
+          }
 
           // 保留原始逻辑作为备选
           const name = operation.operationId || `${method.toUpperCase()} ${path}`;
@@ -150,7 +155,9 @@ export class OpenAPIConvertor {
     return settingsSchema;
   };
 
-  private convertRequestBodyToSchema(requestBody: OpenAPIV3_1.RequestBodyObject) {
+  private convertRequestBodyToSchema(
+    requestBody: OpenAPIV3_1.RequestBodyObject,
+  ): PluginSchema | null {
     if (!requestBody || !requestBody.content) {
       return null;
     }
@@ -186,7 +193,7 @@ export class OpenAPIConvertor {
       }
     }
 
-    return requestBodySchema;
+    return requestBodySchema as PluginSchema;
   }
 
   private mergeSchemas(...schemas: any[]) {