lkj 0.1.40__tar.gz → 0.1.42__tar.gz

{lkj-0.1.40 → lkj-0.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lkj
-Version: 0.1.40
+Version: 0.1.42
 Summary: A dump of homeless useful utils
 Home-page: https://github.com/thorwhalen/lkj
 Author: Thor Whalen

{lkj-0.1.40 → lkj-0.1.42}/lkj/__init__.py

@@ -13,6 +13,7 @@ from lkj.dicts import (
     inclusive_subdict,  # new dictionary with only the keys in `include`
     exclusive_subdict,  # new dictionary with only the keys not in `exclude`.
     merge_dicts,  # Merge multiple dictionaries recursively
+    compare_field_values,  # Compare two dictionaries' values
 )
 from lkj.filesys import get_app_data_dir, get_watermarked_dir, enable_sourcing_from_file
 from lkj.strings import (

{lkj-0.1.40 → lkj-0.1.42}/lkj/dicts.py

@@ -224,7 +224,11 @@ Comparison = Any
 Comparator = Callable[[dict, dict], Comparison]
 
 
-def compare_dicts(
+def _common_keys_list(dict1, dict2):
+    return [k for k in dict1.keys() if k in dict2.keys()]
+
+
+def compare_field_values(
     dict1,
     dict2,
     *,
@@ -232,16 +236,17 @@ def compare_dicts(
     default_comparator: Comparator = operator.eq,
     aggregator: Callable[
         [Dict[KT, Comparison]], Any
-    ] = lambda d: d,  # lambda d: np.mean(list(d.values()))
+    ] = lambda d: d,  # lambda d: np.mean(list(d.values())),
+    get_comparison_fields: Callable[[dict], Iterable[KT]] = _common_keys_list,
 ):
     """
-    Compare two dictionaries field by field using specified comparators or a default comparator.
+    Compare two dictionaries' values field by field
 
     :param dict1: The first dictionary.
     :param dict2: The second dictionary.
     :param field_comparators: A dictionary where keys are field names and values are comparator functions.
     :param default_comparator: A default comparator function to use if no specific comparator is provided for a field.
-    :param aggregator: A function to aggregate the comparison results into a final score.
+    :param aggregator: A function to aggregate the comparison results into a final comparison object.
     :return: A final score based on the comparison results.
 
     >>> dict1 = {"color": "brown", "animal": "dog"}
@@ -251,22 +256,22 @@ def compare_dicts(
     ...     "color": lambda x, y: 1 if x == y else 0,
     ...     "animal": lambda x, y: 1 if len(x) == len(y) else 0
     ... }
-    >>> compare_dicts(dict1, dict2, field_comparators=field_comparators)
+    >>> compare_field_values(dict1, dict2, field_comparators=field_comparators)
     {'color': 1, 'animal': 1}
-    >>> compare_dicts(dict1, dict3, field_comparators=field_comparators)
+    >>> compare_field_values(dict1, dict3, field_comparators=field_comparators)
     {'color': 1, 'animal': 0}
     >>> import functools, statistics
     >>> aggregator = lambda d: statistics.mean(d.values())
-    >>> my_compare_dicts = functools.partial(
-    ...     compare_dicts, field_comparators=field_comparators, aggregator=aggregator
+    >>> mean_of_values = functools.partial(
+    ...     compare_field_values, field_comparators=field_comparators, aggregator=aggregator
     ... )
-    >>> my_compare_dicts(dict1, dict2)
+    >>> mean_of_values(dict1, dict2)
     1
-    >>> my_compare_dicts(dict1, dict3)
+    >>> mean_of_values(dict1, dict3)
     0.5
 
     """
-    common_keys = [k for k in dict1.keys() if k in dict2.keys()]
+    common_keys = get_comparison_fields(dict1, dict2)
 
     comparisons = {}
     for key in common_keys:

{lkj-0.1.40 → lkj-0.1.42}/lkj.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lkj
-Version: 0.1.40
+Version: 0.1.42
 Summary: A dump of homeless useful utils
 Home-page: https://github.com/thorwhalen/lkj
 Author: Thor Whalen

{lkj-0.1.40 → lkj-0.1.42}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = lkj
-version = 0.1.40
+version = 0.1.42
 url = https://github.com/thorwhalen/lkj
 platforms = any
 description_file = README.md