otlmow-template 1.4__py3-none-any.whl → 1.6__py3-none-any.whl

otlmow_template/SubsetTemplateCreator.py

@@ -9,6 +9,7 @@ from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor, as_completed, ALL_COMPLETED
 from pathlib import Path
 
+from openpyxl.cell import Cell
 from openpyxl.reader.excel import load_workbook
 from openpyxl.styles import PatternFill, Alignment
 from openpyxl.utils import get_column_letter
@@ -31,11 +32,6 @@ from otlmow_modelbuilder.SQLDataClasses.OSLOClass import OSLOClass
 
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
-enumeration_validation_rules = {
-    "valid_uri_and_types": {},
-    "valid_regexes": [
-        "^https://wegenenverkeer.data.vlaanderen.be/ns/.+"]
-}
 
 short_to_long_ns = {
     'ond': 'https://wegenenverkeer.data.vlaanderen.be/ns/onderdeel#',
@@ -47,12 +43,13 @@ short_to_long_ns = {
     'proefenmeting': 'https://wegenenverkeer.data.vlaanderen.be/ns/proefenmeting#',
     'pro': 'https://wegenenverkeer.data.vlaanderen.be/ns/proefenmeting#',
     'lev': 'https://wegenenverkeer.data.vlaanderen.be/ns/levenscyclus#',
-    'levenscyclus': 'https://wegenenverkeer.data.vlaanderen.be/ns/levenscyclus#',
-
+    'levenscyclus': 'https://wegenenverkeer.data.vlaanderen.be/ns/levenscyclus#'
 }
 
 
 class SubsetTemplateCreator:
+    green_fill = PatternFill(start_color="90EE90", fill_type="solid")
+
     @classmethod
     def _load_collector_from_subset_path(cls, subset_path: Path) -> OSLOCollector:
         collector = OSLOCollector(subset_path)
@@ -186,18 +183,6 @@ class SubsetTemplateCreator:
                 otl_objects.append(otl_object)
         return otl_objects
 
-    @classmethod
-    def get_number_of_cpus(cls) -> int:
-        import multiprocessing
-        cpu_count = multiprocessing.cpu_count()
-        if cpu_count is None or cpu_count == 0:
-            import os
-            cpu_count = os.cpu_count()
-        if cpu_count is None or cpu_count == 0:
-            cpu_count = 8
-        return cpu_count
-
-
     @classmethod
     def generate_objects_for_template(
             cls, subset_path: Path, class_uris_filter: [str], filter_attributes_by_subset: bool,
@@ -208,13 +193,15 @@ class SubsetTemplateCreator:
         """
         collector = cls._load_collector_from_subset_path(subset_path=subset_path)
         filtered_class_list = cls.filters_classes_by_subset(collector=collector, class_uris_filter=class_uris_filter)
+        if filtered_class_list == []:
+            raise ValueError('Something went wrong, as the class_uri filter list is empty')
         cls.relation_dict = get_hardcoded_relation_dict(model_directory=model_directory)
 
         amount_objects_to_create = max(1, dummy_data_rows)
         otl_objects = []
 
         while True:
-            with ThreadPoolExecutor(max_workers=cls.get_number_of_cpus()) as executor:
+            with ThreadPoolExecutor() as executor:
                 futures = [
                     executor.submit(cls.create_x_objects, oslo_class, add_geometry, collector,
                                     filter_attributes_by_subset, model_directory, amount_objects_to_create)
@@ -274,6 +261,8 @@ class SubsetTemplateCreator:
         collector = cls._load_collector_from_subset_path(subset_path=subset_path)
         await sleep(0)
         filtered_class_list = cls.filters_classes_by_subset(collector=collector, class_uris_filter=class_uris_filter)
+        if filtered_class_list == []:
+            raise ValueError('Something went wrong, as the class_uri filter list is empty')
         await sleep(0)
         cls.relation_dict = get_hardcoded_relation_dict(model_directory=model_directory)
 
@@ -499,7 +488,7 @@ class SubsetTemplateCreator:
         collected_attribute_info = []
         deprecated_attributes_row = []
         header_row = next(sheet.iter_rows(min_row=1, max_row=1))
-        for index, header_cell in enumerate(header_row):
+        for header_cell in header_row:
             header = header_cell.value
             if header is None or header == '':
                 continue
@@ -527,16 +516,19 @@ class SubsetTemplateCreator:
 
             if generate_choice_list:
                 if issubclass(attribute.field, BooleanField):
-                    boolean_validation.add(f'{header_cell.column_letter}{2}:{header_cell.column_letter}1000')
-                    continue
+                    boolean_validation.add(f'{header_cell.column_letter}2:{header_cell.column_letter}1000')
+                    cls.color_choice_lists_green(sheet=sheet, header_cell_column=header_cell)
 
-                if issubclass(attribute.field, KeuzelijstField):
+                elif issubclass(attribute.field, KeuzelijstField):
                     cls.generate_choice_list_in_excel(
                         attribute=attribute, choice_list_dict=choice_list_dict, column=header_cell.column,
                         row_nr=1, sheet=sheet, workbook=workbook)
+                    cls.color_choice_lists_green(sheet=sheet, header_cell_column=header_cell)
 
         if dummy_data_rows == 0:
-            sheet.delete_rows(idx=2)
+            instance_count = len([x for x in instances if x.typeURI == type_uri])
+            if instance_count > 0:
+                sheet.delete_rows(idx=2, amount=instance_count)
 
         if add_deprecated and any(deprecated_attributes_row):
             cls.add_deprecated_row_to_sheet(deprecated_attributes_row, sheet)
@@ -546,6 +538,12 @@ class SubsetTemplateCreator:
 
         cls.set_fixed_column_width(sheet=sheet, width=25)
 
+    @classmethod
+    def color_choice_lists_green(cls, sheet: Worksheet, header_cell_column: Cell):
+        for cell in sheet.iter_rows(min_col=header_cell_column.column, max_col=header_cell_column.column,
+                                    min_row=2, max_row=1000):
+            cell[0].fill = cls.green_fill
+
     @classmethod
     def add_deprecated_row_to_sheet(cls, deprecated_attributes_row, sheet):
         sheet.insert_rows(idx=1)
@@ -582,13 +580,6 @@ class SubsetTemplateCreator:
         data_val.add(f'{get_column_letter(column)}{row_nr + 1}:'
                      f'{get_column_letter(column)}1000')
 
-
-    @classmethod
-    def determine_multiplicity_csv(cls, template_file_path: Path, subset_path: Path,
-                                   instances: list, temporary_path: Path, **kwargs):
-        pass
-
-
     @classmethod
     def filters_classes_by_subset(cls, collector: OSLOCollector,
                                   class_uris_filter: [str] = None) -> list[OSLOClass]:
@@ -596,86 +587,6 @@ class SubsetTemplateCreator:
             return collector.classes
         return [x for x in collector.classes if x.objectUri in class_uris_filter]
 
-    @classmethod
-    def add_type_uri_choice_list_in_excel(cls, sheet, instances, add_attribute_info: bool):
-        starting_row = '3' if add_attribute_info else '2'
-        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
-
-        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 instances 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)
-        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)}{starting_row}:{get_column_letter(column)}1000')
-
-    @classmethod
-    async def add_type_uri_choice_list_in_excel_async(cls, sheet, instances, 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 instances 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
     def set_fixed_column_width(cls, sheet, width: int):
         dim_holder = DimensionHolder(worksheet=sheet)
@@ -719,6 +630,8 @@ class SubsetTemplateCreator:
                 if class_uri != relation.bron_uri:
                     continue
                 for i, bron_instance in enumerate(class_dict[relation.bron_uri]):
+                    if relation.doel_uri not in class_dict:
+                        continue
                     doel_instance = class_dict[relation.doel_uri][i]
                     if relation.objectUri == 'https://wegenenverkeer.data.vlaanderen.be/ns/onderdeel#HeeftBetrokkene':
                         relation_instance = create_betrokkenerelation(rol='toezichter', source=bron_instance,

{otlmow_template-1.4.dist-info → otlmow_template-1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otlmow_template
-Version: 1.4
+Version: 1.6
 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-1.6.dist-info/RECORD

@@ -0,0 +1,7 @@
+otlmow_template/SubsetTemplateCreator.py,sha256=yvRxRRmOnWrMdyALG9q3HaADoQwiUh-sTki7Ui_oudM,33140
+otlmow_template/Exceptions/MissingTypeUriException.py,sha256=DSKwywmP9Bq8n7rzBoDcEPlxvC1IChx18QIHFUCTtdA,51
+otlmow_template-1.6.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+otlmow_template-1.6.dist-info/METADATA,sha256=yL3w0hRhDAYHBDBy56HFy-BMuCXBj3w5vP-tbERc478,44220
+otlmow_template-1.6.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+otlmow_template-1.6.dist-info/top_level.txt,sha256=zPgBoaTLG-avoOLySlwOUEtHaFyA5Vc5wJqkSeX1l6A,16
+otlmow_template-1.6.dist-info/RECORD,,

{otlmow_template-1.4.dist-info → otlmow_template-1.6.dist-info}/WHEEL

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

otlmow_template-1.4.dist-info/RECORD

@@ -1,7 +0,0 @@
-otlmow_template/SubsetTemplateCreator.py,sha256=iZD2kjhOnymQ9tgqU6zq2ZCD8KVIT232mbrxTSR4fQ8,35845
-otlmow_template/Exceptions/MissingTypeUriException.py,sha256=DSKwywmP9Bq8n7rzBoDcEPlxvC1IChx18QIHFUCTtdA,51
-otlmow_template-1.4.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-otlmow_template-1.4.dist-info/METADATA,sha256=MqaUUEubb-DhKErKteUljO6Z3lxjGlaJoDL4a0cam-k,44220
-otlmow_template-1.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-otlmow_template-1.4.dist-info/top_level.txt,sha256=zPgBoaTLG-avoOLySlwOUEtHaFyA5Vc5wJqkSeX1l6A,16
-otlmow_template-1.4.dist-info/RECORD,,