Simplify model context

This commit is contained in:
henryruhs 2024-12-18 00:42:35 +01:00
parent cf642e4e9d
commit e38324e6f6
11 changed files with 21 additions and 42 deletions

View File

@ -79,13 +79,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
_, model_sources = collect_model_downloads()
model_context = __name__ + '.' + state_manager.get_item('face_detector_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('face_detector_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def collect_model_downloads() -> Tuple[DownloadSet, DownloadSet]:

View File

@ -80,13 +80,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
_, model_sources = collect_model_downloads()
model_context = __name__ + '.' + state_manager.get_item('face_landmarker_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('face_landmarker_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def collect_model_downloads() -> Tuple[DownloadSet, DownloadSet]:

View File

@ -65,13 +65,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('age_modifier_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('age_modifier_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions:

View File

@ -240,13 +240,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('deep_swapper_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('deep_swapper_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions:

View File

@ -77,8 +77,7 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('expression_restorer_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:

View File

@ -106,13 +106,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('face_editor_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('face_editor_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions:

View File

@ -223,13 +223,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('face_enhancer_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('face_enhancer_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions:

View File

@ -337,13 +337,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('face_swapper_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('face_swapper_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions:

View File

@ -129,13 +129,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('frame_colorizer_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('frame_colorizer_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions:

View File

@ -386,13 +386,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('frame_enhancer_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('frame_enhancer_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions:

View File

@ -75,13 +75,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources')
model_context = __name__ + '.' + state_manager.get_item('lip_syncer_model')
return inference_manager.get_inference_pool(model_context, model_sources)
return inference_manager.get_inference_pool(__name__, model_sources)
def clear_inference_pool() -> None:
model_context = __name__ + '.' + state_manager.get_item('lip_syncer_model')
inference_manager.clear_inference_pool(model_context)
inference_manager.clear_inference_pool(__name__)
def get_model_options() -> ModelOptions: