Merge branch '323-endpoint-for-list-custom-services-and-custom-mcp-s' into 'main'

Resolve "Endpoint for list custom services and custom mcp-s"

Closes #323

See merge request df/deepfellow-infra!195

Author: ldudzsim

server/api/openai.py

@@ -164,6 +164,16 @@ async def on_rerank(
     return await endpoint_registry.execute_rerank(body, request)
 
 
+@router.get("/custom")
+async def get_custom_prefixes(
+    request: Request,  # noqa: ARG001
+    _: Annotated[str, Depends(auth_server)],
+    endpoint_registry: Annotated[EndpointRegistry, Depends(get_endpoint_registry)],
+) -> list[str]:
+    """Process custom endpoint request."""
+    return [model.props.prefix for model in endpoint_registry.custom_endpoints.list_models() if model.props.prefix]
+
+
 # Replacement from router.api_route which is kind bugged in swagger.
 # Also FastAPI creators doesn't recommend using api_route method.
 @router.get("/custom/{full_path:path}")
@@ -183,6 +193,16 @@ async def on_custom_endpoint(
     return await endpoint_registry.execute_custom_endpoints(full_path, request)
 
 
+@router.get("/mcp")
+async def get_mcp_prefixes(
+    request: Request,  # noqa: ARG001
+    _: Annotated[str, Depends(auth_server)],
+    endpoint_registry: Annotated[EndpointRegistry, Depends(get_endpoint_registry)],
+) -> list[str]:
+    """Process custom endpoint request."""
+    return [model.props.prefix for model in endpoint_registry.mcp_endpoints.list_models() if model.props.prefix]
+
+
 # Replacement from router.api_route which is kind bugged in swagger.
 # Also FastAPI creators doesn't recommend using api_route method.
 @router.get("/mcp/{full_path:path}")

server/models/api.py

@@ -362,6 +362,7 @@ class ModelProps(BaseModel):
     endpoints: list[str]
     context_window: int | None = None
     max_context_window: int | None = None
+    prefix: str | None = None
 
 
 ModelType = Literal[

server/services/custom_service.py

@@ -384,6 +384,7 @@ async def _install_model(
             options.spec = {}
         if "prefix" not in options.spec:
             options.spec["prefix"] = model.default_prefix
+        model.model_props.prefix = options.spec["prefix"]
         parsed_model_options = try_parse_pydantic(CustomModelOptions, options.spec)
         await self._verify_docker_image(model.options.image, options.ignore_warnings)
 

server/services/mcp_service.py

@@ -494,6 +494,7 @@ async def _install_model(
             options.spec = {}
         if "prefix" not in options.spec:
             options.spec["prefix"] = model.default_prefix
+        model.model_props.prefix = options.spec["prefix"]
         parsed_model_options = try_parse_pydantic(McpModelOptions, options.spec)
 
         self.check_envs(model.required_envs, parsed_model_options.envs)