@reglow/reglow 0.13.0 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/reglow/core/entities.d.ts +135 -0
- package/dist/reglow/core/models.d.ts +22 -0
- package/dist/reglow/core/models.js +15 -0
- package/dist/reglow/core/models.js.map +1 -1
- package/dist/reglow/core/tenant_context.d.ts +45 -0
- package/dist/reglow/core/tenant_context.js +77 -0
- package/dist/reglow/core/tenant_context.js.map +1 -0
- package/dist/reglow/core/tenant_guard.js +17 -5
- package/dist/reglow/core/tenant_guard.js.map +1 -1
- package/dist/reglow/modules/ai/controller.js +129 -0
- package/dist/reglow/modules/ai/controller.js.map +1 -1
- package/dist/reglow/modules/ai_usage/controller.d.ts +8 -0
- package/dist/reglow/modules/ai_usage/controller.js +278 -0
- package/dist/reglow/modules/ai_usage/controller.js.map +1 -0
- package/dist/reglow/modules/ai_usage/model.d.ts +216 -0
- package/dist/reglow/modules/ai_usage/model.js +25 -0
- package/dist/reglow/modules/ai_usage/model.js.map +1 -0
- package/dist/reglow/modules/ai_usage/pricing.d.ts +80 -0
- package/dist/reglow/modules/ai_usage/pricing.js +276 -0
- package/dist/reglow/modules/ai_usage/pricing.js.map +1 -0
- package/dist/reglow/modules/ai_usage/reconcile.d.ts +34 -0
- package/dist/reglow/modules/ai_usage/reconcile.js +179 -0
- package/dist/reglow/modules/ai_usage/reconcile.js.map +1 -0
- package/dist/reglow/modules/ai_usage/recorder.d.ts +14 -0
- package/dist/reglow/modules/ai_usage/recorder.js +227 -0
- package/dist/reglow/modules/ai_usage/recorder.js.map +1 -0
- package/dist/reglow/modules/ai_usage/router.d.ts +10 -0
- package/dist/reglow/modules/ai_usage/router.js +10 -0
- package/dist/reglow/modules/ai_usage/router.js.map +1 -0
- package/dist/reglow/modules/ai_usage/schema.d.ts +152 -0
- package/dist/reglow/modules/ai_usage/schema.js +8 -0
- package/dist/reglow/modules/ai_usage/schema.js.map +1 -0
- package/dist/reglow/modules/ai_usage/service.d.ts +40 -0
- package/dist/reglow/modules/ai_usage/service.js +654 -0
- package/dist/reglow/modules/ai_usage/service.js.map +1 -0
- package/dist/reglow/modules/ai_usage/sync.d.ts +98 -0
- package/dist/reglow/modules/ai_usage/sync.js +954 -0
- package/dist/reglow/modules/ai_usage/sync.js.map +1 -0
- package/dist/reglow/modules/ai_usage/xlsx_io.d.ts +35 -0
- package/dist/reglow/modules/ai_usage/xlsx_io.js +494 -0
- package/dist/reglow/modules/ai_usage/xlsx_io.js.map +1 -0
- package/dist/reglow/modules/billing/controller.d.ts +6 -0
- package/dist/reglow/modules/billing/controller.js +112 -0
- package/dist/reglow/modules/billing/controller.js.map +1 -0
- package/dist/reglow/modules/billing/repository.d.ts +20 -0
- package/dist/reglow/modules/billing/repository.js +101 -0
- package/dist/reglow/modules/billing/repository.js.map +1 -0
- package/dist/reglow/modules/billing/router.d.ts +10 -0
- package/dist/reglow/modules/billing/router.js +8 -0
- package/dist/reglow/modules/billing/router.js.map +1 -0
- package/dist/reglow/modules/billing/schema.d.ts +38 -0
- package/dist/reglow/modules/billing/schema.js +42 -0
- package/dist/reglow/modules/billing/schema.js.map +1 -0
- package/dist/reglow/modules/billing/service.d.ts +22 -0
- package/dist/reglow/modules/billing/service.js +179 -0
- package/dist/reglow/modules/billing/service.js.map +1 -0
- package/dist/reglow/modules/customer_service/controller.js +81 -3
- package/dist/reglow/modules/customer_service/controller.js.map +1 -1
- package/dist/reglow/modules/customer_service/repository.d.ts +9 -1
- package/dist/reglow/modules/customer_service/repository.js +56 -2
- package/dist/reglow/modules/customer_service/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/schema.d.ts +2 -0
- package/dist/reglow/modules/customer_service/schema.js +8 -0
- package/dist/reglow/modules/customer_service/schema.js.map +1 -1
- package/dist/reglow/modules/customer_service/sdk_template.html +276 -5
- package/dist/reglow/modules/customer_service/service.d.ts +45 -4
- package/dist/reglow/modules/customer_service/service.js +352 -96
- package/dist/reglow/modules/customer_service/service.js.map +1 -1
- package/dist/reglow/modules/customer_service/ws.d.ts +8 -1
- package/dist/reglow/modules/customer_service/ws.js +38 -1
- package/dist/reglow/modules/customer_service/ws.js.map +1 -1
- package/dist/reglow/modules/open_api/auth.d.ts +28 -0
- package/dist/reglow/modules/open_api/auth.js +65 -0
- package/dist/reglow/modules/open_api/auth.js.map +1 -0
- package/dist/reglow/modules/open_api/controller.d.ts +8 -0
- package/dist/reglow/modules/open_api/controller.js +109 -0
- package/dist/reglow/modules/open_api/controller.js.map +1 -0
- package/dist/reglow/modules/open_api/repository.d.ts +20 -0
- package/dist/reglow/modules/open_api/repository.js +111 -0
- package/dist/reglow/modules/open_api/repository.js.map +1 -0
- package/dist/reglow/modules/open_api/router.d.ts +10 -0
- package/dist/reglow/modules/open_api/router.js +8 -0
- package/dist/reglow/modules/open_api/router.js.map +1 -0
- package/dist/reglow/modules/open_api/schema.d.ts +24 -0
- package/dist/reglow/modules/open_api/schema.js +26 -0
- package/dist/reglow/modules/open_api/schema.js.map +1 -0
- package/dist/reglow/modules/open_api/security.d.ts +19 -0
- package/dist/reglow/modules/open_api/security.js +53 -0
- package/dist/reglow/modules/open_api/security.js.map +1 -0
- package/dist/reglow/modules/open_api/service.d.ts +28 -0
- package/dist/reglow/modules/open_api/service.js +158 -0
- package/dist/reglow/modules/open_api/service.js.map +1 -0
- package/dist/reglow/modules/principal/controller.d.ts +6 -0
- package/dist/reglow/modules/principal/controller.js +158 -0
- package/dist/reglow/modules/principal/controller.js.map +1 -0
- package/dist/reglow/modules/principal/repository.d.ts +20 -0
- package/dist/reglow/modules/principal/repository.js +76 -0
- package/dist/reglow/modules/principal/repository.js.map +1 -0
- package/dist/reglow/modules/principal/router.d.ts +9 -0
- package/dist/reglow/modules/principal/router.js +7 -0
- package/dist/reglow/modules/principal/router.js.map +1 -0
- package/dist/reglow/modules/principal/schema.d.ts +81 -0
- package/dist/reglow/modules/principal/schema.js +85 -0
- package/dist/reglow/modules/principal/schema.js.map +1 -0
- package/dist/reglow/modules/principal/service.d.ts +21 -0
- package/dist/reglow/modules/principal/service.js +193 -0
- package/dist/reglow/modules/principal/service.js.map +1 -0
- package/dist/reglow/modules/principal_member/controller.d.ts +6 -0
- package/dist/reglow/modules/principal_member/controller.js +64 -0
- package/dist/reglow/modules/principal_member/controller.js.map +1 -0
- package/dist/reglow/modules/principal_member/repository.d.ts +13 -0
- package/dist/reglow/modules/principal_member/repository.js +80 -0
- package/dist/reglow/modules/principal_member/repository.js.map +1 -0
- package/dist/reglow/modules/principal_member/router.d.ts +10 -0
- package/dist/reglow/modules/principal_member/router.js +8 -0
- package/dist/reglow/modules/principal_member/router.js.map +1 -0
- package/dist/reglow/modules/principal_member/schema.d.ts +27 -0
- package/dist/reglow/modules/principal_member/schema.js +28 -0
- package/dist/reglow/modules/principal_member/schema.js.map +1 -0
- package/dist/reglow/modules/principal_member/service.d.ts +16 -0
- package/dist/reglow/modules/principal_member/service.js +135 -0
- package/dist/reglow/modules/principal_member/service.js.map +1 -0
- package/dist/reglow/modules/tenant/controller.d.ts +6 -0
- package/dist/reglow/modules/tenant/controller.js +99 -0
- package/dist/reglow/modules/tenant/controller.js.map +1 -0
- package/dist/reglow/modules/tenant/repository.d.ts +18 -0
- package/dist/reglow/modules/tenant/repository.js +71 -0
- package/dist/reglow/modules/tenant/repository.js.map +1 -0
- package/dist/reglow/modules/tenant/router.d.ts +9 -0
- package/dist/reglow/modules/tenant/router.js +7 -0
- package/dist/reglow/modules/tenant/router.js.map +1 -0
- package/dist/reglow/modules/tenant/schema.d.ts +33 -0
- package/dist/reglow/modules/tenant/schema.js +42 -0
- package/dist/reglow/modules/tenant/schema.js.map +1 -0
- package/dist/reglow/modules/tenant/service.d.ts +16 -0
- package/dist/reglow/modules/tenant/service.js +75 -0
- package/dist/reglow/modules/tenant/service.js.map +1 -0
- package/dist/reglow/modules/workflow/controller.d.ts +7 -0
- package/dist/reglow/modules/workflow/controller.js +133 -0
- package/dist/reglow/modules/workflow/controller.js.map +1 -0
- package/dist/reglow/modules/workflow/dsl.d.ts +41 -0
- package/dist/reglow/modules/workflow/dsl.js +173 -0
- package/dist/reglow/modules/workflow/dsl.js.map +1 -0
- package/dist/reglow/modules/workflow/model.d.ts +15 -0
- package/dist/reglow/modules/workflow/model.js +16 -0
- package/dist/reglow/modules/workflow/model.js.map +1 -0
- package/dist/reglow/modules/workflow/repository.d.ts +27 -0
- package/dist/reglow/modules/workflow/repository.js +151 -0
- package/dist/reglow/modules/workflow/repository.js.map +1 -0
- package/dist/reglow/modules/workflow/router.d.ts +10 -0
- package/dist/reglow/modules/workflow/router.js +8 -0
- package/dist/reglow/modules/workflow/router.js.map +1 -0
- package/dist/reglow/modules/workflow/schema.d.ts +32 -0
- package/dist/reglow/modules/workflow/schema.js +39 -0
- package/dist/reglow/modules/workflow/schema.js.map +1 -0
- package/dist/reglow/modules/workflow/service.d.ts +65 -0
- package/dist/reglow/modules/workflow/service.js +209 -0
- package/dist/reglow/modules/workflow/service.js.map +1 -0
- package/dist/reglow/scripts/init-data.js +157 -1
- package/dist/reglow/scripts/init-data.js.map +1 -1
- package/dist/reglow/scripts/schema.js +360 -0
- package/dist/reglow/scripts/schema.js.map +1 -1
- package/dist/server.js +3 -0
- package/dist/server.js.map +1 -1
- package/package.json +3 -3
|
@@ -535,6 +535,7 @@ export interface CSAgent extends TimestampFields, SoftDeleteFields {
|
|
|
535
535
|
enabled?: number;
|
|
536
536
|
status?: string | null;
|
|
537
537
|
last_active_at?: AnyDate;
|
|
538
|
+
max_sessions?: number | null;
|
|
538
539
|
}
|
|
539
540
|
export interface CSMessage extends TimestampFields {
|
|
540
541
|
id: number;
|
|
@@ -657,3 +658,137 @@ export interface StudioMcpTool extends TimestampFields {
|
|
|
657
658
|
enabled?: number;
|
|
658
659
|
synced_at?: AnyDate;
|
|
659
660
|
}
|
|
661
|
+
export interface Principal extends TimestampFields, SoftDeleteFields {
|
|
662
|
+
id: number;
|
|
663
|
+
principal_type?: string;
|
|
664
|
+
name: string;
|
|
665
|
+
code: string;
|
|
666
|
+
contact_name?: string | null;
|
|
667
|
+
contact_phone?: string | null;
|
|
668
|
+
contact_email?: string | null;
|
|
669
|
+
cert_type?: string | null;
|
|
670
|
+
cert_status?: string;
|
|
671
|
+
reject_reason?: string | null;
|
|
672
|
+
credit_code?: string | null;
|
|
673
|
+
legal_person?: string | null;
|
|
674
|
+
residence?: string | null;
|
|
675
|
+
business_address?: string | null;
|
|
676
|
+
license_url?: string | null;
|
|
677
|
+
business_permit_urls?: string | null;
|
|
678
|
+
id_card_no?: string | null;
|
|
679
|
+
legal_id_front_url?: string | null;
|
|
680
|
+
legal_id_back_url?: string | null;
|
|
681
|
+
account_name?: string | null;
|
|
682
|
+
settlement_type?: string | null;
|
|
683
|
+
receipt_mode?: string | null;
|
|
684
|
+
bank_name?: string | null;
|
|
685
|
+
bank_branch?: string | null;
|
|
686
|
+
bank_card_no?: string | null;
|
|
687
|
+
bank_card_front_url?: string | null;
|
|
688
|
+
corporate_account_doc_url?: string | null;
|
|
689
|
+
reviewer_id?: number | null;
|
|
690
|
+
reviewed_at?: AnyDate;
|
|
691
|
+
remark?: string | null;
|
|
692
|
+
status?: number;
|
|
693
|
+
}
|
|
694
|
+
export interface PrincipalMember extends TimestampFields, SoftDeleteFields {
|
|
695
|
+
id: number;
|
|
696
|
+
principal_id: number;
|
|
697
|
+
user_id?: number | null;
|
|
698
|
+
employee_id?: number | null;
|
|
699
|
+
member_role?: string;
|
|
700
|
+
status?: string | null;
|
|
701
|
+
invited_by?: number | null;
|
|
702
|
+
joined_at?: AnyDate;
|
|
703
|
+
}
|
|
704
|
+
export interface Tenant extends TimestampFields, SoftDeleteFields {
|
|
705
|
+
id: number;
|
|
706
|
+
name: string;
|
|
707
|
+
code: string;
|
|
708
|
+
principal_id?: number | null;
|
|
709
|
+
package?: string | null;
|
|
710
|
+
status?: number;
|
|
711
|
+
contact_name?: string | null;
|
|
712
|
+
contact_phone?: string | null;
|
|
713
|
+
expire_at?: AnyDate;
|
|
714
|
+
remark?: string | null;
|
|
715
|
+
max_apps?: number;
|
|
716
|
+
}
|
|
717
|
+
export interface BillingPlan extends TimestampFields, SoftDeleteFields {
|
|
718
|
+
id: number;
|
|
719
|
+
code: string;
|
|
720
|
+
name: string;
|
|
721
|
+
plan_type?: string | null;
|
|
722
|
+
price?: number | string | null;
|
|
723
|
+
quota_json?: unknown;
|
|
724
|
+
status?: number;
|
|
725
|
+
remark?: string | null;
|
|
726
|
+
}
|
|
727
|
+
export interface BillingAccount extends TimestampFields, SoftDeleteFields {
|
|
728
|
+
id: number;
|
|
729
|
+
owner_type?: string | null;
|
|
730
|
+
owner_id?: number | null;
|
|
731
|
+
plan_code?: string | null;
|
|
732
|
+
balance?: number | string | null;
|
|
733
|
+
expire_at?: AnyDate;
|
|
734
|
+
}
|
|
735
|
+
export interface BillingUsage extends TimestampFields {
|
|
736
|
+
id: number;
|
|
737
|
+
account_id?: number | null;
|
|
738
|
+
item_type?: string | null;
|
|
739
|
+
model?: string | null;
|
|
740
|
+
tokens?: number;
|
|
741
|
+
quantity?: number;
|
|
742
|
+
remark?: string | null;
|
|
743
|
+
}
|
|
744
|
+
export interface OpenApiApp extends TimestampFields, SoftDeleteFields {
|
|
745
|
+
id: number;
|
|
746
|
+
app_key: string;
|
|
747
|
+
app_secret: string;
|
|
748
|
+
name: string;
|
|
749
|
+
status?: number;
|
|
750
|
+
daily_quota?: number;
|
|
751
|
+
rate_limit?: number;
|
|
752
|
+
expire_at?: AnyDate;
|
|
753
|
+
remark?: string | null;
|
|
754
|
+
}
|
|
755
|
+
export interface OpenApiCallLog extends TimestampFields {
|
|
756
|
+
id: number;
|
|
757
|
+
app_id?: number | null;
|
|
758
|
+
app_key?: string | null;
|
|
759
|
+
method?: string | null;
|
|
760
|
+
path?: string | null;
|
|
761
|
+
ip?: string | null;
|
|
762
|
+
status_code?: number | null;
|
|
763
|
+
success?: number | null;
|
|
764
|
+
error?: string | null;
|
|
765
|
+
}
|
|
766
|
+
export interface WorkflowDef extends TimestampFields, SoftDeleteFields {
|
|
767
|
+
id: number;
|
|
768
|
+
code: string;
|
|
769
|
+
name: string;
|
|
770
|
+
description?: string | null;
|
|
771
|
+
form_schema?: unknown;
|
|
772
|
+
node_json?: unknown;
|
|
773
|
+
status?: number;
|
|
774
|
+
}
|
|
775
|
+
export interface WorkflowInstance extends TimestampFields, SoftDeleteFields {
|
|
776
|
+
id: number;
|
|
777
|
+
def_id: number;
|
|
778
|
+
title: string;
|
|
779
|
+
status?: string | null;
|
|
780
|
+
current_node?: string | null;
|
|
781
|
+
form_data?: unknown;
|
|
782
|
+
creator_id?: number | null;
|
|
783
|
+
}
|
|
784
|
+
export interface WorkflowTask extends TimestampFields {
|
|
785
|
+
id: number;
|
|
786
|
+
instance_id: number;
|
|
787
|
+
node_key: string;
|
|
788
|
+
node_name?: string | null;
|
|
789
|
+
assignee_type?: string | null;
|
|
790
|
+
assignee_value?: string | null;
|
|
791
|
+
action?: string | null;
|
|
792
|
+
comment?: string | null;
|
|
793
|
+
operator_id?: number | null;
|
|
794
|
+
}
|
|
@@ -53,6 +53,17 @@ export declare const TableNames: {
|
|
|
53
53
|
readonly CSAgent: "cs_agent";
|
|
54
54
|
readonly CSMessage: "cs_message";
|
|
55
55
|
readonly SecurityAuditLog: "sys_security_audit";
|
|
56
|
+
readonly Principal: "sys_principal";
|
|
57
|
+
readonly PrincipalMember: "sys_principal_member";
|
|
58
|
+
readonly Tenant: "sys_tenant";
|
|
59
|
+
readonly BillingPlan: "sys_billing_plan";
|
|
60
|
+
readonly BillingAccount: "sys_billing_account";
|
|
61
|
+
readonly BillingUsage: "sys_billing_usage";
|
|
62
|
+
readonly OpenApiApp: "sys_open_api_app";
|
|
63
|
+
readonly OpenApiCallLog: "sys_open_api_log";
|
|
64
|
+
readonly WorkflowDef: "sys_workflow_def";
|
|
65
|
+
readonly WorkflowInstance: "sys_workflow_instance";
|
|
66
|
+
readonly WorkflowTask: "sys_workflow_task";
|
|
56
67
|
readonly Skill: "studio_skill";
|
|
57
68
|
readonly StudioRole: "studio_role";
|
|
58
69
|
readonly StudioWorkflow: "studio_workflow";
|
|
@@ -115,6 +126,17 @@ export declare const ModelRegistry: {
|
|
|
115
126
|
CSAgent: "cs_agent";
|
|
116
127
|
CSMessage: "cs_message";
|
|
117
128
|
SecurityAuditLog: "sys_security_audit";
|
|
129
|
+
Principal: "sys_principal";
|
|
130
|
+
PrincipalMember: "sys_principal_member";
|
|
131
|
+
Tenant: "sys_tenant";
|
|
132
|
+
BillingPlan: "sys_billing_plan";
|
|
133
|
+
BillingAccount: "sys_billing_account";
|
|
134
|
+
BillingUsage: "sys_billing_usage";
|
|
135
|
+
OpenApiApp: "sys_open_api_app";
|
|
136
|
+
OpenApiCallLog: "sys_open_api_log";
|
|
137
|
+
WorkflowDef: "sys_workflow_def";
|
|
138
|
+
WorkflowInstance: "sys_workflow_instance";
|
|
139
|
+
WorkflowTask: "sys_workflow_task";
|
|
118
140
|
Skill: "studio_skill";
|
|
119
141
|
StudioRole: "studio_role";
|
|
120
142
|
StudioWorkflow: "studio_workflow";
|
|
@@ -53,6 +53,21 @@ export const TableNames = {
|
|
|
53
53
|
CSAgent: "cs_agent",
|
|
54
54
|
CSMessage: "cs_message",
|
|
55
55
|
SecurityAuditLog: "sys_security_audit",
|
|
56
|
+
// 主体认证 / 主体成员 / 多租户
|
|
57
|
+
Principal: "sys_principal",
|
|
58
|
+
PrincipalMember: "sys_principal_member",
|
|
59
|
+
Tenant: "sys_tenant",
|
|
60
|
+
// 计量计费(套餐 / 账户 / 用量)
|
|
61
|
+
BillingPlan: "sys_billing_plan",
|
|
62
|
+
BillingAccount: "sys_billing_account",
|
|
63
|
+
BillingUsage: "sys_billing_usage",
|
|
64
|
+
// 开放平台(应用密钥 / 调用审计)
|
|
65
|
+
OpenApiApp: "sys_open_api_app",
|
|
66
|
+
OpenApiCallLog: "sys_open_api_log",
|
|
67
|
+
// 流程审批(定义 / 实例 / 任务)
|
|
68
|
+
WorkflowDef: "sys_workflow_def",
|
|
69
|
+
WorkflowInstance: "sys_workflow_instance",
|
|
70
|
+
WorkflowTask: "sys_workflow_task",
|
|
56
71
|
// 智能工坊(技能库 + 角色库 + 工作流 + 运行记录 + 产物/长任务 + MCP)
|
|
57
72
|
Skill: "studio_skill",
|
|
58
73
|
StudioRole: "studio_role",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../reglow/core/models.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ,EAAE,cAAc;IACxB,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,mBAAmB;IACjC,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IACzB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAEhB,SAAS,EAAE,YAAY;IACvB,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,mBAAmB;IACjC,QAAQ,EAAE,eAAe;IAEzB,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE,gBAAgB;IAC3B,aAAa,EAAE,oBAAoB;IAEnC,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IAEzB,QAAQ,EAAE,cAAc;IACxB,aAAa,EAAE,oBAAoB;IACnC,qBAAqB,EAAE,6BAA6B;IAEpD,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,MAAM,EAAE,YAAY;IACpB,UAAU,EAAE,iBAAiB;IAE7B,SAAS,EAAE,eAAe;IAC1B,gBAAgB,EAAE,uBAAuB;IAEzC,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,iBAAiB,EAAE,wBAAwB;IAE3C,KAAK,EAAE,WAAW;IAClB,UAAU,EAAE,iBAAiB;IAC7B,aAAa,EAAE,oBAAoB;IAEnC,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,oBAAoB;IACnC,eAAe,EAAE,sBAAsB;IAEvC,YAAY,EAAE,eAAe;IAC7B,aAAa,EAAE,gBAAgB;IAC/B,YAAY,EAAE,eAAe;IAC7B,oBAAoB,EAAE,wBAAwB;IAC9C,kBAAkB,EAAE,sBAAsB;IAE1C,MAAM,EAAE,YAAY;IAEpB,QAAQ,EAAE,WAAW;IACrB,eAAe,EAAE,mBAAmB;IACpC,gBAAgB,EAAE,oBAAoB;IACtC,UAAU,EAAE,cAAc;IAC1B,SAAS,EAAE,YAAY;IACvB,OAAO,EAAE,UAAU;IACnB,SAAS,EAAE,YAAY;IAEvB,gBAAgB,EAAE,oBAAoB;IAEtC,8CAA8C;IAC9C,KAAK,EAAE,cAAc;IACrB,UAAU,EAAE,aAAa;IACzB,cAAc,EAAE,iBAAiB;IACjC,SAAS,EAAE,YAAY;IACvB,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,YAAY;IACvB,eAAe,EAAE,mBAAmB;IACpC,aAAa,EAAE,iBAAiB;CACxB,CAAC;AAIX,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,GAAG,UAAU;IACb,GAAG,CAAC,IAA6B;QAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../reglow/core/models.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ,EAAE,cAAc;IACxB,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,mBAAmB;IACjC,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IACzB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAEhB,SAAS,EAAE,YAAY;IACvB,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,mBAAmB;IACjC,QAAQ,EAAE,eAAe;IAEzB,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE,gBAAgB;IAC3B,aAAa,EAAE,oBAAoB;IAEnC,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IAEzB,QAAQ,EAAE,cAAc;IACxB,aAAa,EAAE,oBAAoB;IACnC,qBAAqB,EAAE,6BAA6B;IAEpD,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,MAAM,EAAE,YAAY;IACpB,UAAU,EAAE,iBAAiB;IAE7B,SAAS,EAAE,eAAe;IAC1B,gBAAgB,EAAE,uBAAuB;IAEzC,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,iBAAiB,EAAE,wBAAwB;IAE3C,KAAK,EAAE,WAAW;IAClB,UAAU,EAAE,iBAAiB;IAC7B,aAAa,EAAE,oBAAoB;IAEnC,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,oBAAoB;IACnC,eAAe,EAAE,sBAAsB;IAEvC,YAAY,EAAE,eAAe;IAC7B,aAAa,EAAE,gBAAgB;IAC/B,YAAY,EAAE,eAAe;IAC7B,oBAAoB,EAAE,wBAAwB;IAC9C,kBAAkB,EAAE,sBAAsB;IAE1C,MAAM,EAAE,YAAY;IAEpB,QAAQ,EAAE,WAAW;IACrB,eAAe,EAAE,mBAAmB;IACpC,gBAAgB,EAAE,oBAAoB;IACtC,UAAU,EAAE,cAAc;IAC1B,SAAS,EAAE,YAAY;IACvB,OAAO,EAAE,UAAU;IACnB,SAAS,EAAE,YAAY;IAEvB,gBAAgB,EAAE,oBAAoB;IAEtC,oBAAoB;IACpB,SAAS,EAAE,eAAe;IAC1B,eAAe,EAAE,sBAAsB;IACvC,MAAM,EAAE,YAAY;IAEpB,qBAAqB;IACrB,WAAW,EAAE,kBAAkB;IAC/B,cAAc,EAAE,qBAAqB;IACrC,YAAY,EAAE,mBAAmB;IAEjC,oBAAoB;IACpB,UAAU,EAAE,kBAAkB;IAC9B,cAAc,EAAE,kBAAkB;IAElC,qBAAqB;IACrB,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,uBAAuB;IACzC,YAAY,EAAE,mBAAmB;IAEjC,8CAA8C;IAC9C,KAAK,EAAE,cAAc;IACrB,UAAU,EAAE,aAAa;IACzB,cAAc,EAAE,iBAAiB;IACjC,SAAS,EAAE,YAAY;IACvB,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,YAAY;IACvB,eAAe,EAAE,mBAAmB;IACpC,aAAa,EAAE,iBAAiB;CACxB,CAAC;AAIX,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,GAAG,UAAU;IACb,GAAG,CAAC,IAA6B;QAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 租户上下文(双轨解析)
|
|
3
|
+
* 对应 backend-python 的 reglow/modules/tenant/context.py(L2 语义对齐)
|
|
4
|
+
*
|
|
5
|
+
* DEPLOY_MODE 双轨:
|
|
6
|
+
* - saas_multi_tenant:共享实例 + tenant_id 行级隔离,上下文从 JWT claim / X-Tenant-Id 头解析
|
|
7
|
+
* - single_tenant(默认):固定单租户或跳过过滤,不阻断既有消费者
|
|
8
|
+
*
|
|
9
|
+
* ⚠️ 这是**显式调用助手**,不是会话级强制注入:业务查询若漏调 applyTenantFilter,
|
|
10
|
+
* 依旧会返回全部租户数据。core/tenant_guard.ts 的 isolationImplemented 仍恒为 false,
|
|
11
|
+
* 库里存在 tenant_id 非空数据时依然拒绝启动(本文件不改变该结论)。
|
|
12
|
+
*/
|
|
13
|
+
import type { Knex } from "knex";
|
|
14
|
+
export declare const DEPLOY_MODE_SINGLE = "single_tenant";
|
|
15
|
+
export declare const DEPLOY_MODE_SAAS = "saas_multi_tenant";
|
|
16
|
+
/** 当前部署轨(每次读取环境变量,便于测试与运行时切换) */
|
|
17
|
+
export declare function deployMode(): string;
|
|
18
|
+
/** 当前是否运行在 SaaS 多租户轨 */
|
|
19
|
+
export declare function isMultiTenant(): boolean;
|
|
20
|
+
/** 仅依赖 headers,避免与 Fastify 类型增强耦合(FastifyRequest 可直接传入) */
|
|
21
|
+
export interface TenantContextRequest {
|
|
22
|
+
headers: Record<string, string | string[] | undefined>;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* 解析当前请求的租户上下文。
|
|
26
|
+
* 优先级:JWT claim `tenant_id` → `X-Tenant-Id` 请求头;解析失败/缺失为 null。
|
|
27
|
+
* single_tenant 轨始终返回 null(跳过过滤)。
|
|
28
|
+
*/
|
|
29
|
+
export declare function getTenantContext(request: TenantContextRequest): number | null;
|
|
30
|
+
export interface TenantFilterOptions {
|
|
31
|
+
/** 目标表是否含 tenant_id 列(缺省按 true 处理,即调用方声明该表受租户隔离) */
|
|
32
|
+
hasTenantColumn?: boolean;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* 对业务查询注入 tenant_id 行级过滤(多租户轨)。
|
|
36
|
+
*
|
|
37
|
+
* fail-closed:多租户轨下解析不到租户上下文时直接拒绝,不静默放行。
|
|
38
|
+
* 否则一次 Token 解析失败就退化为「跨租户全量可见」——那是越权,不是降级。
|
|
39
|
+
*
|
|
40
|
+
* @param query SQLAlchemy select/update 的 node 等价物(knex 查询构建器)
|
|
41
|
+
* @param tenantId 当前租户上下文;单租户轨下恒为 null(此时完全旁路)
|
|
42
|
+
* @param options.hasTenantColumn 表无 tenant_id 列时传 false,原样返回
|
|
43
|
+
* @throws ForbiddenException 多租户轨下缺少租户上下文
|
|
44
|
+
*/
|
|
45
|
+
export declare function applyTenantFilter<Q extends Knex.QueryBuilder>(query: Q, tenantId: number | null, options?: TenantFilterOptions): Q;
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { ForbiddenException } from "../common/errors.js";
|
|
2
|
+
import { verifyToken } from "./security.js";
|
|
3
|
+
export const DEPLOY_MODE_SINGLE = "single_tenant";
|
|
4
|
+
export const DEPLOY_MODE_SAAS = "saas_multi_tenant";
|
|
5
|
+
/** 当前部署轨(每次读取环境变量,便于测试与运行时切换) */
|
|
6
|
+
export function deployMode() {
|
|
7
|
+
return process.env.DEPLOY_MODE || DEPLOY_MODE_SINGLE;
|
|
8
|
+
}
|
|
9
|
+
/** 当前是否运行在 SaaS 多租户轨 */
|
|
10
|
+
export function isMultiTenant() {
|
|
11
|
+
return deployMode() === DEPLOY_MODE_SAAS;
|
|
12
|
+
}
|
|
13
|
+
function headerValue(headers, name) {
|
|
14
|
+
const raw = headers[name];
|
|
15
|
+
if (raw === undefined || raw === null)
|
|
16
|
+
return null;
|
|
17
|
+
const value = Array.isArray(raw) ? raw[0] : raw;
|
|
18
|
+
return value === undefined ? null : value;
|
|
19
|
+
}
|
|
20
|
+
function toTenantId(value) {
|
|
21
|
+
if (value === null || value === undefined || value === "")
|
|
22
|
+
return null;
|
|
23
|
+
const text = String(value).trim();
|
|
24
|
+
if (!/^[+-]?\d+$/.test(text))
|
|
25
|
+
return null;
|
|
26
|
+
const parsed = Number.parseInt(text, 10);
|
|
27
|
+
return Number.isFinite(parsed) ? parsed : null;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* 解析当前请求的租户上下文。
|
|
31
|
+
* 优先级:JWT claim `tenant_id` → `X-Tenant-Id` 请求头;解析失败/缺失为 null。
|
|
32
|
+
* single_tenant 轨始终返回 null(跳过过滤)。
|
|
33
|
+
*/
|
|
34
|
+
export function getTenantContext(request) {
|
|
35
|
+
if (!isMultiTenant())
|
|
36
|
+
return null;
|
|
37
|
+
let tenantId = null;
|
|
38
|
+
// 1. JWT claims(登录签发时写入 tenant_id)
|
|
39
|
+
const auth = headerValue(request.headers, "authorization");
|
|
40
|
+
if (auth && auth.startsWith("Bearer ")) {
|
|
41
|
+
try {
|
|
42
|
+
const payload = verifyToken(auth.slice("Bearer ".length));
|
|
43
|
+
tenantId = payload ? payload.tenant_id : null;
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
tenantId = null;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
// 2. 请求头(外部集成/开放 API 常带)
|
|
50
|
+
if (tenantId === null || tenantId === undefined) {
|
|
51
|
+
tenantId = headerValue(request.headers, "x-tenant-id");
|
|
52
|
+
}
|
|
53
|
+
return toTenantId(tenantId);
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* 对业务查询注入 tenant_id 行级过滤(多租户轨)。
|
|
57
|
+
*
|
|
58
|
+
* fail-closed:多租户轨下解析不到租户上下文时直接拒绝,不静默放行。
|
|
59
|
+
* 否则一次 Token 解析失败就退化为「跨租户全量可见」——那是越权,不是降级。
|
|
60
|
+
*
|
|
61
|
+
* @param query SQLAlchemy select/update 的 node 等价物(knex 查询构建器)
|
|
62
|
+
* @param tenantId 当前租户上下文;单租户轨下恒为 null(此时完全旁路)
|
|
63
|
+
* @param options.hasTenantColumn 表无 tenant_id 列时传 false,原样返回
|
|
64
|
+
* @throws ForbiddenException 多租户轨下缺少租户上下文
|
|
65
|
+
*/
|
|
66
|
+
export function applyTenantFilter(query, tenantId, options = {}) {
|
|
67
|
+
if (options.hasTenantColumn === false)
|
|
68
|
+
return query;
|
|
69
|
+
if (tenantId === null || tenantId === undefined) {
|
|
70
|
+
if (isMultiTenant()) {
|
|
71
|
+
throw new ForbiddenException("多租户模式下缺少租户上下文,拒绝访问");
|
|
72
|
+
}
|
|
73
|
+
return query;
|
|
74
|
+
}
|
|
75
|
+
return query.where("tenant_id", tenantId);
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=tenant_context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant_context.js","sourceRoot":"","sources":["../../../reglow/core/tenant_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,15 @@ import { ForbiddenException } from "../common/errors.js";
|
|
|
4
4
|
/** 逃生阀取值:enforce(默认,命中即拒绝启动)/ off(仅输出 WARN,不阻断) */
|
|
5
5
|
export const TENANT_GUARD_ENFORCE = "enforce";
|
|
6
6
|
export const TENANT_GUARD_OFF = "off";
|
|
7
|
-
/**
|
|
7
|
+
/**
|
|
8
|
+
* node 恒为「未实现隔离」(契约 currentImpl.node.state = "none")
|
|
9
|
+
*
|
|
10
|
+
* 说明:core/tenant_context.ts 新增了显式调用助手(getTenantContext / applyTenantFilter),
|
|
11
|
+
* 但**未做会话级强制注入**,漏调用的查询仍会返回全部租户数据——因此判定保持 false 不变:
|
|
12
|
+
* 库里存在 tenant_id 非空数据时依旧拒绝启动。
|
|
13
|
+
*/
|
|
8
14
|
const ISOLATION_IMPLEMENTED = false;
|
|
9
|
-
const ISOLATION_STATUS = '未实现(node
|
|
15
|
+
const ISOLATION_STATUS = '未实现(node 的租户隔离仅为 core/tenant_context.ts 的显式调用助手,contract/tenant.json 的 currentImpl.node.state = "none")';
|
|
10
16
|
/** 命中表名归一化:去空、去重、排序(输出稳定,可断言) */
|
|
11
17
|
function normalizeTables(tables) {
|
|
12
18
|
return [...new Set(tables.filter((t) => !!t))].sort();
|
|
@@ -38,7 +44,9 @@ export function decideTenantGuard(input) {
|
|
|
38
44
|
};
|
|
39
45
|
}
|
|
40
46
|
// ⑤ 有租户数据但未实现隔离:默认拒绝启动,仅显式 off 才降级为 WARN(且必须留痕)
|
|
41
|
-
const guardEnv = (input.guardEnv ?? TENANT_GUARD_ENFORCE)
|
|
47
|
+
const guardEnv = (input.guardEnv ?? TENANT_GUARD_ENFORCE)
|
|
48
|
+
.trim()
|
|
49
|
+
.toLowerCase();
|
|
42
50
|
const isOff = guardEnv === TENANT_GUARD_OFF;
|
|
43
51
|
const lines = [
|
|
44
52
|
isOff
|
|
@@ -61,7 +69,9 @@ function extractRows(result) {
|
|
|
61
69
|
if (Array.isArray(result) && Array.isArray(result[0])) {
|
|
62
70
|
return result[0];
|
|
63
71
|
}
|
|
64
|
-
return Array.isArray(result)
|
|
72
|
+
return Array.isArray(result)
|
|
73
|
+
? result
|
|
74
|
+
: [];
|
|
65
75
|
}
|
|
66
76
|
/** ① 找出库中所有含 tenant_id 列的表(按项目既有 DB_DRIVER 分支) */
|
|
67
77
|
async function findTablesWithTenantColumn(knex) {
|
|
@@ -86,7 +96,9 @@ async function findTablesWithTenantColumn(knex) {
|
|
|
86
96
|
async function probeTenantData(knex, tables) {
|
|
87
97
|
const hit = [];
|
|
88
98
|
for (const t of tables) {
|
|
89
|
-
const rows = extractRows(await knex.raw("SELECT 1 FROM ?? WHERE tenant_id IS NOT NULL LIMIT 1", [
|
|
99
|
+
const rows = extractRows(await knex.raw("SELECT 1 FROM ?? WHERE tenant_id IS NOT NULL LIMIT 1", [
|
|
100
|
+
t,
|
|
101
|
+
]));
|
|
90
102
|
if (rows.length)
|
|
91
103
|
hit.push(t);
|
|
92
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant_guard.js","sourceRoot":"","sources":["../../../reglow/core/tenant_guard.ts"],"names":[],"mappings":"AAsBA,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,mDAAmD;AACnD,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAC9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAEtC
|
|
1
|
+
{"version":3,"file":"tenant_guard.js","sourceRoot":"","sources":["../../../reglow/core/tenant_guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { logger } from "../../core/logging.js";
|
|
|
12
12
|
import settings from "../../core/config.js";
|
|
13
13
|
import { ChatRequestSchema, SaveProviderSchema, DeleteProviderSchema, VideoGenerateSchema, ImageGenerateSchema, } from "./schema.js";
|
|
14
14
|
import { queryImageTask } from "./service.js";
|
|
15
|
+
import { recordUsage } from "../ai_usage/recorder.js";
|
|
15
16
|
const SS = ModelRegistry.get("SysSetting");
|
|
16
17
|
// ===================== 默认配置 =====================
|
|
17
18
|
const DEEPSEEK_DEFAULT_MODELS = [
|
|
@@ -853,6 +854,45 @@ function resolveVideoMediaUrls(inputData) {
|
|
|
853
854
|
inputData.audio_url = resolveLocalUrl(String(inputData.audio_url));
|
|
854
855
|
}
|
|
855
856
|
}
|
|
857
|
+
// ===================== 用量记账辅助 =====================
|
|
858
|
+
function finiteInt(value) {
|
|
859
|
+
const n = Number(value);
|
|
860
|
+
return Number.isFinite(n) ? Math.trunc(n) : 0;
|
|
861
|
+
}
|
|
862
|
+
/** 从 OpenAI 兼容响应里提取 usage;取不到返回 null */
|
|
863
|
+
function extractChatUsage(result) {
|
|
864
|
+
const usage = result.usage;
|
|
865
|
+
if (!usage || typeof usage !== "object")
|
|
866
|
+
return null;
|
|
867
|
+
const u = usage;
|
|
868
|
+
const promptDetails = (u.prompt_tokens_details ?? {});
|
|
869
|
+
const completionDetails = (u.completion_tokens_details ?? {});
|
|
870
|
+
const prompt = finiteInt(u.prompt_tokens);
|
|
871
|
+
const completion = finiteInt(u.completion_tokens);
|
|
872
|
+
return {
|
|
873
|
+
prompt_tokens: prompt,
|
|
874
|
+
completion_tokens: completion,
|
|
875
|
+
cached_tokens: finiteInt(promptDetails.cached_tokens ?? u.prompt_cache_hit_tokens),
|
|
876
|
+
reasoning_tokens: finiteInt(completionDetails.reasoning_tokens ?? u.reasoning_tokens),
|
|
877
|
+
total_tokens: finiteInt(u.total_tokens) || prompt + completion,
|
|
878
|
+
source: "provider",
|
|
879
|
+
};
|
|
880
|
+
}
|
|
881
|
+
function isPendingTaskStatus(value) {
|
|
882
|
+
const status = String(value ?? "").toUpperCase();
|
|
883
|
+
return (status === "PENDING" || status === "RUNNING" || status === "PROCESSING");
|
|
884
|
+
}
|
|
885
|
+
function parameterInt(parameters, keys) {
|
|
886
|
+
if (!parameters)
|
|
887
|
+
return 0;
|
|
888
|
+
for (const key of keys) {
|
|
889
|
+
const value = parameters[key];
|
|
890
|
+
if (value !== undefined && value !== null && value !== "") {
|
|
891
|
+
return Math.max(0, finiteInt(value));
|
|
892
|
+
}
|
|
893
|
+
}
|
|
894
|
+
return 0;
|
|
895
|
+
}
|
|
856
896
|
// ===================== 路由处理器 =====================
|
|
857
897
|
export async function aiRoutes(fastify, _opts) {
|
|
858
898
|
// 获取供应商配置列表
|
|
@@ -924,6 +964,9 @@ export async function aiRoutes(fastify, _opts) {
|
|
|
924
964
|
throw new AppException(ErrorCode.PARAM_ERROR, `AI 服务未配置,请在系统设置中配置 ${provider} 的 API Key`);
|
|
925
965
|
}
|
|
926
966
|
const model = data.model || config.model || "deepseek-v4-flash";
|
|
967
|
+
const startedAt = Date.now();
|
|
968
|
+
const employeeId = request.currentEmployee?.id ?? null;
|
|
969
|
+
const scene = "ai_chat";
|
|
927
970
|
resolveLocalImageUrls(data.messages);
|
|
928
971
|
const url = `${config.base_url}/chat/completions`;
|
|
929
972
|
const headers = {
|
|
@@ -997,6 +1040,18 @@ export async function aiRoutes(fastify, _opts) {
|
|
|
997
1040
|
}
|
|
998
1041
|
reply.raw.write("data: [DONE]\n\n");
|
|
999
1042
|
reply.raw.end();
|
|
1043
|
+
// 流式无法稳定拿到 usage:成功结束后记一笔,标记为 none
|
|
1044
|
+
void recordUsage({
|
|
1045
|
+
ctx: { scene, source: "admin", employee_id: employeeId },
|
|
1046
|
+
provider,
|
|
1047
|
+
model,
|
|
1048
|
+
model_type: "t2t",
|
|
1049
|
+
billing_unit: "token",
|
|
1050
|
+
status: "success",
|
|
1051
|
+
is_stream: true,
|
|
1052
|
+
latency_ms: Date.now() - startedAt,
|
|
1053
|
+
usage: { source: "none" },
|
|
1054
|
+
}).catch(() => undefined);
|
|
1000
1055
|
}
|
|
1001
1056
|
catch (e) {
|
|
1002
1057
|
logger.error("AI 流式调用异常", e);
|
|
@@ -1028,6 +1083,21 @@ export async function aiRoutes(fastify, _opts) {
|
|
|
1028
1083
|
const thinking = typeof message.reasoning_content === "string"
|
|
1029
1084
|
? message.reasoning_content
|
|
1030
1085
|
: "";
|
|
1086
|
+
const usage = extractChatUsage(result);
|
|
1087
|
+
void recordUsage({
|
|
1088
|
+
ctx: { scene, source: "admin", employee_id: employeeId },
|
|
1089
|
+
provider,
|
|
1090
|
+
model,
|
|
1091
|
+
model_type: "t2t",
|
|
1092
|
+
billing_unit: "token",
|
|
1093
|
+
status: "success",
|
|
1094
|
+
latency_ms: Date.now() - startedAt,
|
|
1095
|
+
provider_request_id: typeof result.id === "string" ? result.id : null,
|
|
1096
|
+
usage: usage ?? { source: "none" },
|
|
1097
|
+
raw_usage: result.usage && typeof result.usage === "object"
|
|
1098
|
+
? result.usage
|
|
1099
|
+
: null,
|
|
1100
|
+
}).catch(() => undefined);
|
|
1031
1101
|
return ApiResponse.success({ reply: replyContent, thinking });
|
|
1032
1102
|
}
|
|
1033
1103
|
catch (e) {
|
|
@@ -1048,6 +1118,9 @@ export async function aiRoutes(fastify, _opts) {
|
|
|
1048
1118
|
const data = request.body;
|
|
1049
1119
|
const provider = data.provider || "aliyun";
|
|
1050
1120
|
const apiKey = await getProviderApiKey(provider);
|
|
1121
|
+
const startedAt = Date.now();
|
|
1122
|
+
const employeeId = request.currentEmployee?.id ?? null;
|
|
1123
|
+
const scene = "ai_video";
|
|
1051
1124
|
resolveVideoMediaUrls(data.input);
|
|
1052
1125
|
try {
|
|
1053
1126
|
let output;
|
|
@@ -1063,6 +1136,24 @@ export async function aiRoutes(fastify, _opts) {
|
|
|
1063
1136
|
else {
|
|
1064
1137
|
throw new AppException(ErrorCode.PARAM_ERROR, `服务商 ${provider} 暂不支持视频生成`);
|
|
1065
1138
|
}
|
|
1139
|
+
const duration = parameterInt(data.parameters, ["duration"]);
|
|
1140
|
+
void recordUsage({
|
|
1141
|
+
ctx: { scene, source: "admin", employee_id: employeeId },
|
|
1142
|
+
provider,
|
|
1143
|
+
model: data.model,
|
|
1144
|
+
model_type: "t2v",
|
|
1145
|
+
billing_unit: "second",
|
|
1146
|
+
pricing_mode: "per_second",
|
|
1147
|
+
status: isPendingTaskStatus(output.task_status)
|
|
1148
|
+
? "submitted"
|
|
1149
|
+
: "success",
|
|
1150
|
+
external_task_id: typeof output.task_id === "string" ? output.task_id : null,
|
|
1151
|
+
duration_seconds: duration,
|
|
1152
|
+
requested_duration: duration,
|
|
1153
|
+
duration_source: duration ? "request" : null,
|
|
1154
|
+
latency_ms: Date.now() - startedAt,
|
|
1155
|
+
usage: { source: "none" },
|
|
1156
|
+
}).catch(() => undefined);
|
|
1066
1157
|
return ApiResponse.success(output);
|
|
1067
1158
|
}
|
|
1068
1159
|
catch (e) {
|
|
@@ -1118,6 +1209,9 @@ export async function aiRoutes(fastify, _opts) {
|
|
|
1118
1209
|
const provider = data.provider || "aliyun";
|
|
1119
1210
|
const apiKey = await getProviderApiKey(provider);
|
|
1120
1211
|
const model = data.model || "wan2.7-image";
|
|
1212
|
+
const startedAt = Date.now();
|
|
1213
|
+
const employeeId = request.currentEmployee?.id ?? null;
|
|
1214
|
+
const scene = "ai_image";
|
|
1121
1215
|
try {
|
|
1122
1216
|
let output;
|
|
1123
1217
|
if (provider === "aliyun") {
|
|
@@ -1131,6 +1225,41 @@ export async function aiRoutes(fastify, _opts) {
|
|
|
1131
1225
|
else {
|
|
1132
1226
|
throw new AppException(ErrorCode.PARAM_ERROR, `服务商 ${provider} 暂不支持图片生成`);
|
|
1133
1227
|
}
|
|
1228
|
+
const requestedQuantity = parameterInt(data.parameters, [
|
|
1229
|
+
"n",
|
|
1230
|
+
"count",
|
|
1231
|
+
"num_images",
|
|
1232
|
+
]);
|
|
1233
|
+
let actualQuantity = 0;
|
|
1234
|
+
if (Array.isArray(output.results)) {
|
|
1235
|
+
actualQuantity = output.results.length;
|
|
1236
|
+
}
|
|
1237
|
+
else {
|
|
1238
|
+
const choices = output.choices;
|
|
1239
|
+
if (Array.isArray(choices) && choices.length) {
|
|
1240
|
+
const content = choices[0]?.message?.content;
|
|
1241
|
+
if (Array.isArray(content))
|
|
1242
|
+
actualQuantity = content.length;
|
|
1243
|
+
}
|
|
1244
|
+
}
|
|
1245
|
+
const taskId = typeof output.task_id === "string" ? output.task_id : null;
|
|
1246
|
+
const pending = isPendingTaskStatus(output.task_status) ||
|
|
1247
|
+
(Boolean(taskId) && actualQuantity === 0);
|
|
1248
|
+
void recordUsage({
|
|
1249
|
+
ctx: { scene, source: "admin", employee_id: employeeId },
|
|
1250
|
+
provider,
|
|
1251
|
+
model,
|
|
1252
|
+
model_type: "t2i",
|
|
1253
|
+
billing_unit: "image",
|
|
1254
|
+
pricing_mode: "per_image",
|
|
1255
|
+
status: pending ? "submitted" : "success",
|
|
1256
|
+
external_task_id: taskId,
|
|
1257
|
+
quantity: requestedQuantity || actualQuantity,
|
|
1258
|
+
requested_quantity: requestedQuantity,
|
|
1259
|
+
actual_quantity: actualQuantity,
|
|
1260
|
+
latency_ms: Date.now() - startedAt,
|
|
1261
|
+
usage: { source: "none" },
|
|
1262
|
+
}).catch(() => undefined);
|
|
1134
1263
|
return ApiResponse.success(output);
|
|
1135
1264
|
}
|
|
1136
1265
|
catch (e) {
|