Use the llamastack identifier for the model id, not the provider's model id

Author: bparees

src/app/endpoints/query.py

@@ -171,13 +171,14 @@ def select_model_and_provider_id(
                 },
             ) from e
 
-    llama_stack_model_id = f"{provider_id}/{model_id}"
     # Validate that the model_id and provider_id are in the available models
     logger.debug("Searching for model: %s, provider: %s", model_id, provider_id)
-    if not any(
-        m.identifier == llama_stack_model_id and m.provider_id == provider_id
-        for m in models
-    ):
+    
+    def check_model(m):
+        logger.debug("Available model - model_identifier: %s, provider_model_id: %s, provider_id: %s", m.identifier, m.provider_resource_id, m.provider_id)
+        return m.identifier == model_id and m.provider_id == provider_id
+    
+    if not any(check_model(m) for m in models):
         message = f"Model {model_id} from provider {provider_id} not found in available models"
         logger.error(message)
         raise HTTPException(
@@ -188,7 +189,7 @@ def select_model_and_provider_id(
             },
         )
 
-    return llama_stack_model_id, provider_id
+    return model_id, provider_id
 
 
 def _is_inout_shield(shield: Shield) -> bool: