devicer.py 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

devicer/confidence.py

@@ -1,6 +1,35 @@
 from .hashing import get_tlsh_hash, get_hash_difference
 import math
 
+def compare_lists(data1: list, data2: list) -> 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.
+    
+    Returns:
+        tuple: A tuple containing the count of matching elements and total elements compared.
+    """
+    fields = 0
+    matches = 0
+    max_length = max(len(data1), len(data2))
+    for i in range(max_length):
+        if data1[i] and data2[i]:
+            fields += 1
+            if isinstance(data1[i], dict) and isinstance(data2[i], dict):
+                sub_matches, sub_fields = compare_dictionaries(data1[i], data2[i])
+                matches += sub_matches
+                fields += sub_fields - 1
+            elif isinstance(data1[i], list) and isinstance(data2[i], list):
+                sub_matches, sub_fields = compare_lists(data1[i], data2[i])
+                matches += sub_matches
+                fields += sub_fields - 1
+            if data1[i] == data2[i]:
+                matches += 1
+    return matches, fields
+
 def compare_dictionaries(data1: dict, data2: dict) -> tuple[int, int]:
     """
     Compare two dictionaries and return the count of matching fields and total fields.
@@ -21,7 +50,11 @@ def compare_dictionaries(data1: dict, data2: dict) -> tuple[int, int]:
                 sub_matches, sub_fields = compare_dictionaries(data1[key], data2[key])
                 matches += sub_matches
                 fields += sub_fields - 1 # Subtract 1 to avoid double counting the key
-            elif data1[key] == data2[key]:
+            elif isinstance(data1[key], list) and isinstance(data2[key], list):
+                sub_matches, sub_fields = compare_lists(data1[key], data2[key])
+                matches += sub_matches
+                fields += sub_fields - 1
+            if data1[key] == data2[key]:
                 matches += 1
     return matches, fields
 
@@ -46,8 +79,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 / 1.5) * 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.4.dist-info → devicer_py-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devicer.py
-Version: 0.1.4
+Version: 0.1.6
 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.1.6.dist-info/RECORD

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

devicer_py-0.1.4.dist-info/RECORD

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