fix: support non-catalog model id fallback

Cherry-pick PR #25's non-catalog model ID mapping fix and update the registry docs to match the new api_model_id behavior.

Author: rbb-dev

docs/model_catalog_and_routing_intelligence.md

@@ -144,7 +144,7 @@ See: [OpenRouter Integrations & Telemetry](openrouter_integrations_and_telemetry
 | `ModelFamily.capabilities(model_id)` | `dict[str,bool]` | Open WebUI capability checkboxes for UI affordances. |
 | `ModelFamily.supported_parameters(model_id)` | `frozenset[str]` | Provider-supported request parameter set (used for reasoning compatibility decisions). |
 | `ModelFamily.max_completion_tokens(model_id)` | `int \| None` | Provider-advertised max completion tokens, used when `USE_MODEL_MAX_OUTPUT_TOKENS=True`. |
-| `OpenRouterModelRegistry.api_model_id(model_id)` | provider slug or `None` | Maps the normalized/sanitized model ID back to the provider’s original ID for outbound API calls. |
+| `OpenRouterModelRegistry.api_model_id(model_id)` | provider slug, reconstructed non-catalog slug, or `None` | Maps the normalized/sanitized model ID back to the provider’s original ID for outbound API calls. |
 
 ---
 

open_webui_openrouter_pipe/models/registry.py

@@ -558,7 +558,21 @@ def api_model_id(cls, model_id: str) -> Optional[str]:
         provider_id = cls._id_map.get(norm)
 
         if not provider_id:
-            return None
+            # Non-catalog model: convert dotted format back to slash format
+            if "/" in model_id_base:
+                api_base = model_id_base
+            elif "." in model_id_base:
+                api_base = model_id_base.replace(".", "/", 1)
+            else:
+                api_base = model_id_base
+
+            # Re-attach suffix with appropriate separator
+            if suffix_tag:
+                if suffix_tag.startswith("preset/"):
+                    return f"{api_base}@{suffix_tag}"
+                else:
+                    return f"{api_base}:{suffix_tag}"
+            return api_base
 
         # Re-attach suffix with appropriate separator
         # Presets use @ separator, variants use : separator

tests/test_variant_models.py

@@ -193,11 +193,11 @@ def test_api_model_id_multiple_variants(self):
             assert result == expected_output, f"Failed for {input_id}"
 
     def test_api_model_id_nonexistent_base(self):
-        """Test that non-existent base model returns None even with variant."""
+        """Test that non-catalog model with variant converts dotted to slash format."""
         OpenRouterModelRegistry._id_map = {}
 
         result = OpenRouterModelRegistry.api_model_id("nonexistent.model:exacto")
-        assert result is None
+        assert result == "nonexistent/model:exacto"
 
 
 class TestPhaseModelSupport:
@@ -500,11 +500,57 @@ def test_api_model_id_multiple_presets(self):
             assert result == expected_output, f"Failed for {input_id}"
 
     def test_api_model_id_nonexistent_preset_base(self):
-        """Test that non-existent base model returns None even with preset."""
+        """Test that non-catalog model with preset converts dotted to slash format."""
         OpenRouterModelRegistry._id_map = {}
 
         result = OpenRouterModelRegistry.api_model_id("nonexistent.model:preset/my-preset")
-        assert result is None
+        assert result == "nonexistent/model@preset/my-preset"
+
+
+class TestAPIModelIDNonCatalogConversion:
+    """Test that api_model_id() converts dotted format to slash format for non-catalog models."""
+
+    def test_non_catalog_model_with_free_suffix(self):
+        """Test non-catalog model with :free suffix converts correctly."""
+        OpenRouterModelRegistry._id_map = {}
+        result = OpenRouterModelRegistry.api_model_id("qwen.qwen3.6-plus-preview:free")
+        assert result == "qwen/qwen3.6-plus-preview:free"
+
+    def test_non_catalog_model_with_variant_suffix(self):
+        """Test non-catalog model with other variant suffix."""
+        OpenRouterModelRegistry._id_map = {}
+        result = OpenRouterModelRegistry.api_model_id("cognitivecomputations.dolphin-mistral-24b-venice-edition:free")
+        assert result == "cognitivecomputations/dolphin-mistral-24b-venice-edition:free"
+
+    def test_non_catalog_model_without_suffix(self):
+        """Test non-catalog model without suffix converts correctly."""
+        OpenRouterModelRegistry._id_map = {}
+        result = OpenRouterModelRegistry.api_model_id("qwen.qwen3.6-plus-preview")
+        assert result == "qwen/qwen3.6-plus-preview"
+
+    def test_non_catalog_model_already_has_slash(self):
+        """Test model that already has slash format is preserved."""
+        OpenRouterModelRegistry._id_map = {}
+        result = OpenRouterModelRegistry.api_model_id("qwen/qwen3.6-plus-preview:free")
+        assert result == "qwen/qwen3.6-plus-preview:free"
+
+    def test_non_catalog_model_with_preset_suffix(self):
+        """Test non-catalog model with preset suffix uses @ separator."""
+        OpenRouterModelRegistry._id_map = {}
+        result = OpenRouterModelRegistry.api_model_id("qwen.qwen3.6-plus-preview:preset/my-preset")
+        assert result == "qwen/qwen3.6-plus-preview@preset/my-preset"
+
+    def test_non_catalog_model_no_provider_prefix(self):
+        """Test model without provider prefix returns as-is."""
+        OpenRouterModelRegistry._id_map = {}
+        result = OpenRouterModelRegistry.api_model_id("some-model:free")
+        assert result == "some-model:free"
+
+    def test_non_catalog_model_multiple_dots(self):
+        """Test model with multiple dots only converts first."""
+        OpenRouterModelRegistry._id_map = {}
+        result = OpenRouterModelRegistry.api_model_id("a.b.c:free")
+        assert result == "a/b.c:free"
 
 
 class TestVariantEnforcementExpansion: