Merge branch 'main' into db_modeling_for_capi

src/alpine_bits_python/alpinebits_server.py

@@ -21,19 +21,12 @@ from xsdata.formats.dataclass.serializers.config import SerializerConfig
 from xsdata_pydantic.bindings import XmlParser, XmlSerializer
 
 from alpine_bits_python.alpine_bits_helpers import (
-    create_res_notif_push_message,
+    create_res_notif_push_message, create_res_retrieve_response)
-    create_res_retrieve_response,
-)
 
 from .db import AckedRequest, Customer, Reservation
-from .generated.alpinebits import (
+from .generated.alpinebits import (OtaNotifReportRq, OtaNotifReportRs,
-    OtaNotifReportRq,
+                                   OtaPingRq, OtaPingRs, OtaReadRq,
-    OtaNotifReportRs,
+                                   WarningStatus)
-    OtaPingRq,
-    OtaPingRs,
-    OtaReadRq,
-    WarningStatus,
-)
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -54,7 +47,7 @@ def dump_json_for_xml(json_content: Any) -> str:
 
     Adds newlines before and after the JSON block for better readability in XML.
     """
-    return f"\n{json.dumps(json_content, indent=4)}\n"
+    return json.dumps(json_content)
 
 
 class AlpineBitsActionName(Enum):
@@ -393,7 +386,7 @@ class PingAction(AlpineBitsAction):
 
         warning_response = OtaPingRs.Warnings(warning=[warning])
 
-        client_response_echo_data = dump_json_for_xml(echo_data_client)
+        client_response_echo_data = parsed_request.echo_data
 
         response_ota_ping = OtaPingRs(
             version="7.000",