ver Jan22ndv3

updated style metric to compare_table

desktop_env/evaluators/metrics/table.py

@@ -14,7 +14,8 @@ from openpyxl.worksheet.worksheet import Worksheet
 #from openpyxl.worksheet.cell_range import MultiCellRange
 from openpyxl.worksheet.datavalidation import DataValidation
 
-from .utils import load_charts, load_sparklines, _match_value_to_rule
+from .utils import load_charts, load_sparklines, load_rows_or_cols, load_xlsx_styles
+from .utils import _match_value_to_rule
 
 logger = logging.getLogger("desktopenv.metric.table")
 
@@ -160,18 +161,19 @@ def compare_table(result: str, expected: str, **options) -> float:
             logger.debug("Assertion: %s[chart] == %s[chart] - %s", r["sheet_idx0"], r["sheet_idx1"], metric)
             #  }}} Compare Charts # 
 
-        elif r["type"] == "number_format":
-            #  Compare Number Formats {{{ # 
+        elif r["type"] == "style":
+            #  Compare Style (Also Conditional Formatiing) {{{ # 
             # sheet_idx0: 0 == "RI0" == "RNSheet1" | "EI0" == "ENSheet1"
             # sheet_idx1: as sheet_idx0
+            # props: list of str indicating concerned styles
 
-            sheet1: Worksheet = _load_sheet(*parse_idx(r["sheet_idx0"], xlworkbookr, xlworkbooke))
-            sheet2: Worksheet = _load_sheet(*parse_idx(r["sheet_idx1"], xlworkbookr, xlworkbooke))
-            number_formats1: List[str] = [c.number_format.lower() for col in sheet1.iter_cols() for c in col if c.data_type=="n"]
-            number_formats2: List[str] = [c.number_format.lower() for col in sheet2.iter_cols() for c in col if c.data_type=="n"]
-            metric: bool = number_formats1 == number_formats2
-            logger.debug("Assertion: %s.nf == %s.nf - %s", r["sheet_idx0"], r["sheet_idx1"], metric)
-            #  }}} Compare Number Formats # 
+            styles1: Dict[str, List[Any]] = load_xlsx_styles(*parse_idx(r["sheet_idx0"], xlworkbookr, xlworkbooke), **r)
+            styles2: Dict[str, List[Any]] = load_xlsx_styles(*parse_idx(r["sheet_idx1"], xlworkbookr, xlworkbooke), **r)
+            #number_formats1: List[str] = [c.number_format.lower() for col in sheet1.iter_cols() for c in col if c.value is not None and c.data_type=="n"]
+            #number_formats2: List[str] = [c.number_format.lower() for col in sheet2.iter_cols() for c in col if c.value is not None and c.data_type=="n"]
+            metric: bool = styles1 == styles2
+            logger.debug("Assertion: %s.style == %s.style - %s", r["sheet_idx0"], r["sheet_idx1"], metric)
+            #  }}} Compare Style (Also Conditional Formatiing) # 
 
         elif r["type"] == "freeze":
             #  Compare Freezing {{{ # 
@@ -243,6 +245,44 @@ def compare_table(result: str, expected: str, **options) -> float:
             metric: bool = total_metric
             #  }}} Check Data Validation # 
 
+        elif r["type"] == "row_props":
+            #  Check Row Properties {{{ # 
+            # sheet_idx0: 0 == "RI0" == "RNSheet1" | "EI0" == "ENSheet1"
+            # sheet_idx1: as sheet_idx0
+            # props: list of str, see utils.load_rows_or_cols
+
+            rows1: Dict[str, Any] = load_rows_or_cols( *parse_idx(r["sheet_idx0"], xlworkbookr, xlworkbooke)
+                                                     , obj="row"
+                                                     , **r
+                                                     )
+            rows2: Dict[str, Any] = load_rows_or_cols( *parse_idx(r["sheet_idx1"], xlworkbookr, xlworkbooke)
+                                                     , obj="row"
+                                                     , **r
+                                                     )
+            logger.debug("Rows1: %s", repr(rows1))
+            logger.debug("Rows2: %s", repr(rows2))
+            metric: bool = rows1 == rows2
+            logger.debug("Assertion: %s[rows] == %s[rows] - %s", r["sheet_idx0"], r["sheet_idx1"], metric)
+            #  }}} Check Row Properties # 
+
+        elif r["type"] == "col_props":
+            #  Check Row Properties {{{ # 
+            # sheet_idx0: 0 == "RI0" == "RNSheet1" | "EI0" == "ENSheet1"
+            # sheet_idx1: as sheet_idx0
+            # props: list of str, see utils.load_rows_or_cols
+
+            cols1: Dict[str, Any] = load_rows_or_cols( *parse_idx(r["sheet_idx0"], xlworkbookr, xlworkbooke)
+                                                     , obj="column"
+                                                     , **r
+                                                     )
+            cols2: Dict[str, Any] = load_rows_or_cols( *parse_idx(r["sheet_idx1"], xlworkbookr, xlworkbooke)
+                                                     , obj="column"
+                                                     , **r
+                                                     )
+            metric: bool = cols1 == cols2
+            logger.debug("Assertion: %s[cols] == %s[cols] - %s", r["sheet_idx0"], r["sheet_idx1"], metric)
+            #  }}} Check Row Properties # 
+
         else:
             raise NotImplementedError("Unimplemented sheet check: {:}".format(r["type"]))
 
@@ -259,52 +299,43 @@ if __name__ == '__main__':
 
     logger = logging.getLogger()
     logger.setLevel(logging.DEBUG)
-    
+
     datetime_str: str = datetime.datetime.now().strftime("%Y%m%d@%H%M%S")
-    
+
     file_handler = logging.FileHandler(os.path.join("logs", "normal-{:}.log".format(datetime_str)))
     debug_handler = logging.FileHandler(os.path.join("logs", "debug-{:}.log".format(datetime_str)))
     stdout_handler = logging.StreamHandler(sys.stdout)
     sdebug_handler = logging.FileHandler(os.path.join("logs", "sdebug-{:}.log".format(datetime_str)))
-    
+
     file_handler.setLevel(logging.INFO)
     debug_handler.setLevel(logging.DEBUG)
     stdout_handler.setLevel(logging.INFO)
     sdebug_handler.setLevel(logging.DEBUG)
-    
+
     formatter = logging.Formatter(fmt="\x1b[1;33m[%(asctime)s \x1b[31m%(levelname)s \x1b[32m%(module)s/%(lineno)d-%(processName)s\x1b[1;33m] \x1b[0m%(message)s")
     file_handler.setFormatter(formatter)
     debug_handler.setFormatter(formatter)
     stdout_handler.setFormatter(formatter)
     sdebug_handler.setFormatter(formatter)
-    
+
     stdout_handler.addFilter(logging.Filter("desktopenv"))
     sdebug_handler.addFilter(logging.Filter("desktopenv"))
-    
+
     logger.addHandler(file_handler)
     logger.addHandler(debug_handler)
     logger.addHandler(stdout_handler)
     logger.addHandler(sdebug_handler)
 
-    path1 = "../../任务数据/LibreOffice Calc/Order_Id_Mark_Pass_Fail.xlsx"
-    path2 = "../../任务数据/LibreOffice Calc/Order_Id_Mark_Pass_Fail_gold.xlsx"
+    path1 = "../../任务数据/LibreOffice Calc/Calendar_Highlight_Weekend_Days.xlsx"
+    path2 = "../../任务数据/LibreOffice Calc/Calendar_Highlight_Weekend_Days_gold.xlsx"
     rules = [ { "type": "sheet_data"
               , "sheet_idx0": 0
               , "sheet_idx1": "EI0"
               }
-            , { "type": "data_validation"
-              , "sheet_idx": 0
-              , "dv_props": [ { "ranges": { "method": "spreadsheet_range"
-                                          , "ref": ["D2:D29", "D2:D1048576"]
-                                          }
-                              , "type": { "method": "eq"
-                                        , "ref": "list"
-                                        }
-                              , "formula1": { "method": "str_set_eq"
-                                            , "ref": ["Pass", "Fail", "Held"]
-                                            }
-                              }
-                            ]
+            , { "type": "style"
+              , "sheet_idx0": 0
+              , "sheet_idx1": "EI0"
+              , "props": ["bgcolor"]
               }
             ]
     print( compare_table( path1, path2
@@ -315,3 +346,32 @@ if __name__ == '__main__':
                         , rules=rules
                         )
          )
+
+    # Row Properties
+    #path1 = "../../任务数据/LibreOffice Calc/Date_Budget_Variance_HideNA.xlsx"
+    #path2 = "../../任务数据/LibreOffice Calc/Date_Budget_Variance_HideNA_gold.xlsx"
+    #workbook: Workbook = openpyxl.load_workbook(filename=path1)
+    #worksheet: Worksheet = workbook.active
+    #for r_no, dms in worksheet.column_dimensions.items():
+        #print(r_no, type(r_no), type(dms), dms.hidden)
+
+    # Conditional Formats
+    #import formulas
+    #path1 = "../../任务数据/LibreOffice Calc/Calendar_Highlight_Weekend_Days.xlsx"
+    #path2 = "../../任务数据/LibreOffice Calc/Calendar_Highlight_Weekend_Days_gold.xlsx"
+    #path3 = "../../任务数据/LibreOffice Calc/Calendar_Highlight_Weekend_Days_gold_test.xlsx"
+    #workbook: Workbook = openpyxl.load_workbook(filename=path2)
+    #worksheet: Worksheet = workbook.active
+    #print(worksheet.conditional_formatting)
+    #for itm in worksheet.conditional_formatting:
+        #print(itm.cells)
+        #for r in itm.rules:
+            #print( r.type, r.formula, r.dxf.font.color.rgb
+                 #, r.dxf.fill.fgColor.rgb, r.dxf.fill.bgColor.rgb
+                 #)
+            #condition = formulas.Parser().ast("=" + r.formula[0])[1].compile()
+            ##print(r.type, r.operator, r.dxfId, r.dxf)
+            #for r in itm.cells:
+                #for c in r.cells:
+                    #value = worksheet.cell(row=c[0], column=c[1]).value
+                    #print(value, condition(str(value)))