otlmow-template 0.11rc1__py3-none-any.whl → 0.11rc2__py3-none-any.whl

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,
@@ -117,14 +119,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 +141,24 @@ 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,
+            await sleep(0)
+            await cls.add_choice_list_excel(workbook=wb, instantiated_attributes=instantiated_attributes,
                                       path_to_subset=path_to_subset)
+        await sleep(0)
         cls.add_mock_data_excel(workbook=wb, rows_of_examples=amount_of_examples)
+        await cls.add_type_uri_choice_list_in_excel(workbook=wb, instantiated_attributes=instantiated_attributes)
         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)
+        await cls.design_workbook_excel(workbook=wb)
+        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 +195,71 @@ 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, workbook, instantiated_attributes):
+        for sheet in workbook:
+            await sleep(0)
+            if sheet.title == 'Keuzelijsten':
+                break
+            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:
+                continue
+
+            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 == '':
+                continue
+
+            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:
+                    column = cell.column
+                    sheet.add_data_validation(data_validation)
+                    data_validation.add(f'{get_column_letter(column)}2:{get_column_letter(column)}1000')
+
+    @classmethod
+    @async_to_sync_wraps
+    async def design_workbook_excel(cls, workbook):
         for sheet in workbook:
             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=25)
             sheet.column_dimensions = dim_holder
 
     @classmethod
-    def add_attribute_info_excel(cls, workbook, instantiated_attributes: list):
+    @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 +322,19 @@ 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):
         choice_list_dict = {}
         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 +342,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()
@@ -296,12 +357,14 @@ class SubsetTemplateCreator:
                                                   allowBlank=True)
                         sheet.add_data_validation(data_val)
                         data_val.add(f'{get_column_letter(cell.column)}2:{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)
+
 
     @classmethod
     def add_mock_data_excel(cls, workbook, rows_of_examples: int):

{otlmow_template-0.11rc1.dist-info → otlmow_template-0.11rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: otlmow_template
-Version: 0.11rc1
+Version: 0.11rc2
 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.dist-info → otlmow_template-0.11rc2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 otlmow_template/CsvTemplateCreator.py,sha256=PQq2zGmliWk0N9bhYNB7ZEa8PWV16OTbvoHh3--qCMs,7538
 otlmow_template/ExcelTemplateCreator.py,sha256=wW-7Uq2Gzr1vHYMO1I7TtqZSBTVFFSWotHvjwzCelV4,10853
-otlmow_template/SubsetTemplateCreator.py,sha256=DpTwiRJihigmCpZSmT1Iz3-2Gep0EBpyygXjVwxPfnY,25524
+otlmow_template/SubsetTemplateCreator.py,sha256=bm_09LyZc4IY1jxx2ptJZ0553W8QeUYuqHF34rvN0Yc,27819
 otlmow_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 otlmow_template/Exceptions/MissingTypeUriException.py,sha256=DSKwywmP9Bq8n7rzBoDcEPlxvC1IChx18QIHFUCTtdA,51
-otlmow_template-0.11rc1.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-otlmow_template-0.11rc1.dist-info/METADATA,sha256=lfKPmGuFW-3zyPkYuOtkakBPAaCMRNOjKNj6-neRkTY,44040
-otlmow_template-0.11rc1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-otlmow_template-0.11rc1.dist-info/top_level.txt,sha256=zPgBoaTLG-avoOLySlwOUEtHaFyA5Vc5wJqkSeX1l6A,16
-otlmow_template-0.11rc1.dist-info/RECORD,,
+otlmow_template-0.11rc2.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+otlmow_template-0.11rc2.dist-info/METADATA,sha256=nBwN3iqwVAHEq7K2V9jQATSzADad0WkKAzXLfAInj9c,44040
+otlmow_template-0.11rc2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+otlmow_template-0.11rc2.dist-info/top_level.txt,sha256=zPgBoaTLG-avoOLySlwOUEtHaFyA5Vc5wJqkSeX1l6A,16
+otlmow_template-0.11rc2.dist-info/RECORD,,