diff --git a/modules/shared.py b/modules/shared.py index 568679d1b..9d6bc157b 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -5,7 +5,7 @@ import sys import time import contextlib from enum import Enum -from typing import TYPE_CHECKING, TypeVar +from typing import TYPE_CHECKING import gradio as gr from modules.json_helpers import readfile, writefile # pylint: disable=W0611 from modules.shared_helpers import listdir, walk_files, html_path, html, req, total_tqdm # pylint: disable=W0611 @@ -30,9 +30,6 @@ if TYPE_CHECKING: from modules.shared_legacy import LegacyOption from modules.ui_extra_networks import ExtraNetworksPage -M = TypeVar("M") -S = TypeVar("S") - class Backend(Enum): ORIGINAL = 1 @@ -120,16 +117,6 @@ list_checkpoint_tiles = list_checkpoint_titles # alias for legacy typo default_checkpoint = list_checkpoint_titles()[0] if len(list_checkpoint_titles()) > 0 else "model.safetensors" -def if_modern(modern: M, standard: S = None) -> M | S: - """Return input depending on whether Modern UI is being used or not. - - Args: - modern (Any): Value to return if Modern UI is being used. - standard (Any, optional): Value to return if Modern UI is NOT being used. Defaults to None. - """ - return modern if opts.theme_type == "Modern" else standard - - def is_url(string): from urllib.parse import urlparse parsed_url = urlparse(string) diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py index 8aefa7d8d..d97e04048 100644 --- a/modules/ui_extensions.py +++ b/modules/ui_extensions.py @@ -32,8 +32,6 @@ sort_ordering = { re_snake_case = re.compile(r'_(?=[a-zA-z0-9])') re_camelCase = re.compile(r'(?<=[a-z])([A-Z])') -th_status = shared.if_modern(f'{ui_symbols.info_btn}', "Status") -th_enabled = shared.if_modern(f'{ui_symbols.check_btn}', "Enabled") def get_installed(ext): @@ -283,7 +281,7 @@ def make_wrappable_html(text: str) -> str: def create_html(search_text, sort_column): # shared.log.debug(f'Extensions manager: refresh list search="{search_text}" sort="{sort_column}"') - code = f""" + code = """
| {th_enabled} | -{th_status} | ++ | Extension | Description | Type | @@ -393,27 +391,27 @@ def create_html(search_text, sort_column): if ext.get('status', None) is None or type(ext['status']) == str: # old format ext['status'] = 0 if ext['url'] is None or ext['url'] == '': - status = f"|
|---|---|---|---|---|---|---|