@carlonicora/nestjs-neo4jsonapi 2.11.0 → 2.13.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/agents/community.summariser/cron/community.summariser.cron.d.ts +6 -1
- package/dist/agents/community.summariser/cron/community.summariser.cron.d.ts.map +1 -1
- package/dist/agents/community.summariser/cron/community.summariser.cron.js +16 -2
- package/dist/agents/community.summariser/cron/community.summariser.cron.js.map +1 -1
- package/dist/agents/community.summariser/processors/community.summariser.processor.d.ts.map +1 -1
- package/dist/agents/community.summariser/processors/community.summariser.processor.js +5 -0
- package/dist/agents/community.summariser/processors/community.summariser.processor.js.map +1 -1
- package/dist/agents/operator/controllers/operator.controller.d.ts +16 -1
- package/dist/agents/operator/controllers/operator.controller.d.ts.map +1 -1
- package/dist/agents/operator/controllers/operator.controller.js +17 -2
- package/dist/agents/operator/controllers/operator.controller.js.map +1 -1
- package/dist/common/helpers/credit-gate.d.ts +11 -0
- package/dist/common/helpers/credit-gate.d.ts.map +1 -1
- package/dist/common/helpers/credit-gate.js +19 -0
- package/dist/common/helpers/credit-gate.js.map +1 -1
- package/dist/common/tokens.d.ts +32 -0
- package/dist/common/tokens.d.ts.map +1 -1
- package/dist/common/tokens.js +12 -0
- package/dist/common/tokens.js.map +1 -1
- package/dist/core/llm/services/audio.llm.service.d.ts.map +1 -1
- package/dist/core/llm/services/audio.llm.service.js +4 -0
- package/dist/core/llm/services/audio.llm.service.js.map +1 -1
- package/dist/core/llm/services/embedder.service.d.ts.map +1 -1
- package/dist/core/llm/services/embedder.service.js +5 -0
- package/dist/core/llm/services/embedder.service.js.map +1 -1
- package/dist/core/llm/services/model.service.d.ts +30 -0
- package/dist/core/llm/services/model.service.d.ts.map +1 -1
- package/dist/core/llm/services/model.service.js +63 -0
- package/dist/core/llm/services/model.service.js.map +1 -1
- package/dist/core/llm/services/unsupported-param-fetch.d.ts.map +1 -1
- package/dist/core/llm/services/unsupported-param-fetch.js +70 -7
- package/dist/core/llm/services/unsupported-param-fetch.js.map +1 -1
- package/dist/foundations/assistant/controllers/assistant.controller.d.ts.map +1 -1
- package/dist/foundations/assistant/controllers/assistant.controller.js +7 -0
- package/dist/foundations/assistant/controllers/assistant.controller.js.map +1 -1
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.d.ts +23 -3
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.d.ts.map +1 -1
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.js +25 -2
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.js.map +1 -1
- package/dist/foundations/chunk/processors/chunk.embedding.processor.d.ts.map +1 -1
- package/dist/foundations/chunk/processors/chunk.embedding.processor.js +6 -0
- package/dist/foundations/chunk/processors/chunk.embedding.processor.js.map +1 -1
- package/dist/foundations/chunk/processors/chunk.processor.d.ts.map +1 -1
- package/dist/foundations/chunk/processors/chunk.processor.js +5 -0
- package/dist/foundations/chunk/processors/chunk.processor.js.map +1 -1
- package/dist/foundations/company/entities/company.d.ts +9 -0
- package/dist/foundations/company/entities/company.d.ts.map +1 -1
- package/dist/foundations/company/entities/company.js +1 -0
- package/dist/foundations/company/entities/company.js.map +1 -1
- package/dist/foundations/company/events/company.events.d.ts +12 -0
- package/dist/foundations/company/events/company.events.d.ts.map +1 -0
- package/dist/foundations/company/events/company.events.js +12 -0
- package/dist/foundations/company/events/company.events.js.map +1 -0
- package/dist/foundations/company/index.d.ts +1 -0
- package/dist/foundations/company/index.d.ts.map +1 -1
- package/dist/foundations/company/index.js +3 -1
- package/dist/foundations/company/index.js.map +1 -1
- package/dist/foundations/company/repositories/company.repository.d.ts +2 -0
- package/dist/foundations/company/repositories/company.repository.d.ts.map +1 -1
- package/dist/foundations/company/repositories/company.repository.js +5 -0
- package/dist/foundations/company/repositories/company.repository.js.map +1 -1
- package/dist/foundations/company/services/company.service.d.ts +46 -1
- package/dist/foundations/company/services/company.service.d.ts.map +1 -1
- package/dist/foundations/company/services/company.service.js +71 -2
- package/dist/foundations/company/services/company.service.js.map +1 -1
- package/dist/foundations/keyconcept/processors/keyconcept.embedding.processor.d.ts +6 -1
- package/dist/foundations/keyconcept/processors/keyconcept.embedding.processor.d.ts.map +1 -1
- package/dist/foundations/keyconcept/processors/keyconcept.embedding.processor.js +20 -2
- package/dist/foundations/keyconcept/processors/keyconcept.embedding.processor.js.map +1 -1
- package/dist/foundations/stripe-subscription/services/token-allocation.service.d.ts +3 -1
- package/dist/foundations/stripe-subscription/services/token-allocation.service.d.ts.map +1 -1
- package/dist/foundations/stripe-subscription/services/token-allocation.service.js +8 -3
- package/dist/foundations/stripe-subscription/services/token-allocation.service.js.map +1 -1
- package/dist/foundations/stripe-trial/services/trial.service.d.ts +3 -1
- package/dist/foundations/stripe-trial/services/trial.service.d.ts.map +1 -1
- package/dist/foundations/stripe-trial/services/trial.service.js +14 -9
- package/dist/foundations/stripe-trial/services/trial.service.js.map +1 -1
- package/dist/foundations/tokenusage/entities/tokenusage.d.ts +2 -0
- package/dist/foundations/tokenusage/entities/tokenusage.d.ts.map +1 -1
- package/dist/foundations/tokenusage/entities/tokenusage.js +8 -0
- package/dist/foundations/tokenusage/entities/tokenusage.js.map +1 -1
- package/dist/foundations/tokenusage/repositories/tokenusage.repository.d.ts +2 -0
- package/dist/foundations/tokenusage/repositories/tokenusage.repository.d.ts.map +1 -1
- package/dist/foundations/tokenusage/repositories/tokenusage.repository.js +9 -0
- package/dist/foundations/tokenusage/repositories/tokenusage.repository.js.map +1 -1
- package/dist/foundations/tokenusage/services/tokenusage.service.d.ts +41 -0
- package/dist/foundations/tokenusage/services/tokenusage.service.d.ts.map +1 -1
- package/dist/foundations/tokenusage/services/tokenusage.service.js +24 -1
- package/dist/foundations/tokenusage/services/tokenusage.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@ import { WorkerHost } from "@nestjs/bullmq";
|
|
|
2
2
|
import { ConfigService } from "@nestjs/config";
|
|
3
3
|
import { Job } from "bullmq";
|
|
4
4
|
import { ClsService } from "nestjs-cls";
|
|
5
|
+
import { CreditValidatorInterface } from "../../../common/tokens";
|
|
5
6
|
import { BaseConfigInterface } from "../../../config/interfaces/base.config.interface";
|
|
6
7
|
import { EmbedderService } from "../../../core";
|
|
7
8
|
import { KeyConceptRepository } from "../repositories/keyconcept.repository";
|
|
@@ -10,8 +11,12 @@ export declare class KeyConceptEmbeddingProcessor extends WorkerHost {
|
|
|
10
11
|
private readonly clsService;
|
|
11
12
|
private readonly keyConceptRepository;
|
|
12
13
|
private readonly embedderService;
|
|
14
|
+
/** See ChunkProcessor: seam, not CompanyService — CompanyModule would mount `companies/*` here. */
|
|
15
|
+
private readonly creditValidator?;
|
|
13
16
|
private readonly rebuildKeyConceptsJobName;
|
|
14
|
-
constructor(clsService: ClsService, keyConceptRepository: KeyConceptRepository, embedderService: EmbedderService, configService: ConfigService<BaseConfigInterface
|
|
17
|
+
constructor(clsService: ClsService, keyConceptRepository: KeyConceptRepository, embedderService: EmbedderService, configService: ConfigService<BaseConfigInterface>,
|
|
18
|
+
/** See ChunkProcessor: seam, not CompanyService — CompanyModule would mount `companies/*` here. */
|
|
19
|
+
creditValidator?: CreditValidatorInterface);
|
|
15
20
|
onActive(job: Job): void;
|
|
16
21
|
onError(job: Job): void;
|
|
17
22
|
onCompleted(job: Job): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyconcept.embedding.processor.d.ts","sourceRoot":"","sources":["../../../../src/foundations/keyconcept/processors/keyconcept.embedding.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"keyconcept.embedding.processor.d.ts","sourceRoot":"","sources":["../../../../src/foundations/keyconcept/processors/keyconcept.embedding.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EAAoB,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,eAAO,MAAM,0BAA0B,0BAA0B,CAAC;AAElE,qBACa,4BAA6B,SAAQ,UAAU;IAIxD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,mGAAmG;IAGnG,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IAVnC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAS;gBAGhC,UAAU,EAAE,UAAU,EACtB,oBAAoB,EAAE,oBAAoB,EAC1C,eAAe,EAAE,eAAe,EACjD,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;IACjD,mGAAmG;IAGlF,eAAe,CAAC,EAAE,wBAAwB;IAQ7D,QAAQ,CAAC,GAAG,EAAE,GAAG;IAKjB,OAAO,CAAC,GAAG,EAAE,GAAG;IAKhB,WAAW,CAAC,GAAG,EAAE,GAAG;IAId,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAqDxD"}
|
|
@@ -8,21 +8,28 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.KeyConceptEmbeddingProcessor = exports.KEYCONCEPT_EMBEDDING_QUEUE = void 0;
|
|
13
16
|
const bullmq_1 = require("@nestjs/bullmq");
|
|
17
|
+
const common_1 = require("@nestjs/common");
|
|
14
18
|
const config_1 = require("@nestjs/config");
|
|
15
19
|
const bullmq_2 = require("bullmq");
|
|
16
20
|
const nestjs_cls_1 = require("nestjs-cls");
|
|
21
|
+
const credit_gate_1 = require("../../../common/helpers/credit-gate");
|
|
22
|
+
const tokens_1 = require("../../../common/tokens");
|
|
17
23
|
const core_1 = require("../../../core");
|
|
18
24
|
const keyconcept_repository_1 = require("../repositories/keyconcept.repository");
|
|
19
25
|
exports.KEYCONCEPT_EMBEDDING_QUEUE = "embedding-keyconcepts";
|
|
20
26
|
let KeyConceptEmbeddingProcessor = class KeyConceptEmbeddingProcessor extends bullmq_1.WorkerHost {
|
|
21
|
-
constructor(clsService, keyConceptRepository, embedderService, configService) {
|
|
27
|
+
constructor(clsService, keyConceptRepository, embedderService, configService, creditValidator) {
|
|
22
28
|
super();
|
|
23
29
|
this.clsService = clsService;
|
|
24
30
|
this.keyConceptRepository = keyConceptRepository;
|
|
25
31
|
this.embedderService = embedderService;
|
|
32
|
+
this.creditValidator = creditValidator;
|
|
26
33
|
this.rebuildKeyConceptsJobName =
|
|
27
34
|
configService.get("jobNames", { infer: true })?.process?.rebuild_keyconcepts ?? "embedding:rebuild_keyconcepts";
|
|
28
35
|
}
|
|
@@ -43,6 +50,15 @@ let KeyConceptEmbeddingProcessor = class KeyConceptEmbeddingProcessor extends bu
|
|
|
43
50
|
this.clsService.set("companyId", job.data.companyId);
|
|
44
51
|
this.clsService.set("userId", job.data.userId);
|
|
45
52
|
this.clsService.set("isAutomatedJob", true);
|
|
53
|
+
// No AI on this plan: drop silently. Deliberately BEFORE the credit
|
|
54
|
+
// check so nothing is ever marked pending or deferred — an AI-free
|
|
55
|
+
// company must accumulate no backlog. Mirrors ChunkEmbeddingProcessor.
|
|
56
|
+
if (!(await (0, credit_gate_1.isAiEnabledVia)(this.creditValidator, { companyId: job.data.companyId }))) {
|
|
57
|
+
return { processed: 0 };
|
|
58
|
+
}
|
|
59
|
+
if (!(await (0, credit_gate_1.hasAvailableCreditsVia)(this.creditValidator, { companyId: job.data.companyId }))) {
|
|
60
|
+
return { processed: 0 }; // admin re-embed is maintenance; skip cleanly, no marker
|
|
61
|
+
}
|
|
46
62
|
// 1. Recreate vector index with new dimensions
|
|
47
63
|
await this.keyConceptRepository.recreateVectorIndex();
|
|
48
64
|
// 2. Get all keyconcepts
|
|
@@ -90,9 +106,11 @@ __decorate([
|
|
|
90
106
|
], KeyConceptEmbeddingProcessor.prototype, "onCompleted", null);
|
|
91
107
|
exports.KeyConceptEmbeddingProcessor = KeyConceptEmbeddingProcessor = __decorate([
|
|
92
108
|
(0, bullmq_1.Processor)(exports.KEYCONCEPT_EMBEDDING_QUEUE, { concurrency: 1, lockDuration: 1000 * 60 * 30 }),
|
|
109
|
+
__param(4, (0, common_1.Optional)()),
|
|
110
|
+
__param(4, (0, common_1.Inject)(tokens_1.CREDIT_VALIDATOR)),
|
|
93
111
|
__metadata("design:paramtypes", [nestjs_cls_1.ClsService,
|
|
94
112
|
keyconcept_repository_1.KeyConceptRepository,
|
|
95
113
|
core_1.EmbedderService,
|
|
96
|
-
config_1.ConfigService])
|
|
114
|
+
config_1.ConfigService, Object])
|
|
97
115
|
], KeyConceptEmbeddingProcessor);
|
|
98
116
|
//# sourceMappingURL=keyconcept.embedding.processor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyconcept.embedding.processor.js","sourceRoot":"","sources":["../../../../src/foundations/keyconcept/processors/keyconcept.embedding.processor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keyconcept.embedding.processor.js","sourceRoot":"","sources":["../../../../src/foundations/keyconcept/processors/keyconcept.embedding.processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AppLoggingService } from "../../../core/logging";
|
|
2
2
|
import { CompanyRepository } from "../../company/repositories/company.repository";
|
|
3
|
+
import { CompanyService } from "../../company/services/company.service";
|
|
3
4
|
import { StripePriceRepository } from "../../stripe-price/repositories/stripe-price.repository";
|
|
4
5
|
import { StripeSubscriptionRepository } from "../repositories/stripe-subscription.repository";
|
|
5
6
|
export interface TokenAllocationResult {
|
|
@@ -12,9 +13,10 @@ export interface TokenAllocationResult {
|
|
|
12
13
|
export declare class TokenAllocationService {
|
|
13
14
|
private readonly subscriptionRepository;
|
|
14
15
|
private readonly companyRepository;
|
|
16
|
+
private readonly companyService;
|
|
15
17
|
private readonly stripePriceRepository;
|
|
16
18
|
private readonly logger;
|
|
17
|
-
constructor(subscriptionRepository: StripeSubscriptionRepository, companyRepository: CompanyRepository, stripePriceRepository: StripePriceRepository, logger: AppLoggingService);
|
|
19
|
+
constructor(subscriptionRepository: StripeSubscriptionRepository, companyRepository: CompanyRepository, companyService: CompanyService, stripePriceRepository: StripePriceRepository, logger: AppLoggingService);
|
|
18
20
|
/**
|
|
19
21
|
* Allocate full tokens on subscription payment (new or renewal)
|
|
20
22
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-allocation.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/stripe-subscription/services/token-allocation.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAChG,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBACa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"token-allocation.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/stripe-subscription/services/token-allocation.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAChG,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBACa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAJN,sBAAsB,EAAE,4BAA4B,EACpD,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,cAAc,EAC9B,qBAAqB,EAAE,qBAAqB,EAC5C,MAAM,EAAE,iBAAiB;IAG5C;;;;;;;;;OASG;IACG,uBAAuB,CAAC,MAAM,EAAE;QAAE,oBAAoB,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAuDvG;;;;;;;;;;;;OAYG;IACG,kCAAkC,CAAC,MAAM,EAAE;QAC/C,oBAAoB,EAAE,MAAM,CAAC;QAC7B,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA8DlC;;;;;;;;;;;OAWG;IACG,oCAAoC,CAAC,MAAM,EAAE;QAAE,eAAe,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAiD/G;;OAEG;YACW,yBAAyB;CAMxC"}
|
|
@@ -13,12 +13,14 @@ exports.TokenAllocationService = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const logging_1 = require("../../../core/logging");
|
|
15
15
|
const company_repository_1 = require("../../company/repositories/company.repository");
|
|
16
|
+
const company_service_1 = require("../../company/services/company.service");
|
|
16
17
|
const stripe_price_repository_1 = require("../../stripe-price/repositories/stripe-price.repository");
|
|
17
18
|
const stripe_subscription_repository_1 = require("../repositories/stripe-subscription.repository");
|
|
18
19
|
let TokenAllocationService = class TokenAllocationService {
|
|
19
|
-
constructor(subscriptionRepository, companyRepository, stripePriceRepository, logger) {
|
|
20
|
+
constructor(subscriptionRepository, companyRepository, companyService, stripePriceRepository, logger) {
|
|
20
21
|
this.subscriptionRepository = subscriptionRepository;
|
|
21
22
|
this.companyRepository = companyRepository;
|
|
23
|
+
this.companyService = companyService;
|
|
22
24
|
this.stripePriceRepository = stripePriceRepository;
|
|
23
25
|
this.logger = logger;
|
|
24
26
|
}
|
|
@@ -60,10 +62,11 @@ let TokenAllocationService = class TokenAllocationService {
|
|
|
60
62
|
isActiveSubscription: true,
|
|
61
63
|
});
|
|
62
64
|
// 5. Reset monthly tokens to full amount
|
|
63
|
-
await this.
|
|
65
|
+
await this.companyService.updateTokensAndAiFlag({
|
|
64
66
|
companyId: company.id,
|
|
65
67
|
monthlyCredits: price.token,
|
|
66
68
|
availableMonthlyCredits: price.token,
|
|
69
|
+
aiEnabled: (price.token ?? 0) > 0,
|
|
67
70
|
});
|
|
68
71
|
this.logger.log(`Token allocation on payment: Company ${company.id} - reset from ${previousTokens} to ${price.token} tokens`);
|
|
69
72
|
return {
|
|
@@ -119,10 +122,11 @@ let TokenAllocationService = class TokenAllocationService {
|
|
|
119
122
|
// 5. Get current company state
|
|
120
123
|
const previousTokens = Number(company.availableMonthlyCredits ?? 0);
|
|
121
124
|
// 6. Reset to prorated amount
|
|
122
|
-
await this.
|
|
125
|
+
await this.companyService.updateTokensAndAiFlag({
|
|
123
126
|
companyId: company.id,
|
|
124
127
|
monthlyCredits: newPrice.token,
|
|
125
128
|
availableMonthlyCredits: proratedTokens,
|
|
129
|
+
aiEnabled: (newPrice.token ?? 0) > 0,
|
|
126
130
|
});
|
|
127
131
|
this.logger.log(`Prorated token allocation: Company ${company.id} - reset from ${previousTokens} to ${proratedTokens} tokens (${remainingDays.toFixed(1)}/${totalDays.toFixed(1)} days remaining)`);
|
|
128
132
|
return {
|
|
@@ -197,6 +201,7 @@ exports.TokenAllocationService = TokenAllocationService = __decorate([
|
|
|
197
201
|
(0, common_1.Injectable)(),
|
|
198
202
|
__metadata("design:paramtypes", [stripe_subscription_repository_1.StripeSubscriptionRepository,
|
|
199
203
|
company_repository_1.CompanyRepository,
|
|
204
|
+
company_service_1.CompanyService,
|
|
200
205
|
stripe_price_repository_1.StripePriceRepository,
|
|
201
206
|
logging_1.AppLoggingService])
|
|
202
207
|
], TokenAllocationService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-allocation.service.js","sourceRoot":"","sources":["../../../../src/foundations/stripe-subscription/services/token-allocation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAA0D;AAE1D,sFAAkF;AAClF,qGAAgG;AAChG,mGAA8F;AAWvF,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,sBAAoD,EACpD,iBAAoC,EACpC,qBAA4C,EAC5C,MAAyB;
|
|
1
|
+
{"version":3,"file":"token-allocation.service.js","sourceRoot":"","sources":["../../../../src/foundations/stripe-subscription/services/token-allocation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ModuleRef } from "@nestjs/core";
|
|
2
2
|
import { AppLoggingService } from "../../../core/logging/services/logging.service";
|
|
3
3
|
import { CompanyRepository } from "../../company/repositories/company.repository";
|
|
4
|
+
import { CompanyService } from "../../company/services/company.service";
|
|
4
5
|
/**
|
|
5
6
|
* TrialService
|
|
6
7
|
*
|
|
@@ -24,8 +25,9 @@ import { CompanyRepository } from "../../company/repositories/company.repository
|
|
|
24
25
|
export declare class TrialService {
|
|
25
26
|
private readonly moduleRef;
|
|
26
27
|
private readonly companyRepository;
|
|
28
|
+
private readonly companyService;
|
|
27
29
|
private readonly logger;
|
|
28
|
-
constructor(moduleRef: ModuleRef, companyRepository: CompanyRepository, logger: AppLoggingService);
|
|
30
|
+
constructor(moduleRef: ModuleRef, companyRepository: CompanyRepository, companyService: CompanyService, logger: AppLoggingService);
|
|
29
31
|
/**
|
|
30
32
|
* Lazily get Stripe services via ModuleRef to avoid circular dependencies.
|
|
31
33
|
* Stripe modules form a complex circular chain that can't be resolved with forwardRef alone.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trial.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/stripe-trial/services/trial.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"trial.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/stripe-trial/services/trial.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAMxE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBACa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,iBAAiB;IAG5C;;;OAGG;IACH,OAAO,KAAK,0BAA0B,GAErC;IAED,OAAO,KAAK,8BAA8B,GAEzC;IAED,OAAO,KAAK,qBAAqB,GAEhC;IAED,OAAO,KAAK,wBAAwB,GAEnC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACG,UAAU,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAwD/E"}
|
|
@@ -14,6 +14,7 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const core_1 = require("@nestjs/core");
|
|
15
15
|
const logging_service_1 = require("../../../core/logging/services/logging.service");
|
|
16
16
|
const company_repository_1 = require("../../company/repositories/company.repository");
|
|
17
|
+
const company_service_1 = require("../../company/services/company.service");
|
|
17
18
|
const stripe_customer_repository_1 = require("../../stripe-customer/repositories/stripe-customer.repository");
|
|
18
19
|
const stripe_customer_admin_service_1 = require("../../stripe-customer/services/stripe-customer-admin.service");
|
|
19
20
|
const stripe_price_repository_1 = require("../../stripe-price/repositories/stripe-price.repository");
|
|
@@ -39,9 +40,10 @@ const stripe_subscription_admin_service_1 = require("../../stripe-subscription/s
|
|
|
39
40
|
* ```
|
|
40
41
|
*/
|
|
41
42
|
let TrialService = class TrialService {
|
|
42
|
-
constructor(moduleRef, companyRepository, logger) {
|
|
43
|
+
constructor(moduleRef, companyRepository, companyService, logger) {
|
|
43
44
|
this.moduleRef = moduleRef;
|
|
44
45
|
this.companyRepository = companyRepository;
|
|
46
|
+
this.companyService = companyService;
|
|
45
47
|
this.logger = logger;
|
|
46
48
|
}
|
|
47
49
|
/**
|
|
@@ -110,15 +112,17 @@ let TrialService = class TrialService {
|
|
|
110
112
|
trialPeriodDays: 14,
|
|
111
113
|
// trialEnd: Math.floor(Date.now() / 1000) + 3 * 60,
|
|
112
114
|
});
|
|
113
|
-
// 4. Allocate trial tokens from price configuration
|
|
115
|
+
// 4. Allocate trial tokens from price configuration.
|
|
116
|
+
// The flag is written unconditionally: a trial price with token 0 is an
|
|
117
|
+
// AI-free trial, and gating this behind `trialTokens > 0` would silently
|
|
118
|
+
// leave such a company with AI enabled.
|
|
114
119
|
const trialTokens = trialPrice.token ?? 0;
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
}
|
|
120
|
+
await this.companyService.updateTokensAndAiFlag({
|
|
121
|
+
companyId: params.companyId,
|
|
122
|
+
monthlyCredits: trialTokens,
|
|
123
|
+
availableMonthlyCredits: trialTokens,
|
|
124
|
+
aiEnabled: trialTokens > 0,
|
|
125
|
+
});
|
|
122
126
|
// 5. Mark subscription as active (during trial)
|
|
123
127
|
await this.companyRepository.markSubscriptionStatus({
|
|
124
128
|
companyId: params.companyId,
|
|
@@ -132,6 +136,7 @@ exports.TrialService = TrialService = __decorate([
|
|
|
132
136
|
(0, common_1.Injectable)(),
|
|
133
137
|
__metadata("design:paramtypes", [core_1.ModuleRef,
|
|
134
138
|
company_repository_1.CompanyRepository,
|
|
139
|
+
company_service_1.CompanyService,
|
|
135
140
|
logging_service_1.AppLoggingService])
|
|
136
141
|
], TrialService);
|
|
137
142
|
//# sourceMappingURL=trial.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trial.service.js","sourceRoot":"","sources":["../../../../src/foundations/stripe-trial/services/trial.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAyC;AACzC,oFAAmF;AACnF,sFAAkF;AAClF,8GAAyG;AACzG,gHAA0G;AAC1G,qGAAgG;AAChG,4HAAsH;AAEtH;;;;;;;;;;;;;;;;;;;GAmBG;AAEI,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YACmB,SAAoB,EACpB,iBAAoC,EACpC,MAAyB;
|
|
1
|
+
{"version":3,"file":"trial.service.js","sourceRoot":"","sources":["../../../../src/foundations/stripe-trial/services/trial.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/entities/tokenusage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAGzD;;;;;;;GAOG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenusage.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/entities/tokenusage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAGzD;;;;;;;GAOG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,oBAAoB,qDAkD/B,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,OAAO,oBAAoB,CAAC"}
|
|
@@ -62,6 +62,14 @@ exports.TokenUsageDescriptor = (0, define_entity_1.defineEntity)()({
|
|
|
62
62
|
required: true,
|
|
63
63
|
description: 'Which internal AI operation triggered this usage (e.g. "summariser", "graph_creator", "ethicist"). See the application\'s TokenUsageType enum for the full list of values.',
|
|
64
64
|
},
|
|
65
|
+
model: {
|
|
66
|
+
type: "string",
|
|
67
|
+
description: 'The model that actually served this call (e.g. "gemini-2.5-flash-lite", "gpt-5-nano"). Resolved from the same tier that priced the call, so it can never disagree with `cost`. Absent on records written before this field existed.',
|
|
68
|
+
},
|
|
69
|
+
provider: {
|
|
70
|
+
type: "string",
|
|
71
|
+
description: 'The provider that served this call (e.g. "vertex", "azure"). Recorded alongside `model` because a model name is only unique within a provider.',
|
|
72
|
+
},
|
|
65
73
|
},
|
|
66
74
|
relationships: {},
|
|
67
75
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/entities/tokenusage.ts"],"names":[],"mappings":";;;AACA,yEAAqE;AAErE,uDAAmD;
|
|
1
|
+
{"version":3,"file":"tokenusage.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/entities/tokenusage.ts"],"names":[],"mappings":";;;AACA,yEAAqE;AAErE,uDAAmD;AAuBnD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACU,QAAA,oBAAoB,GAAG,IAAA,4BAAY,GAAc,CAAC;IAC7D,GAAG,gCAAc;IAEjB,eAAe,EAAE,IAAI;IAErB,MAAM,EAAE;QACN,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,gEAAgE;SAC9E;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,qEAAqE;SACnF;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,WAAW,EACT,kPAAkP;SACrP;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,WAAW,EACT,oNAAoN;SACvN;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,WAAW,EACT,sKAAsK;SACzK;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,WAAW,EACT,4KAA4K;SAC/K;QACD,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,WAAW,EACT,qOAAqO;SACxO;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,WAAW,EACT,gJAAgJ;SACnJ;KACF;IAED,aAAa,EAAE,EAAE;CAClB,CAAC,CAAC"}
|
|
@@ -86,6 +86,8 @@ export declare class TokenUsageRepository extends AbstractRepository<TokenUsage,
|
|
|
86
86
|
cachedInputTokens?: number;
|
|
87
87
|
cost?: number;
|
|
88
88
|
credits?: number;
|
|
89
|
+
model?: string;
|
|
90
|
+
provider?: string;
|
|
89
91
|
relationshipId: string;
|
|
90
92
|
relationshipType: string;
|
|
91
93
|
}): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.repository.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAGxF;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBACa,oBAAqB,SAAQ,kBAAkB,CAAC,UAAU,EAAE,OAAO,oBAAoB,CAAC,aAAa,CAAC;IACjH,SAAS,CAAC,QAAQ,CAAC,UAAU,sDAAwB;gBAEzC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU;IAIzF;;;;;;;;;;;;;;;OAeG;IACY,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5C;;;;;;;;;OASG;IACG,MAAM,CAAC,MAAM,EAAE;QACnB,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;KAC1B,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenusage.repository.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAGxF;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBACa,oBAAqB,SAAQ,kBAAkB,CAAC,UAAU,EAAE,OAAO,oBAAoB,CAAC,aAAa,CAAC;IACjH,SAAS,CAAC,QAAQ,CAAC,UAAU,sDAAwB;gBAEzC,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU;IAIzF;;;;;;;;;;;;;;;OAeG;IACY,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5C;;;;;;;;;OASG;IACG,MAAM,CAAC,MAAM,EAAE;QACnB,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;KAC1B,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CjB;;;;OAIG;IACG,aAAa,CAAC,MAAM,EAAE;QAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,MAAM,CAAC,EAAE,sBAAsB,CAAC;KACjC,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA6BzB;;;;OAIG;IACG,2BAA2B,CAAC,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IA2CpH;;OAEG;IACG,gBAAgB,CAAC,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA4CpG,OAAO,CAAC,QAAQ;CAMjB"}
|
|
@@ -84,6 +84,13 @@ let TokenUsageRepository = class TokenUsageRepository extends abstract_repositor
|
|
|
84
84
|
relationshipId: params.relationshipId,
|
|
85
85
|
cost: params.cost ?? 0,
|
|
86
86
|
credits: params.credits ?? 0,
|
|
87
|
+
// null rather than "": Neo4j omits a null property from the created node,
|
|
88
|
+
// so a record whose model could not be resolved has NO `model` key at all.
|
|
89
|
+
// That keeps "unknown" distinguishable from "recorded as empty" — the same
|
|
90
|
+
// distinction the cost-test comparison relies on to decide whether it can
|
|
91
|
+
// isolate base-tier spend or must fall back to a whole-run delta.
|
|
92
|
+
model: params.model ?? null,
|
|
93
|
+
provider: params.provider ?? null,
|
|
87
94
|
};
|
|
88
95
|
// Guarded: initQuery() binds this variable only when the id is in CLS; an unbound CREATE target creates an orphan node.
|
|
89
96
|
query.query += `
|
|
@@ -95,6 +102,8 @@ let TokenUsageRepository = class TokenUsageRepository extends abstract_repositor
|
|
|
95
102
|
cachedInputTokens: $cachedInputTokens,
|
|
96
103
|
cost: $cost,
|
|
97
104
|
credits: $credits,
|
|
105
|
+
model: $model,
|
|
106
|
+
provider: $provider,
|
|
98
107
|
createdAt: datetime(),
|
|
99
108
|
updatedAt: datetime()
|
|
100
109
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.repository.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAAwC;AAExC,2FAAuF;AACvF,8EAA0E;AAC1E,uFAAmF;AACnF,qEAAwF;AACxF,+EAA2E;AA+B3E;;;;;;;;;;;;;;;;GAgBG;AAEI,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,wCAAyE;IAGjH,YAAY,KAAmB,EAAE,eAAgC,EAAE,UAAsB;QACvF,KAAK,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;QAHzB,eAAU,GAAG,iCAAoB,CAAC;IAIrD,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACM,KAAK,CAAC,YAAY;QACzB,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;QAE3B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAEtD,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;YACxB,KAAK,EAAE,gBAAgB,QAAQ,iCAAiC,QAAQ,IAAI,SAAS,SAAS,QAAQ,aAAa;SACpH,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"tokenusage.repository.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,6 +69,36 @@ export declare class TokenUsageService extends AbstractService<TokenUsage, typeo
|
|
|
69
69
|
* rather than the config's cached rate: mixing one connection's input price
|
|
70
70
|
* with another's cache discount would price cached tokens above uncached ones.
|
|
71
71
|
*/
|
|
72
|
+
/**
|
|
73
|
+
* The CONFIG tier whose rates price a call — and, when no DB-backed connection
|
|
74
|
+
* supplied its own, the tier that served it.
|
|
75
|
+
*
|
|
76
|
+
* Extracted so `computeCost` and the recorded `model`/`provider` read the same
|
|
77
|
+
* tier: a record billed at the vision rate but labelled with the base model
|
|
78
|
+
* would be worse than an unlabelled one, because it reads as evidence.
|
|
79
|
+
*
|
|
80
|
+
* NOTE: this resolves the CONFIG BLOCK only. When a DB-backed AI connection
|
|
81
|
+
* serves the call it also carries its own `rates`, and its model is NOT this
|
|
82
|
+
* tier's model — such callers must pass `model`/`provider` explicitly, exactly
|
|
83
|
+
* as the `costOverride` callers do.
|
|
84
|
+
*/
|
|
85
|
+
protected configForCall(params: {
|
|
86
|
+
useVisionCosts?: boolean;
|
|
87
|
+
modelWeight?: ModelWeight;
|
|
88
|
+
}): {
|
|
89
|
+
provider: string;
|
|
90
|
+
apiKey: string;
|
|
91
|
+
model: string;
|
|
92
|
+
url: string;
|
|
93
|
+
region?: string;
|
|
94
|
+
secret?: string;
|
|
95
|
+
instance?: string;
|
|
96
|
+
apiVersion?: string;
|
|
97
|
+
inputCostPer1MTokens: number;
|
|
98
|
+
outputCostPer1MTokens: number;
|
|
99
|
+
googleCredentialsBase64?: string;
|
|
100
|
+
reasoningEffort?: string;
|
|
101
|
+
};
|
|
72
102
|
computeCost(params: {
|
|
73
103
|
tokens: TokenUsageInterface;
|
|
74
104
|
useVisionCosts?: boolean;
|
|
@@ -100,6 +130,17 @@ export declare class TokenUsageService extends AbstractService<TokenUsage, typeo
|
|
|
100
130
|
costOverride?: number;
|
|
101
131
|
/** Rates of the AI connection that served the call; forwarded to `computeCost`. */
|
|
102
132
|
rates?: TokenUsageRatesInterface;
|
|
133
|
+
/**
|
|
134
|
+
* The model that served the call. MUST be supplied by callers whose model is
|
|
135
|
+
* not the config tier's: those pricing with `costOverride` (embeddings,
|
|
136
|
+
* transcription), and those served by a DB-backed AI connection (which also
|
|
137
|
+
* pass `rates`). Without it the record would name the config-block model for
|
|
138
|
+
* a call that model never made. Everyone else omits it and gets the tier that
|
|
139
|
+
* priced the call.
|
|
140
|
+
*/
|
|
141
|
+
model?: string;
|
|
142
|
+
/** Provider that served the call. Same rule as `model`. */
|
|
143
|
+
provider?: string;
|
|
103
144
|
}): Promise<void>;
|
|
104
145
|
/**
|
|
105
146
|
* KEPT (custom filtering not covered by inherited find()): date-range + tokenUsageType
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/services/tokenusage.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAA0B,MAAM,4BAA4B,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAEvF,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACxF,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGnE;;;;;;;;;GASG;AACH,MAAM,WAAW,wBAAwB;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBACa,iBAAkB,SAAQ,eAAe,CAAC,UAAU,EAAE,OAAO,oBAAoB,CAAC,aAAa,CAAC;IAOzG,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IAE7D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;IACpE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,aAAa;IAThD,SAAS,CAAC,QAAQ,CAAC,UAAU,sDAAwB;IAErD,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAsC;gBAG7D,cAAc,EAAE,cAAc,EACX,oBAAoB,EAAE,oBAAoB,EAC7D,UAAU,EAAE,UAAU,EACH,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC,EACjD,YAAY,EAAE,aAAa;IAKhD,SAAS,KAAK,QAAQ,IAAI,iBAAiB,CAE1C;IAED,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,WAAW;IAW9C;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,MAAM,EAAE;QAClB,MAAM,EAAE,mBAAmB,CAAC;QAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,gFAAgF;QAChF,KAAK,CAAC,EAAE,wBAAwB,CAAC;KAClC,GAAG,MAAM;IAcV;;;;;;;;;;OAUG;IACG,gBAAgB,CAAC,MAAM,EAAE;QAC7B,MAAM,EAAE,mBAAmB,CAAC;QAC5B,IAAI,EAAE,MAAM,CAAC;QACb,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,sJAAsJ;QACtJ,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,6HAA6H;QAC7H,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,mFAAmF;QACnF,KAAK,CAAC,EAAE,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenusage.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/services/tokenusage.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,8 +81,24 @@ let TokenUsageService = TokenUsageService_1 = class TokenUsageService extends ab
|
|
|
81
81
|
* rather than the config's cached rate: mixing one connection's input price
|
|
82
82
|
* with another's cache discount would price cached tokens above uncached ones.
|
|
83
83
|
*/
|
|
84
|
+
/**
|
|
85
|
+
* The CONFIG tier whose rates price a call — and, when no DB-backed connection
|
|
86
|
+
* supplied its own, the tier that served it.
|
|
87
|
+
*
|
|
88
|
+
* Extracted so `computeCost` and the recorded `model`/`provider` read the same
|
|
89
|
+
* tier: a record billed at the vision rate but labelled with the base model
|
|
90
|
+
* would be worse than an unlabelled one, because it reads as evidence.
|
|
91
|
+
*
|
|
92
|
+
* NOTE: this resolves the CONFIG BLOCK only. When a DB-backed AI connection
|
|
93
|
+
* serves the call it also carries its own `rates`, and its model is NOT this
|
|
94
|
+
* tier's model — such callers must pass `model`/`provider` explicitly, exactly
|
|
95
|
+
* as the `costOverride` callers do.
|
|
96
|
+
*/
|
|
97
|
+
configForCall(params) {
|
|
98
|
+
return params.useVisionCosts ? this.aiConfig.vision : this.configForWeight(params.modelWeight);
|
|
99
|
+
}
|
|
84
100
|
computeCost(params) {
|
|
85
|
-
const costConfig =
|
|
101
|
+
const costConfig = this.configForCall(params);
|
|
86
102
|
const inputRate = params.rates?.inputCostPer1MTokens ?? costConfig.inputCostPer1MTokens ?? 0;
|
|
87
103
|
const outputRate = params.rates?.outputCostPer1MTokens ?? costConfig.outputCostPer1MTokens ?? 0;
|
|
88
104
|
// vision/audio configs have no cached rate → falls back to the full input rate (no discount).
|
|
@@ -112,6 +128,11 @@ let TokenUsageService = TokenUsageService_1 = class TokenUsageService extends ab
|
|
|
112
128
|
modelWeight: params.modelWeight,
|
|
113
129
|
rates: params.rates,
|
|
114
130
|
});
|
|
131
|
+
// Which model to record. An explicit value always wins; otherwise it comes
|
|
132
|
+
// from the tier that priced the call, so the two can never drift apart.
|
|
133
|
+
const tier = this.configForCall({ useVisionCosts: params.useVisionCosts, modelWeight: params.modelWeight });
|
|
134
|
+
const model = params.model ?? tier?.model ?? undefined;
|
|
135
|
+
const provider = params.provider ?? tier?.provider ?? undefined;
|
|
115
136
|
const creditsConfig = this.configService.get("credits");
|
|
116
137
|
let credits = 0;
|
|
117
138
|
if (creditsConfig && creditsConfig.creditCost > 0) {
|
|
@@ -127,6 +148,8 @@ let TokenUsageService = TokenUsageService_1 = class TokenUsageService extends ab
|
|
|
127
148
|
cachedInputTokens: params.tokens.cached ?? 0,
|
|
128
149
|
cost: cost,
|
|
129
150
|
credits: credits,
|
|
151
|
+
model: model,
|
|
152
|
+
provider: provider,
|
|
130
153
|
relationshipId: params.relationshipId,
|
|
131
154
|
relationshipType: params.relationshipType,
|
|
132
155
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.service.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/services/tokenusage.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,yDAAsD;AACtD,mCAAoC;AACpC,2CAAwC;AAGxC,2FAAuF;AACvF,oFAAgF;AAChF,qFAAiF;AACjF,qEAAwF;AACxF,+FAI6D;AAC7D,uEAAmE;AACnE,mEAAoG;AAkBpG;;;;;;;;;;;;;;;;;;;;GAoBG;AAEI,IAAM,iBAAiB,yBAAvB,MAAM,iBAAkB,SAAQ,kCAAsE;IAK3G,YACE,cAA8B,EACX,oBAA0C,EAC7D,UAAsB,EACH,aAAiD,EACjD,YAA2B;QAE9C,KAAK,CAAC,cAAc,EAAE,oBAAoB,EAAE,UAAU,EAAE,iCAAoB,CAAC,KAAK,CAAC,CAAC;QALjE,yBAAoB,GAApB,oBAAoB,CAAsB;QAE1C,kBAAa,GAAb,aAAa,CAAoC;QACjD,iBAAY,GAAZ,YAAY,CAAe;QAT7B,eAAU,GAAG,iCAAoB,CAAC;QAElC,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;IAU/D,CAAC;IAED,IAAc,QAAQ;QACpB,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAoB,IAAI,CAAC,CAAC;IACzD,CAAC;IAES,eAAe,CAAC,MAAoB;QAC5C,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,0BAAW,CAAC,IAAI;gBACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC9B,KAAK,0BAAW,CAAC,KAAK;gBACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC/B;gBACE,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,
|
|
1
|
+
{"version":3,"file":"tokenusage.service.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/services/tokenusage.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,yDAAsD;AACtD,mCAAoC;AACpC,2CAAwC;AAGxC,2FAAuF;AACvF,oFAAgF;AAChF,qFAAiF;AACjF,qEAAwF;AACxF,+FAI6D;AAC7D,uEAAmE;AACnE,mEAAoG;AAkBpG;;;;;;;;;;;;;;;;;;;;GAoBG;AAEI,IAAM,iBAAiB,yBAAvB,MAAM,iBAAkB,SAAQ,kCAAsE;IAK3G,YACE,cAA8B,EACX,oBAA0C,EAC7D,UAAsB,EACH,aAAiD,EACjD,YAA2B;QAE9C,KAAK,CAAC,cAAc,EAAE,oBAAoB,EAAE,UAAU,EAAE,iCAAoB,CAAC,KAAK,CAAC,CAAC;QALjE,yBAAoB,GAApB,oBAAoB,CAAsB;QAE1C,kBAAa,GAAb,aAAa,CAAoC;QACjD,iBAAY,GAAZ,YAAY,CAAe;QAT7B,eAAU,GAAG,iCAAoB,CAAC;QAElC,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;IAU/D,CAAC;IAED,IAAc,QAAQ;QACpB,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAoB,IAAI,CAAC,CAAC;IACzD,CAAC;IAES,eAAe,CAAC,MAAoB;QAC5C,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,0BAAW,CAAC,IAAI;gBACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC9B,KAAK,0BAAW,CAAC,KAAK;gBACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC/B;gBACE,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH;;;;;;;;;;;;OAYG;IACO,aAAa,CAAC,MAA+D;QACrF,OAAO,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACjG,CAAC;IAED,WAAW,CAAC,MAMX;QACC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,EAAE,oBAAoB,IAAI,UAAU,CAAC,oBAAoB,IAAI,CAAC,CAAC;QAC7F,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,EAAE,qBAAqB,IAAI,UAAU,CAAC,qBAAqB,IAAI,CAAC,CAAC;QAChG,8FAA8F;QAC9F,MAAM,gBAAgB,GAAI,UAAsD,CAAC,0BAA0B,CAAC;QAC5G,MAAM,UAAU,GACd,MAAM,CAAC,KAAK,EAAE,0BAA0B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,IAAI,SAAS,CAAC,CAAC,CAAC;QAC3G,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC;QACnD,MAAM,IAAI,GAAG,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC;QACjG,OAAO,IAAI,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,gBAAgB,CAAC,MAwBtB;QACC,MAAM,IAAI,GACR,MAAM,CAAC,YAAY;YACnB,IAAI,CAAC,WAAW,CAAC;gBACf,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;aACpB,CAAC,CAAC;QAEL,2EAA2E;QAC3E,wEAAwE;QACxE,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5G,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,SAAS,CAAC;QACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE,QAAQ,IAAI,SAAS,CAAC;QAEhE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAyB,SAAS,CAAC,CAAC;QAChF,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,aAAa,IAAI,aAAa,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;YAClD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC;YACxE,IAAI,MAAM,CAAC,YAAY,KAAK,KAAK;gBAAE,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QACpG,CAAC;QAED,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;YACrC,EAAE,EAAE,IAAA,mBAAU,GAAE;YAChB,cAAc,EAAE,MAAM,CAAC,IAAI;YAC3B,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK;YAChC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;YAClC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC;YAC5C,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;SAC1C,CAAC,CAAC;QAEH,yEAAyE;QACzE,qFAAqF;QACrF,yEAAyE;QACzE,IAAI,CAAC;YACH,MAAM,OAAO,GAA8B;gBACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK;gBAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM;gBAC5B,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,OAAO;aACjB,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,8CAA0B,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kBAAkB,8CAA0B,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC1G,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa,CAAC,MAAqF;QACvG,MAAM,SAAS,GAAqB,IAAI,oCAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEvE,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAClC,iCAAoB,CAAC,KAAK,EAC1B,MAAM,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC;YAC5C,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,MAAM,EAAE,SAAS,CAAC,cAAc,EAAE;SACnC,CAAC,EACF,SAAS,CACV,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,qBAAqB,CAAC,MAAgD;QAC1E,OAAO,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,CAAC;YAC3D,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,eAAe,CAAC,MAAgD;QACpE,OAAO,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;YAChD,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AApNY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAOO,gCAAc;QACW,4CAAoB;QACjD,uBAAU;QACY,sBAAa;QACd,6BAAa;GAVrC,iBAAiB,CAoN7B"}
|
package/package.json
CHANGED