refactor(utils): 🏗️ reorganize the utils package structure

Author: kikkomep

rocrate_validator/__init__.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 def get_version():
-    from rocrate_validator.utils import get_version
+    from rocrate_validator.utils.versioning import get_version
     return get_version()
 
 

rocrate_validator/cli/commands/errors.py

@@ -17,7 +17,7 @@
 
 from rich.console import Console
 
-import rocrate_validator.log as logging
+from rocrate_validator.utils import log as logging
 from rocrate_validator.errors import (InvalidProfilePath, ProfileNotFound,
                                       ProfilesDirectoryNotFound)
 

rocrate_validator/cli/commands/profiles.py

@@ -21,16 +21,17 @@
 from rich.panel import Panel
 from rich.table import Table
 
-import rocrate_validator.log as logging
 from rocrate_validator import services
 from rocrate_validator.cli.commands.errors import handle_error
 from rocrate_validator.cli.main import cli, click
-from rocrate_validator.colors import get_severity_color
 from rocrate_validator.constants import DEFAULT_PROFILE_IDENTIFIER
-from rocrate_validator.utils.io_helpers.output.text.layout.report import get_app_header_rule
 from rocrate_validator.models import (LevelCollection, RequirementLevel,
                                       Severity)
-from rocrate_validator.utils import get_profiles_path, shorten_path
+from rocrate_validator.utils import log as logging
+from rocrate_validator.utils.io_helpers.colors import get_severity_color
+from rocrate_validator.utils.io_helpers.output.text.layout.report import \
+    get_app_header_rule
+from rocrate_validator.utils.paths import get_profiles_path, shorten_path
 
 # set the default profiles path
 DEFAULT_PROFILES_PATH = get_profiles_path()

rocrate_validator/cli/commands/validate.py

@@ -23,7 +23,7 @@
 from rich.padding import Padding
 from rich.rule import Rule
 
-import rocrate_validator.log as logging
+from rocrate_validator.utils import log as logging
 from rocrate_validator import services
 from rocrate_validator.cli.commands.errors import handle_error
 from rocrate_validator.cli.main import cli
@@ -37,7 +37,8 @@
     LiveTextProgressLayout, get_app_header_rule)
 from rocrate_validator.models import (Severity, ValidationResult,
                                       ValidationSettings)
-from rocrate_validator.utils import get_profiles_path, validate_rocrate_uri
+from rocrate_validator.utils.uri import validate_rocrate_uri
+from rocrate_validator.utils.paths import get_profiles_path
 
 # from rich.markdown import Markdown
 # from rich.table import Table

rocrate_validator/cli/main.py

@@ -16,11 +16,11 @@
 
 import rich_click as click
 
-import rocrate_validator.log as logging
+from rocrate_validator.utils import log as logging
 from rocrate_validator.cli.utils import running_in_jupyter
 from rocrate_validator.utils.io_helpers.output.console import Console
 from rocrate_validator.utils.io_helpers.output.pager import SystemPager
-from rocrate_validator.utils import get_version
+from rocrate_validator.utils.versioning import get_version
 
 # set up logging
 logger = logging.getLogger(__name__)

rocrate_validator/cli/ui/text/validate.py

@@ -16,7 +16,7 @@
 
 from typing import Any, Callable, Optional
 
-import rocrate_validator.log as logging
+from rocrate_validator.utils import log as logging
 from rocrate_validator.utils.io_helpers.output.console import Console
 from rocrate_validator.utils.io_helpers.output.pager import SystemPager
 from rocrate_validator.utils.io_helpers.output.text import TextOutputFormatter

rocrate_validator/cli/utils.py

@@ -14,7 +14,7 @@
 
 import os
 
-import rocrate_validator.log as logging
+from rocrate_validator.utils import log as logging
 
 # set up logging
 logger = logging.getLogger(__name__)

rocrate_validator/config.py

@@ -19,7 +19,7 @@
 
 import enum_tools
 
-import rocrate_validator.log as logging
+from rocrate_validator.utils import log as logging
 
 # Set up logging
 logger = logging.getLogger(__name__)

rocrate_validator/events.py

@@ -31,7 +31,7 @@
 import enum_tools
 from rdflib import RDF, RDFS, Graph, Namespace, URIRef
 
-import rocrate_validator.log as logging
+from rocrate_validator.utils import log as logging
 from rocrate_validator import __version__
 from rocrate_validator.constants import (DEFAULT_ONTOLOGY_FILE,
                                          DEFAULT_PROFILE_IDENTIFIER,
@@ -48,9 +48,11 @@
                                       ROCrateMetadataNotFoundError)
 from rocrate_validator.events import Event, EventType, Publisher, Subscriber
 from rocrate_validator.rocrate import ROCrate
-from rocrate_validator.utils import (URI, MapIndex, MultiIndexMap,
-                                     get_profiles_path,
-                                     get_requirement_name_from_file)
+from rocrate_validator.utils.collections import (MapIndex)
+from rocrate_validator.utils.paths import get_profiles_path
+from rocrate_validator.utils.python_helpers import get_requirement_name_from_file
+from rocrate_validator.utils.uri import URI
+from rocrate_validator.utils.collections import MultiIndexMap
 
 # set the default profiles path
 DEFAULT_PROFILES_PATH = get_profiles_path()