Fix response schema generator (#520)

python/composio/tools/base/abs.py

@@ -111,16 +111,13 @@ def schema(self) -> t.Dict:
                 del prop["type"]  # Remove original type to avoid conflict in oneOf
                 continue
 
-            if (
-                "allOf" in prop
-                and len(prop["allOf"]) == 1
-                and "enum" in prop["allOf"][0]
-            ):
+            if "allOf" in prop and len(prop["allOf"]) == 1:
                 (schema,) = prop.pop("allOf")
                 prop.update(schema)
-                prop[
-                    "description"
-                ] += f" Note: choose value only from following options - {prop['enum']}"
+                if "enum" in schema:
+                    prop[
+                        "description"
+                    ] += f" Note: choose value only from following options - {prop['enum']}"
 
         request["properties"] = properties
         return request
@@ -170,6 +167,36 @@ class wrapper(model):  # type: ignore
     def schema(self) -> t.Dict:
         """Build request schema."""
         schema = self.wrapper.model_json_schema(by_alias=True)
+        schema = remove_json_ref(schema)
+        if "$defs" in schema:
+            del schema["$defs"]
+
+        properties = schema.get("properties", {})
+        for prop in properties.values():
+            if prop.get("file_readable", False):
+                prop["oneOf"] = [
+                    {
+                        "type": prop.get("type"),
+                        "description": prop.get("description", ""),
+                    },
+                    {
+                        "type": "string",
+                        "format": "file-path",
+                        "description": f"File path to {prop.get('description', '')}",
+                    },
+                ]
+                del prop["type"]  # Remove original type to avoid conflict in oneOf
+                continue
+
+            if "allOf" in prop and len(prop["allOf"]) == 1:
+                (schema,) = prop.pop("allOf")
+                prop.update(schema)
+                if "enum" in schema:
+                    prop[
+                        "description"
+                    ] += f" Note: choose value only from following options - {prop['enum']}"
+
+        schema["properties"] = properties
         schema["title"] = self.model.__name__
         return remove_json_ref(schema)
 

python/composio/utils/shared.py

@@ -179,6 +179,7 @@ def pydantic_model_from_param_schema(param_schema: t.Dict) -> t.Type:
     optional_fields = {}
     if "title" not in param_schema:
         raise ValueError(f"Missing 'title' in param_schema: {param_schema}")
+
     param_title = str(param_schema["title"]).replace(" ", "")
     required_props = param_schema.get("required", [])