iker-python-common 1.0.71__tar.gz → 1.0.73__tar.gz

{iker_python_common-1.0.71 → iker_python_common-1.0.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.71
+Version: 1.0.73
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{iker_python_common-1.0.71 → iker_python_common-1.0.73}/src/iker/common/utils/dbutils.py

@@ -1,6 +1,7 @@
 import contextlib
 import dataclasses
-from typing import Any, Self, Sequence
+from collections.abc import Callable, Sequence
+from typing import Any, Self
 
 import asyncpg
 import packaging.version
@@ -23,6 +24,8 @@ __all__ = [
     "AsyncConnectionMaker",
     "orm_to_dict",
     "orm_clone",
+    "sql_compiler_extension",
+    "async_sql_compiler_extension",
     "mysql_insert_ignore",
     "postgresql_insert_on_conflict_do_nothing",
 ]
@@ -75,6 +78,7 @@ class ConnectionMaker(object):
         self.url = url
         self.engine_opts = engine_opts or {}
         self.session_opts = session_opts or {}
+        self.sa_engine = None
 
     @classmethod
     def create(
@@ -144,13 +148,23 @@ class ConnectionMaker(object):
 
         :return: The SQLAlchemy ``Engine``.
         """
-        return sqlalchemy.create_engine(self.connection_string, **self.engine_opts)
+        if self.sa_engine is None:
+            self.sa_engine = sqlalchemy.create_engine(self.connection_string, **self.engine_opts)
+        return self.sa_engine
 
-    def make_connection(self) -> sqlalchemy.Connection:
+    def reset_engine(self):
+        """
+        Disposes of the current SQLAlchemy engine, if it exists, and resets the cached engine instance.
+        """
+        if self.sa_engine is not None:
+            self.sa_engine.dispose()
+            self.sa_engine = None
+
+    def make_connection(self) -> contextlib.AbstractContextManager[sqlalchemy.Connection]:
         """
         Establishes and returns a new database connection using the SQLAlchemy engine.
 
-        :return: A database connection object.
+        :return: A context manager yielding a database connection object.
         """
         return self.engine.connect()
 
@@ -159,9 +173,9 @@ class ConnectionMaker(object):
         Creates a context-managed SQLAlchemy session with the configured engine and session options.
 
         :param kwargs: Additional keyword arguments for session creation.
-        :return: A context manager yielding a SQLAlchemy ``Session``.
+        :return: A context manager yielding a database session object.
         """
-        return contextlib.closing(sqlalchemy.orm.sessionmaker(self.engine, **{**self.session_opts, **kwargs})())
+        return sqlalchemy.orm.sessionmaker(self.engine, **{**self.session_opts, **kwargs})()
 
     def create_model(self, orm_base):
         """
@@ -237,27 +251,34 @@ class AsyncConnectionMaker(ConnectionMaker):
 
         :return: The SQLAlchemy ``AsyncEngine``.
         """
-        return sqlalchemy.ext.asyncio.create_async_engine(self.connection_string, **self.engine_opts)
+        if self.sa_engine is None:
+            self.sa_engine = sqlalchemy.ext.asyncio.create_async_engine(self.connection_string, **self.engine_opts)
+        return self.sa_engine
+
+    async def reset_engine(self):
+        """
+        Disposes of the current SQLAlchemy async engine, if it exists, and resets the cached engine instance.
+        """
+        if self.sa_engine is not None:
+            await self.sa_engine.dispose()
+            self.sa_engine = None
 
-    async def make_connection(self) -> sqlalchemy.ext.asyncio.AsyncConnection:
+    def make_connection(self) -> contextlib.AbstractAsyncContextManager[sqlalchemy.ext.asyncio.AsyncConnection]:
         """
-        Asynchronously establishes and returns a new database connection using the SQLAlchemy async engine.
+        Establishes and returns a new asynchronous database connection using the SQLAlchemy async engine.
 
-        :return: A database connection object.
+        :return: An asynchronous context manager yielding a database connection object.
         """
-        return await self.engine.connect()
+        return self.engine.begin()
 
-    def make_session(self, **kwargs) -> contextlib.AbstractAsyncContextManager[
-        sqlalchemy.ext.asyncio.AsyncSession
-    ]:
+    def make_session(self, **kwargs) -> contextlib.AbstractAsyncContextManager[sqlalchemy.ext.asyncio.AsyncSession]:
         """
         Creates a context-managed asynchronous SQLAlchemy session with the configured async engine and session options.
 
         :param kwargs: Additional keyword arguments for session creation.
-        :return: A context manager yielding a SQLAlchemy ``AsyncSession``.
+        :return: An asynchronous context manager yielding a database session object.
         """
-        return contextlib.aclosing(
-            sqlalchemy.ext.asyncio.async_sessionmaker(self.engine, **{**self.session_opts, **kwargs})())
+        return sqlalchemy.ext.asyncio.async_sessionmaker(self.engine, **{**self.session_opts, **kwargs})()
 
     async def create_model(self, orm_base):
         """
@@ -269,7 +290,7 @@ class AsyncConnectionMaker(ConnectionMaker):
             if not isinstance(orm_base, type) or not issubclass(orm_base, sqlalchemy.orm.DeclarativeBase):
                 raise TypeError("not a subclass of 'sqlalchemy.orm.DeclarativeBase'")
 
-        async with self.engine.begin() as conn:
+        async with self.make_connection() as conn:
             await conn.run_sync(orm_base.metadata.create_all)
 
     async def drop_model(self, orm_base):
@@ -282,7 +303,7 @@ class AsyncConnectionMaker(ConnectionMaker):
             if not isinstance(orm_base, type) or not issubclass(orm_base, sqlalchemy.orm.DeclarativeBase):
                 raise TypeError("not a subclass of 'sqlalchemy.orm.DeclarativeBase'")
 
-        async with self.engine.begin() as conn:
+        async with self.make_connection() as conn:
             await conn.run_sync(orm_base.metadata.drop_all)
 
     async def execute(self, sql: str, **params):
@@ -368,48 +389,68 @@ def orm_clone(orm, exclude: set[str] = None, no_autoincrement: bool = False):
 
 
 @contextlib.contextmanager
-def mysql_insert_ignore():
+def sql_compiler_extension(connection_maker: ConnectionMaker, extension: Callable[[bool], ...]):
     """
-    Registers a SQLAlchemy compiler extension to add ``IGNORE`` to MySQL ``INSERT`` statements.
+    A context manager to temporarily enable a SQL compiler extension for the duration of the context block.
+
+    The provided ``extension`` callable should accept a boolean argument to enable or disable the extension, and the
+    context manager will reset the SQLAlchemy engine before and after the context block to ensure the extension is
+    applied correctly.
     """
+    connection_maker.reset_engine()
+    extension(True)
+    try:
+        yield
+    finally:
+        extension(False)
+        connection_maker.reset_engine()
 
-    def context(enabled: bool):
-        @sqlalchemy.ext.compiler.compiles(sqlalchemy.sql.Insert, Dialects.mysql)
-        def dispatch(insert: sqlalchemy.sql.Insert, compiler: sqlalchemy.sql.compiler.SQLCompiler, **kwargs) -> str:
-            if not enabled:
-                return compiler.visit_insert(insert, **kwargs)
 
-            return compiler.visit_insert(insert.prefix_with("IGNORE"), **kwargs)
+@contextlib.asynccontextmanager
+async def async_sql_compiler_extension(connection_maker: AsyncConnectionMaker, extension: Callable[[bool], ...]):
+    """
+    A context manager to temporarily enable a SQL compiler extension for the duration of the context block.
 
-    context(True)
+    The provided ``extension`` callable should accept a boolean argument to enable or disable the extension, and the
+    context manager will reset the SQLAlchemy engine before and after the context block to ensure the extension is
+    applied correctly.
+    """
+    await connection_maker.reset_engine()
+    extension(True)
     try:
         yield
     finally:
-        context(False)
+        extension(False)
+        await connection_maker.reset_engine()
 
 
-@contextlib.contextmanager
-def postgresql_insert_on_conflict_do_nothing():
+def mysql_insert_ignore(enabled: bool):
+    """
+    Registers a SQLAlchemy compiler extension to add ``IGNORE`` to MySQL ``INSERT`` statements.
+    """
+
+    @sqlalchemy.ext.compiler.compiles(sqlalchemy.sql.Insert, Dialects.mysql)
+    def dispatch(insert: sqlalchemy.sql.Insert, compiler: sqlalchemy.sql.compiler.SQLCompiler, **kwargs) -> str:
+        if not enabled:
+            return compiler.visit_insert(insert, **kwargs)
+
+        return compiler.visit_insert(insert.prefix_with("IGNORE"), **kwargs)
+
+
+def postgresql_insert_on_conflict_do_nothing(enabled: bool):
     """
     Registers a SQLAlchemy compiler extension to add ``ON CONFLICT DO NOTHING`` to Postgresql ``INSERT`` statements.
     """
 
-    def context(enabled: bool):
-        @sqlalchemy.ext.compiler.compiles(sqlalchemy.sql.Insert, Dialects.postgresql)
-        def dispatch(insert: sqlalchemy.sql.Insert, compiler: sqlalchemy.sql.compiler.SQLCompiler, **kwargs) -> str:
-            if not enabled:
-                return compiler.visit_insert(insert, **kwargs)
-
-            statement = compiler.visit_insert(insert, **kwargs)
-            # If we have a ``RETURNING`` clause, we must insert before it
-            returning_position = statement.find("RETURNING")
-            if returning_position >= 0:
-                return statement[:returning_position] + " ON CONFLICT DO NOTHING " + statement[returning_position:]
-            else:
-                return statement + " ON CONFLICT DO NOTHING"
-
-    context(True)
-    try:
-        yield
-    finally:
-        context(False)
+    @sqlalchemy.ext.compiler.compiles(sqlalchemy.sql.Insert, Dialects.postgresql)
+    def dispatch(insert: sqlalchemy.sql.Insert, compiler: sqlalchemy.sql.compiler.SQLCompiler, **kwargs) -> str:
+        if not enabled:
+            return compiler.visit_insert(insert, **kwargs)
+
+        statement = compiler.visit_insert(insert, **kwargs)
+        # If we have a ``RETURNING`` clause, we must insert before it
+        returning_position = statement.find("RETURNING")
+        if returning_position >= 0:
+            return statement[:returning_position] + " ON CONFLICT DO NOTHING " + statement[returning_position:]
+        else:
+            return statement + " ON CONFLICT DO NOTHING"

iker_python_common-1.0.71/src/iker/common/utils/shutils.py → iker_python_common-1.0.73/src/iker/common/utils/pathutils.py

@@ -17,8 +17,6 @@ __all__ = [
     "glob_match",
     "scan_files",
     "copy_files",
-    "run",
-    "execute",
 ]
 
 
@@ -74,41 +72,32 @@ def make_path(
     return path
 
 
-if sys.version_info < (3, 14):
-    def fn_suffix(filename: str | os.PathLike[str] | None) -> str | None:
-        """
-        Extracts the filename suffix from the given filename or path.
+def fn_suffix(filename: str | os.PathLike[str] | None) -> str | None:
+    """
+    Extracts the filename suffix from the given filename or path.
 
-        :param filename: The specific filename or path.
-        :return: The filename suffix, including the leading dot (e.g., ".txt" for "file.txt"),
-        or ``None`` if the input filename is ``None``.
-        """
-        if (path := make_path(filename)) is not None:
+    :param filename: The specific filename or path.
+    :return: The filename suffix, including the leading dot (e.g., ".txt" for "file.txt"),
+    or ``None`` if the input filename is ``None``.
+    """
+    if (path := make_path(filename)) is not None:
+        if sys.version_info < (3, 14):
             _, suffix_name = os.path.splitext(path.name)
             return suffix_name
-        return None
-else:
-    def fn_suffix(filename: str | os.PathLike[str] | None) -> str | None:
-        """
-        Extracts the filename suffix from the given filename or path.
-
-        :param filename: The specific filename or path.
-        :return: The filename suffix, including the leading dot (e.g., ".txt" for "file.txt"),
-        or ``None`` if the input filename is ``None``.
-        """
-        if (path := make_path(filename)) is not None:
+        else:
             return path.suffix
-        return None
+    return None
+
 
-if sys.version_info < (3, 14):
-    def fn_suffixes(filename: str | os.PathLike[str] | None) -> list[str]:
-        """
-        Extracts all filename suffixes from the given filename or path.
+def fn_suffixes(filename: str | os.PathLike[str] | None) -> list[str]:
+    """
+    Extracts all filename suffixes from the given filename or path.
 
-        :param filename: The specific filename or path.
-        :return: A list of filename suffixes, each including the leading dot (e.g., [".tar", ".gz"] for "archive.tar.gz").
-        """
-        if (path := make_path(filename)) is not None:
+    :param filename: The specific filename or path.
+    :return: A list of filename suffixes, each including the leading dot (e.g., [".tar", ".gz"] for "archive.tar.gz").
+    """
+    if (path := make_path(filename)) is not None:
+        if sys.version_info < (3, 14):
             results = []
             stem_name = path.name
             while True:
@@ -116,29 +105,21 @@ if sys.version_info < (3, 14):
                 if is_empty(suffix_name):
                     return list(reversed(results))
                 results.append(suffix_name)
-        return []
-else:
-    def fn_suffixes(filename: str | os.PathLike[str] | None) -> list[str]:
-        """
-        Extracts all filename suffixes from the given filename or path.
-
-        :param filename: The specific filename or path.
-        :return: A list of filename suffixes, each including the leading dot (e.g., [".tar", ".gz"] for "archive.tar.gz").
-        """
-        if (path := make_path(filename)) is not None:
+        else:
             return path.suffixes
-        return []
-
-if sys.version_info < (3, 14):
-    def fn_stem(filename: str | os.PathLike[str] | None, minimal: bool = False) -> str | None:
-        """
-        Extracts the filename stem from the given filename or path.
-
-        :param filename: The specific filename or path.
-        :param minimal: If ``True``, extracts the minimal (shortest) stem, otherwise the default stem.
-        :return: The filename stem.
-        """
-        if (path := make_path(filename)) is not None:
+    return []
+
+
+def fn_stem(filename: str | os.PathLike[str] | None, minimal: bool = False) -> str | None:
+    """
+    Extracts the filename stem from the given filename or path.
+
+    :param filename: The specific filename or path.
+    :param minimal: If ``True``, extracts the minimal (shortest) stem, otherwise the default stem.
+    :return: The filename stem.
+    """
+    if (path := make_path(filename)) is not None:
+        if sys.version_info < (3, 14):
             if not minimal:
                 stem_name, _ = os.path.splitext(path.name)
                 return stem_name
@@ -148,17 +129,7 @@ if sys.version_info < (3, 14):
                     stem_name, suffix_name = os.path.splitext(stem_name)
                     if is_empty(suffix_name):
                         return stem_name
-        return None
-else:
-    def fn_stem(filename: str | os.PathLike[str] | None, minimal: bool = False) -> str | None:
-        """
-        Extracts the filename stem from the given filename or path.
-
-        :param filename: The specific filename or path.
-        :param minimal: If ``True``, extracts the minimal (shortest) stem, otherwise the default stem.
-        :return: The filename stem.
-        """
-        if (path := make_path(filename)) is not None:
+        else:
             if not minimal:
                 return path.stem
             else:
@@ -166,7 +137,7 @@ else:
                     if is_empty(path.suffix):
                         return path.stem
                     path = path.with_suffix("")
-        return None
+    return None
 
 
 def path_depth(root: str | os.PathLike[str], child: str | os.PathLike[str]) -> int:
@@ -295,26 +266,3 @@ def copy_files(
                     ignore_dangling_symlinks=ignore_dangling_symlinks,
                     dirs_exist_ok=dirs_exist_ok,
                     copy_function=copy_func)
-
-
-def run(cmd: str) -> bool:
-    """
-    Runs the given command and returns the success status.
-
-    :param cmd: Command to run.
-    :return: ``True`` if the command has been successfully run, ``False`` otherwise.
-    """
-    return os.system(cmd) == 0
-
-
-def execute(cmd: str, strip: bool = True) -> str:
-    """
-    Executes the given command and returns contents collected from standard output.
-
-    :param cmd: Command to execute.
-    :param strip: If ``True``, the contents will be stripped.
-    :return: The content from standard output.
-    """
-    if strip:
-        return os.popen(cmd).read().strip()
-    return os.popen(cmd).read()

{iker_python_common-1.0.71 → iker_python_common-1.0.73}/src/iker_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.71
+Version: 1.0.73
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{iker_python_common-1.0.71 → iker_python_common-1.0.73}/src/iker_python_common.egg-info/SOURCES.txt

@@ -10,16 +10,16 @@ setup.py
 resources/unittest/config/config.cfg
 resources/unittest/csvutils/data.csv
 resources/unittest/csvutils/data.tsv
-resources/unittest/shutils/dir.baz/file.bar.baz
-resources/unittest/shutils/dir.baz/file.foo.bar
-resources/unittest/shutils/dir.baz/file.foo.baz
-resources/unittest/shutils/dir.foo/file.bar
-resources/unittest/shutils/dir.foo/file.baz
-resources/unittest/shutils/dir.foo/file.foo
-resources/unittest/shutils/dir.foo/dir.foo.bar/file.bar.baz
-resources/unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar
-resources/unittest/shutils/dir.foo/dir.foo.bar/file.foo.baz
-resources/unittest/shutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz
+resources/unittest/pathutils/dir.baz/file.bar.baz
+resources/unittest/pathutils/dir.baz/file.foo.bar
+resources/unittest/pathutils/dir.baz/file.foo.baz
+resources/unittest/pathutils/dir.foo/file.bar
+resources/unittest/pathutils/dir.foo/file.baz
+resources/unittest/pathutils/dir.foo/file.foo
+resources/unittest/pathutils/dir.foo/dir.foo.bar/file.bar.baz
+resources/unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar
+resources/unittest/pathutils/dir.foo/dir.foo.bar/file.foo.baz
+resources/unittest/pathutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz
 src/iker/common/__init__.py
 src/iker/common/utils/__init__.py
 src/iker/common/utils/argutils.py
@@ -32,9 +32,9 @@ src/iker/common/utils/iterutils.py
 src/iker/common/utils/jsonutils.py
 src/iker/common/utils/logger.py
 src/iker/common/utils/numutils.py
+src/iker/common/utils/pathutils.py
 src/iker/common/utils/randutils.py
 src/iker/common/utils/retry.py
-src/iker/common/utils/shutils.py
 src/iker/common/utils/span.py
 src/iker/common/utils/strutils.py
 src/iker/common/utils/testutils.py
@@ -59,9 +59,9 @@ test/iker_tests/common/utils/iterutils_test.py
 test/iker_tests/common/utils/jsonutils_test.py
 test/iker_tests/common/utils/logger_test.py
 test/iker_tests/common/utils/numutils_test.py
+test/iker_tests/common/utils/pathutils_test.py
 test/iker_tests/common/utils/randutils_test.py
 test/iker_tests/common/utils/retry_test.py
-test/iker_tests/common/utils/shutils_test.py
 test/iker_tests/common/utils/span_test.py
 test/iker_tests/common/utils/strutils_test.py
 test/iker_tests/common/utils/testutils_test.py

{iker_python_common-1.0.71 → iker_python_common-1.0.73}/test/iker_tests/common/utils/dbutils_test.py

@@ -13,6 +13,7 @@ import sqlalchemy.exc as sa_exc
 import sqlalchemy.orm as sa_orm
 
 from iker.common.utils.dbutils import AsyncConnectionMaker, ConnectionMaker, Dialects, Drivers
+from iker.common.utils.dbutils import async_sql_compiler_extension, sql_compiler_extension
 from iker.common.utils.dbutils import make_scheme
 from iker.common.utils.dbutils import mysql_insert_ignore, postgresql_insert_on_conflict_do_nothing
 from iker.common.utils.dbutils import orm_clone
@@ -190,7 +191,19 @@ def test_mysql_connection_maker(fixture_mysql_test_proc, fixture_mysql_test):
 
     result = records[0]
 
-    with mysql_insert_ignore():
+    with maker.make_session() as session:
+        # PK violation, which causes ``IntegrityError``
+        with pytest.raises(sa_exc.IntegrityError):
+            session.add(orm_clone(result))
+            session.commit()
+
+    with maker.make_session() as session:
+        # Unique index violation, which causes ``IntegrityError``
+        with pytest.raises(sa_exc.IntegrityError):
+            session.add(orm_clone(result, no_autoincrement=True))
+            session.commit()
+
+    with sql_compiler_extension(maker, mysql_insert_ignore):
         with maker.make_session() as session:
             # PK violation, but suppressed by the compiler plugin
             session.add(orm_clone(result))
@@ -331,7 +344,8 @@ def test_mysql_connection_maker__sql_text(fixture_mysql_test_proc, fixture_mysql
     maker.execute(
         # language=mysql
         """
-        INSERT IGNORE INTO `mysql_dummy_record` (`dummy_id`,
+        INSERT
+        IGNORE INTO `mysql_dummy_record` (`dummy_id`,
                                                  `dummy_char`,
                                                  `dummy_varchar`,
                                                  `dummy_text`,
@@ -383,7 +397,8 @@ def test_mysql_connection_maker__sql_text(fixture_mysql_test_proc, fixture_mysql
     maker.execute(
         # language=mysql
         """
-        INSERT IGNORE INTO `mysql_dummy_record` (`dummy_char`,
+        INSERT
+        IGNORE INTO `mysql_dummy_record` (`dummy_char`,
                                                  `dummy_varchar`,
                                                  `dummy_text`,
                                                  `dummy_boolean`,
@@ -624,7 +639,19 @@ def test_postgresql_connection_maker(fixture_postgresql_test_proc, fixture_postg
 
     result = records[0]
 
-    with postgresql_insert_on_conflict_do_nothing():
+    with maker.make_session() as session:
+        # PK violation, which causes ``IntegrityError``
+        with pytest.raises(sa_exc.IntegrityError):
+            session.add(orm_clone(result))
+            session.commit()
+
+    with maker.make_session() as session:
+        # Unique index violation, which causes ``IntegrityError``
+        with pytest.raises(sa_exc.IntegrityError):
+            session.add(orm_clone(result, no_autoincrement=True))
+            session.commit()
+
+    with sql_compiler_extension(maker, postgresql_insert_on_conflict_do_nothing):
         with maker.make_session() as session:
             # PK violation, but suppressed by the compiler plugin
             session.add(orm_clone(result))
@@ -1122,7 +1149,19 @@ async def test_async_postgresql_connection_maker(fixture_postgresql_test_proc, f
 
     result = records[0]
 
-    with postgresql_insert_on_conflict_do_nothing():
+    async with maker.make_session() as session:
+        # PK violation, which causes ``IntegrityError``
+        with pytest.raises(sa_exc.IntegrityError):
+            session.add(orm_clone(result))
+            await session.commit()
+
+    async with maker.make_session() as session:
+        # Unique index violation, which causes ``IntegrityError``
+        with pytest.raises(sa_exc.IntegrityError):
+            session.add(orm_clone(result, no_autoincrement=True))
+            await session.commit()
+
+    async with async_sql_compiler_extension(maker, postgresql_insert_on_conflict_do_nothing):
         async with maker.make_session() as session:
             # PK violation, but suppressed by the compiler plugin
             session.add(orm_clone(result))

iker_python_common-1.0.71/test/iker_tests/common/utils/shutils_test.py → iker_python_common-1.0.73/test/iker_tests/common/utils/pathutils_test.py

@@ -5,10 +5,10 @@ import unittest
 
 import ddt
 
-from iker.common.utils.shutils import copy_files, scan_files
-from iker.common.utils.shutils import fn_stem, fn_suffix, fn_suffixes
-from iker.common.utils.shutils import glob_match
-from iker.common.utils.shutils import make_path, path_depth
+from iker.common.utils.pathutils import copy_files, scan_files
+from iker.common.utils.pathutils import fn_stem, fn_suffix, fn_suffixes
+from iker.common.utils.pathutils import glob_match
+from iker.common.utils.pathutils import make_path, path_depth
 from testenv import resources_directory
 
 work_dir = pathlib.Path.cwd
@@ -16,8 +16,10 @@ home_dir = pathlib.Path.home
 
 
 @ddt.ddt
-class ShUtilsTest(unittest.TestCase):
+class PathUtilsTest(unittest.TestCase):
     data_fn_suffix = [
+        (None, None),
+        ("", ""),
         (".", ""),
         ("..", ""),
         ("...", ""),
@@ -49,6 +51,8 @@ class ShUtilsTest(unittest.TestCase):
         self.assertEqual(expect, fn_suffix(data))
 
     data_fn_suffixes = [
+        (None, []),
+        ("", []),
         (".", []),
         ("..", []),
         ("...", []),
@@ -80,6 +84,8 @@ class ShUtilsTest(unittest.TestCase):
         self.assertEqual(expect, fn_suffixes(data))
 
     data_fn_stem = [
+        (None, None),
+        ("", ""),
         (".", ""),
         ("..", ".."),
         ("...", "..."),
@@ -111,6 +117,8 @@ class ShUtilsTest(unittest.TestCase):
         self.assertEqual(expect, fn_stem(data))
 
     data_fn_stem__minimal = [
+        (None, None),
+        ("", ""),
         (".", ""),
         ("..", ".."),
         ("...", "..."),
@@ -289,133 +297,133 @@ class ShUtilsTest(unittest.TestCase):
 
     data_scan_files = [
         (
-            "unittest/shutils",
+            "unittest/pathutils",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.baz/file.foo.baz",
-                "unittest/shutils/dir.baz/file.bar.baz",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.baz",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.bar.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.baz",
+                "unittest/pathutils/dir.baz/file.bar.baz",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.baz",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.bar.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
             ],
         ),
         (
-            "unittest/shutils/dir.foo",
+            "unittest/pathutils/dir.foo",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.baz",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.bar.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.baz",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.bar.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
             ],
         ),
         (
-            "unittest/shutils/dir.baz",
+            "unittest/pathutils/dir.baz",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.baz/file.foo.baz",
-                "unittest/shutils/dir.baz/file.bar.baz",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.baz",
+                "unittest/pathutils/dir.baz/file.bar.baz",
             ],
         ),
         (
-            "unittest/shutils",
+            "unittest/pathutils",
             ["*.foo", "*.bar"],
             ["*.foo.bar"],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.foo",
             ],
         ),
         (
-            "unittest/shutils",
+            "unittest/pathutils",
             ["*.foo", "*.bar"],
             [],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
             ],
         ),
         (
-            "unittest/shutils",
+            "unittest/pathutils",
             [],
             ["*.baz"],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
             ],
         ),
         (
-            "unittest/shutils",
+            "unittest/pathutils",
             [],
             [],
             2,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.baz/file.foo.baz",
-                "unittest/shutils/dir.baz/file.bar.baz",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.baz",
-                "unittest/shutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.baz",
+                "unittest/pathutils/dir.baz/file.bar.baz",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.baz",
+                "unittest/pathutils/dir.foo/file.foo",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.bar",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             [],
             [],
             2,
             [
-                "unittest/shutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.bar",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             ["*.foo", "*.bar"],
             ["*.baz"],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.bar",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             ["*.foo"],
             [],
             0,
             [],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             [],
             ["*.bar"],
             0,
@@ -436,145 +444,145 @@ class ShUtilsTest(unittest.TestCase):
 
     data_copy_files = [
         (
-            "unittest/shutils",
-            "unittest/shutils",
+            "unittest/pathutils",
+            "unittest/pathutils",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.baz/file.foo.baz",
-                "unittest/shutils/dir.baz/file.bar.baz",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.baz",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.bar.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.baz",
+                "unittest/pathutils/dir.baz/file.bar.baz",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.baz",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.bar.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
             ],
         ),
         (
-            "unittest/shutils/dir.foo",
-            "unittest/shutils/dir.foo",
+            "unittest/pathutils/dir.foo",
+            "unittest/pathutils/dir.foo",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.baz",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.bar.baz",
-                "unittest/shutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.baz",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.bar.baz",
+                "unittest/pathutils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz",
             ],
         ),
         (
-            "unittest/shutils/dir.baz",
-            "unittest/shutils/dir.baz",
+            "unittest/pathutils/dir.baz",
+            "unittest/pathutils/dir.baz",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.baz/file.foo.baz",
-                "unittest/shutils/dir.baz/file.bar.baz",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.baz",
+                "unittest/pathutils/dir.baz/file.bar.baz",
             ],
         ),
         (
-            "unittest/shutils",
-            "unittest/shutils",
+            "unittest/pathutils",
+            "unittest/pathutils",
             ["*.foo", "*.bar"],
             ["*.foo.bar"],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.foo",
             ],
         ),
         (
-            "unittest/shutils",
-            "unittest/shutils",
+            "unittest/pathutils",
+            "unittest/pathutils",
             ["*.foo", "*.bar"],
             [],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
             ],
         ),
         (
-            "unittest/shutils",
-            "unittest/shutils",
+            "unittest/pathutils",
+            "unittest/pathutils",
             [],
             ["*.baz"],
             0,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.foo",
-                "unittest/shutils/dir.foo/dir.foo.bar/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.foo/dir.foo.bar/file.foo.bar",
             ],
         ),
         (
-            "unittest/shutils",
-            "unittest/shutils",
+            "unittest/pathutils",
+            "unittest/pathutils",
             [],
             [],
             2,
             [
-                "unittest/shutils/dir.baz/file.foo.bar",
-                "unittest/shutils/dir.baz/file.foo.baz",
-                "unittest/shutils/dir.baz/file.bar.baz",
-                "unittest/shutils/dir.foo/file.bar",
-                "unittest/shutils/dir.foo/file.baz",
-                "unittest/shutils/dir.foo/file.foo",
+                "unittest/pathutils/dir.baz/file.foo.bar",
+                "unittest/pathutils/dir.baz/file.foo.baz",
+                "unittest/pathutils/dir.baz/file.bar.baz",
+                "unittest/pathutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.baz",
+                "unittest/pathutils/dir.foo/file.foo",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             [],
             [],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.bar",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             [],
             [],
             2,
             [
-                "unittest/shutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.bar",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             ["*.foo", "*.bar"],
             ["*.baz"],
             0,
             [
-                "unittest/shutils/dir.foo/file.bar",
+                "unittest/pathutils/dir.foo/file.bar",
             ],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             ["*.foo"],
             [],
             0,
             [],
         ),
         (
-            "unittest/shutils/dir.foo/file.bar",
-            "unittest/shutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
+            "unittest/pathutils/dir.foo/file.bar",
             [],
             ["*.bar"],
             0,