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

Author: fit-alessandro-berti

Dockerfile

@@ -7,12 +7,12 @@ RUN apt-get -y install gcc g++ flex bison pkg-config automake autoconf cmake
 RUN apt-get -y install python3-dev python3-pydot python3-tk
 RUN apt-get -y install libopenblas-dev liblapack-dev libboost-all-dev libncurses5-dev libtool libssl-dev libjemalloc-dev libboost-dev libboost-filesystem-dev libboost-system-dev libboost-regex-dev libxml2-dev libxslt-dev libfreetype6-dev libsuitesparse-dev libclang-16-dev llvm-16-dev libthrift-dev libfftw3-dev
 RUN python3 -m pip install --upgrade pip
-RUN pip3 install graphviz==0.21 intervaltree==3.1.0 networkx==3.5 packaging==25.0 python-dateutil==2.9.0.post0 pytz==2025.2 setuptools==80.9.0 six==1.17.0 sortedcontainers==2.4.0 tzdata==2025.2 wheel==0.45.1 
-RUN pip3 install colorama==0.4.6 cycler==0.12.1 pydotplus==2.0.2 pyparsing==3.2.5 tqdm==4.67.1 
+RUN pip3 install graphviz==0.21 networkx==3.5 packaging==25.0 python-dateutil==2.9.0.post0 pytz==2025.2 setuptools==80.9.0 six==1.17.0 tzdata==2025.2 wheel==0.45.1 
+RUN pip3 install colorama==0.4.6 cycler==0.12.1 pyparsing==3.2.5 tqdm==4.67.1 
 RUN pip3 install lxml==6.0.2 numpy==2.3.4 pandas==2.3.3 scipy==1.16.3 
 RUN pip3 install contourpy==1.3.3 fonttools==4.60.1 kiwisolver==1.4.9 matplotlib==3.10.7 pillow==12.0.0 
 RUN pip3 install anyio==4.11.0 asttokens==3.0.0 attrs==25.4.0 certifi==2025.10.5 charset-normalizer==3.4.4 convertdate==2.4.0 decorator==5.2.1 distro==1.9.0 executing==2.2.1 h11==0.16.0 httpcore==1.0.9 httpx==0.28.1 idna==3.11 ipython==9.6.0 jedi==0.19.2 Jinja2==3.1.6 jsonpickle==4.1.1 jsonschema-specifications==2025.9.1 lunardate==0.2.2 MarkupSafe==3.0.3 matplotlib-inline==0.2.1 parso==0.8.5 prompt-toolkit==3.0.52 pure-eval==0.2.3 pydantic==2.12.3 Pygments==2.19.2 pyluach==2.3.0 PyMeeus==0.5.12 referencing==0.37.0 rpds-py==0.28.0 sniffio==1.3.1 stack-data==0.6.3 traitlets==5.14.3 typing_extensions==4.15.0 urllib3==2.5.0 wcwidth==0.2.14 
-RUN pip3 install jsonschema==4.25.1 openai==2.6.1 pyvis==0.3.2 requests==2.32.5 workalendar==17.0.0 
+RUN pip3 install jsonschema==4.25.1 openai==2.7.1 pyvis==0.3.2 requests==2.32.5 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
 
 #RUN cd / && git clone https://github.com/numpy/numpy.git && cd /numpy && git submodule update --init && pip3 install .

examples/obj_centr_conf_check.py

@@ -1,9 +1,4 @@
 import pm4py
-from pm4py.algo.discovery.ocel.otg import algorithm as otg_discovery
-from pm4py.algo.discovery.ocel.etot import algorithm as etot_discovery
-from pm4py.algo.conformance.ocel.ocdfg import algorithm as ocdfg_conformance
-from pm4py.algo.conformance.ocel.otg import algorithm as otg_conformance
-from pm4py.algo.conformance.ocel.etot import algorithm as etot_conformance
 
 
 def execute_script():
@@ -17,27 +12,23 @@ def execute_script():
     # object-centric DFG from OCEL2
     ocdfg2 = pm4py.discover_ocdfg(ocel2)
     # OTG (object-type-graph) from OCEL2
-    otg2 = otg_discovery.apply(ocel2)
+    otg2 = pm4py.discover_otg(ocel2)
     # ETOT (ET-OT graph) from OCEL2
-    etot2 = etot_discovery.apply(ocel2)
+    etot2 = pm4py.discover_etot(ocel2)
 
     # conformance checking
     print("== OCDFG")
-    diagn_ocdfg = ocdfg_conformance.apply(ocel1, ocdfg2)
+    diagn_ocdfg = pm4py.conformance_ocdfg(ocel1, ocdfg2)
     print(diagn_ocdfg)
 
     print("\n\n== OTG")
-    diagn_otg = otg_conformance.apply(ocel1, otg2)
+    diagn_otg = pm4py.conformance_otg(ocel1, otg2)
     print(diagn_otg)
 
     print("\n\n== ETOT")
-    diagn_etot = etot_conformance.apply(ocel1, etot2)
+    diagn_etot = pm4py.conformance_etot(ocel1, etot2)
     print(diagn_etot)
 
 
 if __name__ == "__main__":
     execute_script()
-
-
-if __name__ == "__main__":
-    execute_script()

pm4py/__init__.py

@@ -156,6 +156,8 @@
     discover_declare,
     discover_powl,
     correlation_miner,
+    discover_otg,
+    discover_etot,
 )
 from pm4py.conformance import (
     conformance_diagnostics_token_based_replay,
@@ -171,6 +173,9 @@
     conformance_temporal_profile,
     conformance_declare,
     conformance_log_skeleton,
+    conformance_ocdfg,
+    conformance_otg,
+    conformance_etot,
     replay_prefix_tbr,
     generalization_tbr,
 )

pm4py/algo/filtering/polars/variants/variants_filter.py

@@ -22,6 +22,7 @@
 from pm4py.util.constants import CASE_CONCEPT_NAME, PARAMETER_CONSTANT_CASEID_KEY, PARAMETER_CONSTANT_ACTIVITY_KEY
 from enum import Enum
 from pm4py.util import exec_utils, constants, xes_constants
+from pm4py.statistics.variants.polars import get as variants_get
 from typing import Optional, Dict, Any, Union, List
 import polars as pl
 
@@ -92,6 +93,44 @@ def apply(
     return ret
 
 
+def filter_variants_top_k(
+    log: pl.LazyFrame,
+    k: int,
+    parameters: Optional[Dict[Union[str, Parameters], Any]] = None,
+) -> pl.LazyFrame:
+    """
+    Keeps the top-k variants of the log
+
+    Parameters
+    -------------
+    log
+        Event log LazyFrame
+    k
+        Number of variants that should be kept
+    parameters
+        Parameters
+
+    Returns
+    -------------
+    filtered_log
+        Filtered log
+    """
+    if parameters is None:
+        parameters = {}
+
+    variants = variants_get.get_variants_count(log, parameters=parameters)
+    variant_count = []
+    for variant, count in variants.items():
+        variant_count.append([variant, count])
+    variant_count = sorted(
+        variant_count, key=lambda x: (x[1], x[0]), reverse=True
+    )
+    variant_count = variant_count[: min(k, len(variant_count))]
+    variants_to_filter = [x[0] for x in variant_count]
+
+    return apply(log, variants_to_filter, parameters=parameters)
+
+
 def apply_auto_filter(
     df: pl.LazyFrame,
     parameters: Optional[Dict[Union[str, Parameters], Any]] = None,

pm4py/algo/organizational_mining/resource_profiles/variants/log.py

@@ -477,7 +477,7 @@ def __compute_workload(
         for x in events
     ]
     events = sorted(events)
-    from intervaltree import IntervalTree, Interval
+    from pm4py.util.intervaltree import IntervalTree, Interval
 
     tree = IntervalTree()
     ev_map = {}

pm4py/algo/organizational_mining/resource_profiles/variants/pandas.py

@@ -470,7 +470,7 @@ def __compute_workload(
         for x in events
     ]
     events = sorted(events)
-    from intervaltree import IntervalTree, Interval
+    from pm4py.util.intervaltree import IntervalTree, Interval
 
     tree = IntervalTree()
     ev_map = {}

pm4py/algo/simulation/montecarlo/variants/petri_semaph_fifo.py

@@ -26,9 +26,8 @@
 from pm4py.util import xes_constants, exec_utils, constants
 from pm4py.objects.stochastic_petri import utils as stochastic_utils
 from pm4py.util.dt_parsing.variants import strpfromiso
-from pm4py.objects.petri_net.obj import PetriNet, Marking
 
-from intervaltree import Interval, IntervalTree
+from pm4py.util.intervaltree import Interval, IntervalTree
 from statistics import median
 import datetime
 import heapq

pm4py/algo/transformation/__init__.py

@@ -22,9 +22,4 @@
 from pm4py.util import constants as pm4_constants
 
 if pm4_constants.ENABLE_INTERNAL_IMPORTS:
-    from pm4py.algo.transformation import log_to_trie, log_to_features, ocel, log_to_target
-
-    import importlib.util
-
-    if importlib.util.find_spec("intervaltree"):
-        from pm4py.algo.transformation import log_to_interval_tree
+    from pm4py.algo.transformation import log_to_trie, log_to_features, ocel, log_to_target, log_to_interval_tree

pm4py/algo/transformation/log_to_features/variants/trace_based.py

@@ -224,7 +224,7 @@ def resource_workload(
     if parameters is None:
         parameters = {}
 
-    from intervaltree.intervaltree import IntervalTree, Interval
+    from pm4py.util.intervaltree import IntervalTree, Interval
 
     start_timestamp_key = exec_utils.get_param_value(
         Parameters.START_TIMESTAMP_KEY,
@@ -301,7 +301,7 @@ def work_in_progress(
     if parameters is None:
         parameters = {}
 
-    from intervaltree.intervaltree import IntervalTree, Interval
+    from pm4py.util.intervaltree import IntervalTree, Interval
 
     start_timestamp_key = exec_utils.get_param_value(
         Parameters.START_TIMESTAMP_KEY,

pm4py/algo/transformation/log_to_interval_tree/algorithm.py

@@ -22,7 +22,7 @@
 from enum import Enum
 from typing import Optional, Dict, Any
 
-from intervaltree import IntervalTree
+from pm4py.util.intervaltree import IntervalTree
 
 from pm4py.algo.transformation.log_to_interval_tree.variants import open_paths
 from pm4py.objects.log.obj import EventLog