diff --git a/gui/pages/Content/Models/MarketModels.js b/gui/pages/Content/Models/MarketModels.js index 5b864febf..3acf34f5c 100644 --- a/gui/pages/Content/Models/MarketModels.js +++ b/gui/pages/Content/Models/MarketModels.js @@ -4,6 +4,7 @@ import Image from "next/image"; import {loadingTextEffect, modelIcon, returnToolkitIcon} from "@/utils/utils"; import {EventBus} from "@/utils/eventBus"; import {fetchMarketPlaceModel} from "@/pages/api/DashboardService"; +import axios from "axios"; export default function MarketModels(){ const [showMarketplace, setShowMarketplace] = useState(false); @@ -13,13 +14,20 @@ export default function MarketModels(){ useEffect(() => { loadingTextEffect('Loading Models', setLoadingText, 500); - },[]); - useEffect(() => { - fetchMarketPlaceModel().then((response) => { - console.log(response.data) - setModelTemplates(response.data) - }) + if (window.location.href.toLowerCase().includes('marketplace')) { + axios.get('https://app.superagi.com/api/models_controller/marketplace/list/0') + .then((response) => { + console.log(response.data) + setModelTemplates(response.data) + }) + } + else { + fetchMarketPlaceModel().then((response) => { + console.log(response.data) + setModelTemplates(response.data) + }) + } },[]) function handleTemplateClick(item) { diff --git a/superagi/controllers/models_controller.py b/superagi/controllers/models_controller.py index abb771060..e82e6ad60 100644 --- a/superagi/controllers/models_controller.py +++ b/superagi/controllers/models_controller.py @@ -102,7 +102,7 @@ async def fetch_data(request: ModelName, organisation=Depends(get_user_organisat @router.get("/get/list", status_code=200) -def get_knowledge_list(page: int = 0, organisation=Depends(get_user_organisation)): +def get_models_list(page: int = 0, organisation=Depends(get_user_organisation)): """ Get Marketplace Model list. @@ -121,7 +121,7 @@ def get_knowledge_list(page: int = 0, organisation=Depends(get_user_organisation @router.get("/marketplace/list/{page}", status_code=200) -def get_marketplace_knowledge_list(page: int = 0): +def get_marketplace_models_list(page: int = 0): organisation_id = get_config("MARKETPLACE_ORGANISATION_ID") if organisation_id is not None: organisation_id = int(organisation_id) diff --git a/tests/unit_tests/controllers/test_models_controller.py b/tests/unit_tests/controllers/test_models_controller.py index 4e8adc64d..489cff636 100644 --- a/tests/unit_tests/controllers/test_models_controller.py +++ b/tests/unit_tests/controllers/test_models_controller.py @@ -82,7 +82,7 @@ def test_fetch_data_success(mock_get_db): assert response.status_code == 200 @patch('superagi.controllers.models_controller.db') -def test_get_marketplace_knowledge_list_success(mock_get_db): +def test_get_marketplace_models_list_success(mock_get_db): with patch('superagi.helper.auth.get_user_organisation') as mock_get_user_org, \ patch('superagi.helper.auth.db') as mock_auth_db, \ patch('superagi.controllers.models_controller.requests.get') as mock_get: @@ -95,7 +95,7 @@ def test_get_marketplace_knowledge_list_success(mock_get_db): assert response.status_code == 200 @patch('superagi.controllers.models_controller.db') -def test_get_marketplace_knowledge_list_success(mock_get_db): +def test_get_marketplace_models_list_success(mock_get_db): with patch('superagi.helper.auth.get_user_organisation') as mock_get_user_org, \ patch('superagi.helper.auth.db') as mock_auth_db: response = client.get("/models_controller/marketplace/list/0")