From 8e2caf6ede0123dcf93db4a1e3b3ed75a29f7bd1 Mon Sep 17 00:00:00 2001 From: Sefik Ilkin Serengil Date: Sun, 4 Aug 2024 12:02:24 +0100 Subject: [PATCH] cleaner controls --- deepface/modules/modeling.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/deepface/modules/modeling.py b/deepface/modules/modeling.py index 0e76513..efbdfe5 100644 --- a/deepface/modules/modeling.py +++ b/deepface/modules/modeling.py @@ -46,7 +46,7 @@ def build_model(task: str, model_name: str) -> Any: """ # singleton design pattern - global model_obj + global cached_models models = { "facial_recognition": { @@ -84,17 +84,17 @@ def build_model(task: str, model_name: str) -> Any: }, } - if task not in models.keys(): + if models.get(task) is None: raise ValueError(f"unimplemented task - {task}") - if not "model_obj" in globals(): - model_obj = {current_task: {} for current_task in models.keys()} + if not "cached_models" in globals(): + cached_models = {current_task: {} for current_task in models.keys()} - if not model_name in model_obj[task].keys(): + if cached_models[task].get(model_name) is None: model = models[task].get(model_name) if model: - model_obj[task][model_name] = model() + cached_models[task][model_name] = model() else: raise ValueError(f"Invalid model_name passed - {task}/{model_name}") - return model_obj[task][model_name] + return cached_models[task][model_name]