torbjorn/my-pal-mcp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed model name mapping for openrouter

Browse Source
This commit is contained in:
Fahad
2025-06-14 19:19:59 +04:00
parent b405aaf8bd
commit b41b874e31
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@@ -14,7 +14,7 @@ import os
# These values are used in server responses and for tracking releases # These values are used in server responses and for tracking releases
# IMPORTANT: This is the single source of truth for version and author info # IMPORTANT: This is the single source of truth for version and author info
# Semantic versioning: MAJOR.MINOR.PATCH # Semantic versioning: MAJOR.MINOR.PATCH
__version__ = "4.4.1" __version__ = "4.4.2"
# Last update date in ISO format # Last update date in ISO format
__updated__ = "2025-06-14" __updated__ = "2025-06-14"
# Primary maintainer # Primary maintainer

19
providers/custom.py
View File

@@ -201,22 +201,9 @@ class CustomProvider(OpenAICompatibleProvider):
logging.debug(f"Model '{model_name}' -> '{model_id}' validated via registry (custom model)") logging.debug(f"Model '{model_name}' -> '{model_id}' validated via registry (custom model)")
return True return True
else: else:
# This is a cloud/OpenRouter model - check restrictions if available # This is a cloud/OpenRouter model - CustomProvider should NOT handle these
if openrouter_available: # Let OpenRouter provider handle them instead
# Check if OpenRouter model is allowed by restrictions logging.debug(f"Model '{model_name}' -> '{model_id}' rejected (cloud model, defer to OpenRouter)")
from utils.model_restrictions import get_restriction_service
restriction_service = get_restriction_service()
if not restriction_service.is_allowed(ProviderType.OPENROUTER, model_id, model_name):
logging.debug(f"Model '{model_name}' -> '{model_id}' blocked by OpenRouter restrictions")
return False
logging.debug(
f"Model '{model_name}' -> '{model_id}' validated via OpenRouter (passes restrictions)"
)
return True
else:
logging.debug(f"Model '{model_name}' -> '{model_id}' rejected (cloud model, no OpenRouter)")
return False return False
# Handle version tags for unknown models (e.g., "my-model:latest") # Handle version tags for unknown models (e.g., "my-model:latest")

20
simulator_tests/test_conversation_chain_validation.py
View File

@@ -315,22 +315,28 @@ class TestClass:
is_valid_length = chain_length >= 2 is_valid_length = chain_length >= 2
# Try to identify which thread this is for better validation # Try to identify which thread this is for better validation
thread_description = "Unknown thread" thread_description = f"Thread {thread_id[:8]}"
if thread_id == continuation_id_a2: if thread_id == continuation_id_a1:
thread_description = "A2 (should be 2-thread chain)" thread_description = "A1 (original thread)"
is_valid_length = chain_length == 1
elif thread_id == continuation_id_a2:
thread_description = "A2 (2-thread chain)"
is_valid_length = chain_length == 2 is_valid_length = chain_length == 2
elif thread_id == continuation_id_a3: elif thread_id == continuation_id_a3:
thread_description = "A3 (should be 3-thread chain)" thread_description = "A3 (3-thread chain)"
is_valid_length = chain_length == 3 is_valid_length = chain_length == 3
elif thread_id == continuation_id_b1:
thread_description = "B1 (original thread)"
is_valid_length = chain_length == 1
elif thread_id == continuation_id_b2: elif thread_id == continuation_id_b2:
thread_description = "B2 (should be 2-thread chain)" thread_description = "B2 (2-thread chain)"
is_valid_length = chain_length == 2 is_valid_length = chain_length == 2
elif thread_id == continuation_id_a1_branch: elif thread_id == continuation_id_a1_branch:
thread_description = "A1-Branch (should be 2-thread chain)" thread_description = "A1-Branch (2-thread chain)"
is_valid_length = chain_length == 2 is_valid_length = chain_length == 2
traversal_validations.append( traversal_validations.append(
(f"{thread_description[:8]}... has valid chain length", is_valid_length) (f"{thread_description} has valid chain length", is_valid_length)
) )
# Also validate we found at least one traversal (shows the system is working) # Also validate we found at least one traversal (shows the system is working)