Moving public prefix within try-catch block (#486)

* Moving public prefix to block * Path prefix config addition * Abstracting Cloud share APIs * Addressing public attributes for OSS * Update backend/backend/public_urls.py Signed-off-by: Chandrasekharan M <[email protected]> --------- Signed-off-by: Chandrasekharan M <[email protected]> Co-authored-by: Chandrasekharan M <[email protected]> Co-authored-by: Rahul Johny <[email protected]>
Zipstack · Jul 16, 2024 · 142174c · 142174c
1 parent cf3c480
commit 142174c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/backend/backend/public_urls.py b/backend/backend/public_urls.py
@@ -22,7 +22,6 @@
 
 path_prefix = settings.PATH_PREFIX
 api_path_prefix = settings.API_DEPLOYMENT_PATH_PREFIX
-share_path_prefix = settings.PUBLIC_PATH_PREFIX
 
 urlpatterns = [
     path(f"{path_prefix}/", include("account.urls")),
@@ -51,6 +50,8 @@
     import pluggable_apps.platform_admin.urls  # noqa # pylint: disable=unused-import
     import pluggable_apps.public_shares_share_controller.urls  # noqa # pylint: disable=unused-import
 
+    share_path_prefix = settings.PUBLIC_PATH_PREFIX
+
     urlpatterns += [
         path(f"{path_prefix}/", include("pluggable_apps.platform_admin.urls")),
         # Public Sharing

diff --git a/frontend/src/components/helpers/custom-tools/CustomToolsHelper.js b/frontend/src/components/helpers/custom-tools/CustomToolsHelper.js
@@ -10,6 +10,13 @@ import { useSocketCustomToolStore } from "../../../store/socket-custom-tool";
 import { SpinnerLoader } from "../../widgets/spinner-loader/SpinnerLoader";
 import { useTokenUsageStore } from "../../../store/token-usage-store";
 
+let shareManagerToolSource;
+try {
+  shareManagerToolSource =
+    require("../../../plugins/prompt-studio-public-share/helpers/PublicShareAPIs").shareManagerToolSource;
+} catch (err) {
+  // Do nothing, Not-found Page will be triggered.
+}
 function CustomToolsHelper() {
   const [isLoading, setIsLoading] = useState(true);
   const { id } = useParams();
@@ -82,11 +89,13 @@ function CustomToolsHelper() {
       .then((res) => {
         const data = res?.data;
         updatedCusTool["llmProfiles"] = data;
-        const reqOpsShare = {
-          method: "GET",
-          url: `/api/v1/unstract/${sessionDetails?.orgId}/share-manager/tool-source/?tool_id=${id}`,
-        };
-        return handleApiRequest(reqOpsShare);
+        if (shareManagerToolSource) {
+          const reqOpsShare = {
+            method: "GET",
+            url: shareManagerToolSource(id, sessionDetails?.orgId),
+          };
+          return handleApiRequest(reqOpsShare);
+        }
       })
       .then((res) => {
         const data = res?.data;