Re-land Custom model endpoint provider with the provider-coverage gaps closed

application/single_app/app.py

@@ -105,6 +105,7 @@
 from route_plugin_logging import bpl as plugin_logging_bp
 from functions_custom_pages import get_custom_pages_nav
 from functions_debug import debug_print
+from functions_model_endpoint_providers import get_model_endpoint_provider_ui_options
 from functions_terms_of_use import has_terms_of_use_acceptance
 from functions_mcp_server_auth import inbound_mcp_required_blueprint
 
@@ -589,6 +590,7 @@
         idle_timeout_enabled=idle_timeout_enabled,
         idle_timeout_minutes=idle_timeout_minutes,
         idle_warning_minutes=idle_warning_minutes,
+        model_endpoint_api_types=get_model_endpoint_provider_ui_options(),
         mcp_ui_enabled=is_mcp_ui_enabled()
     )
 

application/single_app/config.py

@@ -97,7 +97,7 @@
 EXECUTOR_TYPE = 'thread'
 EXECUTOR_MAX_WORKERS = 30
 SESSION_TYPE = 'filesystem'
-VERSION = "0.261.012"
+VERSION = "0.261.021"
 IS_DEVELOPMENT = is_development_env_enabled()
 
 # Opt-out for deployments where App Service Easy Auth is active but the platform

application/single_app/functions_documents.py

@@ -37,6 +37,11 @@
 from functions_keyvault import SecretReturnType, keyvault_model_endpoint_get_helper
 from functions_model_endpoint_identity_header import build_model_endpoint_identity_headers
 from functions_model_endpoint_runtime import MODEL_ENDPOINT_PROVIDER_ALLOWLIST, build_model_endpoint_sync_chat_client
+from functions_model_endpoint_types import (
+    get_model_endpoint_api_type,
+    resolve_model_endpoint_request_model,
+)
+from model_endpoint_clients import MODEL_ENDPOINT_PROTOCOL_AZURE_OPENAI, infer_model_endpoint_protocol
 import azure.cognitiveservices.speech as speechsdk
 
 _AUDIO_RUNTIME_CAPABILITIES_CACHE = None
@@ -142,6 +147,9 @@
     api_version,
     deployment_name,
     *,
+    api_type='',
+    anthropic_version='',
+    allow_private_custom_endpoints=False,
     settings=None,
     endpoint_config=None,
     identity_context=None,
@@ -152,6 +160,9 @@
         endpoint,
         api_version,
         deployment_name=deployment_name,
+        api_type=api_type,
+        anthropic_version=anthropic_version,
+        allow_private_custom_endpoints=allow_private_custom_endpoints,
         settings=settings,
         endpoint_config=endpoint_config,
         identity_context=identity_context,
@@ -191,21 +202,36 @@
         provider = str(endpoint_cfg.get("provider") or selection["provider"] or "aoai").lower()
         connection = endpoint_cfg.get("connection", {}) or {}
         auth_settings = endpoint_cfg.get("auth", {}) or {}
-        deployment = str(model_cfg.get("deploymentName") or model_cfg.get("deployment") or "").strip()
+        deployment = resolve_model_endpoint_request_model(endpoint_cfg, model_cfg)
         endpoint = str(connection.get("endpoint") or "").strip()
         api_version = str(connection.get("openai_api_version") or connection.get("api_version") or "").strip()
+        api_type = get_model_endpoint_api_type(endpoint_cfg)
+        anthropic_version = str(connection.get("anthropic_version") or "").strip()
+        runtime_protocol = infer_model_endpoint_protocol(
+            provider,
+            endpoint,
+            deployment,
+            api_type,
+        )
 
         if provider not in MODEL_ENDPOINT_PROVIDER_ALLOWLIST:
             raise ValueError(f"Selected metadata extraction provider '{provider}' is not supported.")
-        if not endpoint or not api_version or not deployment:
-            raise ValueError("Selected metadata extraction endpoint is missing endpoint, API version, or deployment configuration.")
+        if not endpoint or not deployment or (
+            runtime_protocol == MODEL_ENDPOINT_PROTOCOL_AZURE_OPENAI and not api_version
+        ):
+            raise ValueError("Selected metadata extraction endpoint is incomplete.")
 
         return _build_model_endpoint_client(
             auth_settings,
             provider,
             endpoint,
             api_version,
             deployment,
+            api_type=api_type,
+            anthropic_version=anthropic_version,
+            allow_private_custom_endpoints=bool(
+                settings.get("allow_private_custom_model_endpoints", False)
+            ),
             settings=settings,
             endpoint_config=endpoint_cfg,
             identity_context=identity_context,