otlmow-template 0.9__py3-none-any.whl → 0.11rc1__py3-none-any.whl

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,26 @@ 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(
+        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))
         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,7 +111,7 @@ 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()
@@ -116,13 +122,17 @@ class SubsetTemplateCreator:
         return 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):
         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)
         highlight_deprecated_attributes = kwargs.get('highlight_deprecated_attributes', False)
         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,
@@ -142,9 +152,11 @@ class SubsetTemplateCreator:
         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)
@@ -201,12 +213,10 @@ class SubsetTemplateCreator:
                         dotnotation_attribute = dotnotation_module.get_attribute_by_dotnotation(single_attribute,
                                                                                                 cell.value)
                         value = dotnotation_attribute.definition
-                    sheet.cell(row=1, column=cell.column, value=value)
-
-            for row in sheet.iter_rows(min_row=1, max_row=1, min_col=1):
-                for cell in row:
-                    cell.alignment = Alignment(wrapText=True, vertical='top')
-                    cell.fill = PatternFill(start_color="808080", end_color="808080", fill_type="solid")
+                    newcell = sheet.cell(row=1, column=cell.column, value=value)
+                    newcell.alignment = Alignment(wrapText=True, vertical='top')
+                    newcell.fill = PatternFill(start_color="808080", end_color="808080",
+                                               fill_type="solid")
 
     @classmethod
     def check_for_deprecated_attributes(cls, workbook, instantiated_attributes: list):

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: otlmow_template
-Version: 0.9
+Version: 0.11rc1
 Author-email: David Vlaminck <david.vlaminck@mow.vlaanderen.be>, Jasper Berton <jasperberton1@telenet.be>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -698,7 +698,8 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: otlmow-converter>=1.7
-Requires-Dist: otlmow-modelbuilder>=0.24
+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.11rc1.dist-info/RECORD

@@ -0,0 +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/__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.9.dist-info → otlmow_template-0.11rc1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

otlmow_template-0.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-otlmow_template/CsvTemplateCreator.py,sha256=PQq2zGmliWk0N9bhYNB7ZEa8PWV16OTbvoHh3--qCMs,7538
-otlmow_template/ExcelTemplateCreator.py,sha256=wW-7Uq2Gzr1vHYMO1I7TtqZSBTVFFSWotHvjwzCelV4,10853
-otlmow_template/SubsetTemplateCreator.py,sha256=xnK3GvAZ9cH7r3Y0WUU8MeObLStfHAK3Ok8EtDQsInE,25175
-otlmow_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-otlmow_template/Exceptions/MissingTypeUriException.py,sha256=DSKwywmP9Bq8n7rzBoDcEPlxvC1IChx18QIHFUCTtdA,51
-otlmow_template-0.9.dist-info/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-otlmow_template-0.9.dist-info/METADATA,sha256=xQIicV7RoS8gicXkXu3YBz0NkI678uM1DrTePhvsjHk,43999
-otlmow_template-0.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-otlmow_template-0.9.dist-info/top_level.txt,sha256=zPgBoaTLG-avoOLySlwOUEtHaFyA5Vc5wJqkSeX1l6A,16
-otlmow_template-0.9.dist-info/RECORD,,