update modelmap to include gcp models with overlap for aws and docker. review updates

Author: nullfunc

src/api/modelmapper.py

@@ -13,7 +13,7 @@ def load_model_map():
 
 def get_model(provider, model):
     provider = provider.lower()
-    model = model.lower()
+    model = model.lower().removesuffix(":latest")
 
     available_models = _model_map.get(provider, {})
     return available_models.get(model, model)

src/api/routers/test_vertex.py

@@ -209,7 +209,7 @@ def test_get_chat_completion_model_name_known_chat_model():
     # But for now, test as is
     result = vertex.get_chat_completion_model_name(model_alias)
     # Should remove 'publishers/' and 'models/' from the string
-    assert result == "google/gemini-2.0-flash-lite-001"
+    assert result == "gemini-2.0-flash-lite-001"
 
 def test_get_chat_completion_model_name_unknown_model():
     model_alias = "some-other-model"

src/api/routers/vertex.py

@@ -14,8 +14,6 @@
 from api.modelmapper import get_model
 
 known_chat_models = [
-    "publishers/meta-llama/models/llama-3-1-8b-instruct",
-    "publishers/meta-llama/models/llama-3-8b-instruct",
     "publishers/mistral-ai/models/mistral-7b-instruct-v0.3",
     "publishers/mistral-ai/models/mistral-nemo-instruct-2407",
     "publishers/mistral-ai/models/mistral-nemo@2407",

src/api/test_modelmapper.py

@@ -5,7 +5,6 @@
 @patch("api.modelmapper._model_map", {
     "provider1": {
         "model1": "mapped_model1",
-        "model1:latest": "mapped_model1",
         "model2": "mapped_model2"
     }
 })

src/data/modelmap.json

@@ -1,54 +1,66 @@
 {
   "aws": {
-    "ai/mistral": "mistral.mistral-7b-instruct-v0:2",
-    "ai/mistral:latest": "mistral.mistral-7b-instruct-v0:2",
-    "ai/mistral:7B-Q4_0": "mistral.mistral-7b-instruct-v0:2",
-    "ai/mistral:7B-F16": "mistral.mistral-7b-instruct-v0:2",
-    "ai/mistral:7B-Q4_K_M": "mistral.mistral-7b-instruct-v0:2",
+    "ai/claude3-haiku": "anthropic.claude-3-haiku-20240307-v1:0",
     "ai/deepseek-r1-distill-llama": "deepseek.r1-v1:0",
-    "ai/deepseek-r1-distill-llama:latest": "deepseek.r1-v1:0",
     "ai/deepseek-r1-distill-llama:70B-Q4_0": "deepseek.r1-v1:0",
-    "ai/deepseek-r1-distill-llama:8B-Q4_0": "deepseek.r1-v1:0",
     "ai/deepseek-r1-distill-llama:70B-Q4_K_M": "deepseek.r1-v1:0",
     "ai/deepseek-r1-distill-llama:8B-F16": "deepseek.r1-v1:0",
+    "ai/deepseek-r1-distill-llama:8B-Q4_0": "deepseek.r1-v1:0",
     "ai/deepseek-r1-distill-llama:8B-Q4_K_M": "deepseek.r1-v1:0",
+    "ai/llama3.1": "meta.llama3-1-8b-instruct-v1:0",
+    "ai/llama3.1:8B-F16": "meta.llama3-1-8b-instruct-v1:0",
+    "ai/llama3.1:8B-Q4_K_M": "meta.llama3-1-8b-instruct-v1:0",
     "ai/llama3.2": "meta.llama3-2-1b-instruct-v1:0",
-    "ai/llama3.2:latest": "meta.llama3-2-1b-instruct-v1:0",
-    "ai/llama3.2:3B-Q4_0": "meta.llama3-2-3b-instruct-v1:0",
+    "ai/llama3.2:1B-F16": "meta.llama3-2-1b-instruct-v1:0",
     "ai/llama3.2:1B-Q4_0": "meta.llama3-2-1b-instruct-v1:0",
+    "ai/llama3.2:1B-Q8_0": "meta.llama3-2-1b-instruct-v1:0",
     "ai/llama3.2:3B-F16": "meta.llama3-2-3b-instruct-v1:0",
+    "ai/llama3.2:3B-Q4_0": "meta.llama3-2-3b-instruct-v1:0",
     "ai/llama3.2:3B-Q4_K_M": "meta.llama3-2-3b-instruct-v1:0",
-    "ai/llama3.2:1B-F16": "meta.llama3-2-1b-instruct-v1:0",
-    "ai/llama3.2:1B-Q8_0": "meta.llama3-2-1b-instruct-v1:0",
     "ai/llama3.3": "meta.llama3-3-70b-instruct-v1:0",
-    "ai/llama3.3:latest": "meta.llama3-3-70b-instruct-v1:0",
     "ai/llama3.3:70B-Q4_0": "meta.llama3-3-70b-instruct-v1:0",
     "ai/llama3.3:70B-Q4_K_M": "meta.llama3-3-70b-instruct-v1:0",
-    "ai/llama3.1": "meta.llama3-1-8b-instruct-v1:0",
-    "ai/llama3.1:latest": "meta.llama3-1-8b-instruct-v1:0",
-    "ai/llama3.1:8B-F16": "meta.llama3-1-8b-instruct-v1:0",
-    "ai/llama3.1:8B-Q4_K_M": "meta.llama3-1-8b-instruct-v1:0",
-    "ai/claude3-haiku": "anthropic.claude-3-haiku-20240307-v1:0",
-    "ai/claude3-haiku:latest": "anthropic.claude-3-haiku-20240307-v1:0",
+    "ai/mistral": "mistral.mistral-7b-instruct-v0:2",
+    "ai/mistral:7B-F16": "mistral.mistral-7b-instruct-v0:2",
+    "ai/mistral:7B-Q4_0": "mistral.mistral-7b-instruct-v0:2",
+    "ai/mistral:7B-Q4_K_M": "mistral.mistral-7b-instruct-v0:2",
     "ai/smollm2": "us.amazon.nova-micro-v1:0",
-    "ai/smollm2:latest": "us.amazon.nova-micro-v1:0",
+    "nova-lite": "use.amazon.nova-lite-v1:0",
+    "nova-micro": "us.amazon.nova-micro-v1:0",
+    "nova-premier-v1": "amazon.nova-premier-v1:0",
+    "nova-pro": "us.amazon.nova-pro-v1:0",
     "default": "us.amazon.nova-micro-v1:0"
   },
   "gcp": {
+    "ai/claude3-haiku": "publishers/anthropic/models/claude-3-haiku@20240307",
+    "ai/deepseek-r1-distill-llama": "publishers/deepseek-ai/models/deepseek-ai/deepseek-r1-distill-llama-70b",
+    "ai/deepseek-r1-distill-llama:70B-Q4_0": "publishers/deepseek-ai/models/deepseek-ai/deepseek-r1-distill-llama-70b",
+    "ai/deepseek-r1-distill-llama:70B-Q4_K_M": "publishers/deepseek-ai/models/deepseek-ai/deepseek-r1-distill-llama-70b",
+    "ai/deepseek-r1-distill-llama:8B-F16": "publishers/deepseek-ai/models/deepseek-ai/deepseek-ai/deepseek-r1-distill-llama-8b",
+    "ai/deepseek-r1-distill-llama:8B-Q4_0": "publishers/deepseek-ai/models/deepseek-ai/deepseek-r1-distill-llama-8b",
+    "ai/deepseek-r1-distill-llama:8B-Q4_K_M": "publishers/deepseek-ai/models/deepseek-ai/deepseek-r1-distill-llama-8b",
+    "ai/llama3.1": "publishers/meta/models/llama-3-1-8b-instruct",
+    "ai/llama3.1:8B-F16": "publishers/meta/models/llama-3-1-8b-instruct",
+    "ai/llama3.1:8B-Q4_K_M": "publishers/meta/models/llama-3-1-8b-instruct",
+    "ai/llama3.2": "publishers/meta/models/llama-3-2-90b-vision",
+    "ai/llama3.2:1B-F16": "publishers/meta/models/llama-3-2-90b-vision",
+    "ai/llama3.2:1B-Q4_0": "publishers/meta/models/llama-3-2-90b-vision",
+    "ai/llama3.2:1B-Q8_0": "publishers/meta/models/llama-3-2-90b-vision",
+    "ai/llama3.2:3B-F16": "publishers/meta/models/llama-3-2-90b-vision",
+    "ai/llama3.2:3B-Q4_0": "publishers/meta/models/llama-3-2-90b-vision",
+    "ai/llama3.2:3B-Q4_K_M": "publishers/meta/models/llama-3-2-90b-vision",
+    "ai/llama3.3": "publishers/meta/models/llama-3-3-70b-instruct",
+    "ai/llama3.3:70B-Q4_0": "publishers/meta/models/llama-3-3-70b-instruct",
+    "ai/llama3.3:70B-Q4_K_M": "publishers/meta/models/llama-3-3-70b-instruct",
+    "ai/mistral": "publishers/mistralai/models/mistral-nemo",
+    "ai/mistral:7B-F16": "publishers/mistralai/models/mistral-nemo",
+    "ai/mistral:7B-Q4_0": "publishers/mistralai/models/mistral-nemo",
+    "ai/mistral:7B-Q4_K_M": "publishers/mistralai/models/mistral-nemo",
     "ai/smollm2": "publishers/google/models/gemini-2.0-flash-lite-001",
-    "ai/smollm2:latest": "publishers/google/models/gemini-2.0-flash-lite-001",
-    "gemini-2.5-pro": "publishers/google/models/gemini-2.5-pro-preview-05-06",
-    "gemini-2.5-pro:latest": "publishers/google/models/gemini-2.5-pro-preview-05-06",
-    "gemini-2.5-flash": "publishers/google/models/gemini-2.5-flash-preview-05-20",
-    "gemini-2.5-flash:latest": "publishers/google/models/gemini-2.5-flash-preview-05-20",
     "gemini-2.0-flash": "publishers/google/models/gemini-2.0-flash-001",
-    "gemini-2.0-flash:latest": "publishers/google/models/gemini-2.0-flash-001",
     "gemini-2.0-flash-lite": "publishers/google/models/gemini-2.0-flash-lite-001",
-    "gemini-2.0-flash-lite:latest": "publishers/google/models/gemini-2.0-flash-lite-001",
-    "claude-3-haiku": "publishers/anthropic/models/claude-3-haiku@20240307",
-    "claude-3-haiku:latest": "publishers/anthropic/models/claude-3-haiku@20240307",
-    "ai/mistral": "publishers/mistralai/models/mistral-nemo",
-    "a/mistral:latest": "publishers/mistralai/models/mistral-nemo",
+    "gemini-2.5-flash": "publishers/google/models/gemini-2.5-flash-preview-05-20",
+    "gemini-2.5-pro": "publishers/google/models/gemini-2.5-pro-preview-05-06",
     "default": "publishers/google/models/gemini-2.0-flash-lite-001"
   }
 }