duplicate_checker.py aktualisiert
This commit is contained in:
@@ -6,88 +6,93 @@ from thefuzz import fuzz
|
|||||||
from helpers import normalize_company_name, simple_normalize_url
|
from helpers import normalize_company_name, simple_normalize_url
|
||||||
from google_sheet_handler import GoogleSheetHandler
|
from google_sheet_handler import GoogleSheetHandler
|
||||||
|
|
||||||
# duplicate_checker.py v2.6 (Original v2.0 Kern + Logging)
|
# duplicate_checker.py v2.7 (Logging-Setup Fix)
|
||||||
# Version: 2025-08-06_17-15
|
# Version: 2025-08-06_17-30
|
||||||
|
|
||||||
# --- Konfiguration ---
|
# --- Konfiguration ---
|
||||||
CRM_SHEET_NAME = "CRM_Accounts"
|
CRM_SHEET_NAME = "CRM_Accounts"
|
||||||
MATCHING_SHEET_NAME = "Matching_Accounts"
|
MATCHING_SHEET_NAME = "Matching_Accounts"
|
||||||
SCORE_THRESHOLD = 80
|
SCORE_THRESHOLD = 80
|
||||||
LOG_DIR = "Log"
|
LOG_DIR = "Log"
|
||||||
LOG_FILE = "duplicate_check_v2.6.log"
|
LOG_FILE = "duplicate_check_v2.7.log"
|
||||||
|
|
||||||
# --- Logging Setup ---
|
# --- Logging Setup ---
|
||||||
if not os.path.exists(LOG_DIR):
|
if not os.path.exists(LOG_DIR):
|
||||||
os.makedirs(LOG_DIR, exist_ok=True)
|
os.makedirs(LOG_DIR, exist_ok=True)
|
||||||
log_path = os.path.join(LOG_DIR, LOG_FILE)
|
log_path = os.path.join(LOG_DIR, LOG_FILE)
|
||||||
|
|
||||||
# Global logging config
|
# Clear existing handlers
|
||||||
logging.basicConfig(
|
root_logger = logging.getLogger()
|
||||||
level=logging.DEBUG,
|
root_logger.setLevel(logging.DEBUG)
|
||||||
format="%(asctime)s - %(levelname)-8s - %(message)s",
|
for h in list(root_logger.handlers):
|
||||||
handlers=[
|
root_logger.removeHandler(h)
|
||||||
logging.StreamHandler(sys.stdout),
|
|
||||||
logging.FileHandler(log_path, mode='a', encoding='utf-8')
|
|
||||||
]
|
|
||||||
)
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
logger.info(f"Starting duplicate_checker.py v2.6 | Log: {log_path}")
|
# Formatter
|
||||||
|
formatter = logging.Formatter("%(asctime)s - %(levelname)-8s - %(message)s")
|
||||||
|
|
||||||
|
# Console Handler - INFO+
|
||||||
|
ch = logging.StreamHandler(sys.stdout)
|
||||||
|
ch.setLevel(logging.INFO)
|
||||||
|
ch.setFormatter(formatter)
|
||||||
|
root_logger.addHandler(ch)
|
||||||
|
|
||||||
|
# File Handler - DEBUG+
|
||||||
|
fh = logging.FileHandler(log_path, mode='a', encoding='utf-8')
|
||||||
|
fh.setLevel(logging.DEBUG)
|
||||||
|
fh.setFormatter(formatter)
|
||||||
|
root_logger.addHandler(fh)
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
logger.info(f"Logging to console and file: {log_path}")
|
||||||
|
logger.info("Starting duplicate_checker.py v2.7 | Version: 2025-08-06_17-30")
|
||||||
|
|
||||||
|
|
||||||
def calculate_similarity(record1, record2):
|
def calculate_similarity(record1, record2):
|
||||||
"""Berechnet einen gewichteten Ähnlichkeits-Score (0–190)."""
|
|
||||||
total_score = 0
|
total_score = 0
|
||||||
# Domain-Exact
|
|
||||||
dom1 = record1.get('normalized_domain', '')
|
dom1 = record1.get('normalized_domain', '')
|
||||||
dom2 = record2.get('normalized_domain', '')
|
dom2 = record2.get('normalized_domain', '')
|
||||||
if dom1 and dom1 == dom2:
|
if dom1 and dom1 == dom2:
|
||||||
total_score += 100
|
total_score += 100
|
||||||
# Name-Fuzzy
|
|
||||||
name1 = record1.get('normalized_name', '')
|
name1 = record1.get('normalized_name', '')
|
||||||
name2 = record2.get('normalized_name', '')
|
name2 = record2.get('normalized_name', '')
|
||||||
if name1 and name2:
|
if name1 and name2:
|
||||||
name_similarity = fuzz.token_set_ratio(name1, name2)
|
total_score += fuzz.token_set_ratio(name1, name2) * 0.7
|
||||||
total_score += name_similarity * 0.7
|
if record1.get('CRM Ort') == record2.get('CRM Ort') and record1.get('CRM Land') == record2.get('CRM Land'):
|
||||||
# Ort+Land exact
|
total_score += 20
|
||||||
if record1.get('CRM Ort') and record1.get('CRM Ort') == record2.get('CRM Ort'):
|
|
||||||
if record1.get('CRM Land') and record1.get('CRM Land') == record2.get('CRM Land'):
|
|
||||||
total_score += 20
|
|
||||||
return round(total_score)
|
return round(total_score)
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
logger.info("Starte Duplikats-Check v2.6 (Original v2.0 Kern mit Logging)")
|
logger.info("Starte Duplikats-Check v2.7")
|
||||||
try:
|
try:
|
||||||
sheet_handler = GoogleSheetHandler()
|
sheet_handler = GoogleSheetHandler()
|
||||||
logger.info("GoogleSheetHandler initialisiert")
|
logger.info("GoogleSheetHandler initialisiert")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.critical(f"FEHLER Init GoogleSheetHandler: {e}")
|
logger.critical(f"Init GoogleSheetHandler fehlgeschlagen: {e}")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
# Load data
|
# Load data
|
||||||
logger.info(f"Lade Master-Daten aus '{CRM_SHEET_NAME}'...")
|
logger.info(f"Lade CRM-Daten aus '{CRM_SHEET_NAME}'...")
|
||||||
crm_df = sheet_handler.get_sheet_as_dataframe(CRM_SHEET_NAME)
|
crm_df = sheet_handler.get_sheet_as_dataframe(CRM_SHEET_NAME)
|
||||||
if crm_df is None or crm_df.empty:
|
if crm_df is None or crm_df.empty:
|
||||||
logger.critical(f"Keine Daten in '{CRM_SHEET_NAME}'. Abbruch.")
|
logger.critical("CRM-Tab leer. Abbruch.")
|
||||||
return
|
return
|
||||||
logger.info(f"{len(crm_df)} CRM-Datensätze geladen")
|
logger.info(f"{len(crm_df)} CRM-Datensätze geladen")
|
||||||
|
|
||||||
logger.info(f"Lade Matching-Daten aus '{MATCHING_SHEET_NAME}'...")
|
logger.info(f"Lade Matching-Daten aus '{MATCHING_SHEET_NAME}'...")
|
||||||
match_df = sheet_handler.get_sheet_as_dataframe(MATCHING_SHEET_NAME)
|
match_df = sheet_handler.get_sheet_as_dataframe(MATCHING_SHEET_NAME)
|
||||||
if match_df is None or match_df.empty:
|
if match_df is None or match_df.empty:
|
||||||
logger.critical(f"Keine Daten in '{MATCHING_SHEET_NAME}'. Abbruch.")
|
logger.critical("Matching-Tab leer. Abbruch.")
|
||||||
return
|
return
|
||||||
logger.info(f"{len(match_df)} Matching-Datensätze geladen")
|
logger.info(f"{len(match_df)} Matching-Datensätze geladen")
|
||||||
|
|
||||||
# Normalize
|
# Normalize & blocking key
|
||||||
logger.info("Normalisiere Daten...")
|
|
||||||
for df, label in [(crm_df, 'CRM'), (match_df, 'Matching')]:
|
for df, label in [(crm_df, 'CRM'), (match_df, 'Matching')]:
|
||||||
df['normalized_name'] = df['CRM Name'].astype(str).apply(normalize_company_name)
|
df['normalized_name'] = df['CRM Name'].astype(str).apply(normalize_company_name)
|
||||||
df['normalized_domain'] = df['CRM Website'].astype(str).apply(simple_normalize_url)
|
df['normalized_domain'] = df['CRM Website'].astype(str).apply(simple_normalize_url)
|
||||||
df['CRM Ort'] = df['CRM Ort'].astype(str).str.lower().str.strip()
|
df['CRM Ort'] = df['CRM Ort'].astype(str).str.lower().str.strip()
|
||||||
df['CRM Land'] = df['CRM Land'].astype(str).str.lower().str.strip()
|
df['CRM Land'] = df['CRM Land'].astype(str).str.lower().str.strip()
|
||||||
df['block_key'] = df['normalized_name'].apply(lambda x: x.split()[0] if x else None)
|
df['block_key'] = df['normalized_name'].apply(lambda x: x.split()[0] if x else None)
|
||||||
logger.debug(f"{label}-Sample: {df.iloc[0][['normalized_name','normalized_domain','block_key']].to_dict()}")
|
logger.debug(f"{label}-Sample: {df.iloc[0][['normalized_name','normalized_domain','block_key']].to_dict()}")
|
||||||
|
|
||||||
# Build blocking index
|
# Build blocking index
|
||||||
@@ -97,10 +102,10 @@ def main():
|
|||||||
key = row['block_key']
|
key = row['block_key']
|
||||||
if key:
|
if key:
|
||||||
crm_index.setdefault(key, []).append(row)
|
crm_index.setdefault(key, []).append(row)
|
||||||
logger.info(f"Blocking-Index erstellt mit {len(crm_index)} Keys")
|
logger.info(f"Blocking-Index mit {len(crm_index)} Keys erstellt")
|
||||||
|
|
||||||
# Matching
|
# Matching
|
||||||
logger.info("Starte Matching-Prozess...")
|
logger.info("Starte Matching...")
|
||||||
results = []
|
results = []
|
||||||
total = len(match_df)
|
total = len(match_df)
|
||||||
for i, mrow in match_df.iterrows():
|
for i, mrow in match_df.iterrows():
|
||||||
@@ -111,7 +116,6 @@ def main():
|
|||||||
results.append({'Potenzieller Treffer im CRM': '', 'Ähnlichkeits-Score': 0})
|
results.append({'Potenzieller Treffer im CRM': '', 'Ähnlichkeits-Score': 0})
|
||||||
continue
|
continue
|
||||||
scored = [(crow['CRM Name'], calculate_similarity(mrow, crow)) for crow in candidates]
|
scored = [(crow['CRM Name'], calculate_similarity(mrow, crow)) for crow in candidates]
|
||||||
# Log Top-3 only
|
|
||||||
top3 = sorted(scored, key=lambda x: x[1], reverse=True)[:3]
|
top3 = sorted(scored, key=lambda x: x[1], reverse=True)[:3]
|
||||||
logger.debug(f" Top3 Kandidaten: {top3}")
|
logger.debug(f" Top3 Kandidaten: {top3}")
|
||||||
best_name, best_score = max(scored, key=lambda x: x[1])
|
best_name, best_score = max(scored, key=lambda x: x[1])
|
||||||
@@ -119,16 +123,16 @@ def main():
|
|||||||
results.append({'Potenzieller Treffer im CRM': best_name, 'Ähnlichkeits-Score': best_score})
|
results.append({'Potenzieller Treffer im CRM': best_name, 'Ähnlichkeits-Score': best_score})
|
||||||
logger.info(f" --> Match: '{best_name}' Score={best_score}")
|
logger.info(f" --> Match: '{best_name}' Score={best_score}")
|
||||||
else:
|
else:
|
||||||
results.append({'Potenzieller Treffer im CRM': best_name if best_name else '', 'Ähnlichkeits-Score': best_score})
|
results.append({'Potenzieller Treffer im CRM': best_name or '', 'Ähnlichkeits-Score': best_score})
|
||||||
logger.info(f" --> Kein Match (höchster Score {best_score})")
|
logger.info(f" --> Kein Match (Score {best_score})")
|
||||||
|
|
||||||
# Write back
|
# Write back
|
||||||
logger.info("Schreibe Ergebnisse zurück ins Sheet...")
|
logger.info("Schreibe Ergebnisse zurück ins Sheet...")
|
||||||
result_df = pd.DataFrame(results)
|
out_df = pd.DataFrame(results)
|
||||||
output_df = match_df[['CRM Name','CRM Website','CRM Ort','CRM Land']].copy()
|
output = match_df[['CRM Name','CRM Website','CRM Ort','CRM Land']].copy()
|
||||||
output_df = pd.concat([output_df.reset_index(drop=True), result_df], axis=1)
|
output = pd.concat([output.reset_index(drop=True), out_df], axis=1)
|
||||||
data_to_write = [output_df.columns.tolist()] + output_df.values.tolist()
|
data = [output.columns.tolist()] + output.values.tolist()
|
||||||
success = sheet_handler.clear_and_write_data(MATCHING_SHEET_NAME, data_to_write)
|
success = sheet_handler.clear_and_write_data(MATCHING_SHEET_NAME, data)
|
||||||
if success:
|
if success:
|
||||||
logger.info("Ergebnisse erfolgreich geschrieben")
|
logger.info("Ergebnisse erfolgreich geschrieben")
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user