Merge branch 'development' of github.com:hotosm/fmtm into refactor/fr…

…ontend-code

src/backend/app/central/central_crud.py

@@ -30,8 +30,7 @@
 from fastapi import HTTPException
 from loguru import logger as log
 from osm_fieldwork.OdkCentral import OdkAppUser, OdkForm, OdkProject
-from pyxform.builder import create_survey_element_from_dict
-from pyxform.xls2json import parse_file_to_json
+from pyxform.xls2xform import convert as xform_convert
 from sqlalchemy import text
 from sqlalchemy.orm import Session
 
@@ -387,19 +386,8 @@ async def read_and_test_xform(
             ) from e
     else:
         try:
-            log.debug("Converting xlsform -> xform")
-            json_data = parse_file_to_json(
-                path=f"/dummy/path/with/file{file_ext}",
-                file_object=input_data,
-            )
-            generated_xform = create_survey_element_from_dict(json_data)
-            # NOTE do not enable validate=True, as this requires Java to be installed
-            xform_bytesio = BytesIO(
-                generated_xform.to_xml(
-                    validate=False,
-                    pretty_print=False,
-                ).encode("utf-8")
-            )
+            log.debug("Parsing XLSForm --> XML data")
+            xform_bytesio = BytesIO(xform_convert(input_data).xform.encode("utf-8"))
         except Exception as e:
             log.error(e)
             msg = f"XLSForm is invalid: {str(e)}"

src/backend/pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "geoalchemy2==0.15.2",
     "geojson==3.1.0",
     "shapely==2.0.5",
-    "pyxform==2.0.3",
+    "pyxform==2.1.0",
     "loguru==0.7.2",
     "minio==7.2.7",
     "pyproj==3.6.1",