otlmow-template 0.11rc1__tar.gz → 0.11rc3__tar.gz

{otlmow_template-0.11rc1 → otlmow_template-0.11rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: otlmow_template
-Version: 0.11rc1
+Version: 0.11rc3
 Author-email: David Vlaminck <david.vlaminck@mow.vlaanderen.be>, Jasper Berton <jasperberton1@telenet.be>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{otlmow_template-0.11rc1 → otlmow_template-0.11rc3}/otlmow_template/SubsetTemplateCreator.py

@@ -52,10 +52,12 @@ class SubsetTemplateCreator:
             os.makedirs(tempdir)
         test = ntpath.basename(path_to_template_file_and_extension)
         temporary_path = Path(tempdir) / test
+        await sleep(0)
         instantiated_attributes = (await self.generate_basic_template(
             path_to_subset=path_to_subset, temporary_path=temporary_path, ignore_relations=ignore_relations,
             path_to_template_file_and_extension=path_to_template_file_and_extension,
             filter_attributes_by_subset=filter_attributes_by_subset, **kwargs))
+        await sleep(0)
         extension = os.path.splitext(path_to_template_file_and_extension)[-1].lower()
         if extension == '.xlsx':
             await self.alter_excel_template(path_to_template_file_and_extension=path_to_template_file_and_extension,
@@ -95,6 +97,7 @@ class SubsetTemplateCreator:
                 continue
             for _ in range(generate_dummy_records):
                 instance = dynamic_create_instance_from_uri(class_object.objectUri, model_directory=model_directory)
+                await sleep(0)
                 if instance is None:
                     continue
                 attributen = collector.find_attributes_by_class(class_object)
@@ -110,6 +113,7 @@ class SubsetTemplateCreator:
 
                 DotnotationHelper.clear_list_of_list_attributes(instance)
 
+        await sleep(0)
         converter = OtlmowConverter()
         await converter.from_objects_to_file(file_path=temporary_path,
                                           sequence_of_objects=otl_objects, **kwargs)
@@ -117,14 +121,15 @@ class SubsetTemplateCreator:
         extension = os.path.splitext(path_to_template_file_and_extension)[-1].lower()
         instantiated_attributes = []
         if path_is_split is False or extension == '.xlsx':
-            instantiated_attributes = converter.from_file_to_objects(file_path=temporary_path,
+            instantiated_attributes = await converter.from_file_to_objects(file_path=temporary_path,
                                                                         path_to_subset=path_to_subset)
-        return instantiated_attributes
+        return list(instantiated_attributes)
 
     @classmethod
     @async_to_sync_wraps
     async def alter_excel_template(cls, path_to_template_file_and_extension: Path, path_to_subset: Path,
                              instantiated_attributes: list, temporary_path, **kwargs):
+        await sleep(0)
         generate_choice_list = kwargs.get('generate_choice_list', False)
         add_geo_artefact = kwargs.get('add_geo_artefact', False)
         add_attribute_info = kwargs.get('add_attribute_info', False)
@@ -138,16 +143,25 @@ class SubsetTemplateCreator:
         # Volgorde is belangrijk! Eerst rijen verwijderen indien nodig dan choice list toevoegen,
         # staat namelijk vast op de kolom en niet het attribuut in die kolom
         if add_geo_artefact is False:
+            await sleep(0)
             cls.remove_geo_artefact_excel(workbook=wb)
         if generate_choice_list:
-            cls.add_choice_list_excel(workbook=wb, instantiated_attributes=instantiated_attributes,
-                                      path_to_subset=path_to_subset)
-        cls.add_mock_data_excel(workbook=wb, rows_of_examples=amount_of_examples)
+            await sleep(0)
+            await cls.add_choice_list_excel(workbook=wb, instantiated_attributes=instantiated_attributes,
+                                      path_to_subset=path_to_subset, add_attribute_info=add_attribute_info)
+        await sleep(0)
+        cls.add_mock_data_excel(workbook=wb, rows_of_examples=amount_of_examples) # remove dummy rows if needed
+
+        await cls.custom_exel_fixes(workbook=wb, instantiated_attributes=instantiated_attributes,
+                                    add_attribute_info=add_attribute_info)
+        await sleep(0)
         if highlight_deprecated_attributes:
+            await sleep(0)
             cls.check_for_deprecated_attributes(workbook=wb, instantiated_attributes=instantiated_attributes)
         if add_attribute_info:
-            cls.add_attribute_info_excel(workbook=wb, instantiated_attributes=instantiated_attributes)
-        cls.design_workbook_excel(workbook=wb)
+            await sleep(0)
+            await cls.add_attribute_info_excel(workbook=wb, instantiated_attributes=instantiated_attributes)
+        await sleep(0)
         wb.save(path_to_template_file_and_extension)
         file_location = os.path.dirname(temporary_path)
         [f.unlink() for f in Path(file_location).glob("*") if f.is_file()]
@@ -184,24 +198,94 @@ class SubsetTemplateCreator:
         return converter_path / 'settings_otlmow_converter.json'
 
     @classmethod
-    def design_workbook_excel(cls, workbook):
+    @async_to_sync_wraps
+    async def add_type_uri_choice_list_in_excel(cls, sheet, instantiated_attributes, add_attribute_info: bool):
+        starting_row = '3' if add_attribute_info else '2'
+        await sleep(0)
+        if sheet.title == 'Keuzelijsten':
+            return
+        type_uri_found = False
+        for row in sheet.iter_rows(min_row=1, max_row=1):
+            for cell in row:
+                if cell.value == 'typeURI':
+                    type_uri_found = True
+                    break
+            if type_uri_found:
+                break
+        if not type_uri_found:
+            return
+
+        await sleep(0)
+        sheet_name = sheet.title
+        type_uri = ''
+        if sheet_name.startswith('http'):
+            type_uri = sheet_name
+        else:
+            split_name = sheet_name.split("#")
+            subclass_name = split_name[1]
+
+            possible_classes = [x for x in instantiated_attributes if x.typeURI.endswith(subclass_name)]
+            if len(possible_classes) == 1:
+                type_uri = possible_classes[0].typeURI
+
+        if type_uri == '':
+            return
+
+        data_validation = DataValidation(type="list", formula1=f'"{type_uri}"', allow_blank=True)
+        await sleep(0)
+        for rows in sheet.iter_rows(min_row=1, max_row=1, min_col=1, max_col=1):
+            for cell in rows:
+                await sleep(0)
+                column = cell.column
+                sheet.add_data_validation(data_validation)
+                data_validation.add(f'{get_column_letter(column)}{starting_row}:{get_column_letter(column)}1000')
+
+    @classmethod
+    @async_to_sync_wraps
+    async def custom_exel_fixes(cls, workbook, instantiated_attributes, add_attribute_info: bool):
         for sheet in workbook:
-            dim_holder = DimensionHolder(worksheet=sheet)
-            for col in range(sheet.min_column, sheet.max_column + 1):
-                dim_holder[get_column_letter(col)] = ColumnDimension(sheet, min=col, max=col, width=25)
-            sheet.column_dimensions = dim_holder
+            await sleep(0)
+            await cls.set_fixed_column_width(sheet=sheet, width=25)
+            await cls.add_type_uri_choice_list_in_excel(sheet=sheet, instantiated_attributes=instantiated_attributes,
+                                                        add_attribute_info=add_attribute_info)
+            await cls.remove_asset_versie(sheet=sheet)
+
+    @classmethod
+    @async_to_sync_wraps
+    async def remove_asset_versie(cls, sheet):
+        for row in sheet.iter_rows(min_row=1, max_row=1, min_col=4):
+            for cell in row:
+                await sleep(0)
+                if cell.value is None or not cell.value.startswith('assetVersie'):
+                    continue
+                for rows in sheet.iter_rows(min_row=row, max_row=row, min_col=2, max_col=1000):
+                    for c in rows:
+                        await sleep(0)
+                        c.value = ''
 
     @classmethod
-    def add_attribute_info_excel(cls, workbook, instantiated_attributes: list):
+    @async_to_sync_wraps
+    async def set_fixed_column_width(cls, sheet, width: int):
+        dim_holder = DimensionHolder(worksheet=sheet)
+        for col in range(sheet.min_column, sheet.max_column + 1):
+            await sleep(0)
+            dim_holder[get_column_letter(col)] = ColumnDimension(sheet, min=col, max=col, width=width)
+        sheet.column_dimensions = dim_holder
+
+    @classmethod
+    @async_to_sync_wraps
+    async def add_attribute_info_excel(cls, workbook, instantiated_attributes: list):
         dotnotation_module = DotnotationHelper()
         for sheet in workbook:
             if sheet == workbook['Keuzelijsten']:
                 break
             filter_uri = SubsetTemplateCreator.find_uri_in_sheet(sheet)
+            await sleep(0)
             single_attribute = next(x for x in instantiated_attributes if x.typeURI == filter_uri)
             sheet.insert_rows(1)
             for rows in sheet.iter_rows(min_row=2, max_row=2, min_col=1):
                 for cell in rows:
+                    await sleep(0)
                     if cell.value == 'typeURI':
                         value = 'De URI van het object volgens https://www.w3.org/2001/XMLSchema#anyURI .'
                     elif cell.value.find('[DEPRECATED]') != -1:
@@ -264,16 +348,21 @@ class SubsetTemplateCreator:
                         sheet.delete_cols(cell.column)
 
     @classmethod
-    def add_choice_list_excel(cls, workbook, instantiated_attributes: list, path_to_subset: Path):
+    @async_to_sync_wraps
+    async def add_choice_list_excel(cls, workbook, instantiated_attributes: list, path_to_subset: Path, 
+                                    add_attribute_info: bool=False):
         choice_list_dict = {}
+        starting_row = '3' if add_attribute_info else '2'
         dotnotation_module = DotnotationHelper()
         for sheet in workbook:
+            await sleep(0)
             if sheet == workbook['Keuzelijsten']:
                 break
             filter_uri = SubsetTemplateCreator.find_uri_in_sheet(sheet)
             single_attribute = next(x for x in instantiated_attributes if x.typeURI == filter_uri)
             for rows in sheet.iter_rows(min_row=1, max_row=1, min_col=2):
                 for cell in rows:
+                    await sleep(0)
                     if cell.value.find('[DEPRECATED]') != -1:
                         strip = cell.value.split(' ')
                         dotnotation_attribute = dotnotation_module.get_attribute_by_dotnotation(single_attribute,
@@ -281,7 +370,7 @@ class SubsetTemplateCreator:
                     else:
                         dotnotation_attribute = dotnotation_module.get_attribute_by_dotnotation(single_attribute,
                                                                                                 cell.value)
-
+                    await sleep(0)
                     if issubclass(dotnotation_attribute.field, KeuzelijstField):
                         name = dotnotation_attribute.field.naam
                         valid_options = [v.invulwaarde for k, v in dotnotation_attribute.field.options.items()
@@ -295,13 +384,17 @@ class SubsetTemplateCreator:
                         data_val = DataValidation(type="list", formula1=f"Keuzelijsten!{start_range}:{end_range}",
                                                   allowBlank=True)
                         sheet.add_data_validation(data_val)
-                        data_val.add(f'{get_column_letter(cell.column)}2:{get_column_letter(cell.column)}1000')
+                        data_val.add(f'{get_column_letter(cell.column)}{starting_row}:'
+                                     f'{get_column_letter(cell.column)}1000')
+
+                    await sleep(0)
                     if issubclass(dotnotation_attribute.field, BooleanField):
-                        data_validation = DataValidation(type="list", formula1='"TRUE,FALSE,-"', allow_blank=True)
+                        data_validation = DataValidation(type="list", formula1='"TRUE,FALSE,"', allow_blank=True)
                         column = cell.column
                         sheet.add_data_validation(data_validation)
-                        data_validation.add(f'{get_column_letter(column)}2:{get_column_letter(column)}1000')
-                        sheet.add_data_validation(data_validation)
+                        data_validation.add(f'{get_column_letter(column)}{starting_row}:'
+                                            f'{get_column_letter(column)}1000')
+
 
     @classmethod
     def add_mock_data_excel(cls, workbook, rows_of_examples: int):

{otlmow_template-0.11rc1 → otlmow_template-0.11rc3}/otlmow_template.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: otlmow_template
-Version: 0.11rc1
+Version: 0.11rc3
 Author-email: David Vlaminck <david.vlaminck@mow.vlaanderen.be>, Jasper Berton <jasperberton1@telenet.be>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{otlmow_template-0.11rc1 → otlmow_template-0.11rc3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "otlmow_template"
-version = "0.11-rc1"
+version = "0.11-rc3"
 authors = [{name = "David Vlaminck", email = "david.vlaminck@mow.vlaanderen.be"},
     {name = "Jasper Berton", email = "jasperberton1@telenet.be"},]
 readme = "README.md"