Commit 91a7fa5c authored by Guillaume Anciaux's avatar Guillaume Anciaux
Browse files

bytes -> base64 in metadata

parent 821fe664

core @ 4ba60744

Compare 55c7ebc2 to 4ba60744
Original line number Diff line number Diff line 
Subproject commit 55c7ebc268fe0da22090d1ca64d2689d75173447
 
Subproject commit 4ba607447a592724f368bc63b2b353400b82150a

solid-mech @ 30024349

Compare 778fb873 to 30024349
Original line number Diff line number Diff line 
Subproject commit 778fb8735ae2ebc9eef7f98390cb5b1fc56c98f9
 
Subproject commit 300243499a7827cf765983892f24f948154ec8d8

solidipes/reports/curation.py

+3 −11
Original line number Diff line number Diff line
@@ -7,11 +7,8 @@ from solidipes.loaders.mime_types import get_possible_extensions 
from solidipes.reports.report import Report

from solidipes.utils import bcolors, get_path_relative_to_root, logging, rename_file

from solidipes.validators.curation import CurationValidator

from solidipes.validators.global_validation import dataset, get_global_validator

from solidipes.validators.ontology import (

    OntologyValidator,

    get_ontology_identifier,

)

from solidipes.validators.global_validation import dataset

from solidipes.validators.ontology import get_ontology_identifier



print = logging.invalidPrint

logger = logging.getLogger()
@@ -61,10 +58,6 @@ class CurationReport(Report): 
        ontology_identifier = get_ontology_identifier() or "Default Solidipes ontology"

        logger.info(f"Ontology: `{ontology_identifier}`")



        ontology_validator = get_global_validator(OntologyValidator)

        ontology_class = ontology_validator.ontology.get_file_class_name(dataset)

        logger.info(f"Ontology class: `{ontology_class}`")



    def populate_parser(self, parser: argparse.ArgumentParser) -> None:

        parser.description = self.command_help
@@ -113,9 +106,8 @@ class CurationReport(Report): 
        scanner.search_path = dir_path

        if remote:

            scanner.uri = dir_path

        loaders = scanner.get_loader_dict()

        validator.validate()



        loaders = scanner.get_loader_dict()

        for loader in loaders.values():

            self.display_file(loader, **kwargs)

solidipes/scanners/scanner.py

+3 −0
Original line number Diff line number Diff line
@@ -302,6 +302,9 @@ class Scanner(ABC): 
            tree = self.convert_filepath_tree_to_loader_tree(filepath_tree=filepath_tree, progress_bar=progress_bar)

            tree = LoaderTree(tree)



        from solidipes.loaders.rocrate_metadata import rocrate



        rocrate.write_json()

        return tree



    def get_filtered_loader_tree(

solidipes/utils/utils.py

+4 −0
Original line number Diff line number Diff line
@@ -487,6 +487,10 @@ def transform_data_containers_to_dict(data): 
        data = {"DataContainer.TemporaryFile": data.getstate()}

    if isinstance(data, DataContainer):

        data = data._data_collection

    if isinstance(data, bytes):

        import base64



        data = {"binary": base64.b64encode(data).decode("ascii")}

    if isinstance(data, dict):

        data_res = {}

        for k, v in data.items():