otlmow-template 0.4__tar.gz → 0.6__tar.gz

{otlmow_template-0.4 → otlmow_template-0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otlmow_template
-Version: 0.4
+Version: 0.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
@@ -679,10 +679,11 @@ License:                     GNU GENERAL PUBLIC LICENSE
 Project-URL: Homepage, https://github.com/davidvlaminck/OTLMOW-Template
 Project-URL: Bug Tracker, https://github.com/davidvlaminck/OTLMOW-Template/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -693,11 +694,11 @@ Classifier: Natural Language :: Dutch
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Quality Assurance
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: otlmow-converter>=0.14
-Requires-Dist: otlmow-modelbuilder>=0.11
+Requires-Dist: otlmow-converter>=0.15
+Requires-Dist: otlmow-modelbuilder>=0.24
 
 # OTLMOW-Template
 [![PyPI](https://img.shields.io/pypi/v/otlmow-template?label=latest%20release)](https://pypi.org/project/otlmow-template/)

{otlmow_template-0.4 → otlmow_template-0.6}/otlmow_template/SubsetTemplateCreator.py

@@ -1,10 +1,12 @@
+import csv
+import logging
 import ntpath
 import os
-import csv
 import site
 import tempfile
 from pathlib import Path
-from typing import List
+
+
 from openpyxl.reader.excel import load_workbook
 from openpyxl.styles import PatternFill
 from openpyxl.utils import get_column_letter
@@ -15,7 +17,9 @@ from otlmow_converter.OtlmowConverter import OtlmowConverter
 from otlmow_model.OtlmowModel.BaseClasses.BooleanField import BooleanField
 from otlmow_model.OtlmowModel.BaseClasses.KeuzelijstField import KeuzelijstField
 from otlmow_model.OtlmowModel.BaseClasses.OTLObject import dynamic_create_instance_from_uri
+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
 
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
@@ -37,16 +41,15 @@ class SubsetTemplateCreator:
         return collector
 
     def generate_template_from_subset(self, path_to_subset: Path, path_to_template_file_and_extension: Path,
-                                      **kwargs):
+                                      ignore_relations: bool = True, **kwargs):
         tempdir = Path(tempfile.gettempdir()) / 'temp-otlmow'
         if not tempdir.exists():
             os.makedirs(tempdir)
         test = ntpath.basename(path_to_template_file_and_extension)
         temporary_path = Path(tempdir) / test
-        instantiated_attributes = self.generate_basic_template(path_to_subset=path_to_subset,
-                                                               temporary_path=temporary_path,
-                                                               path_to_template_file_and_extension=path_to_template_file_and_extension,
-                                                               **kwargs)
+        instantiated_attributes = 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, **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,
@@ -61,17 +64,25 @@ class SubsetTemplateCreator:
                                             **kwargs)
 
     def generate_basic_template(self, path_to_subset: Path, path_to_template_file_and_extension: Path,
-                                temporary_path: Path, **kwargs):
-        collector = self._load_collector_from_subset_path(path_to_subset=path_to_subset)
+                                temporary_path: Path, ignore_relations: bool = True, **kwargs):
+        list_of_otl_objectUri = None
+        if kwargs is not None:
+            list_of_otl_objectUri = kwargs.get('list_of_otl_objectUri', None)
+        filtered_class_list = self.filters_classes_by_subset(
+            path_to_subset=path_to_subset, list_of_otl_objectUri=list_of_otl_objectUri)
         otl_objects = []
         amount_of_examples = kwargs.get('amount_of_examples', 0)
+        model_directory = None
+        if kwargs is not None:
+            model_directory = kwargs.get('model_directory', None)
+        relation_dict = get_hardcoded_relation_dict(model_directory=model_directory)
+
+        for class_object in [cl for cl in filtered_class_list if cl.abstract == 0]:
+            if ignore_relations and class_object.objectUri in relation_dict:
+                continue
 
-        for class_object in list(filter(lambda cl: cl.abstract == 0, collector.classes)):
-            model_directory = None
-            if kwargs is not None:
-                model_directory = kwargs.get('model_directory', None)
             if amount_of_examples != 0:
-                for i in range(amount_of_examples):
+                for _ in range(amount_of_examples):
                     instance = dynamic_create_instance_from_uri(class_object.objectUri, model_directory=model_directory)
                     if instance is None:
                         continue
@@ -84,11 +95,8 @@ class SubsetTemplateCreator:
                 instance.fill_with_dummy_data()
                 otl_objects.append(instance)
 
-            # TODO: check if this is needed, as the above line should cover this
-            attributen = collector.find_attributes_by_class(class_object)
-            for attribute_object in attributen:
-                attr = getattr(instance, '_' + attribute_object.name)
-                attr.fill_with_dummy_data()
+            DotnotationHelper.clear_list_of_list_attributes(instance)
+
         converter = OtlmowConverter()
         converter.from_objects_to_file(file_path=temporary_path,
                                           sequence_of_objects=otl_objects, **kwargs)
@@ -102,7 +110,7 @@ class SubsetTemplateCreator:
 
     @classmethod
     def alter_excel_template(cls, path_to_template_file_and_extension: Path, path_to_subset: Path,
-                             instantiated_attributes: List, temporary_path, **kwargs):
+                             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)
@@ -128,7 +136,7 @@ class SubsetTemplateCreator:
         [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,
-                                   instantiated_attributes: List, temporary_path: Path, **kwargs):
+                                   instantiated_attributes: list, temporary_path: Path, **kwargs):
         path_is_split = kwargs.get('split_per_type', True)
         if path_is_split is False:
             self.alter_csv_template(path_to_template_file_and_extension=path_to_template_file_and_extension,
@@ -142,13 +150,13 @@ class SubsetTemplateCreator:
         [f.unlink() for f in Path(file_location).glob("*") if f.is_file()]
 
     @classmethod
-    def filters_assets_by_subset(cls, path_to_subset: Path, list_of_otl_objectUri: [str] = None):
+    def filters_classes_by_subset(cls, path_to_subset: Path, list_of_otl_objectUri: [str] = None) -> list[OSLOClass]:
         if list_of_otl_objectUri is None:
             list_of_otl_objectUri = []
 
         collector = cls._load_collector_from_subset_path(path_to_subset=path_to_subset)
         if list_of_otl_objectUri == []:
-            return [x for x in collector.classes]
+            return collector.classes
         return [x for x in collector.classes if x.objectUri in list_of_otl_objectUri]
 
     @staticmethod
@@ -165,7 +173,7 @@ class SubsetTemplateCreator:
             sheet.column_dimensions = dim_holder
 
     @classmethod
-    def add_attribute_info_excel(cls, workbook, instantiated_attributes: List):
+    def add_attribute_info_excel(cls, workbook, instantiated_attributes: list):
         dotnotation_module = DotnotationHelper()
         for sheet in workbook:
             if sheet == workbook['Keuzelijsten']:
@@ -192,7 +200,7 @@ class SubsetTemplateCreator:
                                                                              fill_type="solid")
 
     @classmethod
-    def check_for_deprecated_attributes(cls, workbook, instantiated_attributes: List):
+    def check_for_deprecated_attributes(cls, workbook, instantiated_attributes: list):
         dotnotation_module = DotnotationHelper()
         for sheet in workbook:
             if sheet == workbook['Keuzelijsten']:
@@ -215,7 +223,7 @@ class SubsetTemplateCreator:
                         is_deprecated = True
 
                     if is_deprecated:
-                        cell.value = '[DEPRECATED] ' + cell.value
+                        cell.value = f'[DEPRECATED] {cell.value}'
 
     @classmethod
     def find_uri_in_sheet(cls, sheet):
@@ -237,7 +245,7 @@ class SubsetTemplateCreator:
                         sheet.delete_cols(cell.column)
 
     @classmethod
-    def add_choice_list_excel(cls, workbook, instantiated_attributes: List, path_to_subset: Path):
+    def add_choice_list_excel(cls, workbook, instantiated_attributes: list, path_to_subset: Path):
         choice_list_dict = {}
         dotnotation_module = DotnotationHelper()
         for sheet in workbook:
@@ -259,17 +267,10 @@ class SubsetTemplateCreator:
                         name = dotnotation_attribute.field.naam
                         valid_options = [v.invulwaarde for k, v in dotnotation_attribute.field.options.items()
                                          if v.status != 'verwijderd']
-                        if dotnotation_attribute.field.naam in choice_list_dict:
-                            column = choice_list_dict[dotnotation_attribute.field.naam]
-                        else:
-                            choice_list_dict = cls.add_choice_list_to_sheet(workbook=workbook, name=name,
-                                                                            options=valid_options,
-                                                                            choice_list_dict=choice_list_dict)
-                            column = choice_list_dict[dotnotation_attribute.field.naam]
-                        print(column)
-                        option_list = []
-                        for option in valid_options:
-                            option_list.append(option)
+                        if (dotnotation_attribute.field.naam not in choice_list_dict):
+                            choice_list_dict = cls.add_choice_list_to_sheet(
+                                workbook=workbook, name=name,  options=valid_options, choice_list_dict=choice_list_dict)
+                        column = choice_list_dict[dotnotation_attribute.field.naam]
                         start_range = f"${column}$2"
                         end_range = f"${column}${len(valid_options) + 1}"
                         data_val = DataValidation(type="list", formula1=f"Keuzelijsten!{start_range}:{end_range}",
@@ -307,12 +308,11 @@ class SubsetTemplateCreator:
                               instantiated_attributes, **kwargs):
         file_location = os.path.dirname(path_to_template_file_and_extension)
         tempdir = Path(tempfile.gettempdir()) / 'temp-otlmow'
-        print(file_location)
+        logging.debug(file_location)
         file_name = ntpath.basename(path_to_template_file_and_extension)
         split_file_name = file_name.split('.')
         things_in_there = os.listdir(tempdir)
-        csv_templates = [x for x in things_in_there if x.startswith(split_file_name[0] + '_')]
-        print(csv_templates)
+        csv_templates = [x for x in things_in_there if x.startswith(f'{split_file_name[0]}_')]
         for file in csv_templates:
             test_template_loc = Path(os.path.dirname(path_to_template_file_and_extension)) / file
             temp_loc = Path(tempdir) / file
@@ -334,27 +334,26 @@ class SubsetTemplateCreator:
         amount_of_examples = kwargs.get('amount_of_examples', 0)
         quote_char = '"'
         with open(temporary_path, 'r+', encoding='utf-8') as csvfile:
-            new_file = open(path_to_template_file_and_extension, 'w', encoding='utf-8')
-            reader = csv.reader(csvfile, delimiter=delimiter, quotechar=quote_char)
-            for row_nr, row in enumerate(reader):
-                if row_nr == 0:
-                    header = row
-                else:
-                    data.append(row)
-            if add_geo_artefact is False:
-                [header, data] = cls.remove_geo_artefact_csv(header=header, data=data)
-            if add_attribute_info:
-                [info, header] = cls.add_attribute_info_csv(header=header, data=data,
-                                                            instantiated_attributes=instantiated_attributes)
-                new_file.write(delimiter.join(info) + '\n')
-            data = cls.add_mock_data_csv(header=header, data=data, rows_of_examples=amount_of_examples)
-            if highlight_deprecated_attributes:
-                header = cls.highlight_deprecated_attributes_csv(header=header, data=data,
-                                                                 instantiated_attributes=instantiated_attributes)
-            new_file.write(delimiter.join(header) + '\n')
-            for d in data:
-                new_file.write(delimiter.join(d) + '\n')
-            new_file.close()
+            with open(path_to_template_file_and_extension, 'w', encoding='utf-8') as new_file:
+                reader = csv.reader(csvfile, delimiter=delimiter, quotechar=quote_char)
+                for row_nr, row in enumerate(reader):
+                    if row_nr == 0:
+                        header = row
+                    else:
+                        data.append(row)
+                if add_geo_artefact is False:
+                    [header, data] = cls.remove_geo_artefact_csv(header=header, data=data)
+                if add_attribute_info:
+                    [info, header] = cls.add_attribute_info_csv(header=header, data=data,
+                                                                instantiated_attributes=instantiated_attributes)
+                    new_file.write(delimiter.join(info) + '\n')
+                data = cls.add_mock_data_csv(header=header, data=data, rows_of_examples=amount_of_examples)
+                if highlight_deprecated_attributes:
+                    header = cls.highlight_deprecated_attributes_csv(header=header, data=data,
+                                                                     instantiated_attributes=instantiated_attributes)
+                new_file.write(delimiter.join(header) + '\n')
+                for d in data:
+                    new_file.write(delimiter.join(d) + '\n')
 
     @classmethod
     def add_attribute_info_csv(cls, header, data, instantiated_attributes):
@@ -401,39 +400,35 @@ class SubsetTemplateCreator:
             for dotnototation_title in header:
                 if dotnototation_title == 'typeURI':
                     continue
-                else:
-                    index = header.index(dotnototation_title)
-                    value = header[index]
-                    try:
-                        is_deprecated = False
-                        if dotnototation_title.count('.') == 1:
-                            dot_split = dotnototation_title.split('.')
-                            attribute = dotnotation_module.get_attribute_by_dotnotation(single_object,
-                                                                                        dot_split[0])
-
-                            if len(attribute.deprecated_version) > 0:
-                                is_deprecated = True
-                        dotnotation_attribute = dotnotation_module.get_attribute_by_dotnotation(single_object,
-                                                                                                dotnototation_title)
-                        if len(dotnotation_attribute.deprecated_version) > 0:
+
+                index = header.index(dotnototation_title)
+                value = header[index]
+                try:
+                    is_deprecated = False
+                    if dotnototation_title.count('.') == 1:
+                        dot_split = dotnototation_title.split('.')
+                        attribute = dotnotation_module.get_attribute_by_dotnotation(single_object,
+                                                                                    dot_split[0])
+
+                        if len(attribute.deprecated_version) > 0:
                             is_deprecated = True
-                    except AttributeError:
-                        continue
-                    if is_deprecated:
-                        header[index] = "[DEPRECATED] " + value
+                    dotnotation_attribute = dotnotation_module.get_attribute_by_dotnotation(single_object,
+                                                                                            dotnototation_title)
+                    if len(dotnotation_attribute.deprecated_version) > 0:
+                        is_deprecated = True
+                except AttributeError:
+                    continue
+                if is_deprecated:
+                    header[index] = f"[DEPRECATED] {value}"
         return header
 
     @classmethod
     def find_uri_in_csv(cls, header):
-        filter_uri = None
-        if 'typeURI' in header:
-            filter_uri = header.index('typeURI')
-        return filter_uri
+        return header.index('typeURI') if 'typeURI' in header else None
 
     @classmethod
     def add_choice_list_to_sheet(cls, workbook, name, options, choice_list_dict):
         active_sheet = workbook['Keuzelijsten']
-        print(options)
         row_nr = 2
         for rows in active_sheet.iter_rows(min_row=1, max_row=1, min_col=1, max_col=700):
             for cell in rows:
@@ -441,10 +436,8 @@ class SubsetTemplateCreator:
                     cell.value = name
                     column_nr = cell.column
                     for option in options:
-                        print(option)
                         active_sheet.cell(row=row_nr, column=column_nr, value=option)
                         row_nr += 1
-                        print(row_nr)
                     choice_list_dict[name] = get_column_letter(column_nr)
                     break
         return choice_list_dict

{otlmow_template-0.4 → otlmow_template-0.6}/otlmow_template.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otlmow_template
-Version: 0.4
+Version: 0.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
@@ -679,10 +679,11 @@ License:                     GNU GENERAL PUBLIC LICENSE
 Project-URL: Homepage, https://github.com/davidvlaminck/OTLMOW-Template
 Project-URL: Bug Tracker, https://github.com/davidvlaminck/OTLMOW-Template/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -693,11 +694,11 @@ Classifier: Natural Language :: Dutch
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Quality Assurance
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: otlmow-converter>=0.14
-Requires-Dist: otlmow-modelbuilder>=0.11
+Requires-Dist: otlmow-converter>=0.15
+Requires-Dist: otlmow-modelbuilder>=0.24
 
 # OTLMOW-Template
 [![PyPI](https://img.shields.io/pypi/v/otlmow-template?label=latest%20release)](https://pypi.org/project/otlmow-template/)

otlmow_template-0.6/otlmow_template.egg-info/requires.txt

@@ -0,0 +1,2 @@
+otlmow-converter>=0.15
+otlmow-modelbuilder>=0.24

{otlmow_template-0.4 → otlmow_template-0.6}/pyproject.toml

@@ -4,17 +4,18 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "otlmow_template"
-version = "0.4"
+version = "0.6"
 authors = [{name = "David Vlaminck", email = "david.vlaminck@mow.vlaanderen.be"},
-    {name = "Jasper Berton", email = "jasperberton1@telenet.be"}]
+    {name = "Jasper Berton", email = "jasperberton1@telenet.be"},]
 readme = "README.md"
 license = {file = "LICENSE"}
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: OS Independent",
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
@@ -26,10 +27,10 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
-  'otlmow-converter >= 0.14',
-  'otlmow-modelbuilder >= 0.11',
+  'otlmow-converter >= 0.15',
+  'otlmow-modelbuilder >= 0.24',
 ]
 
 [tool.setuptools.packages.find]

otlmow_template-0.4/otlmow_template.egg-info/requires.txt

@@ -1,2 +0,0 @@
-otlmow-converter>=0.14
-otlmow-modelbuilder>=0.11