Skip to content

Commit 8df104a

Browse files
OliverBryantOliverBryant
committed
num1
1 parent 04e7e50 commit 8df104a

File tree

19 files changed

+294
-218
lines changed

19 files changed

+294
-218
lines changed

‎xinference/core/supervisor.py‎

Lines changed: 223 additions & 172 deletions
Large diffs are not rendered by default.

‎xinference/core/worker.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,53 +1203,53 @@ def sort_helper(item):
12031203
return item.get("model_name").lower()
12041204

12051205
if model_type == "LLM":
1206-
from ..model.llm import get_user_defined_llm_families
1206+
from ..model.llm import get_registered_llm_families
12071207

12081208
ret = []
12091209

1210-
for family in get_user_defined_llm_families():
1210+
for family in get_registered_llm_families():
12111211
ret.append({"model_name": family.model_name, "is_builtin": False})
12121212

12131213
ret.sort(key=sort_helper)
12141214
return ret
12151215
elif model_type == "embedding":
1216-
from ..model.embedding.custom import get_user_defined_embeddings
1216+
from ..model.embedding.custom import get_registered_embeddings
12171217

12181218
ret = []
12191219

1220-
for model_spec in get_user_defined_embeddings():
1220+
for model_spec in get_registered_embeddings():
12211221
ret.append({"model_name": model_spec.model_name, "is_builtin": False})
12221222

12231223
ret.sort(key=sort_helper)
12241224
return ret
12251225
elif model_type == "image":
1226-
from ..model.image.custom import get_user_defined_images
1226+
from ..model.image.custom import get_registered_images
12271227

12281228
ret = []
12291229

1230-
for model_spec in get_user_defined_images():
1230+
for model_spec in get_registered_images():
12311231
ret.append({"model_name": model_spec.model_name, "is_builtin": False})
12321232

12331233
ret.sort(key=sort_helper)
12341234
return ret
12351235
elif model_type == "audio":
1236-
from ..model.audio.custom import get_user_defined_audios
1236+
from ..model.audio.custom import get_registered_audios
12371237

12381238
ret = []
12391239

1240-
for model_spec in get_user_defined_audios():
1240+
for model_spec in get_registered_audios():
12411241
ret.append({"model_name": model_spec.model_name, "is_builtin": False})
12421242

12431243
ret.sort(key=sort_helper)
12441244
return ret
12451245
elif model_type == "video":
12461246
return []
12471247
elif model_type == "rerank":
1248-
from ..model.rerank.custom import get_user_defined_reranks
1248+
from ..model.rerank.custom import get_registered_reranks
12491249

12501250
ret = []
12511251

1252-
for model_spec in get_user_defined_reranks():
1252+
for model_spec in get_registered_reranks():
12531253
ret.append({"model_name": model_spec.model_name, "is_builtin": False})
12541254

12551255
ret.sort(key=sort_helper)
@@ -1270,35 +1270,35 @@ def sort_helper(item):
12701270
@log_sync(logger=logger)
12711271
async def get_model_registration(self, model_type: str, model_name: str) -> Any:
12721272
if model_type == "LLM":
1273-
from ..model.llm import get_user_defined_llm_families
1273+
from ..model.llm import get_registered_llm_families
12741274

1275-
for f in get_user_defined_llm_families():
1275+
for f in get_registered_llm_families():
12761276
if f.model_name == model_name:
12771277
return f
12781278
elif model_type == "embedding":
1279-
from ..model.embedding.custom import get_user_defined_embeddings
1279+
from ..model.embedding.custom import get_registered_embeddings
12801280

1281-
for f in get_user_defined_embeddings():
1281+
for f in get_registered_embeddings():
12821282
if f.model_name == model_name:
12831283
return f
12841284
elif model_type == "image":
1285-
from ..model.image.custom import get_user_defined_images
1285+
from ..model.image.custom import get_registered_images
12861286

1287-
for f in get_user_defined_images():
1287+
for f in get_registered_images():
12881288
if f.model_name == model_name:
12891289
return f
12901290
elif model_type == "audio":
1291-
from ..model.audio.custom import get_user_defined_audios
1291+
from ..model.audio.custom import get_registered_audios
12921292

1293-
for f in get_user_defined_audios():
1293+
for f in get_registered_audios():
12941294
if f.model_name == model_name:
12951295
return f
12961296
elif model_type == "video":
12971297
return None
12981298
elif model_type == "rerank":
1299-
from ..model.rerank.custom import get_user_defined_reranks
1299+
from ..model.rerank.custom import get_registered_reranks
13001300

1301-
for f in get_user_defined_reranks():
1301+
for f in get_registered_reranks():
13021302
if f.model_name == model_name:
13031303
return f
13041304
return None

‎xinference/model/audio/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def convert_audio_model_format(model_json: Dict[str, Any]) -> Dict[str, Any]:
7979
)
8080
from .custom import (
8181
CustomAudioModelFamilyV2,
82-
get_user_defined_audios,
82+
get_registered_audios,
8383
register_audio,
8484
unregister_audio,
8585
)
@@ -143,7 +143,7 @@ def _install():
143143
register_custom_model()
144144

145145
# register model description
146-
for ud_audio in get_user_defined_audios():
146+
for ud_audio in get_registered_audios():
147147
AUDIO_MODEL_DESCRIPTIONS.update(generate_audio_description(ud_audio))
148148

149149

‎xinference/model/audio/core.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ def match_audio(
100100
) -> AudioModelFamilyV2:
101101
from ..utils import download_from_modelscope
102102
from . import BUILTIN_AUDIO_MODELS
103-
from .custom import get_user_defined_audios
103+
from .custom import get_registered_audios
104104

105-
for model_spec in get_user_defined_audios():
105+
for model_spec in get_registered_audios():
106106
if model_spec.model_name == model_name:
107107
return model_spec
108108

‎xinference/model/audio/custom.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@ def __init__(self):
8383
self.builtin_models = list(BUILTIN_AUDIO_MODELS.keys())
8484

8585

86-
def get_user_defined_audios() -> List[CustomAudioModelFamilyV2]:
86+
def get_registered_audios() -> List[CustomAudioModelFamilyV2]:
87+
"""
88+
Get all audio families registered in the registry (both user-defined and editor-defined).
89+
This excludes hardcoded builtin models.
90+
"""
8791
from ..custom import RegistryManager
8892

8993
registry = RegistryManager.get_registry("audio")

‎xinference/model/embedding/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def convert_embedding_model_format(model_json: Dict[str, Any]) -> Dict[str, Any]
7070
)
7171
from .custom import (
7272
CustomEmbeddingModelFamilyV2,
73-
get_user_defined_embeddings,
73+
get_registered_embeddings,
7474
register_embedding,
7575
unregister_embedding,
7676
)
@@ -211,7 +211,7 @@ def _install():
211211
register_custom_model()
212212

213213
# register model description
214-
for ud_embedding in get_user_defined_embeddings():
214+
for ud_embedding in get_registered_embeddings():
215215
EMBEDDING_MODEL_DESCRIPTIONS.update(
216216
generate_embedding_description(ud_embedding)
217217
)

‎xinference/model/embedding/custom.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ def remove_ud_model_files(self, model_family: "CustomEmbeddingModelFamilyV2"):
6969
cache_manager.unregister_custom_model(self.model_type)
7070

7171

72-
def get_user_defined_embeddings() -> List[EmbeddingModelFamilyV2]:
72+
def get_registered_embeddings() -> List[EmbeddingModelFamilyV2]:
73+
"""
74+
Get all embedding families registered in the registry (both user-defined and editor-defined).
75+
This excludes hardcoded builtin models.
76+
"""
7377
from ..custom import RegistryManager
7478

7579
registry = RegistryManager.get_registry("embedding")

‎xinference/model/embedding/embed_family.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ def match_embedding(
3737
] = None,
3838
) -> "EmbeddingModelFamilyV2":
3939
from ..utils import download_from_modelscope
40-
from .custom import get_user_defined_embeddings
40+
from .custom import get_registered_embeddings
4141

4242
target_family = None
4343

4444
if model_name in BUILTIN_EMBEDDING_MODELS:
4545
target_family = BUILTIN_EMBEDDING_MODELS[model_name]
4646
else:
47-
for model_family in get_user_defined_embeddings():
47+
for model_family in get_registered_embeddings():
4848
if model_name == model_family.model_name:
4949
target_family = model_family
5050
break

‎xinference/model/image/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def convert_image_model_format(model_json: Dict[str, Any]) -> Dict[str, Any]:
9494
)
9595
from .custom import (
9696
CustomImageModelFamilyV2,
97-
get_user_defined_images,
97+
get_registered_images,
9898
register_image,
9999
unregister_image,
100100
)
@@ -240,7 +240,7 @@ def _install():
240240

241241
register_custom_model()
242242

243-
for ud_image in get_user_defined_images():
243+
for ud_image in get_registered_images():
244244
IMAGE_MODEL_DESCRIPTIONS.update(generate_image_description(ud_image))
245245

246246

‎xinference/model/image/core.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ def match_diffusion(
121121
) -> ImageModelFamilyV2:
122122
from ..utils import download_from_modelscope
123123
from . import BUILTIN_IMAGE_MODELS
124-
from .custom import get_user_defined_images
124+
from .custom import get_registered_images
125125

126-
for model_spec in get_user_defined_images():
126+
for model_spec in get_registered_images():
127127
if model_spec.model_name == model_name:
128128
return model_spec
129129

0 commit comments

Comments
 (0)