Merge branch 'features/fix_ollama'

Author: Paweł Kędzia

llm_router_api/endpoints/builtin/lmstudio.py

@@ -72,11 +72,7 @@ def prepare_payload(
             A response containing the object type ``"list"`` and a ``data``
             field with the available model tags.
         """
-        # models = self.__proper_models_list_format()
-        models = self.__proper_models_list_format()
-        # import json
-        # print(json.dumps(models, indent=2, ensure_ascii=False))
-        return {"models": models}
+        return self.__proper_models_list_format()
 
     def __proper_models_list_format(self):
         _models_data = self._api_type_dispatcher.tags(
@@ -86,17 +82,17 @@ def __proper_models_list_format(self):
         proper_models = []
         for m in _models_data:
             _model = {
+                "id": m["id"],
+                "object": "model",
                 "type": "llm",
-                "modelKey": m["id"],
-                "format": "gguf",
-                "displayName": m["id"],
-                "path": m["id"],
-                "sizeBytes": 4683073952,
-                "paramsString": "7B",
-                "architecture": "qwen2",
-                "vision": False,
-                "trainedForToolUse": True,
-                "maxContextLength": 32768,
+                "publisher": m["publisher"],
+                "arch": m["arch"],
+                "compatibility_type": "gguf",
+                "quantization": "Q8_0",
+                "state": "loaded",
+                "max_context_length": m["max_context_length"],
             }
             proper_models.append(_model)
-        return proper_models
+
+        _response = {"data": proper_models, "object": "list"}
+        return _response

llm_router_api/endpoints/endpoint_i.py

@@ -1121,6 +1121,9 @@ def _clear_payload(payload: Dict[str, Any]):
         Dict[str, Any]
             The payload with internal keys removed.
         """
+        if type(payload) is str:
+            return payload
+
         for k in CLEAR_PREDEFINED_PARAMS:
             payload.pop(k, None)
         # If stream param is not given, then set as False