Enhance proxy response handling to support file uploads and form data in OIDC API Proxy

Author: fujita-h

endpoints/helpers/endpoint.py

@@ -11,9 +11,13 @@ def proxy_response(
     headers: httpx._types.HeaderTypes | None,
     params: httpx._types.QueryParamTypes | None,
     json: Any | None,
+    data: httpx._types.RequestData | None,
+    files: httpx._types.RequestFiles | None,
 ) -> werkzeug.Response:
     with httpx.Client() as client:
-        response = client.request(method=method, url=url, headers=headers, params=params, json=json)
+        response = client.request(
+            method=method, url=url, headers=headers, params=params, json=json, data=data, files=files
+        )
 
         return werkzeug.Response(
             response=response.content,
@@ -28,8 +32,10 @@ def proxy_stream_response(
     headers: httpx._types.HeaderTypes | None,
     params: httpx._types.QueryParamTypes | None,
     json: Any | None,
+    data: httpx._types.RequestData | None,
+    files: httpx._types.RequestFiles | None,
 ) -> werkzeug.Response:
-    stream_context = httpx.stream(method=method, url=url, headers=headers, json=json)
+    stream_context = httpx.stream(method=method, url=url, headers=headers, json=json, data=data, files=files)
 
     # Manually enter the context manager to get the response
     stream_response = stream_context.__enter__()

endpoints/oidc_api_proxy.py

@@ -64,9 +64,16 @@ def _invoke(self, r: Request, values: Mapping, settings: Mapping) -> Response:
         # prepare json if request is json
         json = r.get_json() if r.is_json else None
 
+        # prepare files if request has files
+        files = [
+            (file, (r.files[file].filename, r.files[file].stream, r.files[file].content_type)) for file in r.files
+        ] or None
+
         # Forward request to Dify API with Syncronous HTTP Client
         try:
-            return proxy_stream_response(method=r.method, url=url, headers=headers, params=r.args, json=json)
+            return proxy_stream_response(
+                method=r.method, url=url, headers=headers, params=r.args, json=json, data=r.form, files=files
+            )
         except Exception as e:
             print(str(e))
             return OidcApiProxyErrorResponse(str(e), 500)