Merge branch 'main' into fix/enable-handle-fs-connector

Zipstack · Jul 9, 2024 · af536dc · af536dc
2 parents fb7981f + d8e731d
commit af536dc
Show file tree

Hide file tree

Showing 10 changed files with 516 additions and 488 deletions.
diff --git a/backend/backend/urls.py b/backend/backend/urls.py
@@ -17,8 +17,7 @@
 from django.conf.urls import *  # noqa: F401, F403
 from django.urls import include, path
 
-from backend.constants import FeatureFlag, UrlPathConstants
-from unstract.flags.feature_flag import check_feature_flag_status
+from backend.constants import UrlPathConstants
 
 urlpatterns = [
     path("", include("tenant_account.urls")),
@@ -63,25 +62,24 @@
 ]
 
 
-if check_feature_flag_status(FeatureFlag.APP_DEPLOYMENT):
-    # APP deployment urls
-    try:
-        import pluggable_apps.apps.app_deployment.urls  # noqa # pylint: disable=unused-import
-        import pluggable_apps.apps.canned_question.urls  # noqa # pylint: disable=unused-import
-        import pluggable_apps.apps.chat_history.urls  # noqa # pylint: disable=unused-import
-        import pluggable_apps.apps.chat_transcript.urls  # noqa # pylint: disable=unused-import
+# APP deployment urls
+try:
+    import pluggable_apps.apps.app_deployment.urls  # noqa # pylint: disable=unused-import
+    import pluggable_apps.apps.canned_question.urls  # noqa # pylint: disable=unused-import
+    import pluggable_apps.apps.chat_history.urls  # noqa # pylint: disable=unused-import
+    import pluggable_apps.apps.chat_transcript.urls  # noqa # pylint: disable=unused-import
 
-        urlpatterns += [
-            path(
-                "canned_question/",
-                include("pluggable_apps.apps.canned_question.urls"),
-            ),
-            path("app/", include("pluggable_apps.apps.app_deployment.urls")),
-            path("chat_history/", include("pluggable_apps.apps.chat_history.urls")),
-            path("chat/", include("pluggable_apps.apps.chat_transcript.urls")),
-        ]
-    except ImportError:
-        pass
+    urlpatterns += [
+        path(
+            "canned_question/",
+            include("pluggable_apps.apps.canned_question.urls"),
+        ),
+        path("app/", include("pluggable_apps.apps.app_deployment.urls")),
+        path("chat_history/", include("pluggable_apps.apps.chat_history.urls")),
+        path("chat/", include("pluggable_apps.apps.chat_transcript.urls")),
+    ]
+except ImportError:
+    pass
 
 # Subscription urls
 try: