devicer.py 0.1.5__py3-none-any.whl → 0.2.0__py3-none-any.whl

devicer/confidence.py

@@ -1,27 +1,73 @@
 from .hashing import get_tlsh_hash, get_hash_difference
 import math
 
-def compare_dictionaries(data1: dict, data2: dict) -> tuple[int, int]:
+def compare_lists(data1: list, data2: list, max_depth: int = 5) -> tuple[int, int]:
+    """
+    Compare two lists and return the count of matching elements and total elements.
+    
+    Args:
+        data1 (list): First list containing data.
+        data2 (list): Second list containing data.
+        max_depth (int): Maximum depth to compare nested lists. Default is 5.
+    
+    Returns:
+        tuple: A tuple containing the count of matching elements and total elements compared.
+    """
+    fields = 0
+    matches = 0
+
+    if max_depth <= 0:
+        return matches, fields
+
+    sorted_data1 = sorted(data1, key=lambda x: str(x) if isinstance(x, (dict, list)) else x)
+    sorted_data2 = sorted(data2, key=lambda x: str(x) if isinstance(x, (dict, list)) else x)
+
+    max_length = min(len(data1), len(data2))
+    for i in range(max_length):
+        if sorted_data1[i] and sorted_data2[i]:
+            fields += 1
+            if isinstance(sorted_data1[i], list) and isinstance(sorted_data2[i], list):
+                sub_matches, sub_fields = compare_lists(sorted_data1[i], sorted_data2[i], max_depth - 1)
+                fields += sub_fields - 1
+                matches += sub_matches
+            elif isinstance(sorted_data1[i], dict) and isinstance(sorted_data2[i], dict):
+                sub_matches, sub_fields = compare_dictionaries(sorted_data1[i], sorted_data2[i], max_depth - 1)
+                fields += sub_fields - 1
+                matches += sub_matches
+            if sorted_data1[i] in sorted_data2:
+                matches += 1
+    return matches, fields
+
+def compare_dictionaries(data1: dict, data2: dict, max_depth: int = 5) -> tuple[int, int]:
     """
     Compare two dictionaries and return the count of matching fields and total fields.
     
     Args:
         data1 (dict): First dictionary containing data.
         data2 (dict): Second dictionary containing data.
+        max_depth (int): Maximum depth to compare nested dictionaries. Default is 5.
     
     Returns:
         tuple: A tuple containing the count of matching fields and total fields compared.
     """
     fields = 0
     matches = 0
+
+    if max_depth <= 0:
+        return matches, fields
+
     for key in data1:
         if key in data2:
             fields += 1
             if isinstance(data1[key], dict) and isinstance(data2[key], dict):
-                sub_matches, sub_fields = compare_dictionaries(data1[key], data2[key])
+                sub_matches, sub_fields = compare_dictionaries(data1[key], data2[key], max_depth - 1)
+                fields += sub_fields - 1
+                matches += sub_matches
+            elif isinstance(data1[key], list) and isinstance(data2[key], list):
+                sub_matches, sub_fields = compare_lists(data1[key], data2[key], max_depth - 1)
+                fields += sub_fields - 1
                 matches += sub_matches
-                fields += sub_fields - 1 # Subtract 1 to avoid double counting the key
-            elif data1[key] == data2[key]:
+            if data1[key] == data2[key]:
                 matches += 1
     return matches, fields
 
@@ -46,8 +92,8 @@ def calculate_confidence(data1: dict, data2: dict) -> float:
     difference_score = get_hash_difference(hash1, hash2)
 
     inverse_match_score = 1 - (matches / fields)
-    x = difference_score * inverse_match_score
+    x = 1.3 * difference_score * inverse_match_score
     if (inverse_match_score == 0 or difference_score == 0):
         return 100
-    confidence_score = 100 / (1 + math.e ** (-4.5 + (0.25 * x)))
+    confidence_score = 100 / (1 + math.e ** (-4.5 + (0.3 * x)))
     return confidence_score

{devicer_py-0.1.5.dist-info → devicer_py-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devicer.py
-Version: 0.1.5
+Version: 0.2.0
 Summary: Open-Source Python Middleware for Digital Fingerprinting
 Author: One anonymous contributor
 Author-email: Samuel Roux <sam.roux.com@gmail.com>, Stephen Perso <stephenrperso@gmail.com>

devicer_py-0.2.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+devicer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+devicer/confidence.py,sha256=BQjsvLSfAhyYfeGigY6AXpc0G13ue5qVlR0UcNvUn5s,3990
+devicer/hashing.py,sha256=drqu_9YA7UbcaxgSiD3lWP5qkce6-0c-HHWmqyJi4Tg,645
+devicer_py-0.2.0.dist-info/licenses/license.txt,sha256=z84l2WzrGJ9egXM0Gcgl2_G1GK_L6OtqP3SBi5aKOxg,1171
+devicer_py-0.2.0.dist-info/METADATA,sha256=4P0M2TALl5IX6pjhDxFZf3ttt_kkzrbPjJX_EdO9lbw,1752
+devicer_py-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+devicer_py-0.2.0.dist-info/top_level.txt,sha256=U7avJlzadMpnTLycX86eYZWIZxZAffgTkOj0MmZ6VvY,8
+devicer_py-0.2.0.dist-info/RECORD,,

devicer_py-0.1.5.dist-info/RECORD

@@ -1,8 +0,0 @@
-devicer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devicer/confidence.py,sha256=0acgNkuzlVlWEQWTj5J9rJ8JySFcGas20ZRmhtvDTcU,1983
-devicer/hashing.py,sha256=drqu_9YA7UbcaxgSiD3lWP5qkce6-0c-HHWmqyJi4Tg,645
-devicer_py-0.1.5.dist-info/licenses/license.txt,sha256=z84l2WzrGJ9egXM0Gcgl2_G1GK_L6OtqP3SBi5aKOxg,1171
-devicer_py-0.1.5.dist-info/METADATA,sha256=J1MjNOCeK9HArSkYR5BHUPH53bAkHwb2nNzJtFbzvqg,1752
-devicer_py-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-devicer_py-0.1.5.dist-info/top_level.txt,sha256=U7avJlzadMpnTLycX86eYZWIZxZAffgTkOj0MmZ6VvY,8
-devicer_py-0.1.5.dist-info/RECORD,,