Merge remote-tracking branch 'upstream/previous' into release

Dockerfile

@@ -11,7 +11,7 @@ RUN pip3 install deprecation==2.1.0 graphviz==0.20.3 intervaltree==3.1.0 network
 RUN pip3 install colorama==0.4.6 cycler==0.12.1 pydotplus==2.0.2 pyparsing==3.1.2 tqdm==4.66.4 
 RUN pip3 install lxml==5.2.2 numpy==2.0.1 pandas==2.2.2 scipy==1.14.0 
 RUN pip3 install contourpy==1.2.1 fonttools==4.53.1 kiwisolver==1.4.5 matplotlib==3.9.1 pillow==10.4.0 
-RUN pip3 install anyio==4.4.0 asttokens==2.4.1 attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 convertdate==2.4.0 decorator==5.1.1 distro==1.9.0 executing==2.0.1 h11==0.14.0 httpcore==1.0.5 httpx==0.27.0 idna==3.7 ipython==8.26.0 jedi==0.19.1 Jinja2==3.1.4 jsonpickle==3.2.2 jsonschema-specifications==2023.12.1 lunardate==0.2.2 MarkupSafe==2.1.5 matplotlib-inline==0.1.7 parso==0.8.4 prompt-toolkit==3.0.47 pure-eval==0.2.3 pydantic==2.8.2 Pygments==2.18.0 pyluach==2.2.0 PyMeeus==0.5.12 referencing==0.35.1 rpds-py==0.19.0 sniffio==1.3.1 stack-data==0.6.3 traitlets==5.14.3 typing_extensions==4.12.2 urllib3==2.2.2 wcwidth==0.2.13 
+RUN pip3 install anyio==4.4.0 asttokens==2.4.1 attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 convertdate==2.4.0 decorator==5.1.1 distro==1.9.0 executing==2.0.1 h11==0.14.0 httpcore==1.0.5 httpx==0.27.0 idna==3.7 ipython==8.26.0 jedi==0.19.1 Jinja2==3.1.4 jsonpickle==3.2.2 jsonschema-specifications==2023.12.1 lunardate==0.2.2 MarkupSafe==2.1.5 matplotlib-inline==0.1.7 parso==0.8.4 prompt-toolkit==3.0.47 pure-eval==0.2.3 pydantic==2.8.2 Pygments==2.18.0 pyluach==2.2.0 PyMeeus==0.5.12 referencing==0.35.1 rpds-py==0.19.1 sniffio==1.3.1 stack-data==0.6.3 traitlets==5.14.3 typing_extensions==4.12.2 urllib3==2.2.2 wcwidth==0.2.13 
 RUN pip3 install jsonschema==4.23.0 openai==1.37.0 pyvis==0.3.2 requests==2.32.3 workalendar==17.0.0 
 RUN pip3 install -U meson-python==0.15.0 Cython==3.0.10 ninja==1.11.1.1 spin==0.8 build==1.2.1 setuptools_scm==8.0.4
 

pm4py/objects/ocel/exporter/csv/variants/pandas.py

@@ -17,6 +17,7 @@
 from pm4py.objects.ocel.obj import OCEL
 from typing import Optional, Dict, Any
 from pm4py.objects.ocel.util import ocel_consistency
+from pm4py.objects.ocel.util import filtering_utils
 from enum import Enum
 from pm4py.util import exec_utils, constants as pm4_constants
 
@@ -46,6 +47,7 @@ def apply(ocel: OCEL, output_path: str, objects_path=None, parameters: Optional[
     encoding = exec_utils.get_param_value(Parameters.ENCODING, parameters, pm4_constants.DEFAULT_ENCODING)
 
     ocel = ocel_consistency.apply(ocel, parameters=parameters)
+    ocel = filtering_utils.propagate_relations_filtering(ocel, parameters=parameters)
 
     ocel.get_extended_table().to_csv(output_path, index=False, na_rep="", encoding=encoding)
 

pm4py/objects/ocel/exporter/jsonocel/variants/classic.py

@@ -25,6 +25,7 @@
 from pm4py.objects.ocel.obj import OCEL
 from pm4py.objects.ocel.util import attributes_names
 from pm4py.objects.ocel.util import related_objects
+from pm4py.objects.ocel.util import filtering_utils
 from pm4py.util import exec_utils, constants as pm4_constants, pandas_utils
 from pm4py.objects.ocel.util import ocel_consistency
 
@@ -117,6 +118,7 @@ def apply(ocel: OCEL, target_path: str, parameters: Optional[Dict[Any, Any]] = N
     encoding = exec_utils.get_param_value(Parameters.ENCODING, parameters, pm4_constants.DEFAULT_ENCODING)
 
     ocel = ocel_consistency.apply(ocel, parameters=parameters)
+    ocel = filtering_utils.propagate_relations_filtering(ocel, parameters=parameters)
 
     base_object = get_base_json_object(ocel, parameters=parameters)
 

pm4py/objects/ocel/exporter/jsonocel/variants/ocel20.py

@@ -22,6 +22,7 @@
 from pm4py.objects.ocel.obj import OCEL
 from pm4py.util import exec_utils, constants as pm4_constants
 from pm4py.objects.ocel.util import ocel_consistency
+from pm4py.objects.ocel.util import filtering_utils
 from pm4py.objects.ocel.exporter.jsonocel.variants import classic
 from pm4py.objects.ocel.util import attributes_per_type
 
@@ -43,6 +44,7 @@ def get_enriched_object(ocel: OCEL, parameters: Optional[Dict[Any, Any]] = None)
     event_timestamp = exec_utils.get_param_value(Parameters.EVENT_TIMESTAMP, parameters, ocel.event_timestamp)
 
     ocel = ocel_consistency.apply(ocel, parameters=parameters)
+    ocel = filtering_utils.propagate_relations_filtering(ocel, parameters=parameters)
 
     base_object = classic.get_base_json_object(ocel, parameters=parameters)
 

pm4py/objects/ocel/exporter/sqlite/variants/ocel20.py

@@ -23,6 +23,7 @@
 from enum import Enum
 from pm4py.util import exec_utils, pandas_utils
 from pm4py.objects.ocel.util import ocel_consistency
+from pm4py.objects.ocel.util import filtering_utils
 
 
 class Parameters(Enum):
@@ -41,6 +42,7 @@ def apply(ocel: OCEL, file_path: str, parameters: Optional[Dict[Any, Any]] = Non
         os.remove(file_path)
 
     ocel = ocel_consistency.apply(ocel, parameters=parameters)
+    ocel = filtering_utils.propagate_relations_filtering(ocel, parameters=parameters)
 
     event_id = ocel.event_id_column
     event_activity = ocel.event_activity

pm4py/objects/ocel/exporter/sqlite/variants/pandas_exporter.py

@@ -18,6 +18,7 @@
 from pm4py.objects.ocel.obj import OCEL
 from typing import Dict, Any, Optional
 from pm4py.objects.ocel.util import ocel_consistency
+from pm4py.objects.ocel.util import filtering_utils
 import os
 
 
@@ -43,6 +44,7 @@ def apply(ocel: OCEL, target_path: str, parameters: Optional[Dict[Any, Any]] = N
         os.remove(target_path)
 
     ocel = ocel_consistency.apply(ocel, parameters=parameters)
+    ocel = filtering_utils.propagate_relations_filtering(ocel, parameters=parameters)
 
     conn = sqlite3.connect(target_path)
 

pm4py/objects/ocel/exporter/xmlocel/variants/classic.py

@@ -27,6 +27,7 @@
 from pm4py.objects.ocel.util import related_objects
 from pm4py.util import exec_utils, constants as pm4_constants, pandas_utils
 from pm4py.objects.ocel.util import ocel_consistency
+from pm4py.objects.ocel.util import filtering_utils
 
 
 class Parameters(Enum):
@@ -72,6 +73,7 @@ def apply(ocel: OCEL, target_path: str, parameters: Optional[Dict[Any, Any]] = N
     encoding = exec_utils.get_param_value(Parameters.ENCODING, parameters, pm4_constants.DEFAULT_ENCODING)
 
     ocel = ocel_consistency.apply(ocel, parameters=parameters)
+    ocel = filtering_utils.propagate_relations_filtering(ocel, parameters=parameters)
 
     all_object_types = pandas_utils.format_unique(ocel.objects[object_type].unique())
     all_attribute_names = attributes_names.get_attribute_names(ocel, parameters=parameters)

pm4py/objects/ocel/exporter/xmlocel/variants/ocel20.py

@@ -25,6 +25,7 @@
 from pm4py.util import exec_utils, constants as pm4_constants
 from pm4py.objects.ocel.util import ocel_consistency
 from pm4py.objects.ocel.util import attributes_per_type
+from pm4py.objects.ocel.util import filtering_utils
 
 
 class Parameters(Enum):
@@ -55,6 +56,7 @@ def apply(ocel: OCEL, target_path: str, parameters: Optional[Dict[Any, Any]] = N
     changed_field_column = exec_utils.get_param_value(Parameters.CHANGED_FIELD, parameters, ocel.changed_field)
 
     ocel = ocel_consistency.apply(ocel, parameters=parameters)
+    ocel = filtering_utils.propagate_relations_filtering(ocel, parameters=parameters)
 
     objects0 = ocel.objects.to_dict("records")
     events0 = ocel.events.to_dict("records")

safety_checks/20240725

@@ -0,0 +1,47 @@
++==============================================================================+
+
+                               /$$$$$$            /$$
+                              /$$__  $$          | $$
+           /$$$$$$$  /$$$$$$ | $$  \__//$$$$$$  /$$$$$$   /$$   /$$
+          /$$_____/ |____  $$| $$$$   /$$__  $$|_  $$_/  | $$  | $$
+         |  $$$$$$   /$$$$$$$| $$_/  | $$$$$$$$  | $$    | $$  | $$
+          \____  $$ /$$__  $$| $$    | $$_____/  | $$ /$$| $$  | $$
+          /$$$$$$$/|  $$$$$$$| $$    |  $$$$$$$  |  $$$$/|  $$$$$$$
+         |_______/  \_______/|__/     \_______/   \___/   \____  $$
+                                                          /$$  | $$
+                                                         |  $$$$$$/
+  by safetycli.com                                        \______/
+
++==============================================================================+
+
+ REPORT 
+
+  Safety is using PyUp's free open-source vulnerability database. This
+data is 30 days old and limited. 
+  For real-time enhanced vulnerability data, fix recommendations, severity
+reporting, cybersecurity support, team and project policy management and more
+sign up at https://pyup.io or email [email protected]
+
+  Safety v3.1.0 is scanning for Vulnerabilities...
+  Scanning dependencies in your files:
+
+  -> requirements_stable.txt
+
+  Using open-source vulnerability database
+  Found and scanned 26 packages
+  Timestamp 2024-07-25 07:06:16
+  0 vulnerabilities reported
+  0 vulnerabilities ignored
++==============================================================================+
+
+ No known security vulnerabilities reported. 
+
++==============================================================================+
+
+  Safety is using PyUp's free open-source vulnerability database. This
+data is 30 days old and limited. 
+  For real-time enhanced vulnerability data, fix recommendations, severity
+reporting, cybersecurity support, team and project policy management and more
+sign up at https://pyup.io or email [email protected]
+
++==============================================================================+