otlmow-template 0.10__tar.gz → 0.11rc2__tar.gz

{otlmow_template-0.10 → otlmow_template-0.11rc2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: otlmow_template
-Version: 0.10
+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
@@ -699,6 +699,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: otlmow-converter>=1.7
 Requires-Dist: otlmow-modelbuilder>=0.25
+Requires-Dist: universalasync>=0.4.0
 
 # OTLMOW-Template
 [![PyPI](https://img.shields.io/pypi/v/otlmow-template?label=latest%20release)](https://pypi.org/project/otlmow-template/)

{otlmow_template-0.10 → otlmow_template-0.11rc2}/otlmow_template/SubsetTemplateCreator.py

@@ -1,9 +1,11 @@
+import asyncio
 import csv
 import logging
 import ntpath
 import os
 import site
 import tempfile
+from asyncio import sleep
 from pathlib import Path
 
 
@@ -20,6 +22,7 @@ from otlmow_model.OtlmowModel.BaseClasses.OTLObject import dynamic_create_instan
 from otlmow_model.OtlmowModel.Helpers.generated_lists import get_hardcoded_relation_dict
 from otlmow_modelbuilder.OSLOCollector import OSLOCollector
 from otlmow_modelbuilder.SQLDataClasses.OSLOClass import OSLOClass
+from universalasync import async_to_sync_wraps
 
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
@@ -40,7 +43,8 @@ class SubsetTemplateCreator:
         collector.collect_all(include_abstract=True)
         return collector
 
-    def generate_template_from_subset(self, path_to_subset: Path, path_to_template_file_and_extension: Path,
+    @async_to_sync_wraps
+    async def generate_template_from_subset(self, path_to_subset: Path, path_to_template_file_and_extension: Path,
                                       ignore_relations: bool = True, filter_attributes_by_subset: bool = True,
                                       **kwargs):
         tempdir = Path(tempfile.gettempdir()) / 'temp-otlmow'
@@ -48,24 +52,28 @@ class SubsetTemplateCreator:
             os.makedirs(tempdir)
         test = ntpath.basename(path_to_template_file_and_extension)
         temporary_path = Path(tempdir) / test
-        instantiated_attributes = (self.generate_basic_template(
+        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':
-            self.alter_excel_template(path_to_template_file_and_extension=path_to_template_file_and_extension,
+            await self.alter_excel_template(path_to_template_file_and_extension=path_to_template_file_and_extension,
                                       temporary_path=temporary_path,
                                       path_to_subset=path_to_subset, instantiated_attributes=instantiated_attributes,
                                       **kwargs)
         elif extension == '.csv':
-            self.determine_multiplicity_csv(path_to_template_file_and_extension=path_to_template_file_and_extension,
+            await self.determine_multiplicity_csv(
+                path_to_template_file_and_extension=path_to_template_file_and_extension,
                                             path_to_subset=path_to_subset,
                                             instantiated_attributes=instantiated_attributes,
                                             temporary_path=temporary_path,
                                             **kwargs)
 
-    def generate_basic_template(self, path_to_subset: Path, path_to_template_file_and_extension: Path,
+    @async_to_sync_wraps
+    async def generate_basic_template(self, path_to_subset: Path, path_to_template_file_and_extension: Path,
                                 temporary_path: Path, ignore_relations: bool = True, **kwargs):
         list_of_otl_objectUri = None
         if kwargs is not None:
@@ -105,19 +113,21 @@ class SubsetTemplateCreator:
                 DotnotationHelper.clear_list_of_list_attributes(instance)
 
         converter = OtlmowConverter()
-        converter.from_objects_to_file(file_path=temporary_path,
+        await converter.from_objects_to_file(file_path=temporary_path,
                                           sequence_of_objects=otl_objects, **kwargs)
         path_is_split = kwargs.get('split_per_type', True)
         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
-    def alter_excel_template(cls, path_to_template_file_and_extension: Path, path_to_subset: Path,
+    @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)
@@ -125,28 +135,39 @@ class SubsetTemplateCreator:
         amount_of_examples = kwargs.get('amount_of_examples', 0)
         if add_attribute_info and amount_of_examples == 0:
             amount_of_examples = 1
+        await sleep(0)
         wb = load_workbook(temporary_path)
         wb.create_sheet('Keuzelijsten')
         # 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()]
 
-    def determine_multiplicity_csv(self, path_to_template_file_and_extension: Path, path_to_subset: Path,
+    @async_to_sync_wraps
+    async def determine_multiplicity_csv(self, path_to_template_file_and_extension: Path, path_to_subset: Path,
                                    instantiated_attributes: list, temporary_path: Path, **kwargs):
         path_is_split = kwargs.get('split_per_type', True)
+        await sleep(0)
         if path_is_split is False:
             self.alter_csv_template(path_to_template_file_and_extension=path_to_template_file_and_extension,
                                     temporary_path=temporary_path, path_to_subset=path_to_subset, **kwargs)
@@ -174,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:
@@ -254,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,
@@ -271,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()
@@ -286,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.10 → otlmow_template-0.11rc2}/otlmow_template.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: otlmow_template
-Version: 0.10
+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
@@ -699,6 +699,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: otlmow-converter>=1.7
 Requires-Dist: otlmow-modelbuilder>=0.25
+Requires-Dist: universalasync>=0.4.0
 
 # OTLMOW-Template
 [![PyPI](https://img.shields.io/pypi/v/otlmow-template?label=latest%20release)](https://pypi.org/project/otlmow-template/)

{otlmow_template-0.10 → otlmow_template-0.11rc2}/otlmow_template.egg-info/requires.txt

@@ -1,2 +1,3 @@
 otlmow-converter>=1.7
 otlmow-modelbuilder>=0.25
+universalasync>=0.4.0

{otlmow_template-0.10 → otlmow_template-0.11rc2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "otlmow_template"
-version = "0.10"
+version = "0.11-rc2"
 authors = [{name = "David Vlaminck", email = "david.vlaminck@mow.vlaanderen.be"},
     {name = "Jasper Berton", email = "jasperberton1@telenet.be"},]
 readme = "README.md"
@@ -31,6 +31,7 @@ requires-python = ">=3.9"
 dependencies = [
   'otlmow-converter >= 1.7',
   'otlmow-modelbuilder >= 0.25',
+  'universalasync>=0.4.0'
 ]
 
 [tool.setuptools.packages.find]