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

Author: fit-alessandro-berti

pm4py/meta.py

@@ -1,27 +1,5 @@
-'''
-    PM4Py – A Process Mining Library for Python
-Copyright (C) 2024 Process Intelligence Solutions UG (haftungsbeschränkt)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see this software project's root or
-visit <https://www.gnu.org/licenses/>.
-
-Website: https://processintelligence.solutions
-Contact: info@processintelligence.solutions
-'''
-
-__name__ = 'pm4py'
-VERSION = '2.7.17'
+__name__ = "pm4py"
+VERSION = "2.7.17"
 __version__ = VERSION
 __doc__ = "Process mining for Python"
 __author__ = "Process Intelligence Solutions (PIS)"

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

@@ -137,19 +137,35 @@ def get_base_ocel(json_obj: Any, parameters: Optional[Dict[Any, Any]] = None):
     events = pandas_utils.instantiate_dataframe(events)
     objects = pandas_utils.instantiate_dataframe(objects)
     relations = pandas_utils.instantiate_dataframe(relations)
+    # If there are no relations, ensure the dataframe has the expected schema
+    # to avoid downstream crashes when accessing required columns.
+    if len(relations) == 0:
+        relations = pandas_utils.instantiate_dataframe(
+            {
+                event_id: [],
+                event_activity: [],
+                event_timestamp: [],
+                object_id: [],
+                object_type: [],
+            }
+        )
 
     events = pandas_utils.insert_index(
         events, internal_index, reset_index=False, copy_dataframe=False
     )
-    relations = pandas_utils.insert_index(
-        relations, internal_index, reset_index=False, copy_dataframe=False
-    )
+    # Only add temporary index and sort if there are relations rows
+    if len(relations) > 0:
+        relations = pandas_utils.insert_index(
+            relations, internal_index, reset_index=False, copy_dataframe=False
+        )
 
     events = events.sort_values([event_timestamp, internal_index])
-    relations = relations.sort_values([event_timestamp, internal_index])
+    if len(relations) > 0:
+        relations = relations.sort_values([event_timestamp, internal_index])
 
     del events[internal_index]
-    del relations[internal_index]
+    if internal_index in relations.columns:
+        del relations[internal_index]
 
     globals = {}
     globals[constants.OCEL_GLOBAL_LOG] = json_obj[constants.OCEL_GLOBAL_LOG]

pm4py/visualization/align_table/variants/classic.py

@@ -69,8 +69,9 @@ def apply(
     variants_idx_list = []
     for variant in variants_idx_dict:
         variants_idx_list.append((variant, variants_idx_dict[variant]))
+    # Deterministic ordering: sort by count (desc) then by variant key (asc)
     variants_idx_list = sorted(
-        variants_idx_list, key=lambda x: len(x[1]), reverse=True
+        variants_idx_list, key=lambda x: (-len(x[1]), x[0])
     )
 
     image_format = exec_utils.get_param_value(