mirror of
https://github.com/langgenius/dify.git
synced 2026-06-08 17:02:22 +08:00
chore: seprate vector space quota query (#36514)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
parent
a698c60b29
commit
473c945839
@ -3,12 +3,12 @@ from werkzeug.exceptions import Unauthorized
|
||||
|
||||
from controllers.common.schema import register_response_schema_models
|
||||
from libs.login import current_account_with_tenant, current_user, login_required
|
||||
from services.feature_service import FeatureModel, FeatureService, SystemFeatureModel
|
||||
from services.feature_service import FeatureModel, FeatureService, LimitationModel, SystemFeatureModel
|
||||
|
||||
from . import console_ns
|
||||
from .wraps import account_initialization_required, cloud_utm_record, setup_required
|
||||
|
||||
register_response_schema_models(console_ns, FeatureModel, SystemFeatureModel)
|
||||
register_response_schema_models(console_ns, FeatureModel, LimitationModel, SystemFeatureModel)
|
||||
|
||||
|
||||
@console_ns.route("/features")
|
||||
@ -28,7 +28,32 @@ class FeatureApi(Resource):
|
||||
"""Get feature configuration for current tenant"""
|
||||
_, current_tenant_id = current_account_with_tenant()
|
||||
|
||||
return FeatureService.get_features(current_tenant_id).model_dump()
|
||||
payload = FeatureService.get_features(
|
||||
current_tenant_id,
|
||||
exclude_vector_space=True,
|
||||
).model_dump()
|
||||
payload.pop("vector_space", None)
|
||||
return payload
|
||||
|
||||
|
||||
@console_ns.route("/features/vector-space")
|
||||
class FeatureVectorSpaceApi(Resource):
|
||||
@console_ns.doc("get_tenant_feature_vector_space")
|
||||
@console_ns.doc(description="Get vector-space usage and limit for current tenant")
|
||||
@console_ns.response(
|
||||
200,
|
||||
"Success",
|
||||
console_ns.models[LimitationModel.__name__],
|
||||
)
|
||||
@setup_required
|
||||
@login_required
|
||||
@account_initialization_required
|
||||
@cloud_utm_record
|
||||
def get(self):
|
||||
"""Get vector-space usage and limit for current tenant"""
|
||||
_, current_tenant_id = current_account_with_tenant()
|
||||
|
||||
return FeatureService.get_vector_space(current_tenant_id).model_dump()
|
||||
|
||||
|
||||
@console_ns.route("/system-features")
|
||||
|
||||
@ -5693,6 +5693,23 @@ Get feature configuration for current tenant
|
||||
| ---- | ----------- | ------ |
|
||||
| 200 | Success | [FeatureModel](#featuremodel) |
|
||||
|
||||
### /features/vector-space
|
||||
|
||||
#### GET
|
||||
##### Summary
|
||||
|
||||
Get vector-space usage and limit for current tenant
|
||||
|
||||
##### Description
|
||||
|
||||
Get vector-space usage and limit for current tenant
|
||||
|
||||
##### Responses
|
||||
|
||||
| Code | Description | Schema |
|
||||
| ---- | ----------- | ------ |
|
||||
| 200 | Success | [LimitationModel](#limitationmodel) |
|
||||
|
||||
### /files/support-type
|
||||
|
||||
#### GET
|
||||
|
||||
@ -116,7 +116,7 @@ class BillingInfo(TypedDict):
|
||||
subscription: _BillingSubscription
|
||||
members: _BillingQuota
|
||||
apps: _BillingQuota
|
||||
vector_space: _VectorSpaceQuota
|
||||
vector_space: NotRequired[_VectorSpaceQuota]
|
||||
knowledge_rate_limit: _KnowledgeRateLimit
|
||||
documents_upload_quota: _BillingQuota
|
||||
annotation_quota_limit: _BillingQuota
|
||||
@ -128,6 +128,7 @@ class BillingInfo(TypedDict):
|
||||
|
||||
|
||||
_billing_info_adapter = TypeAdapter(BillingInfo)
|
||||
_vector_space_quota_adapter = TypeAdapter(_VectorSpaceQuota)
|
||||
|
||||
|
||||
class KnowledgeRateLimitDict(TypedDict):
|
||||
@ -185,12 +186,21 @@ class BillingService:
|
||||
_PLAN_CACHE_TTL = 600
|
||||
|
||||
@classmethod
|
||||
def get_info(cls, tenant_id: str) -> BillingInfo:
|
||||
def get_info(cls, tenant_id: str, exclude_vector_space: bool = False) -> BillingInfo:
|
||||
params = {"tenant_id": tenant_id}
|
||||
if exclude_vector_space:
|
||||
params["exclude_vector_space"] = "true"
|
||||
|
||||
billing_info = cls._send_request("GET", "/subscription/info", params=params)
|
||||
return _billing_info_adapter.validate_python(billing_info)
|
||||
|
||||
@classmethod
|
||||
def get_vector_space(cls, tenant_id: str) -> _VectorSpaceQuota:
|
||||
params = {"tenant_id": tenant_id}
|
||||
return _vector_space_quota_adapter.validate_python(
|
||||
cls._send_request("GET", "/subscription/vector-space", params=params)
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def get_tenant_feature_plan_usage_info(cls, tenant_id: str):
|
||||
"""Deprecated: Use get_quota_info instead."""
|
||||
|
||||
@ -6,7 +6,7 @@ from configs import dify_config
|
||||
from constants.dsl_version import CURRENT_APP_DSL_VERSION
|
||||
from enums.cloud_plan import CloudPlan
|
||||
from enums.hosted_provider import HostedTrialProvider
|
||||
from services.billing_service import BillingService
|
||||
from services.billing_service import BillingInfo, BillingService
|
||||
from services.enterprise.enterprise_service import EnterpriseService
|
||||
|
||||
|
||||
@ -186,13 +186,17 @@ class SystemFeatureModel(FeatureResponseModel):
|
||||
|
||||
class FeatureService:
|
||||
@classmethod
|
||||
def get_features(cls, tenant_id: str) -> FeatureModel:
|
||||
def get_features(cls, tenant_id: str, exclude_vector_space: bool = False) -> FeatureModel:
|
||||
features = FeatureModel()
|
||||
|
||||
cls._fulfill_params_from_env(features)
|
||||
|
||||
if dify_config.BILLING_ENABLED and tenant_id:
|
||||
cls._fulfill_params_from_billing_api(features, tenant_id)
|
||||
cls._fulfill_params_from_billing_api(
|
||||
features,
|
||||
tenant_id,
|
||||
exclude_vector_space=exclude_vector_space,
|
||||
)
|
||||
|
||||
if dify_config.ENTERPRISE_ENABLED:
|
||||
features.webapp_copyright_enabled = True
|
||||
@ -206,6 +210,18 @@ class FeatureService:
|
||||
|
||||
return features
|
||||
|
||||
@classmethod
|
||||
def get_vector_space(cls, tenant_id: str) -> LimitationModel:
|
||||
vector_space = LimitationModel(size=0, limit=5)
|
||||
if dify_config.BILLING_ENABLED and tenant_id:
|
||||
billing_vector_space = BillingService.get_vector_space(tenant_id)
|
||||
# NOTE: billing API returns vector_space.size as float (e.g. 0.0),
|
||||
# but feature API keeps LimitationModel.size as int for compatibility.
|
||||
vector_space.size = int(billing_vector_space["size"])
|
||||
vector_space.limit = billing_vector_space["limit"]
|
||||
|
||||
return vector_space
|
||||
|
||||
@classmethod
|
||||
def get_knowledge_rate_limit(cls, tenant_id: str):
|
||||
knowledge_rate_limit = KnowledgeRateLimitModel()
|
||||
@ -289,8 +305,16 @@ class FeatureService:
|
||||
features.workspace_members.enabled = workspace_info["WorkspaceMembers"]["enabled"]
|
||||
|
||||
@classmethod
|
||||
def _fulfill_params_from_billing_api(cls, features: FeatureModel, tenant_id: str):
|
||||
billing_info = BillingService.get_info(tenant_id)
|
||||
def _fulfill_params_from_billing_api(
|
||||
cls,
|
||||
features: FeatureModel,
|
||||
tenant_id: str,
|
||||
exclude_vector_space: bool = False,
|
||||
):
|
||||
if exclude_vector_space:
|
||||
billing_info = BillingService.get_info(tenant_id, exclude_vector_space=True)
|
||||
else:
|
||||
billing_info = BillingService.get_info(tenant_id)
|
||||
|
||||
features_usage_info = BillingService.get_quota_info(tenant_id)
|
||||
|
||||
@ -322,12 +346,8 @@ class FeatureService:
|
||||
features.apps.size = billing_info["apps"]["size"]
|
||||
features.apps.limit = billing_info["apps"]["limit"]
|
||||
|
||||
if "vector_space" in billing_info:
|
||||
# NOTE (hj24): billing API returns vector_space.size as float (e.g. 0.0)
|
||||
# but LimitationModel.size is int; truncate here for compatibility
|
||||
features.vector_space.size = int(billing_info["vector_space"]["size"])
|
||||
# NOTE END
|
||||
features.vector_space.limit = billing_info["vector_space"]["limit"]
|
||||
if not exclude_vector_space:
|
||||
cls._fulfill_vector_space_from_billing_info(features.vector_space, billing_info)
|
||||
|
||||
if "documents_upload_quota" in billing_info:
|
||||
features.documents_upload_quota.size = billing_info["documents_upload_quota"]["size"]
|
||||
@ -359,6 +379,16 @@ class FeatureService:
|
||||
if "next_credit_reset_date" in billing_info:
|
||||
features.next_credit_reset_date = billing_info["next_credit_reset_date"]
|
||||
|
||||
@classmethod
|
||||
def _fulfill_vector_space_from_billing_info(cls, vector_space: LimitationModel, billing_info: BillingInfo):
|
||||
if "vector_space" not in billing_info:
|
||||
return
|
||||
|
||||
# NOTE: billing API returns vector_space.size as float (e.g. 0.0),
|
||||
# but feature API keeps LimitationModel.size as int for compatibility.
|
||||
vector_space.size = int(billing_info["vector_space"]["size"])
|
||||
vector_space.limit = billing_info["vector_space"]["limit"]
|
||||
|
||||
@classmethod
|
||||
def _fulfill_params_from_enterprise(cls, features: SystemFeatureModel, is_authenticated: bool = False):
|
||||
enterprise_info = EnterpriseService.get_info()
|
||||
|
||||
@ -20,8 +20,10 @@ class TestFeatureApi:
|
||||
return_value=("account_id", "tenant_123"),
|
||||
)
|
||||
|
||||
mocker.patch("controllers.console.feature.FeatureService.get_features").return_value.model_dump.return_value = {
|
||||
"features": {"feature_a": True}
|
||||
get_features = mocker.patch("controllers.console.feature.FeatureService.get_features")
|
||||
get_features.return_value.model_dump.return_value = {
|
||||
"features": {"feature_a": True},
|
||||
"vector_space": {"size": 1, "limit": 2},
|
||||
}
|
||||
|
||||
api = FeatureApi()
|
||||
@ -30,6 +32,28 @@ class TestFeatureApi:
|
||||
result = raw_get(api)
|
||||
|
||||
assert result == {"features": {"feature_a": True}}
|
||||
get_features.assert_called_once_with("tenant_123", exclude_vector_space=True)
|
||||
|
||||
|
||||
class TestFeatureVectorSpaceApi:
|
||||
def test_get_vector_space_success(self, mocker: MockerFixture):
|
||||
from controllers.console.feature import FeatureVectorSpaceApi
|
||||
|
||||
mocker.patch(
|
||||
"controllers.console.feature.current_account_with_tenant",
|
||||
return_value=("account_id", "tenant_123"),
|
||||
)
|
||||
|
||||
get_vector_space = mocker.patch("controllers.console.feature.FeatureService.get_vector_space")
|
||||
get_vector_space.return_value.model_dump.return_value = {"size": 5120, "limit": 20480}
|
||||
|
||||
api = FeatureVectorSpaceApi()
|
||||
|
||||
raw_get = unwrap(FeatureVectorSpaceApi.get)
|
||||
result = raw_get(api)
|
||||
|
||||
assert result == {"size": 5120, "limit": 20480}
|
||||
get_vector_space.assert_called_once_with("tenant_123")
|
||||
|
||||
|
||||
class TestSystemFeatureApi:
|
||||
|
||||
@ -313,6 +313,54 @@ class TestBillingServiceSubscriptionInfo:
|
||||
assert result == expected_response
|
||||
mock_send_request.assert_called_once_with("GET", "/subscription/info", params={"tenant_id": tenant_id})
|
||||
|
||||
def test_get_info_exclude_vector_space(self, mock_send_request):
|
||||
"""When requested, get_info asks billing to skip vector_space."""
|
||||
# Arrange
|
||||
tenant_id = "tenant-123"
|
||||
expected_response = {
|
||||
"enabled": True,
|
||||
"subscription": {"plan": "professional", "interval": "month", "education": False},
|
||||
"members": {"size": 1, "limit": 50},
|
||||
"apps": {"size": 1, "limit": 200},
|
||||
"knowledge_rate_limit": {"limit": 1000},
|
||||
"documents_upload_quota": {"size": 0, "limit": 1000},
|
||||
"annotation_quota_limit": {"size": 0, "limit": 5000},
|
||||
"docs_processing": "top-priority",
|
||||
"can_replace_logo": True,
|
||||
"model_load_balancing_enabled": True,
|
||||
"knowledge_pipeline_publish_enabled": True,
|
||||
}
|
||||
mock_send_request.return_value = expected_response
|
||||
|
||||
# Act
|
||||
result = BillingService.get_info(tenant_id, exclude_vector_space=True)
|
||||
|
||||
# Assert
|
||||
assert "vector_space" not in result
|
||||
mock_send_request.assert_called_once_with(
|
||||
"GET",
|
||||
"/subscription/info",
|
||||
params={"tenant_id": tenant_id, "exclude_vector_space": "true"},
|
||||
)
|
||||
|
||||
def test_get_vector_space_success(self, mock_send_request):
|
||||
"""Test successful retrieval of vector-space usage and limit."""
|
||||
# Arrange
|
||||
tenant_id = "tenant-123"
|
||||
expected_response = {"size": 5120.75, "limit": 20480}
|
||||
mock_send_request.return_value = expected_response
|
||||
|
||||
# Act
|
||||
result = BillingService.get_vector_space(tenant_id)
|
||||
|
||||
# Assert
|
||||
assert result == expected_response
|
||||
mock_send_request.assert_called_once_with(
|
||||
"GET",
|
||||
"/subscription/vector-space",
|
||||
params={"tenant_id": tenant_id},
|
||||
)
|
||||
|
||||
def test_get_knowledge_rate_limit_with_defaults(self, mock_send_request):
|
||||
"""Test knowledge rate limit retrieval with default values."""
|
||||
# Arrange
|
||||
@ -1744,8 +1792,9 @@ class TestBillingServiceSubscriptionInfoDataType:
|
||||
assert isinstance(result["apps"]["size"], int)
|
||||
assert isinstance(result["apps"]["limit"], int)
|
||||
|
||||
assert isinstance(result["vector_space"]["size"], float)
|
||||
assert isinstance(result["vector_space"]["limit"], int)
|
||||
if "vector_space" in result:
|
||||
assert isinstance(result["vector_space"]["size"], float)
|
||||
assert isinstance(result["vector_space"]["limit"], int)
|
||||
|
||||
assert isinstance(result["knowledge_rate_limit"]["limit"], int)
|
||||
|
||||
@ -1783,11 +1832,13 @@ class TestBillingServiceSubscriptionInfoDataType:
|
||||
def test_get_info_without_optional_fields(self, mock_send_request, string_billing_response):
|
||||
"""NotRequired fields can be absent without raising."""
|
||||
del string_billing_response["next_credit_reset_date"]
|
||||
del string_billing_response["vector_space"]
|
||||
mock_send_request.return_value = string_billing_response
|
||||
|
||||
result = BillingService.get_info("tenant-type-test")
|
||||
|
||||
assert "next_credit_reset_date" not in result
|
||||
assert "vector_space" not in result
|
||||
self._assert_billing_info_types(result)
|
||||
|
||||
def test_get_info_with_extra_fields(self, mock_send_request, string_billing_response):
|
||||
|
||||
@ -102,3 +102,17 @@ def test_resolve_human_input_email_delivery_enabled_matrix(
|
||||
)
|
||||
|
||||
assert result is case.expected
|
||||
|
||||
|
||||
def test_get_vector_space_converts_billing_float_size(monkeypatch: pytest.MonkeyPatch):
|
||||
monkeypatch.setattr(feature_service_module.dify_config, "BILLING_ENABLED", True)
|
||||
monkeypatch.setattr(
|
||||
feature_service_module.BillingService,
|
||||
"get_vector_space",
|
||||
lambda tenant_id: {"size": 5120.75, "limit": 20480},
|
||||
)
|
||||
|
||||
result = FeatureService.get_vector_space("tenant-1")
|
||||
|
||||
assert result.size == 5120
|
||||
assert result.limit == 20480
|
||||
|
||||
@ -2,14 +2,35 @@
|
||||
|
||||
import { oc } from '@orpc/contract'
|
||||
|
||||
import { zGetFeaturesResponse } from './zod.gen'
|
||||
import { zGetFeaturesResponse, zGetFeaturesVectorSpaceResponse } from './zod.gen'
|
||||
|
||||
/**
|
||||
* Get vector-space usage and limit for current tenant
|
||||
*
|
||||
* Get vector-space usage and limit for current tenant
|
||||
*/
|
||||
export const get = oc
|
||||
.route({
|
||||
description: 'Get vector-space usage and limit for current tenant',
|
||||
inputStructure: 'detailed',
|
||||
method: 'GET',
|
||||
operationId: 'getFeaturesVectorSpace',
|
||||
path: '/features/vector-space',
|
||||
summary: 'Get vector-space usage and limit for current tenant',
|
||||
tags: ['console'],
|
||||
})
|
||||
.output(zGetFeaturesVectorSpaceResponse)
|
||||
|
||||
export const vectorSpace = {
|
||||
get,
|
||||
}
|
||||
|
||||
/**
|
||||
* Get feature configuration for current tenant
|
||||
*
|
||||
* Get feature configuration for current tenant
|
||||
*/
|
||||
export const get = oc
|
||||
export const get2 = oc
|
||||
.route({
|
||||
description: 'Get feature configuration for current tenant',
|
||||
inputStructure: 'detailed',
|
||||
@ -22,7 +43,8 @@ export const get = oc
|
||||
.output(zGetFeaturesResponse)
|
||||
|
||||
export const features = {
|
||||
get,
|
||||
get: get2,
|
||||
vectorSpace,
|
||||
}
|
||||
|
||||
export const contract = {
|
||||
|
||||
@ -75,3 +75,17 @@ export type GetFeaturesResponses = {
|
||||
}
|
||||
|
||||
export type GetFeaturesResponse = GetFeaturesResponses[keyof GetFeaturesResponses]
|
||||
|
||||
export type GetFeaturesVectorSpaceData = {
|
||||
body?: never
|
||||
path?: never
|
||||
query?: never
|
||||
url: '/features/vector-space'
|
||||
}
|
||||
|
||||
export type GetFeaturesVectorSpaceResponses = {
|
||||
200: LimitationModel
|
||||
}
|
||||
|
||||
export type GetFeaturesVectorSpaceResponse
|
||||
= GetFeaturesVectorSpaceResponses[keyof GetFeaturesVectorSpaceResponses]
|
||||
|
||||
@ -93,3 +93,8 @@ export const zFeatureModel = z.object({
|
||||
* Success
|
||||
*/
|
||||
export const zGetFeaturesResponse = zFeatureModel
|
||||
|
||||
/**
|
||||
* Success
|
||||
*/
|
||||
export const zGetFeaturesVectorSpaceResponse = zLimitationModel
|
||||
|
||||
@ -53,6 +53,9 @@ vi.mock('@/service/use-billing', () => ({
|
||||
refetch: mockRefetch,
|
||||
}),
|
||||
useBindPartnerStackInfo: () => ({ mutateAsync: vi.fn() }),
|
||||
useCurrentPlanVectorSpace: () => ({
|
||||
data: undefined,
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('@/service/use-education', () => ({
|
||||
|
||||
@ -60,6 +60,9 @@ vi.mock('@/service/use-billing', () => ({
|
||||
isFetching: false,
|
||||
refetch: vi.fn(),
|
||||
}),
|
||||
useCurrentPlanVectorSpace: () => ({
|
||||
data: undefined,
|
||||
}),
|
||||
}))
|
||||
|
||||
// ─── Navigation mocks ───────────────────────────────────────────────────────
|
||||
|
||||
@ -39,6 +39,12 @@ vi.mock('@/service/billing', () => ({
|
||||
fetchSubscriptionUrls: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/service/use-billing', () => ({
|
||||
useCurrentPlanVectorSpace: () => ({
|
||||
data: undefined,
|
||||
}),
|
||||
}))
|
||||
|
||||
const fetchSubscriptionUrlsMock = vi.mocked(fetchSubscriptionUrls)
|
||||
|
||||
const mutateAsyncMock = vi.fn()
|
||||
|
||||
@ -71,10 +71,6 @@ export type CurrentPlanInfoBackend = {
|
||||
size: number
|
||||
limit: number // total. 0 means unlimited
|
||||
}
|
||||
vector_space: {
|
||||
size: number
|
||||
limit: number // total. 0 means unlimited
|
||||
}
|
||||
annotation_quota_limit: {
|
||||
size: number
|
||||
limit: number // total. 0 means unlimited
|
||||
|
||||
@ -10,6 +10,7 @@ const queryPlaceholder = () =>
|
||||
let mockPlanType = Plan.sandbox
|
||||
let mockVectorSpaceUsage = 30
|
||||
let mockVectorSpaceTotal = 5120
|
||||
let mockVectorSpaceApiData: { size: number, limit: number } | undefined
|
||||
|
||||
vi.mock('@/context/provider-context', () => ({
|
||||
useProviderContext: () => ({
|
||||
@ -28,6 +29,12 @@ vi.mock('@/context/provider-context', () => ({
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('@/service/use-billing', () => ({
|
||||
useCurrentPlanVectorSpace: () => ({
|
||||
data: mockVectorSpaceApiData,
|
||||
}),
|
||||
}))
|
||||
|
||||
describe('VectorSpaceInfo', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
@ -35,6 +42,7 @@ describe('VectorSpaceInfo', () => {
|
||||
mockPlanType = Plan.sandbox
|
||||
mockVectorSpaceUsage = 30
|
||||
mockVectorSpaceTotal = 5120
|
||||
mockVectorSpaceApiData = undefined
|
||||
})
|
||||
|
||||
describe('Rendering', () => {
|
||||
@ -252,5 +260,18 @@ describe('VectorSpaceInfo', () => {
|
||||
expect(screen.getByText('100')).toBeInTheDocument()
|
||||
expect(screen.getByText('102400MB')).toBeInTheDocument()
|
||||
})
|
||||
|
||||
it('should use vector space API limit directly', () => {
|
||||
mockVectorSpaceApiData = {
|
||||
size: 100,
|
||||
limit: 0,
|
||||
}
|
||||
|
||||
render(<VectorSpaceInfo />)
|
||||
|
||||
expect(screen.getByText('100')).toBeInTheDocument()
|
||||
expect(screen.getByText('0MB')).toBeInTheDocument()
|
||||
expect(screen.queryByText('billing.plansCommon.unlimited')).not.toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@ -7,6 +7,7 @@ import {
|
||||
import * as React from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { useProviderContext } from '@/context/provider-context'
|
||||
import { useCurrentPlanVectorSpace } from '@/service/use-billing'
|
||||
import { Plan } from '../type'
|
||||
import UsageInfo from '../usage-info'
|
||||
import { getPlanVectorSpaceLimitMB } from '../utils'
|
||||
@ -23,11 +24,25 @@ const VectorSpaceInfo: FC<Props> = ({
|
||||
}) => {
|
||||
const { t } = useTranslation()
|
||||
const { plan } = useProviderContext()
|
||||
const { data: vectorSpace } = useCurrentPlanVectorSpace()
|
||||
const displayPlan = vectorSpace
|
||||
? {
|
||||
...plan,
|
||||
usage: {
|
||||
...plan.usage,
|
||||
vectorSpace: vectorSpace.size,
|
||||
},
|
||||
total: {
|
||||
...plan.total,
|
||||
vectorSpace: vectorSpace.limit,
|
||||
},
|
||||
}
|
||||
: plan
|
||||
const {
|
||||
type,
|
||||
usage,
|
||||
total,
|
||||
} = plan
|
||||
} = displayPlan
|
||||
|
||||
// Determine total based on plan type (in MB), derived from ALL_PLANS config
|
||||
const getTotalInMB = () => {
|
||||
|
||||
@ -65,10 +65,6 @@ describe('billing utils', () => {
|
||||
size: 2,
|
||||
limit: 5,
|
||||
},
|
||||
vector_space: {
|
||||
size: 10,
|
||||
limit: 50,
|
||||
},
|
||||
annotation_quota_limit: {
|
||||
size: 5,
|
||||
limit: 10,
|
||||
@ -108,7 +104,7 @@ describe('billing utils', () => {
|
||||
const data = createMockPlanData()
|
||||
const result = parseCurrentPlan(data)
|
||||
|
||||
expect(result.usage.vectorSpace).toBe(10)
|
||||
expect(result.usage.vectorSpace).toBe(0)
|
||||
expect(result.usage.buildApps).toBe(2)
|
||||
expect(result.usage.teamMembers).toBe(1)
|
||||
expect(result.usage.annotatedResponse).toBe(5)
|
||||
@ -125,6 +121,29 @@ describe('billing utils', () => {
|
||||
expect(result.total.annotatedResponse).toBe(10)
|
||||
})
|
||||
|
||||
it('should not read vector space usage from current plan info', () => {
|
||||
const data = createMockPlanData()
|
||||
const result = parseCurrentPlan(data)
|
||||
|
||||
expect(result.usage.vectorSpace).toBe(0)
|
||||
expect(result.total.vectorSpace).toBe(50)
|
||||
})
|
||||
|
||||
it('should derive vector space total from plan config', () => {
|
||||
const data = createMockPlanData({
|
||||
billing: {
|
||||
enabled: true,
|
||||
subscription: {
|
||||
plan: Plan.professional,
|
||||
},
|
||||
},
|
||||
})
|
||||
const result = parseCurrentPlan(data)
|
||||
|
||||
expect(result.usage.vectorSpace).toBe(0)
|
||||
expect(result.total.vectorSpace).toBe(5 * 1024)
|
||||
})
|
||||
|
||||
it('should convert 0 limits to NUM_INFINITE (-1)', () => {
|
||||
const data = createMockPlanData({
|
||||
documents_upload_quota: {
|
||||
|
||||
@ -79,6 +79,7 @@ const getResetInDaysFromDate = (resetDate?: number | null) => {
|
||||
export const parseCurrentPlan = (data: CurrentPlanInfoBackend) => {
|
||||
const planType = data.billing.subscription.plan
|
||||
const planPreset = ALL_PLANS[planType]
|
||||
const vectorSpaceLimit = getPlanVectorSpaceLimitMB(planType)
|
||||
const resolveRateLimit = (limit?: number, fallback?: number) => {
|
||||
const value = limit ?? fallback ?? 0
|
||||
return parseRateLimit(value)
|
||||
@ -93,7 +94,7 @@ export const parseCurrentPlan = (data: CurrentPlanInfoBackend) => {
|
||||
return {
|
||||
type: planType,
|
||||
usage: {
|
||||
vectorSpace: data.vector_space.size,
|
||||
vectorSpace: 0,
|
||||
buildApps: data.apps?.size || 0,
|
||||
teamMembers: data.members.size,
|
||||
annotatedResponse: data.annotation_quota_limit.size,
|
||||
@ -102,7 +103,7 @@ export const parseCurrentPlan = (data: CurrentPlanInfoBackend) => {
|
||||
triggerEvents: getQuotaUsage(data.trigger_event),
|
||||
},
|
||||
total: {
|
||||
vectorSpace: parseLimit(data.vector_space.limit),
|
||||
vectorSpace: vectorSpaceLimit,
|
||||
buildApps: parseLimit(data.apps?.limit) || 0,
|
||||
teamMembers: parseLimit(data.members.limit),
|
||||
annotatedResponse: parseLimit(data.annotation_quota_limit.limit),
|
||||
|
||||
@ -21,6 +21,12 @@ vi.mock('../../upgrade-btn', () => ({
|
||||
default: () => <button data-testid="vector-upgrade-btn" type="button">Upgrade</button>,
|
||||
}))
|
||||
|
||||
vi.mock('@/service/use-billing', () => ({
|
||||
useCurrentPlanVectorSpace: () => ({
|
||||
data: undefined,
|
||||
}),
|
||||
}))
|
||||
|
||||
// Mock utils to control threshold and plan limits
|
||||
vi.mock('../../utils', () => ({
|
||||
getPlanVectorSpaceLimitMB: (planType: string) => {
|
||||
|
||||
@ -36,6 +36,16 @@ vi.mock('@/context/provider-context', () => ({
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('@/service/use-billing', () => ({
|
||||
useCurrentPlanVectorSpace: () => ({
|
||||
data: {
|
||||
size: mockPlan.usage.vectorSpace,
|
||||
limit: mockPlan.total.vectorSpace,
|
||||
},
|
||||
isFetching: false,
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('../../file-uploader', () => ({
|
||||
default: ({ onPreview, fileList }: { onPreview: (file: File) => void, fileList: FileItem[] }) => (
|
||||
<div data-testid="file-uploader">
|
||||
|
||||
@ -15,6 +15,7 @@ import VectorSpaceFull from '@/app/components/billing/vector-space-full'
|
||||
import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail'
|
||||
import { useProviderContext } from '@/context/provider-context'
|
||||
import { DataSourceType } from '@/models/datasets'
|
||||
import { useCurrentPlanVectorSpace } from '@/service/use-billing'
|
||||
import EmptyDatasetCreationModal from '../empty-dataset-creation-modal'
|
||||
import FileUploader from '../file-uploader'
|
||||
import Website from '../website'
|
||||
@ -119,7 +120,15 @@ const StepOne = ({
|
||||
|
||||
const allFileLoaded = files.length > 0 && files.every(file => file.file.id)
|
||||
const hasNotion = notionPages.length > 0
|
||||
const isVectorSpaceFull = plan.usage.vectorSpace >= plan.total.vectorSpace
|
||||
const shouldCheckVectorSpace = enableBilling && (allFileLoaded || hasNotion)
|
||||
const {
|
||||
data: vectorSpace,
|
||||
isFetching: isFetchingVectorSpacePlan,
|
||||
} = useCurrentPlanVectorSpace(shouldCheckVectorSpace)
|
||||
const isCheckingVectorSpace = shouldCheckVectorSpace && !vectorSpace && isFetchingVectorSpacePlan
|
||||
const isVectorSpaceFull = !!vectorSpace
|
||||
&& vectorSpace.limit > 0
|
||||
&& vectorSpace.size >= vectorSpace.limit
|
||||
const isShowVectorSpaceFull = (allFileLoaded || hasNotion) && isVectorSpaceFull && enableBilling
|
||||
const supportBatchUpload = !enableBilling || plan.type !== Plan.sandbox
|
||||
|
||||
@ -131,8 +140,10 @@ const StepOne = ({
|
||||
return true
|
||||
if (files.some(file => !file.file.id))
|
||||
return true
|
||||
if (isCheckingVectorSpace)
|
||||
return true
|
||||
return isShowVectorSpaceFull
|
||||
}, [files, isShowVectorSpaceFull])
|
||||
}, [files, isCheckingVectorSpace, isShowVectorSpaceFull])
|
||||
|
||||
// Clear previews when switching data source type
|
||||
const handleClearPreviews = useCallback((newType: DataSourceType) => {
|
||||
|
||||
@ -42,6 +42,16 @@ vi.mock('@/context/provider-context', () => ({
|
||||
selector({ plan: mockPlan, enableBilling: true }),
|
||||
}))
|
||||
|
||||
vi.mock('@/service/use-billing', () => ({
|
||||
useCurrentPlanVectorSpace: () => ({
|
||||
data: {
|
||||
size: mockPlan.usage.vectorSpace,
|
||||
limit: mockPlan.total.vectorSpace,
|
||||
},
|
||||
isFetching: false,
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('@/context/dataset-detail', () => ({
|
||||
useDatasetDetailContextWithSelector: (selector: (state: { dataset: { pipeline_id: string } }) => unknown) =>
|
||||
selector({ dataset: { pipeline_id: 'test-pipeline-id' } }),
|
||||
|
||||
@ -13,6 +13,7 @@ type DatasourceUIStateParams = {
|
||||
selectedFileIdsLength: number
|
||||
onlineDriveFileList: OnlineDriveFile[]
|
||||
isVectorSpaceFull: boolean
|
||||
isCheckingVectorSpace?: boolean
|
||||
enableBilling: boolean
|
||||
currentWorkspacePagesLength: number
|
||||
fileUploadConfig: { file_size_limit: number, batch_count_limit: number }
|
||||
@ -30,6 +31,7 @@ export const useDatasourceUIState = ({
|
||||
selectedFileIdsLength,
|
||||
onlineDriveFileList,
|
||||
isVectorSpaceFull,
|
||||
isCheckingVectorSpace = false,
|
||||
enableBilling,
|
||||
currentWorkspacePagesLength,
|
||||
fileUploadConfig,
|
||||
@ -59,14 +61,14 @@ export const useDatasourceUIState = ({
|
||||
return true
|
||||
|
||||
const disabledConditions: Record<string, boolean> = {
|
||||
[DatasourceType.localFile]: isShowVectorSpaceFull || localFileListLength === 0 || !allFileLoaded,
|
||||
[DatasourceType.onlineDocument]: isShowVectorSpaceFull || onlineDocumentsLength === 0,
|
||||
[DatasourceType.websiteCrawl]: isShowVectorSpaceFull || websitePagesLength === 0,
|
||||
[DatasourceType.onlineDrive]: isShowVectorSpaceFull || selectedFileIdsLength === 0,
|
||||
[DatasourceType.localFile]: isCheckingVectorSpace || isShowVectorSpaceFull || localFileListLength === 0 || !allFileLoaded,
|
||||
[DatasourceType.onlineDocument]: isCheckingVectorSpace || isShowVectorSpaceFull || onlineDocumentsLength === 0,
|
||||
[DatasourceType.websiteCrawl]: isCheckingVectorSpace || isShowVectorSpaceFull || websitePagesLength === 0,
|
||||
[DatasourceType.onlineDrive]: isCheckingVectorSpace || isShowVectorSpaceFull || selectedFileIdsLength === 0,
|
||||
}
|
||||
|
||||
return disabledConditions[datasourceType] ?? true
|
||||
}, [datasource, datasourceType, isShowVectorSpaceFull, localFileListLength, allFileLoaded, onlineDocumentsLength, websitePagesLength, selectedFileIdsLength])
|
||||
}, [datasource, datasourceType, isCheckingVectorSpace, isShowVectorSpaceFull, localFileListLength, allFileLoaded, onlineDocumentsLength, websitePagesLength, selectedFileIdsLength])
|
||||
|
||||
// Check if select all should be shown
|
||||
const showSelect = useMemo(() => {
|
||||
|
||||
@ -12,6 +12,7 @@ import { PlanUpgradeModal } from '@/app/components/billing/plan-upgrade-modal'
|
||||
import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail'
|
||||
import { useProviderContextSelector } from '@/context/provider-context'
|
||||
import { DatasourceType } from '@/models/pipeline'
|
||||
import { useCurrentPlanVectorSpace } from '@/service/use-billing'
|
||||
import { useFileUploadConfig } from '@/service/use-common'
|
||||
import { usePublishedPipelineInfo } from '@/service/use-pipeline'
|
||||
import { useDataSourceStore } from './data-source/store'
|
||||
@ -91,7 +92,20 @@ const CreateFormPipeline = () => {
|
||||
} = useOnlineDrive()
|
||||
|
||||
// Computed values
|
||||
const isVectorSpaceFull = plan.usage.vectorSpace >= plan.total.vectorSpace
|
||||
const shouldCheckVectorSpace = enableBilling && (
|
||||
allFileLoaded
|
||||
|| onlineDocuments.length > 0
|
||||
|| websitePages.length > 0
|
||||
|| selectedFileIds.length > 0
|
||||
)
|
||||
const {
|
||||
data: vectorSpace,
|
||||
isFetching: isFetchingVectorSpacePlan,
|
||||
} = useCurrentPlanVectorSpace(shouldCheckVectorSpace)
|
||||
const isCheckingVectorSpace = shouldCheckVectorSpace && !vectorSpace && isFetchingVectorSpacePlan
|
||||
const isVectorSpaceFull = !!vectorSpace
|
||||
&& vectorSpace.limit > 0
|
||||
&& vectorSpace.size >= vectorSpace.limit
|
||||
const supportBatchUpload = !enableBilling || plan.type !== 'sandbox'
|
||||
|
||||
// UI state
|
||||
@ -112,6 +126,7 @@ const CreateFormPipeline = () => {
|
||||
selectedFileIdsLength: selectedFileIds.length,
|
||||
onlineDriveFileList,
|
||||
isVectorSpaceFull,
|
||||
isCheckingVectorSpace,
|
||||
enableBilling,
|
||||
currentWorkspacePagesLength: currentWorkspace?.pages.length ?? 0,
|
||||
fileUploadConfig,
|
||||
|
||||
@ -1,10 +1,19 @@
|
||||
import type { CurrentPlanInfoBackend, SubscriptionUrlsBackend } from '@/app/components/billing/type'
|
||||
import { get } from './base'
|
||||
|
||||
export type CurrentPlanVectorSpaceBackend = {
|
||||
size: number
|
||||
limit: number
|
||||
}
|
||||
|
||||
export const fetchCurrentPlanInfo = () => {
|
||||
return get<CurrentPlanInfoBackend>('/features')
|
||||
}
|
||||
|
||||
export const fetchCurrentPlanVectorSpace = () => {
|
||||
return get<CurrentPlanVectorSpaceBackend>('/features/vector-space')
|
||||
}
|
||||
|
||||
export const fetchSubscriptionUrls = (plan: string, interval: string) => {
|
||||
return get<SubscriptionUrlsBackend>(`/billing/subscription?plan=${plan}&interval=${interval}`)
|
||||
}
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
import { useMutation, useQuery } from '@tanstack/react-query'
|
||||
import { consoleClient, consoleQuery } from '@/service/client'
|
||||
import { fetchCurrentPlanVectorSpace } from './billing'
|
||||
|
||||
const currentPlanVectorSpaceQueryKey = ['billing', 'current-plan-vector-space'] as const
|
||||
|
||||
export const useBindPartnerStackInfo = () => {
|
||||
return useMutation({
|
||||
@ -21,3 +24,11 @@ export const useBillingUrl = (enabled: boolean) => {
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
export const useCurrentPlanVectorSpace = (enabled = true) => {
|
||||
return useQuery({
|
||||
queryKey: currentPlanVectorSpaceQueryKey,
|
||||
queryFn: () => fetchCurrentPlanVectorSpace(),
|
||||
enabled,
|
||||
})
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user