amqp/adapter/cleverthis_service_adapter.py

@@ -6,6 +6,7 @@ import re
 
 from aiohttp import ClientSession, ClientResponse
 from fastapi import HTTPException, UploadFile
+from python_multipart import multipart
 from python_multipart.multipart import Field, File
 from typing import Dict, List, Tuple, Callable, Coroutine, AnyStr, Any
 from urllib.parse import parse_qs
@@ -21,7 +22,19 @@ class CleverMultiPartParser:
         self.form_data = {}
         # Convert each list of strings to a single string joined by newline, then to bytes
         headers = {key: "\n".join(value).encode("utf-8") for key, value in message.headers.items()}
-        python_multipart.parse_form(headers, io.BytesIO(message.body()), self.on_field, self.on_file)
+        content_type: str | bytes | None = headers.get("Content-Type")
+        content_type, params = multipart.parse_options_header(content_type)
+        if content_type in ["application/octet-stream",
+                            "multipart/form-data",
+                            "application/x-www-form-urlencoded",
+                            "application/x-url-encoded"]:
+            try:
+                python_multipart.parse_form(headers, io.BytesIO(message.body()), self.on_field, self.on_file)
+            except Exception as e:
+                logging.error(f"Error parsing multipart/form-data: {e}")
+                self.form_data = message.body()
+        else:
+            self.form_data = message.body()
 
     def on_field(self, field: Field):
         print(field)

amqp/service/service_message_handler.py

@@ -67,7 +67,7 @@ class AMQServiceMessageHandler:
 
         amq_message: AMQMessage = AMQMessageFactory.from_bytes(body)
         logging.info(" [*] ######[%s] AMQ Message received, ctag=%s, msgId=%s, traceInfo=%s",
-              delivery_tag, method.consumer_tag, amq_message.id, map_as_string(amq_message.trace_info))
+                     delivery_tag, method.consumer_tag, amq_message.id, map_as_string(amq_message.trace_info))
 
         propagator = TraceContextTextMapPropagator()
         context = propagator.extract(carrier=amq_message.trace_info, context=trace.context_api.get_current())
@@ -135,10 +135,11 @@ class AMQServiceMessageHandler:
         """
         if reply_to:
             logging.info(" [*] ######[%s] AMQ Message Reply, To=%s, msgId=%s",
-                  delivery_tag, reply_to, response.id)
+                         delivery_tag, reply_to, response.id)
             reply_props = pika.BasicProperties(
                 correlation_id=response.id,
                 content_type=response.content_type[0]
+                if isinstance(response.content_type, list) else response.content_type
             )
             channel.basic_publish(
                 exchange=AMQ_REPLY_TO_EXCHANGE,