From 4c948e2b512d9ecb549514348572792802d44e17 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Wed, 30 Apr 2025 16:00:10 +0400
Subject: [PATCH] refac

---
 src/mcpo/main.py       | 7 ++-----
 src/mcpo/utils/main.py | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/mcpo/main.py b/src/mcpo/main.py
index b0e476f..7339c71 100644
--- a/src/mcpo/main.py
+++ b/src/mcpo/main.py
@@ -40,9 +40,8 @@ async def create_dynamic_endpoints(app: FastAPI, api_dependency=None):
         inputSchema = tool.inputSchema
         outputSchema = getattr(tool, "outputSchema", None)
 
-        form_model_name = f"{endpoint_name}_form_model"
         form_model_fields = get_model_fields(
-            form_model_name,
+            f"{endpoint_name}_form_model",
             inputSchema.get("properties", {}),
             inputSchema.get("required", []),
             inputSchema.get("$defs", {}),
@@ -50,9 +49,8 @@ async def create_dynamic_endpoints(app: FastAPI, api_dependency=None):
 
         response_model_fields = None
         if outputSchema:
-            response_model_name = f"{endpoint_name}_response_model"
             response_model_fields = get_model_fields(
-                response_model_name,
+                f"{endpoint_name}_response_model",
                 outputSchema.get("properties", {}),
                 outputSchema.get("required", []),
                 outputSchema.get("$defs", {}),
@@ -61,7 +59,6 @@ async def create_dynamic_endpoints(app: FastAPI, api_dependency=None):
         tool_handler = get_tool_handler(
             session,
             endpoint_name,
-            form_model_name,
             form_model_fields,
             response_model_fields,
         )
diff --git a/src/mcpo/utils/main.py b/src/mcpo/utils/main.py
index 583c56d..4d72815 100644
--- a/src/mcpo/utils/main.py
+++ b/src/mcpo/utils/main.py
@@ -195,12 +195,11 @@ def get_model_fields(form_model_name, properties, required_fields, schema_defs=N
 def get_tool_handler(
     session,
     endpoint_name,
-    form_model_name,
     form_model_fields,
     response_model_fields=None,
 ):
     if form_model_fields:
-        FormModel = create_model(form_model_name, **form_model_fields)
+        FormModel = create_model(f"{endpoint_name}_form_model", **form_model_fields)
         ResponseModel = (
             create_model(f"{endpoint_name}_response_model", **response_model_fields)
             if response_model_fields