Skip to content

LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows

Minor fixes and url router updates (#747)

alidcf718c8881d
diff --git a/backend/backend/public_urls_v2.py b/backend/backend/public_urls_v2.py
index 1e6d3550e..dee9b28df 100644
--- a/backend/backend/public_urls_v2.py
+++ b/backend/backend/public_urls_v2.py
@@ -27,12 +27,12 @@ urlpatterns = [
path("", include("account_v2.urls")),
# Connector OAuth
path("", include("connector_auth_v2.urls")),
- # # Docs
+ # Docs
path("", include("docs.urls")),
- # # # API deployment
- # path("api/", include("api_v2.execution_urls")),
- # # Feature flags
+ # Feature flags
path("flags/", include("feature_flag.urls")),
+ # Pipeline
+ path("pipeline/", include("pipeline_v2.public_api_urls")),
]
if settings.ADMIN_ENABLED:
# Admin URLs
@@ -44,13 +44,3 @@ if settings.ADMIN_ENABLED:
),
]
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
-
-
-try:
- import pluggable_apps.platform_admin.urls # noqa: F401
-
- urlpatterns += [
- path("", include("pluggable_apps.platform_admin.urls")),
- ]
-except ImportError:
- pass
diff --git a/backend/backend/urls_v2.py b/backend/backend/urls_v2.py
index 0c0b3f40e..fa222aecb 100644
--- a/backend/backend/urls_v2.py
+++ b/backend/backend/urls_v2.py
@@ -32,6 +32,7 @@ urlpatterns = [
path("platform/", include("platform_settings_v2.urls")),
path("api/", include("api_v2.urls")),
path("usage/", include("usage_v2.urls")),
+ path("notifications/", include("notification_v2.urls")),
path(
UrlPathConstants.PROMPT_STUDIO,
include("prompt_studio.prompt_profile_manager_v2.urls"),
@@ -58,12 +59,3 @@ urlpatterns = [
include("prompt_studio.prompt_studio_index_manager_v2.urls"),
),
]
-
-try:
- import pluggable_apps.subscription.urls # noqa: F401
-
- urlpatterns += [
- path("", include("pluggable_apps.subscription.urls")),
- ]
-except ImportError:
- pass
diff --git a/prompt-service/src/unstract/prompt_service/helper.py b/prompt-service/src/unstract/prompt_service/helper.py
index baed82c49..43a29245a 100644
--- a/prompt-service/src/unstract/prompt_service/helper.py
+++ b/prompt-service/src/unstract/prompt_service/helper.py
@@ -9,7 +9,7 @@ from dotenv import load_dotenv
from flask import Flask, current_app, json
from unstract.prompt_service.authentication_middleware import AuthenticationMiddleware
from unstract.prompt_service.config import db
-from unstract.prompt_service.constants import FeatureFlag
+from unstract.prompt_service.constants import DBTableV2, FeatureFlag
from unstract.prompt_service.constants import PromptServiceContants as PSKeys
from unstract.prompt_service.db_utils import DBUtils
from unstract.prompt_service.env_manager import EnvLoader
@@ -118,7 +118,7 @@ def initialize_plugin_endpoints(app: Flask) -> None:
def query_usage_metadata(token: str, metadata: dict[str, Any]) -> dict[str, Any]:
if check_feature_flag_status(FeatureFlag.MULTI_TENANCY_V2):
- return query_usage_metadata_v2(db, token, metadata)
+ return query_usage_metadata_v2(token, metadata)
org_id: str = AuthenticationMiddleware.get_account_from_bearer_token(token)
run_id: str = metadata["run_id"]
query: str = f"""
@@ -170,7 +170,7 @@ def query_usage_metadata_v2(token: str, metadata: dict[str, Any]) -> dict[str, A
SUM(total_tokens) AS total_tokens,
SUM(embedding_tokens) AS embedding_tokens,
SUM(cost_in_dollars) AS cost_in_dollars
- FROM "{DB_SCHEMA}"."token_usage_v2"
+ FROM "{DB_SCHEMA}"."{DBTableV2.TOKEN_USAGE}"
WHERE run_id = %s and organization_id = %s
GROUP BY usage_type, llm_usage_reason, model_name;
"""