plexus-python-pulse-common 1.1.80__tar.gz → 1.1.82__tar.gz

{plexus_python_pulse_common-1.1.80 → plexus_python_pulse_common-1.1.82}/.editorconfig

@@ -1,13 +1,48 @@
 root = true
 
-[*.py]
+[*]
 charset = utf-8
 end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-indent_style = space
 indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 120
+tab_width = 4
+ij_formatter_tags_enabled = true
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+ij_shell_use_unix_line_separator = true
 
+[{*.markdown,*.md}]
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_format_tables = true
+ij_markdown_insert_quote_arrows_on_wrap = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_keep_line_breaks_inside_text_blocks = true
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+ij_markdown_wrap_text_if_long = true
+ij_markdown_wrap_text_inside_blockquotes = true
+
+[*.py]
+insert_final_newline = true
+trim_trailing_whitespace = true
 ij_python_align_collections_and_comprehensions = true
 ij_python_align_multiline_imports = true
 ij_python_align_multiline_parameters = true
@@ -21,16 +56,16 @@ ij_python_blank_lines_around_top_level_classes_functions = 2
 ij_python_blank_lines_before_first_method = 0
 ij_python_call_parameters_new_line_after_left_paren = false
 ij_python_call_parameters_right_paren_on_new_line = false
-ij_python_call_parameters_wrap = normal
+ij_python_call_parameters_wrap = on_every_item
 ij_python_dict_alignment = 0
 ij_python_dict_new_line_after_left_brace = false
 ij_python_dict_new_line_before_right_brace = false
-ij_python_dict_wrapping = 1
-ij_python_from_import_new_line_after_left_parenthesis = false
-ij_python_from_import_new_line_before_right_parenthesis = false
-ij_python_from_import_parentheses_force_if_multiline = false
-ij_python_from_import_trailing_comma_if_multiline = false
-ij_python_from_import_wrapping = 1
+ij_python_dict_wrapping = on_every_item
+ij_python_from_import_new_line_after_left_parenthesis = true
+ij_python_from_import_new_line_before_right_parenthesis = true
+ij_python_from_import_parentheses_force_if_multiline = true
+ij_python_from_import_trailing_comma_if_multiline = true
+ij_python_from_import_wrapping = on_every_item
 ij_python_hang_closing_brackets = false
 ij_python_keep_blank_lines_in_code = 1
 ij_python_keep_blank_lines_in_declarations = 1
@@ -38,7 +73,7 @@ ij_python_keep_indents_on_empty_lines = false
 ij_python_keep_line_breaks = true
 ij_python_method_parameters_new_line_after_left_paren = false
 ij_python_method_parameters_right_paren_on_new_line = false
-ij_python_method_parameters_wrap = normal
+ij_python_method_parameters_wrap = on_every_item
 ij_python_new_line_after_colon = false
 ij_python_new_line_after_colon_multi_clause = true
 ij_python_optimize_imports_always_split_from_imports = false
@@ -78,3 +113,33 @@ ij_python_use_continuation_indent_for_arguments = false
 ij_python_use_continuation_indent_for_collection_and_comprehensions = false
 ij_python_use_continuation_indent_for_parameters = false
 ij_python_wrap_long_lines = false
+
+[*.json]
+indent_size = 2
+ij_json_array_wrapping = split_into_lines
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_keep_trailing_comma = false
+ij_json_object_wrapping = split_into_lines
+ij_json_property_alignment = do_not_align
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = false
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true

{plexus_python_pulse_common-1.1.80 → plexus_python_pulse_common-1.1.82}/.gitignore

@@ -1,15 +1,16 @@
-# System junks
-*.[oa]
-*~
+# OS scratch
 .DS_Store
 Thumbs.db
+*.[oa]
+*~
 
 # Git
 .git/
 
-# General
+# General scratch files and compiled output
 target/
 output/
+out/
 build/
 opt/
 gen/
@@ -25,7 +26,7 @@ temp/
 .vscode/
 
 
-# Byte-compiled / optimized / DLL files
+# Python byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
@@ -33,9 +34,8 @@ __pycache__/
 # C extensions
 *.so
 
-# Distribution / packaging
+# Python distribution / packaging
 .Python
-build/
 develop-eggs/
 dist/
 downloads/
@@ -49,8 +49,8 @@ var/
 wheels/
 share/python-wheels/
 *.egg-info/
-.installed.cfg
 *.egg
+.installed.cfg
 MANIFEST
 
 # PyInstaller
@@ -112,7 +112,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+#.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -178,10 +178,3 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/

{plexus_python_pulse_common-1.1.80 → plexus_python_pulse_common-1.1.82}/PKG-INFO

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

{plexus_python_pulse_common-1.1.80 → plexus_python_pulse_common-1.1.82}/src/plexus/pulse/common/utils/tagutils.py

@@ -444,6 +444,11 @@ def make_tag_target_model_mixin() -> type[pdt.BaseModel]:
             default=None,
             description="Additional properties of the tag target in JSON format",
         )
+        flags: int = Field(
+            sa_column=sa.Column(sa_sqlite.INTEGER),
+            default=0,
+            description="Integer bitmask storing status or metadata flags for this tag target",
+        )
 
         @pdt.field_validator("identifier", mode="after")
         @classmethod
@@ -619,6 +624,7 @@ if typing.TYPE_CHECKING:
         begin_dt: sa_orm.Mapped[datetime.datetime] = ...
         end_dt: sa_orm.Mapped[datetime.datetime] = ...
         props: sa_orm.Mapped[JsonType | None] = ...
+        flags: sa_orm.Mapped[int] = ...
 
 
     class TagTargetTable(TagTarget, SequenceModelMixinProtocol):
@@ -769,6 +775,7 @@ class TagCache(object):
         begin_dt: datetime.datetime | None = None,
         end_dt: datetime.datetime | None = None,
         props: JsonType | None = None,
+        flags: int | None = None,
     ) -> Chainable[Self, TagTargetTable]:
         """
         Updates a tag target.
@@ -781,6 +788,7 @@ class TagCache(object):
         :param begin_dt: New start datetime for the tag target's validity period.
         :param end_dt: New end datetime for the tag target's validity period.
         :param props: New additional tag target properties.
+        :param flags: New integer bitmask for status or metadata flags.
         :return: Chainable self and the updated ``TagTargetTable`` instance.
         """
 
@@ -808,6 +816,8 @@ class TagCache(object):
                 db_tag_target.vehicle_name = vehicle_name
             if props is not None:
                 db_tag_target.props = props
+            if flags is not None:
+                db_tag_target.flags = flags
 
             session.commit()
 
@@ -892,7 +902,7 @@ class TagCache(object):
                     .delete(synchronize_session=False)
                 )
 
-            query_stmt.delete(synchronize_session=False)
+            query_stmt.delete()
             session.commit()
 
             return self
@@ -1179,10 +1189,10 @@ class TagCache(object):
         begin_dt: datetime.datetime,
         end_dt: datetime.datetime,
         tag: str | Tag | BoundTag,
-        features: JsonType | None = None,
-        props: JsonType | None = None,
         tagset_namespace: str | None = None,
         tagset_version: str | None = None,
+        features: JsonType | None = None,
+        props: JsonType | None = None,
     ) -> Chainable[Self, TagRecordTable]:
         """
         Adds a tag record to the cache for the specified time range.
@@ -1192,14 +1202,14 @@ class TagCache(object):
         :param end_dt: End datetime of the tag record.
         :param tag: Tag name or ``Tag``/``BoundTag`` instance to add. If a ``Tag``/``BoundTag`` instance is provided,
                     its name is used.
-        :param features: Optional tag record features in JSON format, used to store preprocessed data for querying
-                         and filtering.
-        :param props: Optional tag record properties in JSON format.
         :param tagset_namespace: Namespace of the tagset that the tag belongs to. If the ``tag`` parameter is a
                                  ``BoundTag`` instance, this parameter will be ignored and the namespace from the
                                  instance will be used.
         :param tagset_version: Version of the tagset that the tag belongs to. If the ``tag`` parameter is a ``BoundTag``
                                instance, this parameter will be ignored and the version from the instance will be used.
+        :param features: Optional tag record features in JSON format, used to store preprocessed data for querying
+                         and filtering.
+        :param props: Optional tag record properties in JSON format.
         :return: Chainable self and the added ``TagRecordTable`` instance.
         """
         if is_tag_cache_strict_mode():
@@ -1234,10 +1244,10 @@ class TagCache(object):
         begin_dt: datetime.datetime | None = None,
         end_dt: datetime.datetime | None = None,
         tag: str | Tag | BoundTag | None = None,
-        features: JsonType | None = None,
-        props: JsonType | None = None,
         tagset_namespace: str | None = None,
         tagset_version: str | None = None,
+        features: JsonType | None = None,
+        props: JsonType | None = None,
         flags: int | None = None,
     ) -> Chainable[Self, TagRecordTable]:
         """
@@ -1245,20 +1255,20 @@ class TagCache(object):
 
         :param target_sqn: Sequence number of the tag record's target.
         :param sqn: Sequence number of the tag record to update.
-        :param begin_dt: New start datetime of the tag record (optional).
-        :param end_dt: New end datetime of the tag record (optional).
-        :param tag: New tag name or ``Tag``/``BoundTag`` instance to use (optional). If a ``Tag``/``BoundTag`` instance
-                    is provided, its name will be used.
+        :param begin_dt: New start datetime of the tag record.
+        :param end_dt: New end datetime of the tag record.
+        :param tag: New tag name or ``Tag``/``BoundTag`` instance to use. If a ``Tag``/``BoundTag`` instance is
+                    provided, its name will be used.
+        :param tagset_namespace: New namespace of the tagset that the tag belongs to. If the ``tag`` parameter is a
+                                 ``BoundTag`` instance, this parameter will be ignored and the namespace from the
+                                 instance will be used.
+        :param tagset_version: New version of the tagset that the tag belongs to. If the ``tag`` parameter is a
+                               ``BoundTag`` instance, this parameter will be ignored and the version from the instance
+                               will be used.
         :param features: New optional tag record features in JSON format, used to store preprocessed data for querying
                          and filtering.
         :param props: New optional tag record properties in JSON format.
-        :param tagset_namespace: New namespace of the tagset that the tag belongs to (optional). If the ``tag``
-                                 parameter is a ``BoundTag`` instance, this parameter will be ignored and the namespace
-                                 from the instance will be used.
-        :param tagset_version: New version of the tagset that the tag belongs to (optional). If the ``tag`` parameter
-                               is a ``BoundTag`` instance, this parameter will be ignored and the version from the
-                               instance will be used.
-        :param flags: New integer bitmask for status or metadata flags (optional).
+        :param flags: New integer bitmask for status or metadata flags.
         :return: Chainable self and the updated ``TagRecordTable`` instance.
         """
         with self.make_session() as session:
@@ -1459,38 +1469,38 @@ class TargetedTagCache(object):
         begin_dt: datetime.datetime | None,
         end_dt: datetime.datetime | None,
         tag: str | Tag | BoundTag,
-        features: JsonType | None = None,
-        props: JsonType | None = None,
         tagset_namespace: str | None = None,
         tagset_version: str | None = None,
+        features: JsonType | None = None,
+        props: JsonType | None = None,
     ) -> Chainable[Self, TagRecordTable]:
         result = self.cache.target_add_record(
             target_sqn=self.tag_target.sqn,
             begin_dt=begin_dt or self.tag_target.begin_dt,
             end_dt=end_dt or self.tag_target.end_dt,
             tag=tag,
-            features=features,
-            props=props,
             tagset_namespace=tagset_namespace,
             tagset_version=tagset_version,
+            features=features,
+            props=props,
         )
         return result.retarget(self)
 
     def add_record(
         self,
         tag: str | Tag | BoundTag,
-        features: JsonType | None = None,
-        props: JsonType | None = None,
         tagset_namespace: str | None = None,
         tagset_version: str | None = None,
+        features: JsonType | None = None,
+        props: JsonType | None = None,
     ) -> Chainable[Self, TagRecordTable]:
         result = self.add_ranged_record(
             begin_dt=self.tag_target.begin_dt,
             end_dt=self.tag_target.end_dt,
             tag=tag,
-            features=features,
             tagset_namespace=tagset_namespace,
             tagset_version=tagset_version,
+            features=features,
             props=props,
         )
         return result.retarget(self)
@@ -1502,10 +1512,10 @@ class TargetedTagCache(object):
         begin_dt: datetime.datetime | None = None,
         end_dt: datetime.datetime | None = None,
         tag: str | Tag | BoundTag | None = None,
-        features: JsonType | None = None,
-        props: JsonType | None = None,
         tagset_namespace: str | None = None,
         tagset_version: str | None = None,
+        features: JsonType | None = None,
+        props: JsonType | None = None,
         flags: int | None = None,
     ) -> Chainable[Self, TagRecordTable]:
         result = self.cache.target_update_record(
@@ -1514,10 +1524,10 @@ class TargetedTagCache(object):
             begin_dt=begin_dt,
             end_dt=end_dt,
             tag=tag,
-            features=features,
-            props=props,
             tagset_namespace=tagset_namespace,
             tagset_version=tagset_version,
+            features=features,
+            props=props,
             flags=flags,
         )
         return result.retarget(self)

{plexus_python_pulse_common-1.1.80 → plexus_python_pulse_common-1.1.82}/src/plexus_python_pulse_common.egg-info/PKG-INFO

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

{plexus_python_pulse_common-1.1.80 → plexus_python_pulse_common-1.1.82}/test/plexus_tests/pulse/common/utils/dockerutils_test.py

@@ -25,11 +25,11 @@ class MockedDockerClient(docker.DockerClient):
 
 class MockedDockerImage(docker.models.resource.Model):
     def __init__(
-            self,
-            model_id: str,
-            *,
-            tags_callee: CalleeMock = return_callee(),
-            labels_callee: CalleeMock = return_callee(),
+        self,
+        model_id: str,
+        *,
+        tags_callee: CalleeMock = return_callee(),
+        labels_callee: CalleeMock = return_callee(),
     ):
         super(MockedDockerImage, self).__init__({docker.models.resource.Model.id_attribute: model_id})
         self.tags_callee = tags_callee
@@ -46,14 +46,14 @@ class MockedDockerImage(docker.models.resource.Model):
 
 class MockedDockerContainer(docker.models.resource.Model):
     def __init__(
-            self,
-            model_id: str,
-            *,
-            status_callee: CalleeMock = return_callee(),
-            wait_callee: CalleeMock = return_callee(),
-            logs_callee: CalleeMock = return_callee(),
-            stop_callee: CalleeMock = return_callee(),
-            remove_callee: CalleeMock = return_callee(),
+        self,
+        model_id: str,
+        *,
+        status_callee: CalleeMock = return_callee(),
+        wait_callee: CalleeMock = return_callee(),
+        logs_callee: CalleeMock = return_callee(),
+        stop_callee: CalleeMock = return_callee(),
+        remove_callee: CalleeMock = return_callee(),
     ):
         super(MockedDockerContainer, self).__init__({docker.models.resource.Model.id_attribute: model_id})
         self.status_callee = status_callee