plexus-python-common 1.0.46__tar.gz → 1.0.48__tar.gz

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.46
+Version: 1.0.48
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus/common/utils/bagutils.py

@@ -5,6 +5,7 @@ from typing import Literal
 
 import sqlalchemy as sa
 import sqlalchemy.orm as sa_orm
+from iker.common.utils.pathutils import make_path
 
 __all__ = [
     "SerializationFormat",
@@ -77,12 +78,20 @@ class BagMessage(BagBase):
 
 
 class BagReader(AbstractContextManager):
-    def __init__(self, db_dir: str, db_file: str = default_bag_db_file):
-        self.db_path = os.path.join(db_dir, db_file)
-        if not os.path.exists(self.db_path):
-            raise FileNotFoundError(f"could not find SQLite DB at '{db_dir}'")
-
-        self.engine = sa.create_engine(f"sqlite:///{self.db_path}")
+    def __init__(self, db_dir: str | os.PathLike[str], db_file: str | os.PathLike[str] = default_bag_db_file):
+        """
+        Creates a BagReader instance to read messages from a ROS2 bag file.
+
+        :param db_dir: directory containing the SQLite DB file.
+        :param db_file: name of the SQLite DB file.
+        :return: BagReader instance.
+        """
+        self.db_dir = make_path(db_dir)
+        self.db_path = self.db_dir / db_file
+        if not self.db_path.exists():
+            raise FileNotFoundError(f"could not find SQLite DB at '{str(self.db_path)}'")
+
+        self.engine = sa.create_engine(f"sqlite:///{str(self.db_path.absolute())}")
         self.session = sa_orm.Session(self.engine)
         self.topic_map = None
 
@@ -121,12 +130,22 @@ class BagReader(AbstractContextManager):
 
 
 class BagWriter(AbstractContextManager):
-    def __init__(self, db_dir: str, db_file: str = default_bag_db_file):
-        self.db_path = os.path.join(db_dir, db_file)
-        if os.path.exists(self.db_path):
-            os.remove(self.db_path)
-
-        self.engine = sa.create_engine(f"sqlite:///{self.db_path}")
+    def __init__(self, db_dir: str | os.PathLike[str], db_file: str | os.PathLike[str] = default_bag_db_file):
+        """
+        Creates a BagWriter instance to write messages to a ROS2 bag file.
+
+        :param db_dir: directory to store the SQLite DB file.
+        :param db_file: name of the SQLite DB file.
+        :return: BagWriter instance.
+        """
+        self.db_dir = make_path(db_dir)
+        if not self.db_dir.exists():
+            self.db_dir.mkdir(parents=True, exist_ok=True)
+        self.db_path = self.db_dir / db_file
+        if self.db_path.exists():
+            self.db_path.unlink()
+
+        self.engine = sa.create_engine(f"sqlite:///{str(self.db_path.absolute())}")
         self.session = sa_orm.Session(self.engine)
         self.topic_map = {}
 
@@ -191,25 +210,5 @@ class BagWriter(AbstractContextManager):
         return db_message
 
 
-def bag_reader(db_dir: str, db_file: str = default_bag_db_file) -> BagReader:
-    """
-    Creates a BagReader instance to read messages from a ROS2 bag file.
-
-    :param db_dir: directory containing the SQLite DB file.
-    :param db_file: name of the SQLite DB file.
-    :return: BagReader instance.
-    """
-    return BagReader(db_dir, db_file)
-
-
-def bag_writer(db_dir: str, db_file: str = default_bag_db_file) -> BagWriter:
-    """
-    Creates a BagWriter instance to write messages to a ROS2 bag file.
-
-    :param db_dir: directory to store the SQLite DB file.
-    :param db_file: name of the SQLite DB file.
-    :return: BagWriter instance.
-    """
-    if not os.path.exists(db_dir):
-        os.makedirs(db_dir, exist_ok=True)
-    return BagWriter(db_dir, db_file)
+bag_reader = BagReader
+bag_writer = BagWriter

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus/common/utils/config.py

@@ -1,17 +1,19 @@
+import os
+
 from iker.common.utils import logger
 from iker.common.utils.config import Config
 from iker.common.utils.funcutils import memorized
-from iker.common.utils.shutils import expanded_path
+from iker.common.utils.pathutils import make_path
 
 
 @memorized()
-def config(config_path: str = "") -> Config:
+def config(config_path: str | os.PathLike[str] = "") -> Config:
     default_items: list[tuple[str, str, str]] = [
         ("plexus", "logging.level", "INFO"),
         ("plexus", "logging.format", "%(asctime)s [%(levelname)s] %(name)s: %(message)s"),
     ]
 
-    instance = Config(config_path or expanded_path("~/.plexus.cfg"))
+    instance = Config(config_path or make_path("~/.plexus.cfg", expand=True, normalize=True, absolute=True))
     instance.restore()
     instance.update(default_items, overwrite=False)
 

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus/common/utils/jsonutils.py

@@ -9,7 +9,7 @@ from iker.common.utils.iterutils import batched
 from iker.common.utils.jsonutils import JsonType, JsonValueCompatible
 from iker.common.utils.jsonutils import json_reformat
 
-from plexus.common.utils.shutils import collect_volumed_filenames, populate_volumed_filenames
+from plexus.common.utils.pathutils import collect_volumed_filenames, populate_volumed_filenames
 
 __all__ = [
     "json_datetime_decoder",

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus/common/utils/ormutils.py

@@ -1146,7 +1146,7 @@ def db_read_active_snapshot_model_of_record[SnapshotModelT: SnapshotModelMixin](
 ) -> SnapshotModelT:
     db_instance = db.query(model).where(model.record_sqn == record_sqn, model.expired_at.is_(None)).one_or_none()
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     return db_instance
 
@@ -1218,7 +1218,7 @@ def db_update_snapshot_model[SnapshotModelT: SnapshotModelMixin](
 ) -> SnapshotModelT:
     db_instance = db.query(model).where(model.record_sqn == record_sqn, model.expired_at.is_(None)).one_or_none()
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     db_instance.expired_at = updated_at
     db_instance = clone_snapshot_model_instance(model, db_instance, clear_meta_fields=False, inplace=True)
@@ -1247,7 +1247,7 @@ def db_expire_snapshot_model[SnapshotModelT: SnapshotModelMixin](
         .one_or_none()
     )
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     db_instance.expired_at = updated_at
     db_instance = clone_snapshot_model_instance(model, db_instance, clear_meta_fields=False, inplace=True)
@@ -1275,7 +1275,7 @@ def db_activate_snapshot_model[SnapshotModelT: SnapshotModelMixin](
         .first()
     )
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Expired '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"expired '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     db_new_instance = clone_snapshot_model_instance(model, db_instance)
     db_new_instance.record_sqn = record_sqn
@@ -1371,7 +1371,7 @@ def db_read_active_revision_model_of_record[RevisionModelT: RevisionModelMixin](
 ) -> RevisionModelT:
     db_instance = db.query(model).where(model.record_sqn == record_sqn, model.expired_at.is_(None)).one_or_none()
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     return db_instance
 
@@ -1443,7 +1443,7 @@ def db_update_revision_model[RevisionModelT: RevisionModelMixin](
 ) -> RevisionModelT:
     db_instance = db.query(model).where(model.record_sqn == record_sqn, model.expired_at.is_(None)).one_or_none()
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     db_instance.expired_at = updated_at
     db_instance = clone_revision_model_instance(model, db_instance, clear_meta_fields=False, inplace=True)
@@ -1474,7 +1474,7 @@ def db_expire_revision_model[RevisionModelT: RevisionModelMixin](
         .one_or_none()
     )
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     db_instance.expired_at = updated_at
     db_instance = clone_revision_model_instance(model, db_instance, clear_meta_fields=False, inplace=True)
@@ -1492,7 +1492,7 @@ def db_activate_revision_model[RevisionModelT: RevisionModelMixin](
     db_instance = db.query(model).where(model.record_sqn == record_sqn, model.expired_at.is_(None)).one_or_none()
     if db_instance is not None:
         raise sa_exc.MultipleResultsFound(
-            f"Active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' already exists")
+            f"active '{model_name_of(model)}' of specified record_sqn '{record_sqn}' already exists")
 
     db_instance = (
         db
@@ -1502,7 +1502,7 @@ def db_activate_revision_model[RevisionModelT: RevisionModelMixin](
         .first()
     )
     if db_instance is None:
-        raise sa_exc.NoResultFound(f"Expired '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
+        raise sa_exc.NoResultFound(f"expired '{model_name_of(model)}' of specified record_sqn '{record_sqn}' not found")
 
     db_new_instance = clone_revision_model_instance(model, db_instance)
     db_new_instance.record_sqn = record_sqn

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus/common/utils/s3utils.py

@@ -6,7 +6,7 @@ import functools
 import io
 import mimetypes
 import os
-import os.path
+import pathlib
 import shutil
 import tempfile
 import typing
@@ -20,7 +20,7 @@ import fsspec
 import fsspec.utils
 from iker.common.utils.iterutils import chunk_between, head, last
 from iker.common.utils.jsonutils import JsonObject
-from iker.common.utils.shutils import glob_match, listfile, path_depth
+from iker.common.utils.pathutils import glob_match, make_path, path_depth, scan_files
 from iker.common.utils.strutils import is_empty, trim_to_none
 from mypy_boto3_s3 import S3Client
 from rich.progress import BarColumn, DownloadColumn, Progress, TextColumn, TransferSpeedColumn
@@ -30,7 +30,7 @@ __all__ = [
     "s3_make_client",
     "s3_head_object",
     "s3_list_objects",
-    "s3_listfile",
+    "s3_list_files",
     "s3_cp_download",
     "s3_cp_upload",
     "s3_sync_download",
@@ -40,7 +40,7 @@ __all__ = [
     "s3_make_progressed_client",
     "ArchiveMemberChunk",
     "s3_archive_member_tree",
-    "s3_archive_listfile",
+    "s3_archive_list_files",
     "s3_archive_open_member",
     "s3_archive_use_ranged_requests",
     "s3_archive_use_chunked_reads",
@@ -147,7 +147,7 @@ def s3_list_objects(
         continuation_token = response.get("NextContinuationToken")
 
 
-def s3_listfile(
+def s3_list_files(
     client: S3Client,
     bucket: str,
     prefix: str,
@@ -173,9 +173,10 @@ def s3_listfile(
         prefix = prefix + "/"
 
     def filter_object_meta(object_meta: S3ObjectMeta) -> bool:
-        if 0 < depth <= path_depth(prefix, os.path.dirname(object_meta.key)):
+        object_path = make_path(object_meta.key)
+        if 0 < depth <= path_depth(prefix, object_path.parent):
             return False
-        if len(glob_match([os.path.basename(object_meta.key)], include_patterns, exclude_patterns)) == 0:
+        if len(glob_match([object_path.name], include_patterns, exclude_patterns)) == 0:
             return False
         return True
 
@@ -238,16 +239,18 @@ def s3_sync_download(
     if not prefix.endswith("/"):
         prefix = prefix + "/"
 
-    objects = s3_listfile(client,
-                          bucket,
-                          prefix,
-                          include_patterns=include_patterns,
-                          exclude_patterns=exclude_patterns,
-                          depth=depth)
+    dir_path = make_path(dir_path)
+
+    objects = s3_list_files(client,
+                            bucket,
+                            prefix,
+                            include_patterns=include_patterns,
+                            exclude_patterns=exclude_patterns,
+                            depth=depth)
 
     def download_file(key: str):
-        file_path = os.path.join(dir_path, key[len(prefix):])
-        os.makedirs(os.path.dirname(file_path), exist_ok=True)
+        file_path = dir_path / key[len(prefix):]
+        file_path.parent.mkdir(parents=True, exist_ok=True)
         s3_cp_download(client, bucket, key, file_path)
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
@@ -293,13 +296,15 @@ def s3_sync_upload(
     if not prefix.endswith("/"):
         prefix = prefix + "/"
 
-    file_paths = listfile(dir_path,
-                          include_patterns=include_patterns,
-                          exclude_patterns=exclude_patterns,
-                          depth=depth)
+    dir_path = make_path(dir_path)
+
+    file_paths = scan_files(dir_path,
+                            include_patterns=include_patterns,
+                            exclude_patterns=exclude_patterns,
+                            depth=depth)
 
-    def upload_file(file_path: str):
-        s3_cp_upload(client, file_path, bucket, prefix + os.path.relpath(file_path, dir_path))
+    def upload_file(file_path: pathlib.Path):
+        s3_cp_upload(client, file_path, bucket, prefix + str(file_path.relative_to(dir_path)))
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
         futures = [executor.submit(upload_file, file_path) for file_path in file_paths]
@@ -415,7 +420,7 @@ class S3ClientProgressProxy(object):
         Callback=None,
         Config=None,
     ):
-        bytes_total = os.path.getsize(Filename)
+        bytes_total = make_path(Filename).stat().st_size
         with (
             contextlib.nullcontext(Callback) if Callback is not None
             else self.make_transfer_callback(Key, bytes_total, "upload")
@@ -585,7 +590,7 @@ def s3_archive_member_tree(
     return root_member_tree
 
 
-def s3_archive_listfile(
+def s3_archive_list_files(
     client: S3Client,
     bucket: str,
     key: str,
@@ -597,7 +602,7 @@ def s3_archive_listfile(
     under that directory will be included in the results.
 
     Example usage:
-    >>> archive_size, member_zip_infos, missed_members = s3_archive_listfile(client, bucket, key, members=["file1.txt", "dir1/"])
+    >>> archive_size, member_zip_infos, missed_members = s3_archive_list_files(client, bucket, key, members=["file1.txt", "dir1/"])
     >>> for info in member_zip_infos:
     ...     print(info.filename, info.file_size)
     >>> if missed_members:
@@ -836,9 +841,9 @@ def s3_archive_open_members(
 
     s3_options = s3_options_from_s3_client(client)
 
-    archive_size, member_zip_infos, missed_members = s3_archive_listfile(client, bucket, key, members)
+    archive_size, member_zip_infos, missed_members = s3_archive_list_files(client, bucket, key, members)
     if missed_members:
-        raise FileNotFoundError(f"Archive members not found: {', '.join(missed_members)}")
+        raise FileNotFoundError(f"archive members not found: {', '.join(missed_members)}")
 
     if callable(use_ranged_requests):
         use_ranged_requests = use_ranged_requests(archive_size, member_zip_infos)

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus/common/utils/tagutils.py

@@ -1,6 +1,7 @@
 import dataclasses
 import datetime
-import os.path
+import os
+import pathlib
 import textwrap
 import typing
 from collections.abc import Generator, Mapping, Sequence
@@ -324,18 +325,17 @@ def render_tagset_markdown_readme(tagset: Tagset) -> str:
 
 
 @singleton
-def tag_cache_file_path() -> str:
-    return os.path.expanduser(f"~/.local/plus/datahub/tag_cache/{randomizer().random_alphanumeric(7)}.db")
+def tag_cache_file_path() -> pathlib.Path:
+    return pathlib.Path.home() / ".local" / "plus" / "datahub" / "tag_cache" / f"{randomizer().random_alphanumeric(7)}.db"
 
 
 class TagCache(object):
-    def __init__(self, *, file_path: str | None = None, fail_if_exists: bool = False):
-        self.file_path = file_path or tag_cache_file_path()
-        if fail_if_exists and os.path.exists(self.file_path):
-            raise FileExistsError(f"tag cache file '{self.file_path}' already exists")
-        if not os.path.exists(os.path.dirname(self.file_path)):
-            os.makedirs(os.path.dirname(self.file_path), exist_ok=True)
-        self.conn_maker = ConnectionMaker.from_url(f"sqlite:///{self.file_path}",
+    def __init__(self, *, file_path: str | os.PathLike[str] | None = None, fail_if_exists: bool = False):
+        self.file_path = pathlib.Path(file_path or tag_cache_file_path())
+        if fail_if_exists and self.file_path.exists():
+            raise FileExistsError(f"tag cache file '{str(self.file_path)}' already exists")
+        self.file_path.parent.mkdir(parents=True, exist_ok=True)
+        self.conn_maker = ConnectionMaker.from_url(f"sqlite:///{str(self.file_path.absolute())}",
                                                    engine_opts=dict(connect_args={"check_same_thread": False}))
         BaseModel.metadata.create_all(self.conn_maker.engine)
 

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-common
-Version: 1.0.46
+Version: 1.0.48
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/src/plexus_python_common.egg-info/SOURCES.txt

@@ -10,6 +10,22 @@ setup.py
 resources/unittest/jsonutils/dummy.0.jsonl
 resources/unittest/jsonutils/dummy.1.jsonl
 resources/unittest/jsonutils/dummy.2.jsonl
+resources/unittest/pathutils/0-dummy
+resources/unittest/pathutils/1-dummy
+resources/unittest/pathutils/2-dummy
+resources/unittest/pathutils/dummy.0.0.jsonl
+resources/unittest/pathutils/dummy.0.0.vol-0.jsonl
+resources/unittest/pathutils/dummy.0.jsonl
+resources/unittest/pathutils/dummy.1.1.jsonl
+resources/unittest/pathutils/dummy.1.1.vol-1.jsonl
+resources/unittest/pathutils/dummy.1.jsonl
+resources/unittest/pathutils/dummy.2.2.jsonl
+resources/unittest/pathutils/dummy.2.2.vol-2.jsonl
+resources/unittest/pathutils/dummy.2.jsonl
+resources/unittest/pathutils/dummy.csv.part0
+resources/unittest/pathutils/dummy.csv.part1
+resources/unittest/pathutils/dummy.csv.part2
+resources/unittest/pathutils/dummy.txt
 resources/unittest/s3utils/dir.baz/file.bar.baz
 resources/unittest/s3utils/dir.baz/file.foo.bar
 resources/unittest/s3utils/dir.baz/file.foo.baz
@@ -22,22 +38,6 @@ resources/unittest/s3utils/dir.foo/dir.foo.bar/file.foo.baz
 resources/unittest/s3utils/dir.foo/dir.foo.bar/dir.foo.bar.baz/file.foo.bar.baz
 resources/unittest/s3utils_archive/archive.compressed.zip
 resources/unittest/s3utils_archive/archive.uncompressed.zip
-resources/unittest/shutils/0-dummy
-resources/unittest/shutils/1-dummy
-resources/unittest/shutils/2-dummy
-resources/unittest/shutils/dummy.0.0.jsonl
-resources/unittest/shutils/dummy.0.0.vol-0.jsonl
-resources/unittest/shutils/dummy.0.jsonl
-resources/unittest/shutils/dummy.1.1.jsonl
-resources/unittest/shutils/dummy.1.1.vol-1.jsonl
-resources/unittest/shutils/dummy.1.jsonl
-resources/unittest/shutils/dummy.2.2.jsonl
-resources/unittest/shutils/dummy.2.2.vol-2.jsonl
-resources/unittest/shutils/dummy.2.jsonl
-resources/unittest/shutils/dummy.csv.part0
-resources/unittest/shutils/dummy.csv.part1
-resources/unittest/shutils/dummy.csv.part2
-resources/unittest/shutils/dummy.txt
 src/plexus/common/__init__.py
 src/plexus/common/pose.py
 src/plexus/common/proj.py
@@ -57,8 +57,8 @@ src/plexus/common/utils/datautils.py
 src/plexus/common/utils/dockerutils.py
 src/plexus/common/utils/jsonutils.py
 src/plexus/common/utils/ormutils.py
+src/plexus/common/utils/pathutils.py
 src/plexus/common/utils/s3utils.py
-src/plexus/common/utils/shutils.py
 src/plexus/common/utils/sqlutils.py
 src/plexus/common/utils/strutils.py
 src/plexus/common/utils/tagutils.py
@@ -69,19 +69,22 @@ src/plexus_python_common.egg-info/dependency_links.txt
 src/plexus_python_common.egg-info/not-zip-safe
 src/plexus_python_common.egg-info/requires.txt
 src/plexus_python_common.egg-info/top_level.txt
-test/plexus_test.py
+test/testenv.py
 test/plexus_tests/__init__.py
+test/plexus_tests/common/__init__.py
 test/plexus_tests/common/pose_test.py
 test/plexus_tests/common/proj_test.py
+test/plexus_tests/common/carto/__init__.py
 test/plexus_tests/common/carto/osm_file_test.py
 test/plexus_tests/common/carto/osm_tags_test.py
+test/plexus_tests/common/utils/__init__.py
 test/plexus_tests/common/utils/bagutils_test.py
 test/plexus_tests/common/utils/datautils_test.py
 test/plexus_tests/common/utils/dockerutils_test.py
 test/plexus_tests/common/utils/jsonutils_test.py
 test/plexus_tests/common/utils/ormutils_test.py
+test/plexus_tests/common/utils/pathutils_test.py
 test/plexus_tests/common/utils/s3utils_test.py
-test/plexus_tests/common/utils/shutils_test.py
 test/plexus_tests/common/utils/strutils_test.py
 test/plexus_tests/common/utils/tagutils_test.py
 test/plexus_tests/common/utils/testutils_test.py

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/test/plexus_tests/common/utils/jsonutils_test.py

@@ -4,13 +4,12 @@ import unittest
 import ddt
 
 from plexus.common.utils.jsonutils import read_chunked_jsonl
-from plexus_test import resources_directory
+from testenv import resources_directory
 
 
 @ddt.ddt
 class JsonUtilsTest(unittest.TestCase):
 
     def test_read_chunked_jsonl(self):
-        for data, path in read_chunked_jsonl(
-            os.path.join(resources_directory, "unittest/jsonutils", "dummy.{{}}.jsonl")):
+        for data, path in read_chunked_jsonl(str(resources_directory / "unittest" / "jsonutils" / "dummy.{{}}.jsonl")):
             self.assertEqual(data["file"], os.path.basename(path))

{plexus_python_common-1.0.46 → plexus_python_common-1.0.48}/test/plexus_tests/common/utils/ormutils_test.py

@@ -30,9 +30,13 @@ from plexus.common.utils.ormutils import (
     db_activate_revision_model,
     db_activate_snapshot_model,
     db_create_changing_model,
+    db_create_changing_models,
     db_create_revision_model,
+    db_create_revision_models,
     db_create_sequence_model,
+    db_create_sequence_models,
     db_create_snapshot_model,
+    db_create_snapshot_models,
     db_delete_sequence_model,
     db_expire_revision_model,
     db_expire_snapshot_model,
@@ -223,6 +227,21 @@ def test_db_sequence_model_crud(fixture_postgresql_test_proc, fixture_postgresql
         results = db_read_sequence_models(session, DummySequenceModel, 0, 200)
         assert len(results) == 0
 
+        create_records = [random_record() for _ in range(0, 100)]
+
+        results = db_create_sequence_models(session, DummySequenceModel, create_records)
+        assert len(results) == len(create_records)
+
+        for i, result in zip(range(0, 100), results):
+            assert result.sqn == i + 101
+            assert result.dummy_uuid == create_records[i].dummy_uuid
+            assert result.dummy_int == create_records[i].dummy_int
+            assert result.dummy_str == create_records[i].dummy_str
+            assert result.dummy_float == create_records[i].dummy_float
+            assert result.dummy_bool == create_records[i].dummy_bool
+            assert result.dummy_array == create_records[i].dummy_array
+            assert result.dummy_json == create_records[i].dummy_json
+
 
 def test_db_changing_model_crud(fixture_postgresql_test_proc, fixture_postgresql_test):
     scheme = make_scheme(Dialects.postgresql, Drivers.psycopg)
@@ -359,6 +378,26 @@ def test_db_changing_model_crud(fixture_postgresql_test_proc, fixture_postgresql
         results = db_read_sequence_models(session, DummyChangingModel, 0, 200)
         assert len(results) == 0
 
+        create_records = [random_record() for _ in range(0, 100)]
+
+        results = db_create_changing_models(session,
+                                            DummyChangingModel,
+                                            create_records,
+                                            dt_parse_iso("2024-01-01T00:00:00+00:00"))
+        assert len(results) == len(create_records)
+
+        for i, result in zip(range(0, 100), results):
+            assert result.sqn == i + 101
+            assert result.created_at == dt_parse_iso("2024-01-01T00:00:00+00:00")
+            assert result.updated_at == dt_parse_iso("2024-01-01T00:00:00+00:00")
+            assert result.dummy_uuid == create_records[i].dummy_uuid
+            assert result.dummy_int == create_records[i].dummy_int
+            assert result.dummy_str == create_records[i].dummy_str
+            assert result.dummy_float == create_records[i].dummy_float
+            assert result.dummy_bool == create_records[i].dummy_bool
+            assert result.dummy_array == create_records[i].dummy_array
+            assert result.dummy_json == create_records[i].dummy_json
+
 
 def test_db_snapshot_model_crud(fixture_postgresql_test_proc, fixture_postgresql_test):
     scheme = make_scheme(Dialects.postgresql, Drivers.psycopg)
@@ -644,6 +683,27 @@ def test_db_snapshot_model_crud(fixture_postgresql_test_proc, fixture_postgresql
             assert result.dummy_array == update_records[i].dummy_array
             assert result.dummy_json == update_records[i].dummy_json
 
+        create_records = [random_record() for _ in range(0, 100)]
+
+        results = db_create_snapshot_models(session,
+                                            DummySnapshotModel,
+                                            create_records,
+                                            dt_parse_iso("2024-01-01T00:00:00+00:00"))
+        assert len(results) == len(create_records)
+
+        for i, result in zip(range(0, 100), results):
+            assert result.sqn == i + 301
+            assert result.record_sqn == i + 301
+            assert result.created_at == dt_parse_iso("2024-01-01T00:00:00+00:00")
+            assert result.expired_at is None
+            assert result.dummy_uuid == create_records[i].dummy_uuid
+            assert result.dummy_int == create_records[i].dummy_int
+            assert result.dummy_str == create_records[i].dummy_str
+            assert result.dummy_float == create_records[i].dummy_float
+            assert result.dummy_bool == create_records[i].dummy_bool
+            assert result.dummy_array == create_records[i].dummy_array
+            assert result.dummy_json == create_records[i].dummy_json
+
 
 def test_db_revision_model_crud(fixture_postgresql_test_proc, fixture_postgresql_test):
     scheme = make_scheme(Dialects.postgresql, Drivers.psycopg)
@@ -957,6 +1017,29 @@ def test_db_revision_model_crud(fixture_postgresql_test_proc, fixture_postgresql
             assert result.dummy_array == update_records[i].dummy_array
             assert result.dummy_json == update_records[i].dummy_json
 
+        create_records = [random_record() for _ in range(0, 100)]
+
+        results = db_create_revision_models(session,
+                                            DummyRevisionModel,
+                                            create_records,
+                                            dt_parse_iso("2024-01-01T00:00:00+00:00"))
+        assert len(results) == len(create_records)
+
+        for i, result in zip(range(0, 100), results):
+            assert result.sqn == i + 301
+            assert result.record_sqn == i + 301
+            assert result.revision == 1
+            assert result.created_at == dt_parse_iso("2024-01-01T00:00:00+00:00")
+            assert result.updated_at == dt_parse_iso("2024-01-01T00:00:00+00:00")
+            assert result.expired_at is None
+            assert result.dummy_uuid == create_records[i].dummy_uuid
+            assert result.dummy_int == create_records[i].dummy_int
+            assert result.dummy_str == create_records[i].dummy_str
+            assert result.dummy_float == create_records[i].dummy_float
+            assert result.dummy_bool == create_records[i].dummy_bool
+            assert result.dummy_array == create_records[i].dummy_array
+            assert result.dummy_json == create_records[i].dummy_json
+
 
 def test_make_snapshot_model_trigger(fixture_postgresql_test_proc, fixture_postgresql_test):
     scheme = make_scheme(Dialects.postgresql, Drivers.psycopg)