now use jsondiff to compare json + bug correction in Calc Statement

Author: cyrilus

lotemplate/CalcTemplate.py

@@ -30,6 +30,7 @@
 from . import Template
 from lotemplate.Statement.CalcSearchStatement import CalcTextStatement
 import pdb
+from jsondiff import diff
 
 class CalcTemplate(Template):
     formats = {
@@ -82,14 +83,11 @@ def scan(self, **kwargs) -> dict[str: dict[str, Union[str, list[str]]]]:
         should_close = kwargs.get("should_close", False)
         texts = {} 
         #(Pdb) self.doc.getSheets().getElementNames()
-        #('maF1', 'Feuille2')
-        #(Pdb) self.doc.getSheets().getByName('maF1')
         for sheet in self.doc.getSheets():
             texts = texts | CalcTextStatement.scan(sheet)
         tables=CalcTableStatement.scan(self.doc)
-        #range.getElementNames()
         #texts = CalcTextStatement.scan_Document_text(self.doc)
-
+        #pdb.set_trace()
         return texts | tables 
 
 
@@ -100,17 +98,15 @@ def search_error(self, json_vars: dict[str, dict[str, Union[str, list[str]]]]) -
         :param json_vars: the given json variables
         :return: None
         """
-
-        if json_vars == self.variables:
+        notdiff=diff(json_vars, self.variables)
+        if  not notdiff:
             return
-
-        json_missing = [key for key in set(self.variables) - set(json_vars)]
-        if json_missing:
-            raise errors.JsonComparaisonError(
+        else:
+           raise errors.JsonComparaisonError(
                 'missing_required_variable',
-                f"The variable {json_missing[0]!r}, present in the template, "
-                f"isn't present in the json.",
-                dict(variable=json_missing[0])
+                f"The json are not the same here is the diff "
+                f"{notdiff}",
+                dict(variable=notdiff)
             )
 
         # when parsing the template, we assume that all vars are of type text. But it can also be of type html.

lotemplate/Statement/CalcSearchStatement.py

@@ -5,8 +5,10 @@
 import pdb 
 
 class CalcTextStatement:
-    text_regex_as_string = r'\$(\w+(\(((?:\\.|.)*?)\))?)'
-    text_regex = regex.compile(text_regex_as_string)
+    text_regex_str = r'\$(\w+(\(((?:\\.|.)*?)\))?)'
+    text_regex = regex.compile(text_regex_str)
+    table_regex_str = r'\&(\w+(\(((?:\\.|.)*?)\))?)'
+    table_regex = regex.compile(table_regex_str)
 
     def __init__(self, text_string):
         self.text_string = text_string
@@ -23,12 +25,14 @@ def scan(component: XComponent, get_table=False) -> dict[str, dict[str, str]]:
         if  component.getImplementationName()=="ScNamedRangeObj":
             #doc= component.getReferredCells().getSpreadsheet()
             doc=component.getReferredCells()
-            CalcTextStatement.text_regex_as_string = r'\&(\w+(\(((?:\\.|.)*?)\))?)'
+            regex_to_use=CalcTextStatement.table_regex_str
         else:
             doc=component
+            regex_to_use=CalcTextStatement.text_regex_str
+
         plain_vars = {}
         search = doc.createReplaceDescriptor()
-        search.SearchString = CalcTextStatement.text_regex_as_string
+        search.SearchString = regex_to_use
         search.SearchRegularExpression = True
         search.SearchCaseSensitive = False
         founded = doc.findAll(search)
@@ -64,3 +68,4 @@ def fill(doc: XComponent, variable: str, value: str) -> None:
         founded = doc.replaceAll(search)
 
 
+

lotemplate/unittest/files/content/calc_table.json

@@ -74,11 +74,11 @@
             },
             "Age": {
                 "type": "table",
-                "value": [12,13,14,14]
+                "value": ["12","13","14","14"]
             },
             "poid": {
                 "type": "table",
-                "value": [100,110,111,112]
+                "value": ["100","110","111","112"]
             },
             "poste": {
                 "type": "table",
@@ -116,11 +116,11 @@
             },
             "Age": {
                 "type": "table",
-                "value": [12,13,14,14]
+                "value": ["12","13","14","14"]
             },
             "poid": {
                 "type": "table",
-                "value": [100,110,111,112]
+                "value": ["100","110","111","112"]
             },
             "poste": {
                 "type": "table",

lotemplate/unittest/test_json_convertion.py

@@ -123,9 +123,9 @@ class Tables(unittest.TestCase):
     def test_valid(self):
         self.assertEqual(
             {
-                "var": {"type": "table", "value": [""]},
-                "var1": {"type": "table", "value": [""]},
-                "var2": {"type": "table", "value": [""]}
+                "var": {"type": "table", "value": []},
+                "var1": {"type": "table", "value": []},
+                "var2": {"type": "table", "value": []}
             },
             ot.convert_to_datas_template(file_to_dict("lotemplate/unittest/files/jsons/tab_valid.json"))
         )

lotemplate/utils.py

@@ -150,7 +150,7 @@ def get_cleaned_object(var_name: str, var_value: dict ) -> dict:
         :param var_value: the table
         :return: the cleaned table
         """
-        return dict
+        return convert_to_datas_template(var_value) 
 
 
     @check_type
@@ -161,7 +161,7 @@ def get_cleaned_table(var_name: str, var_value: list[str]) -> list[str]:
         :param var_value: the table
         :return: the cleaned table
         """
-        return [""]
+        return []
 
     @check_type
     def get_cleaned_image(var_name: str, var_value: str) -> str:

requirements.txt

@@ -7,3 +7,4 @@ Werkzeug~=3.1.2
 sorcery~=0.2.2
 regex~=2024.11.6
 pypdf~=5.1.0
+jsondiff~=2.2