Models Marketplace bug fix for main (TransformerOptimus#1267)

dungnmaster · Sep 28, 2023 · ef75dd7 · ef75dd7
1 parent 681982d
commit ef75dd7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/superagi/controllers/models_controller.py b/superagi/controllers/models_controller.py
@@ -131,8 +131,16 @@ def get_marketplace_knowledge_list(page: int = 0):
     query = db.session.query(Models).filter(Models.org_id == organisation_id)
     if page < 0:
         models = query.all()
-    models = query.offset(page * page_size).limit(page_size).all()
-    return models
+    else:
+        models = query.offset(page * page_size).limit(page_size).all()
+
+    models_list = []
+    for model in models:
+        model_dict = model.__dict__
+        model_dict["provider"] = db.session.query(ModelsConfig).filter(ModelsConfig.id == model.model_provider_id).first().provider
+        models_list.append(model_dict)
+
+    return models_list
 
 
 @router.get("/get/models_details", status_code=200)

diff --git a/superagi/models/models.py b/superagi/models/models.py
@@ -79,8 +79,6 @@ def get_model_install_details(cls, session, marketplace_models, organisation_id,
                 else:
                     model["is_installed"] = installed_models_dict.get(model["model_name"], False)
                 model["installs"] = model_counts_dict.get(model["model_name"], 0)
-                model["provider"] = session.query(ModelsConfig).filter(
-                    ModelsConfig.id == model["model_provider_id"]).first().provider
             except TypeError as e:
                 logging.error("Error Occurred: %s", e)