From 96f3058145ec117c998ce9ff08ec0ce719e74c2f Mon Sep 17 00:00:00 2001
From: Xi Yan <xiyan@meta.com>
Date: Wed, 11 Sep 2024 14:20:52 -0700
Subject: [PATCH] remove hack from openapi generator

---
 .../llama-stack-spec.html                     | 28 +++++++++----------
 .../llama-stack-spec.yaml                     | 16 +++++------
 rfcs/openapi_generator/pyopenapi/generator.py | 11 ++------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html
index e611b2bc3..f0203c8c3 100644
--- a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html
+++ b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html
@@ -21,7 +21,7 @@
     "info": {
         "title": "[DRAFT] Llama Stack Specification",
         "version": "0.0.1",
-        "description": "This is the specification of the llama stack that provides\n                a set of endpoints and their corresponding interfaces that are tailored to\n                best leverage Llama Models. The specification is still in draft and subject to change.\n                Generated at 2024-09-11 14:17:44.361462"
+        "description": "This is the specification of the llama stack that provides\n                a set of endpoints and their corresponding interfaces that are tailored to\n                best leverage Llama Models. The specification is still in draft and subject to change.\n                Generated at 2024-09-11 14:20:37.290525"
     },
     "servers": [
         {
@@ -5677,6 +5677,12 @@
         }
     ],
     "tags": [
+        {
+            "name": "RewardScoring"
+        },
+        {
+            "name": "Inference"
+        },
         {
             "name": "Telemetry"
         },
@@ -5684,31 +5690,25 @@
             "name": "Evaluations"
         },
         {
-            "name": "PostTraining"
-        },
-        {
-            "name": "Datasets"
+            "name": "Safety"
         },
         {
             "name": "SyntheticDataGeneration"
         },
         {
-            "name": "BatchInference"
+            "name": "Datasets"
         },
         {
-            "name": "Inference"
-        },
-        {
-            "name": "AgenticSystem"
-        },
-        {
-            "name": "Safety"
+            "name": "PostTraining"
         },
         {
             "name": "Memory"
         },
         {
-            "name": "RewardScoring"
+            "name": "BatchInference"
+        },
+        {
+            "name": "AgenticSystem"
         },
         {
             "name": "BuiltinTool",
diff --git a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml
index b029f9adf..bd7701449 100644
--- a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml
+++ b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml
@@ -2470,7 +2470,7 @@ info:
   description: "This is the specification of the llama stack that provides\n     \
     \           a set of endpoints and their corresponding interfaces that are tailored\
     \ to\n                best leverage Llama Models. The specification is still in\
-    \ draft and subject to change.\n                Generated at 2024-09-11 14:17:44.361462"
+    \ draft and subject to change.\n                Generated at 2024-09-11 14:20:37.290525"
   title: '[DRAFT] Llama Stack Specification'
   version: 0.0.1
 jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
@@ -3445,17 +3445,17 @@ security:
 servers:
 - url: http://any-hosted-llama-stack.com
 tags:
+- name: RewardScoring
+- name: Inference
 - name: Telemetry
 - name: Evaluations
-- name: PostTraining
-- name: Datasets
-- name: SyntheticDataGeneration
-- name: BatchInference
-- name: Inference
-- name: AgenticSystem
 - name: Safety
+- name: SyntheticDataGeneration
+- name: Datasets
+- name: PostTraining
 - name: Memory
-- name: RewardScoring
+- name: BatchInference
+- name: AgenticSystem
 - description: <SchemaDefinition schemaRef="#/components/schemas/BuiltinTool" />
   name: BuiltinTool
 - description: <SchemaDefinition schemaRef="#/components/schemas/CompletionMessage"
diff --git a/rfcs/openapi_generator/pyopenapi/generator.py b/rfcs/openapi_generator/pyopenapi/generator.py
index a711d9f68..f6be71854 100644
--- a/rfcs/openapi_generator/pyopenapi/generator.py
+++ b/rfcs/openapi_generator/pyopenapi/generator.py
@@ -471,14 +471,9 @@ class Generator:
 
             from dataclasses import make_dataclass
 
-            if len(op.request_params) == 1 and "Request" in first[1].__name__:
-                # TODO(ashwin): Undo the "Request" hack and this entire block eventually
-                request_name = first[1].__name__ + "Wrapper"
-                request_type = make_dataclass(request_name, op.request_params)
-            else:
-                op_name = "".join(word.capitalize() for word in op.name.split("_"))
-                request_name = f"{op_name}Request"
-                request_type = make_dataclass(request_name, op.request_params)
+            op_name = "".join(word.capitalize() for word in op.name.split("_"))
+            request_name = f"{op_name}Request"
+            request_type = make_dataclass(request_name, op.request_params)
 
             requestBody = RequestBody(
                 content={