@carlonicora/nestjs-neo4jsonapi 1.32.1 → 1.34.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/config/base.config.d.ts.map +1 -1
- package/dist/config/base.config.js +13 -0
- package/dist/config/base.config.js.map +1 -1
- package/dist/config/enums/job.name.d.ts.map +1 -1
- package/dist/config/enums/job.name.js +3 -1
- package/dist/config/enums/job.name.js.map +1 -1
- package/dist/config/enums/queue.id.d.ts +3 -1
- package/dist/config/enums/queue.id.d.ts.map +1 -1
- package/dist/config/enums/queue.id.js +2 -0
- package/dist/config/enums/queue.id.js.map +1 -1
- package/dist/config/interfaces/config.ai.interface.d.ts +14 -0
- package/dist/config/interfaces/config.ai.interface.d.ts.map +1 -1
- package/dist/core/email/templates/en/companyDeleted.hbs +55 -0
- package/dist/core/email/templates/en/deletionWarning.hbs +65 -0
- package/dist/core/email/templates/en/subscriptionCancelled.hbs +45 -0
- package/dist/core/email/templates/en/trialEndedWithoutPayment.hbs +53 -0
- package/dist/core/email/templates/en/trialEndingReminder.hbs +48 -0
- 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 +95 -0
- package/dist/core/llm/services/model.service.js.map +1 -1
- package/dist/core/llm/services/vision.llm.service.d.ts +30 -4
- package/dist/core/llm/services/vision.llm.service.d.ts.map +1 -1
- package/dist/core/llm/services/vision.llm.service.js +143 -26
- package/dist/core/llm/services/vision.llm.service.js.map +1 -1
- package/dist/core/queue/queue.module.d.ts.map +1 -1
- package/dist/core/queue/queue.module.js +3 -2
- package/dist/core/queue/queue.module.js.map +1 -1
- package/dist/foundations/auth/auth.module.d.ts.map +1 -1
- package/dist/foundations/auth/auth.module.js +13 -2
- package/dist/foundations/auth/auth.module.js.map +1 -1
- package/dist/foundations/auth/index.d.ts +1 -0
- package/dist/foundations/auth/index.d.ts.map +1 -1
- package/dist/foundations/auth/index.js +3 -1
- package/dist/foundations/auth/index.js.map +1 -1
- package/dist/foundations/auth/repositories/auth.repository.d.ts.map +1 -1
- package/dist/foundations/auth/repositories/auth.repository.js +8 -15
- package/dist/foundations/auth/repositories/auth.repository.js.map +1 -1
- package/dist/foundations/auth/services/auth.service.d.ts +5 -3
- package/dist/foundations/auth/services/auth.service.d.ts.map +1 -1
- package/dist/foundations/auth/services/auth.service.js +19 -4
- package/dist/foundations/auth/services/auth.service.js.map +1 -1
- package/dist/foundations/auth/services/trial-queue.service.d.ts +12 -0
- package/dist/foundations/auth/services/trial-queue.service.d.ts.map +1 -0
- package/dist/foundations/auth/services/trial-queue.service.js +55 -0
- package/dist/foundations/auth/services/trial-queue.service.js.map +1 -0
- package/dist/foundations/company/controllers/company.controller.d.ts +1 -3
- package/dist/foundations/company/controllers/company.controller.d.ts.map +1 -1
- package/dist/foundations/company/controllers/company.controller.js +28 -10
- package/dist/foundations/company/controllers/company.controller.js.map +1 -1
- package/dist/foundations/company/entities/company.d.ts +3 -0
- package/dist/foundations/company/entities/company.d.ts.map +1 -1
- package/dist/foundations/company/entities/company.js +3 -0
- package/dist/foundations/company/entities/company.js.map +1 -1
- 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/interfaces/company-deletion-handler.interface.d.ts +38 -0
- package/dist/foundations/company/interfaces/company-deletion-handler.interface.d.ts.map +1 -0
- package/dist/foundations/company/interfaces/company-deletion-handler.interface.js +9 -0
- package/dist/foundations/company/interfaces/company-deletion-handler.interface.js.map +1 -0
- package/dist/foundations/company/repositories/company.repository.d.ts +12 -0
- package/dist/foundations/company/repositories/company.repository.d.ts.map +1 -1
- package/dist/foundations/company/repositories/company.repository.js +65 -0
- package/dist/foundations/company/repositories/company.repository.js.map +1 -1
- package/dist/foundations/company/services/company.service.d.ts +17 -1
- package/dist/foundations/company/services/company.service.d.ts.map +1 -1
- package/dist/foundations/company/services/company.service.js +43 -2
- package/dist/foundations/company/services/company.service.js.map +1 -1
- package/dist/foundations/foundations.modules.d.ts.map +1 -1
- package/dist/foundations/foundations.modules.js +2 -0
- package/dist/foundations/foundations.modules.js.map +1 -1
- package/dist/foundations/stripe/stripe.module.d.ts +0 -1
- package/dist/foundations/stripe/stripe.module.d.ts.map +1 -1
- package/dist/foundations/stripe/stripe.module.js +0 -3
- package/dist/foundations/stripe/stripe.module.js.map +1 -1
- package/dist/foundations/stripe-price/dtos/stripe-price.dto.d.ts +2 -0
- package/dist/foundations/stripe-price/dtos/stripe-price.dto.d.ts.map +1 -1
- package/dist/foundations/stripe-price/dtos/stripe-price.dto.js +10 -0
- package/dist/foundations/stripe-price/dtos/stripe-price.dto.js.map +1 -1
- package/dist/foundations/stripe-price/entities/stripe-price.entity.d.ts +1 -0
- package/dist/foundations/stripe-price/entities/stripe-price.entity.d.ts.map +1 -1
- package/dist/foundations/stripe-price/entities/stripe-price.map.d.ts.map +1 -1
- package/dist/foundations/stripe-price/entities/stripe-price.map.js +1 -0
- package/dist/foundations/stripe-price/entities/stripe-price.map.js.map +1 -1
- package/dist/foundations/stripe-price/repositories/stripe-price.repository.d.ts +11 -0
- package/dist/foundations/stripe-price/repositories/stripe-price.repository.d.ts.map +1 -1
- package/dist/foundations/stripe-price/repositories/stripe-price.repository.js +25 -0
- package/dist/foundations/stripe-price/repositories/stripe-price.repository.js.map +1 -1
- package/dist/foundations/stripe-price/serialisers/stripe-price.serialiser.d.ts.map +1 -1
- package/dist/foundations/stripe-price/serialisers/stripe-price.serialiser.js +1 -0
- package/dist/foundations/stripe-price/serialisers/stripe-price.serialiser.js.map +1 -1
- package/dist/foundations/stripe-price/services/stripe-price-admin.service.d.ts.map +1 -1
- package/dist/foundations/stripe-price/services/stripe-price-admin.service.js +2 -0
- package/dist/foundations/stripe-price/services/stripe-price-admin.service.js.map +1 -1
- package/dist/foundations/stripe-subscription/services/stripe-subscription-admin.service.d.ts +3 -1
- package/dist/foundations/stripe-subscription/services/stripe-subscription-admin.service.d.ts.map +1 -1
- package/dist/foundations/stripe-subscription/services/stripe-subscription-admin.service.js +6 -2
- package/dist/foundations/stripe-subscription/services/stripe-subscription-admin.service.js.map +1 -1
- package/dist/foundations/stripe-subscription/services/stripe-subscription-api.service.d.ts +3 -1
- package/dist/foundations/stripe-subscription/services/stripe-subscription-api.service.d.ts.map +1 -1
- package/dist/foundations/stripe-subscription/services/stripe-subscription-api.service.js +7 -2
- package/dist/foundations/stripe-subscription/services/stripe-subscription-api.service.js.map +1 -1
- package/dist/foundations/stripe-trial/index.d.ts +3 -0
- package/dist/foundations/stripe-trial/index.d.ts.map +1 -0
- package/dist/foundations/stripe-trial/index.js +19 -0
- package/dist/foundations/stripe-trial/index.js.map +1 -0
- package/dist/foundations/stripe-trial/interfaces/trial-job.interface.d.ts +5 -0
- package/dist/foundations/stripe-trial/interfaces/trial-job.interface.d.ts.map +1 -0
- package/dist/foundations/stripe-trial/interfaces/trial-job.interface.js +3 -0
- package/dist/foundations/stripe-trial/interfaces/trial-job.interface.js.map +1 -0
- package/dist/foundations/stripe-trial/processors/trial.processor.d.ts +17 -0
- package/dist/foundations/stripe-trial/processors/trial.processor.d.ts.map +1 -0
- package/dist/foundations/stripe-trial/processors/trial.processor.js +69 -0
- package/dist/foundations/stripe-trial/processors/trial.processor.js.map +1 -0
- package/dist/foundations/stripe-trial/services/trial.service.d.ts +61 -0
- package/dist/foundations/stripe-trial/services/trial.service.d.ts.map +1 -0
- package/dist/foundations/stripe-trial/services/trial.service.js +137 -0
- package/dist/foundations/stripe-trial/services/trial.service.js.map +1 -0
- package/dist/foundations/stripe-trial/stripe-trial.module.d.ts +22 -0
- package/dist/foundations/stripe-trial/stripe-trial.module.d.ts.map +1 -0
- package/dist/foundations/stripe-trial/stripe-trial.module.js +45 -0
- package/dist/foundations/stripe-trial/stripe-trial.module.js.map +1 -0
- package/dist/foundations/stripe-webhook/processors/stripe-webhook.processor.d.ts +8 -3
- package/dist/foundations/stripe-webhook/processors/stripe-webhook.processor.d.ts.map +1 -1
- package/dist/foundations/stripe-webhook/processors/stripe-webhook.processor.js +191 -51
- package/dist/foundations/stripe-webhook/processors/stripe-webhook.processor.js.map +1 -1
- package/dist/foundations/stripe-webhook/services/stripe-webhook-notification.service.d.ts +38 -0
- package/dist/foundations/stripe-webhook/services/stripe-webhook-notification.service.d.ts.map +1 -1
- package/dist/foundations/stripe-webhook/services/stripe-webhook-notification.service.js +175 -0
- package/dist/foundations/stripe-webhook/services/stripe-webhook-notification.service.js.map +1 -1
- package/dist/foundations/stripe-webhook/stripe-webhook.module.d.ts.map +1 -1
- package/dist/foundations/stripe-webhook/stripe-webhook.module.js +2 -0
- package/dist/foundations/stripe-webhook/stripe-webhook.module.js.map +1 -1
- package/dist/foundations/tokenusage/services/tokenusage.service.d.ts +1 -0
- package/dist/foundations/tokenusage/services/tokenusage.service.d.ts.map +1 -1
- package/dist/foundations/tokenusage/services/tokenusage.service.js +4 -3
- package/dist/foundations/tokenusage/services/tokenusage.service.js.map +1 -1
- package/dist/foundations/user/repositories/user.repository.d.ts +7 -0
- package/dist/foundations/user/repositories/user.repository.d.ts.map +1 -1
- package/dist/foundations/user/repositories/user.repository.js +19 -0
- package/dist/foundations/user/repositories/user.repository.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigService } from "@nestjs/config";
|
|
2
2
|
import { ZodType } from "zod";
|
|
3
|
+
import { BaseConfigInterface } from "../../../config/interfaces";
|
|
4
|
+
import { ModelService } from "../../llm/services/model.service";
|
|
5
|
+
/**
|
|
6
|
+
* Error thrown when vision model's content moderation blocks an image analysis request.
|
|
7
|
+
* This typically happens when the image content triggers safety filters.
|
|
8
|
+
*/
|
|
9
|
+
export declare class ContentModerationError extends Error {
|
|
10
|
+
constructor(message: string);
|
|
11
|
+
}
|
|
3
12
|
/**
|
|
4
13
|
* Parameters for Vision LLM service calls
|
|
5
14
|
*/
|
|
@@ -11,9 +20,10 @@ interface VisionCallParams<T> {
|
|
|
11
20
|
}
|
|
12
21
|
export declare class VisionLLMService {
|
|
13
22
|
private readonly modelService;
|
|
23
|
+
private readonly config;
|
|
14
24
|
private readonly MAX_RETRIES;
|
|
15
25
|
private readonly INITIAL_DELAY_MS;
|
|
16
|
-
constructor(modelService: ModelService);
|
|
26
|
+
constructor(modelService: ModelService, config: ConfigService<BaseConfigInterface>);
|
|
17
27
|
/**
|
|
18
28
|
* Checks if an error is a rate limit (429) error
|
|
19
29
|
*/
|
|
@@ -31,15 +41,31 @@ export declare class VisionLLMService {
|
|
|
31
41
|
* Required because OpenRouter cannot access local/private URLs.
|
|
32
42
|
*/
|
|
33
43
|
private fetchImageAsBase64;
|
|
44
|
+
/**
|
|
45
|
+
* Checks if the configured vision model is a Gemini model.
|
|
46
|
+
* Gemini models require schema sanitization (removal of $schema, $defs, etc.)
|
|
47
|
+
*/
|
|
48
|
+
private isGeminiVisionModel;
|
|
49
|
+
/**
|
|
50
|
+
* Fallback method to call the LLM without structured output.
|
|
51
|
+
* Used when structured output parsing fails.
|
|
52
|
+
*
|
|
53
|
+
* @template T - The expected output type
|
|
54
|
+
* @param params - Call parameters
|
|
55
|
+
* @param message - The HumanMessage to send
|
|
56
|
+
* @returns Promise with parsed response and raw content
|
|
57
|
+
*/
|
|
58
|
+
private callWithoutStructuredOutput;
|
|
34
59
|
/**
|
|
35
60
|
* Calls the LLM with an image for vision analysis using structured output.
|
|
36
61
|
*
|
|
37
62
|
* This method follows the same pattern as LLMService:
|
|
38
63
|
* 1. Gets the base model from ModelService
|
|
39
|
-
* 2. Wraps it with withStructuredOutput for schema enforcement
|
|
64
|
+
* 2. Wraps it with withStructuredOutput for schema enforcement (with Gemini sanitization if needed)
|
|
40
65
|
* 3. Creates a multimodal HumanMessage with text and image
|
|
41
66
|
* 4. Invokes the structured LLM directly
|
|
42
|
-
* 5.
|
|
67
|
+
* 5. Falls back to non-structured call if parsing fails
|
|
68
|
+
* 6. Returns parsed response with token usage metadata
|
|
43
69
|
*
|
|
44
70
|
* @template T - The expected output type (inferred from outputSchema)
|
|
45
71
|
* @param params - Call parameters
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.llm.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"vision.llm.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAqB,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,UAAU,gBAAgB,CAAC,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAgCD,qBACa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAK;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;gBAGtB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAG7D;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;OAEG;YACW,SAAS;IA6BvB;;;OAGG;YACW,kBAAkB;IAahC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAM3B;;;;;;;;OAQG;YACW,2BAA2B;IA0CzC;;;;;;;;;;;;;;;;;;;OAmBG;IACG,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG;QAAE,UAAU,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CA2G3G"}
|
|
@@ -9,10 +9,23 @@ 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
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.VisionLLMService = void 0;
|
|
12
|
+
exports.VisionLLMService = exports.ContentModerationError = void 0;
|
|
13
13
|
const messages_1 = require("@langchain/core/messages");
|
|
14
14
|
const common_1 = require("@nestjs/common");
|
|
15
|
+
const config_1 = require("@nestjs/config");
|
|
15
16
|
const model_service_1 = require("../../llm/services/model.service");
|
|
17
|
+
const schema_utils_1 = require("../utils/schema.utils");
|
|
18
|
+
/**
|
|
19
|
+
* Error thrown when vision model's content moderation blocks an image analysis request.
|
|
20
|
+
* This typically happens when the image content triggers safety filters.
|
|
21
|
+
*/
|
|
22
|
+
class ContentModerationError extends Error {
|
|
23
|
+
constructor(message) {
|
|
24
|
+
super(message);
|
|
25
|
+
this.name = "ContentModerationError";
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
exports.ContentModerationError = ContentModerationError;
|
|
16
29
|
/**
|
|
17
30
|
* Type guard to validate raw response structure
|
|
18
31
|
*/
|
|
@@ -20,8 +33,9 @@ function isValidRaw(raw) {
|
|
|
20
33
|
return typeof raw === "object" && raw !== null;
|
|
21
34
|
}
|
|
22
35
|
let VisionLLMService = class VisionLLMService {
|
|
23
|
-
constructor(modelService) {
|
|
36
|
+
constructor(modelService, config) {
|
|
24
37
|
this.modelService = modelService;
|
|
38
|
+
this.config = config;
|
|
25
39
|
this.MAX_RETRIES = 5;
|
|
26
40
|
this.INITIAL_DELAY_MS = 1000;
|
|
27
41
|
}
|
|
@@ -82,15 +96,65 @@ let VisionLLMService = class VisionLLMService {
|
|
|
82
96
|
const base64 = Buffer.from(arrayBuffer).toString("base64");
|
|
83
97
|
return `data:${contentType};base64,${base64}`;
|
|
84
98
|
}
|
|
99
|
+
/**
|
|
100
|
+
* Checks if the configured vision model is a Gemini model.
|
|
101
|
+
* Gemini models require schema sanitization (removal of $schema, $defs, etc.)
|
|
102
|
+
*/
|
|
103
|
+
isGeminiVisionModel() {
|
|
104
|
+
const visionConfig = this.config.get("ai").vision;
|
|
105
|
+
const modelLower = visionConfig.model.toLowerCase();
|
|
106
|
+
return modelLower.startsWith("gemini") || modelLower.includes("/gemini");
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Fallback method to call the LLM without structured output.
|
|
110
|
+
* Used when structured output parsing fails.
|
|
111
|
+
*
|
|
112
|
+
* @template T - The expected output type
|
|
113
|
+
* @param params - Call parameters
|
|
114
|
+
* @param message - The HumanMessage to send
|
|
115
|
+
* @returns Promise with parsed response and raw content
|
|
116
|
+
*/
|
|
117
|
+
async callWithoutStructuredOutput(params, message) {
|
|
118
|
+
const baseModel = this.modelService.getVisionLLM({
|
|
119
|
+
temperature: params.temperature ?? 0.1,
|
|
120
|
+
});
|
|
121
|
+
try {
|
|
122
|
+
// Call without structured output - the model will return raw text
|
|
123
|
+
const response = await baseModel.invoke([message]);
|
|
124
|
+
const rawContent = typeof response.content === "string" ? response.content : JSON.stringify(response.content);
|
|
125
|
+
// Extract JSON from response (handle markdown code blocks)
|
|
126
|
+
const jsonMatch = rawContent.match(/```json\n?([\s\S]*?)\n?```/) || rawContent.match(/\{[\s\S]*\}/);
|
|
127
|
+
const jsonStr = jsonMatch ? jsonMatch[1] || jsonMatch[0] : rawContent;
|
|
128
|
+
// Parse and validate
|
|
129
|
+
const parsed = JSON.parse(jsonStr);
|
|
130
|
+
const validated = params.outputSchema.parse(parsed);
|
|
131
|
+
return { parsed: validated, rawContent };
|
|
132
|
+
}
|
|
133
|
+
catch (error) {
|
|
134
|
+
// Check for content moderation / safety filter errors
|
|
135
|
+
const errorStr = error instanceof Error ? error.message : String(error);
|
|
136
|
+
if (errorStr.includes("SAFETY") ||
|
|
137
|
+
errorStr.includes("blocked") ||
|
|
138
|
+
errorStr.includes("content policy") ||
|
|
139
|
+
errorStr.includes("HARM_CATEGORY") ||
|
|
140
|
+
errorStr.includes("message") // This catches the "Cannot read properties of undefined (reading 'message')" error
|
|
141
|
+
) {
|
|
142
|
+
throw new ContentModerationError(`Image may have been blocked by content moderation. Original error: ${errorStr}. ` +
|
|
143
|
+
`This typically happens when the vision model's safety filters reject the image content.`);
|
|
144
|
+
}
|
|
145
|
+
throw error;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
85
148
|
/**
|
|
86
149
|
* Calls the LLM with an image for vision analysis using structured output.
|
|
87
150
|
*
|
|
88
151
|
* This method follows the same pattern as LLMService:
|
|
89
152
|
* 1. Gets the base model from ModelService
|
|
90
|
-
* 2. Wraps it with withStructuredOutput for schema enforcement
|
|
153
|
+
* 2. Wraps it with withStructuredOutput for schema enforcement (with Gemini sanitization if needed)
|
|
91
154
|
* 3. Creates a multimodal HumanMessage with text and image
|
|
92
155
|
* 4. Invokes the structured LLM directly
|
|
93
|
-
* 5.
|
|
156
|
+
* 5. Falls back to non-structured call if parsing fails
|
|
157
|
+
* 6. Returns parsed response with token usage metadata
|
|
94
158
|
*
|
|
95
159
|
* @template T - The expected output type (inferred from outputSchema)
|
|
96
160
|
* @param params - Call parameters
|
|
@@ -102,31 +166,64 @@ let VisionLLMService = class VisionLLMService {
|
|
|
102
166
|
* @throws {Error} If LLM call fails or returns invalid structured output
|
|
103
167
|
*/
|
|
104
168
|
async call(params) {
|
|
169
|
+
// Create message first so it can be reused in fallback
|
|
170
|
+
const message = new messages_1.HumanMessage({
|
|
171
|
+
content: [
|
|
172
|
+
{
|
|
173
|
+
type: "text",
|
|
174
|
+
text: params.systemPrompt,
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
type: "image_url",
|
|
178
|
+
image_url: {
|
|
179
|
+
url: params.image,
|
|
180
|
+
},
|
|
181
|
+
},
|
|
182
|
+
],
|
|
183
|
+
});
|
|
105
184
|
try {
|
|
106
|
-
const baseModel = this.modelService.
|
|
185
|
+
const baseModel = this.modelService.getVisionLLM({
|
|
107
186
|
temperature: params.temperature ?? 0.1,
|
|
108
187
|
});
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
],
|
|
125
|
-
});
|
|
188
|
+
// Check if Gemini model needs schema sanitization (remove $schema, $defs, etc.)
|
|
189
|
+
const needsGeminiSanitization = this.isGeminiVisionModel();
|
|
190
|
+
let structuredLlm;
|
|
191
|
+
if (needsGeminiSanitization) {
|
|
192
|
+
const jsonSchema = (0, schema_utils_1.convertZodToJsonSchema)(params.outputSchema);
|
|
193
|
+
const sanitizedSchema = (0, schema_utils_1.sanitizeSchemaForGemini)(jsonSchema);
|
|
194
|
+
structuredLlm = baseModel.withStructuredOutput(sanitizedSchema, {
|
|
195
|
+
includeRaw: true,
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
structuredLlm = baseModel.withStructuredOutput(params.outputSchema, {
|
|
200
|
+
includeRaw: true,
|
|
201
|
+
});
|
|
202
|
+
}
|
|
126
203
|
const response = await this.withRetry(async () => {
|
|
127
204
|
return (await structuredLlm.invoke([message]));
|
|
128
205
|
});
|
|
129
|
-
//
|
|
206
|
+
// Handle null parsed response with fallback JSON parsing
|
|
207
|
+
if (!response.parsed) {
|
|
208
|
+
const raw = isValidRaw(response.raw) ? response.raw : undefined;
|
|
209
|
+
const rawContent = raw?.content || "";
|
|
210
|
+
if (rawContent) {
|
|
211
|
+
// Attempt manual JSON parsing
|
|
212
|
+
const jsonMatch = rawContent.match(/```json\n?([\s\S]*?)\n?```/) || rawContent.match(/\{[\s\S]*\}/);
|
|
213
|
+
const jsonStr = jsonMatch ? jsonMatch[1] || jsonMatch[0] : rawContent;
|
|
214
|
+
const parsed = JSON.parse(jsonStr);
|
|
215
|
+
const validated = params.outputSchema.parse(parsed);
|
|
216
|
+
return {
|
|
217
|
+
...validated,
|
|
218
|
+
tokenUsage: {
|
|
219
|
+
input: raw?.usage_metadata?.input_tokens ?? 0,
|
|
220
|
+
output: raw?.usage_metadata?.output_tokens ?? 0,
|
|
221
|
+
},
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
throw new Error("Structured output parsing failed and no raw content available");
|
|
225
|
+
}
|
|
226
|
+
// Success path - extract token usage with type guard
|
|
130
227
|
const raw = isValidRaw(response.raw) ? response.raw : undefined;
|
|
131
228
|
const input = raw?.usage_metadata?.input_tokens ?? 0;
|
|
132
229
|
const output = raw?.usage_metadata?.output_tokens ?? 0;
|
|
@@ -139,14 +236,34 @@ let VisionLLMService = class VisionLLMService {
|
|
|
139
236
|
};
|
|
140
237
|
}
|
|
141
238
|
catch (error) {
|
|
142
|
-
|
|
143
|
-
|
|
239
|
+
// Check if this is the structured output parsing error
|
|
240
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
241
|
+
const isParsingError = errorMessage.includes("Cannot read properties of undefined") || errorMessage.includes("map");
|
|
242
|
+
if (isParsingError) {
|
|
243
|
+
try {
|
|
244
|
+
const { parsed } = await this.withRetry(() => this.callWithoutStructuredOutput(params, message));
|
|
245
|
+
return {
|
|
246
|
+
...parsed,
|
|
247
|
+
tokenUsage: { input: 0, output: 0 }, // Token usage not available in fallback
|
|
248
|
+
};
|
|
249
|
+
}
|
|
250
|
+
catch (fallbackError) {
|
|
251
|
+
const fallbackErrorMessage = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
|
|
252
|
+
// Re-throw ContentModerationError to allow proper handling upstream
|
|
253
|
+
if (fallbackError instanceof ContentModerationError) {
|
|
254
|
+
throw fallbackError;
|
|
255
|
+
}
|
|
256
|
+
throw new Error(`Vision LLM service error: ${errorMessage}. ` + `Fallback error: ${fallbackErrorMessage}`);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
throw new Error(`Vision LLM service error: ${errorMessage}`);
|
|
144
260
|
}
|
|
145
261
|
}
|
|
146
262
|
};
|
|
147
263
|
exports.VisionLLMService = VisionLLMService;
|
|
148
264
|
exports.VisionLLMService = VisionLLMService = __decorate([
|
|
149
265
|
(0, common_1.Injectable)(),
|
|
150
|
-
__metadata("design:paramtypes", [model_service_1.ModelService
|
|
266
|
+
__metadata("design:paramtypes", [model_service_1.ModelService,
|
|
267
|
+
config_1.ConfigService])
|
|
151
268
|
], VisionLLMService);
|
|
152
269
|
//# sourceMappingURL=vision.llm.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.llm.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAwD;AACxD,2CAA4C;AAC5C,oEAAgE;
|
|
1
|
+
{"version":3,"file":"vision.llm.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.module.d.ts","sourceRoot":"","sources":["../../../src/core/queue/queue.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAkB,MAAM,gBAAgB,CAAC;AAK/D;;;;;;;;GAQG;AACH,qBAEa,WAAW;IACtB,MAAM,CAAC,OAAO,IAAI,aAAa;
|
|
1
|
+
{"version":3,"file":"queue.module.d.ts","sourceRoot":"","sources":["../../../src/core/queue/queue.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAkB,MAAM,gBAAgB,CAAC;AAK/D;;;;;;;;GAQG;AACH,qBAEa,WAAW;IACtB,MAAM,CAAC,OAAO,IAAI,aAAa;IAkD/B;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,aAAa;CA6B5D"}
|
|
@@ -44,9 +44,10 @@ let QueueModule = QueueModule_1 = class QueueModule {
|
|
|
44
44
|
};
|
|
45
45
|
},
|
|
46
46
|
}),
|
|
47
|
-
// Always register the library's
|
|
47
|
+
// Always register the library's core queues
|
|
48
48
|
bullmq_1.BullModule.registerQueue({ name: queue_id_1.QueueId.CHUNK }),
|
|
49
49
|
bullmq_1.BullModule.registerQueue({ name: queue_id_1.QueueId.COMPANY }),
|
|
50
|
+
bullmq_1.BullModule.registerQueue({ name: queue_id_1.QueueId.TRIAL }),
|
|
50
51
|
],
|
|
51
52
|
providers: [
|
|
52
53
|
// Provider that registers app-specific queues dynamically
|
|
@@ -73,7 +74,7 @@ let QueueModule = QueueModule_1 = class QueueModule {
|
|
|
73
74
|
* Use this when you need to explicitly specify which queues to register.
|
|
74
75
|
*/
|
|
75
76
|
static forRootWithQueues(queueIds) {
|
|
76
|
-
const allQueueIds = new Set([queue_id_1.QueueId.CHUNK, queue_id_1.QueueId.COMPANY, ...queueIds]);
|
|
77
|
+
const allQueueIds = new Set([queue_id_1.QueueId.CHUNK, queue_id_1.QueueId.COMPANY, queue_id_1.QueueId.TRIAL, ...queueIds]);
|
|
77
78
|
return {
|
|
78
79
|
module: QueueModule_1,
|
|
79
80
|
imports: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.module.js","sourceRoot":"","sources":["../../../src/core/queue/queue.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+D;AAC/D,2CAA6D;AAC7D,0DAAsD;AAGtD;;;;;;;;GAQG;AAGI,IAAM,WAAW,mBAAjB,MAAM,WAAW;IACtB,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE;gBACP,qBAAY;gBACZ,4CAA4C;gBAC5C,mBAAU,CAAC,YAAY,CAAC;oBACtB,OAAO,EAAE,CAAC,qBAAY,CAAC;oBACvB,MAAM,EAAE,CAAC,sBAAa,CAAC;oBACvB,UAAU,EAAE,CAAC,aAAiD,EAAE,EAAE;wBAChE,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAuB,OAAO,CAAC,CAAC;wBAC/D,OAAO;4BACL,UAAU,EAAE;gCACV,IAAI,EAAE,KAAK,EAAE,IAAI;gCACjB,IAAI,EAAE,KAAK,EAAE,IAAI;gCACjB,QAAQ,EAAE,KAAK,EAAE,QAAQ;gCACzB,QAAQ,EAAE,KAAK,EAAE,QAAQ;6BAC1B;4BACD,MAAM,EAAE,KAAK,EAAE,KAAK;yBACrB,CAAC;oBACJ,CAAC;iBACF,CAAC;gBACF,4CAA4C;gBAC5C,mBAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,kBAAO,CAAC,KAAK,EAAE,CAAC;gBACjD,mBAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,kBAAO,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"queue.module.js","sourceRoot":"","sources":["../../../src/core/queue/queue.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../../src/foundations/auth/auth.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../../src/foundations/auth/auth.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAsBtD,qBAqBa,UAAW,YAAW,YAAY;IAC7C,YAAY;CAIb"}
|
|
@@ -7,10 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.AuthModule = void 0;
|
|
10
|
+
const bullmq_1 = require("@nestjs/bullmq");
|
|
10
11
|
const common_1 = require("@nestjs/common");
|
|
11
12
|
const jwt_1 = require("@nestjs/jwt");
|
|
12
13
|
const auth_controller_1 = require("./controllers/auth.controller");
|
|
13
14
|
const registry_1 = require("../../common/registries/registry");
|
|
15
|
+
const queue_id_1 = require("../../config/enums/queue.id");
|
|
14
16
|
const company_module_1 = require("../company/company.module");
|
|
15
17
|
const discord_user_module_1 = require("../discord-user/discord-user.module");
|
|
16
18
|
const google_user_module_1 = require("../google-user/google-user.module");
|
|
@@ -25,6 +27,7 @@ const auth_discord_service_1 = require("./services/auth.discord.service");
|
|
|
25
27
|
const auth_google_service_1 = require("./services/auth.google.service");
|
|
26
28
|
const auth_service_1 = require("./services/auth.service");
|
|
27
29
|
const pending_registration_service_1 = require("./services/pending-registration.service");
|
|
30
|
+
const trial_queue_service_1 = require("./services/trial-queue.service");
|
|
28
31
|
let AuthModule = class AuthModule {
|
|
29
32
|
onModuleInit() {
|
|
30
33
|
registry_1.modelRegistry.register(auth_model_1.AuthModel);
|
|
@@ -42,9 +45,17 @@ exports.AuthModule = AuthModule = __decorate([
|
|
|
42
45
|
auth_discord_service_1.AuthDiscordService,
|
|
43
46
|
auth_google_service_1.AuthGoogleService,
|
|
44
47
|
pending_registration_service_1.PendingRegistrationService,
|
|
48
|
+
trial_queue_service_1.TrialQueueService,
|
|
49
|
+
],
|
|
50
|
+
exports: [auth_service_1.AuthService, pending_registration_service_1.PendingRegistrationService, trial_queue_service_1.TrialQueueService],
|
|
51
|
+
imports: [
|
|
52
|
+
user_module_1.UserModule,
|
|
53
|
+
jwt_1.JwtModule,
|
|
54
|
+
company_module_1.CompanyModule,
|
|
55
|
+
discord_user_module_1.DiscordUserModule,
|
|
56
|
+
google_user_module_1.GoogleUserModule,
|
|
57
|
+
bullmq_1.BullModule.registerQueue({ name: queue_id_1.QueueId.TRIAL }),
|
|
45
58
|
],
|
|
46
|
-
exports: [auth_service_1.AuthService, pending_registration_service_1.PendingRegistrationService],
|
|
47
|
-
imports: [user_module_1.UserModule, jwt_1.JwtModule, company_module_1.CompanyModule, discord_user_module_1.DiscordUserModule, google_user_module_1.GoogleUserModule],
|
|
48
59
|
})
|
|
49
60
|
], AuthModule);
|
|
50
61
|
//# sourceMappingURL=auth.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../src/foundations/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAsD;AACtD,qCAAwC;AACxC,mEAA+D;AAE/D,+DAAiE;AACjE,8DAA0D;AAC1D,6EAAwE;AACxE,0EAAqE;AACrE,qDAAiD;AACjD,mFAA8E;AAC9E,iFAA4E;AAC5E,gEAA2D;AAC3D,sDAAkD;AAClD,oEAAgE;AAChE,mEAA+D;AAC/D,0EAAqE;AACrE,wEAAmE;AACnE,0DAAsD;AACtD,0FAAqF;
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../../src/foundations/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,2CAAsD;AACtD,qCAAwC;AACxC,mEAA+D;AAE/D,+DAAiE;AACjE,0DAAsD;AACtD,8DAA0D;AAC1D,6EAAwE;AACxE,0EAAqE;AACrE,qDAAiD;AACjD,mFAA8E;AAC9E,iFAA4E;AAC5E,gEAA2D;AAC3D,sDAAkD;AAClD,oEAAgE;AAChE,mEAA+D;AAC/D,0EAAqE;AACrE,wEAAmE;AACnE,0DAAsD;AACtD,0FAAqF;AACrF,wEAAmE;AAuB5D,IAAM,UAAU,GAAhB,MAAM,UAAU;IACrB,YAAY;QACV,wBAAa,CAAC,QAAQ,CAAC,sBAAS,CAAC,CAAC;QAClC,wBAAa,CAAC,QAAQ,CAAC,+BAAa,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AALY,gCAAU;qBAAV,UAAU;IArBtB,IAAA,eAAM,EAAC;QACN,WAAW,EAAE,CAAC,gCAAc,EAAE,+CAAqB,EAAE,6CAAoB,CAAC;QAC1E,SAAS,EAAE;YACT,0BAAW;YACX,gCAAc;YACd,gCAAc;YACd,yCAAkB;YAClB,uCAAiB;YACjB,yDAA0B;YAC1B,uCAAiB;SAClB;QACD,OAAO,EAAE,CAAC,0BAAW,EAAE,yDAA0B,EAAE,uCAAiB,CAAC;QACrE,OAAO,EAAE;YACP,wBAAU;YACV,eAAS;YACT,8BAAa;YACb,uCAAiB;YACjB,qCAAgB;YAChB,mBAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,kBAAO,CAAC,KAAK,EAAE,CAAC;SAClD;KACF,CAAC;GACW,UAAU,CAKtB"}
|
|
@@ -2,4 +2,5 @@ export { AuthModule } from "./auth.module";
|
|
|
2
2
|
export { AuthController } from "./controllers/auth.controller";
|
|
3
3
|
export { authMeta } from "./entities/auth.meta";
|
|
4
4
|
export { AuthService } from "./services/auth.service";
|
|
5
|
+
export { TrialQueueService } from "./services/trial-queue.service";
|
|
5
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/foundations/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/foundations/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AuthService = exports.authMeta = exports.AuthController = exports.AuthModule = void 0;
|
|
3
|
+
exports.TrialQueueService = exports.AuthService = exports.authMeta = exports.AuthController = exports.AuthModule = void 0;
|
|
4
4
|
var auth_module_1 = require("./auth.module");
|
|
5
5
|
Object.defineProperty(exports, "AuthModule", { enumerable: true, get: function () { return auth_module_1.AuthModule; } });
|
|
6
6
|
var auth_controller_1 = require("./controllers/auth.controller");
|
|
@@ -9,4 +9,6 @@ var auth_meta_1 = require("./entities/auth.meta");
|
|
|
9
9
|
Object.defineProperty(exports, "authMeta", { enumerable: true, get: function () { return auth_meta_1.authMeta; } });
|
|
10
10
|
var auth_service_1 = require("./services/auth.service");
|
|
11
11
|
Object.defineProperty(exports, "AuthService", { enumerable: true, get: function () { return auth_service_1.AuthService; } });
|
|
12
|
+
var trial_queue_service_1 = require("./services/trial-queue.service");
|
|
13
|
+
Object.defineProperty(exports, "TrialQueueService", { enumerable: true, get: function () { return trial_queue_service_1.TrialQueueService; } });
|
|
12
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/foundations/auth/index.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAAlC,yGAAA,UAAU,OAAA;AACnB,iEAA+D;AAAtD,iHAAA,cAAc,OAAA;AACvB,kDAAgD;AAAvC,qGAAA,QAAQ,OAAA;AACjB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/foundations/auth/index.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAAlC,yGAAA,UAAU,OAAA;AACnB,iEAA+D;AAAtD,iHAAA,cAAc,OAAA;AACvB,kDAAgD;AAAvC,qGAAA,QAAQ,OAAA;AACjB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,sEAAmE;AAA1D,wHAAA,iBAAiB,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.repository.d.ts","sourceRoot":"","sources":["../../../../src/foundations/auth/repositories/auth.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAEhE,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAOvD,OAAO,EAAE,IAAI,EAAkB,MAAM,0BAA0B,CAAC;AAEhE,qBACa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBADR,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,eAAe;IAGtC,YAAY;IAUZ,YAAY,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAcvD,UAAU,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;IAevD,QAAQ,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCnD,YAAY,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAerD,aAAa,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAevD,UAAU,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3F,YAAY,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBtE,kBAAkB,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7D,cAAc,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzD,YAAY,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvD,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.repository.d.ts","sourceRoot":"","sources":["../../../../src/foundations/auth/repositories/auth.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -200,21 +200,14 @@ let AuthRepository = class AuthRepository {
|
|
|
200
200
|
CREATE (auth:Auth {id: $authId, token: $token, expiration: $expiration, createdAt: datetime(), updatedAt: datetime()})
|
|
201
201
|
CREATE (auth_user)-[:HAS_AUTH]->(auth)
|
|
202
202
|
|
|
203
|
-
|
|
204
|
-
MATCH (auth_${user_1.userMeta.nodeName}_${company_1.companyMeta.nodeName}_${feature_meta_1.featureMeta.nodeName}:${feature_meta_1.featureMeta.labelName})
|
|
205
|
-
WHERE auth_${user_1.userMeta.nodeName}_${company_1.companyMeta.nodeName}_${feature_meta_1.featureMeta.nodeName}.isCore = true
|
|
206
|
-
OR EXISTS {((auth_${user_1.userMeta.nodeName}_${company_1.companyMeta.nodeName})-[:HAS_FEATURE]->(auth_${user_1.userMeta.nodeName}_${company_1.companyMeta.nodeName}_${feature_meta_1.featureMeta.nodeName}))}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
WITH auth, auth_user, auth_user_company, auth_${user_1.userMeta.nodeName}_${company_1.companyMeta.nodeName}_${feature_meta_1.featureMeta.nodeName}
|
|
203
|
+
WITH auth, auth_user
|
|
211
204
|
OPTIONAL MATCH (auth_user)-[:MEMBER_OF]->(auth_user_role:Role)
|
|
212
205
|
OPTIONAL MATCH (auth_user_role)-[perm:HAS_PERMISSIONS]->(module:Module)
|
|
213
|
-
WITH auth, auth_user,
|
|
206
|
+
WITH auth, auth_user, auth_user_role, module, apoc.convert.fromJsonList(module.permissions) AS modPerms, collect(perm) AS rolePerms
|
|
214
207
|
|
|
215
|
-
WITH auth, auth_user,
|
|
208
|
+
WITH auth, auth_user, auth_user_role, module, apoc.convert.fromJsonList(module.permissions) AS modPerms
|
|
216
209
|
|
|
217
|
-
WITH auth, auth_user,
|
|
210
|
+
WITH auth, auth_user, auth_user_role, module,
|
|
218
211
|
CASE
|
|
219
212
|
WHEN head([p IN modPerms WHERE p.type = "create"]) IS NULL THEN false
|
|
220
213
|
ELSE head([p IN modPerms WHERE p.type = "create"]).value
|
|
@@ -233,18 +226,18 @@ CASE
|
|
|
233
226
|
END AS defaultDelete
|
|
234
227
|
|
|
235
228
|
OPTIONAL MATCH (auth_user_role)-[perm:HAS_PERMISSIONS]->(module)
|
|
236
|
-
WITH auth, auth_user,
|
|
229
|
+
WITH auth, auth_user, auth_user_role, module, defaultCreate, defaultRead, defaultUpdate, defaultDelete, collect(perm) AS rolePerms
|
|
237
230
|
|
|
238
|
-
WITH auth, auth_user,
|
|
231
|
+
WITH auth, auth_user, auth_user_role, module, defaultCreate, defaultRead, defaultUpdate, defaultDelete, apoc.coll.flatten([p IN rolePerms | apoc.convert.fromJsonList(p.permissions)]) AS rolePermsParsed
|
|
239
232
|
|
|
240
|
-
WITH auth, auth_user,
|
|
233
|
+
WITH auth, auth_user, auth_user_role, module,
|
|
241
234
|
defaultCreate, defaultRead, defaultUpdate, defaultDelete, rolePermsParsed,
|
|
242
235
|
[defaultCreate] + [r IN rolePermsParsed WHERE r.type="create" | r.value] AS createValues,
|
|
243
236
|
[defaultRead] + [r IN rolePermsParsed WHERE r.type="read" | r.value] AS readValues,
|
|
244
237
|
[defaultUpdate] + [r IN rolePermsParsed WHERE r.type="update" | r.value] AS updateValues,
|
|
245
238
|
[defaultDelete] + [r IN rolePermsParsed WHERE r.type="delete" | r.value] AS deleteValues
|
|
246
239
|
|
|
247
|
-
WITH auth, auth_user,
|
|
240
|
+
WITH auth, auth_user, auth_user_role, module,
|
|
248
241
|
CASE
|
|
249
242
|
WHEN any(x IN createValues WHERE x = true) THEN true
|
|
250
243
|
WHEN any(x IN createValues WHERE x <> true AND x <> false) THEN head([x IN createValues WHERE x <> true AND x <> false])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.repository.js","sourceRoot":"","sources":["../../../../src/foundations/auth/repositories/auth.repository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.repository.js","sourceRoot":"","sources":["../../../../src/foundations/auth/repositories/auth.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,13 @@ import { AuthCode } from "../../auth/entities/auth.code.entity";
|
|
|
13
13
|
import { Auth } from "../../auth/entities/auth.entity";
|
|
14
14
|
import { AuthRepository } from "../../auth/repositories/auth.repository";
|
|
15
15
|
import { CompanyRepository } from "../../company/repositories/company.repository";
|
|
16
|
+
import { DiscordUserService } from "../../discord-user/services/discord-user.service";
|
|
17
|
+
import { GoogleUserService } from "../../google-user/services/google-user.service";
|
|
16
18
|
import { User } from "../../user/entities/user";
|
|
17
19
|
import { UserRepository } from "../../user/repositories/user.repository";
|
|
18
20
|
import { UserService } from "../../user/services/user.service";
|
|
19
21
|
import { PendingRegistrationService } from "./pending-registration.service";
|
|
20
|
-
import {
|
|
21
|
-
import { GoogleUserService } from "../../google-user/services/google-user.service";
|
|
22
|
+
import { TrialQueueService } from "./trial-queue.service";
|
|
22
23
|
export declare class AuthService {
|
|
23
24
|
private readonly builder;
|
|
24
25
|
private readonly repository;
|
|
@@ -34,7 +35,8 @@ export declare class AuthService {
|
|
|
34
35
|
private readonly pendingRegistrationService;
|
|
35
36
|
private readonly discordUserService;
|
|
36
37
|
private readonly googleUserService;
|
|
37
|
-
|
|
38
|
+
private readonly trialQueueService;
|
|
39
|
+
constructor(builder: JsonApiService, repository: AuthRepository, userService: UserService, users: UserRepository, companyRepository: CompanyRepository, emailService: EmailService, security: SecurityService, clsService: ClsService, neo4j: Neo4jService, moduleRef: ModuleRef, configService: ConfigService<BaseConfigInterface>, pendingRegistrationService: PendingRegistrationService, discordUserService: DiscordUserService, googleUserService: GoogleUserService, trialQueueService: TrialQueueService);
|
|
38
40
|
private get appConfig();
|
|
39
41
|
private get authConfig();
|
|
40
42
|
findCurrentAuth(): Promise<JsonApiDataInterface>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/auth/services/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAA+B,eAAe,EAAE,MAAM,kDAAkD,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAA2C,MAAM,4BAA4B,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/auth/services/auth.service.ts"],"names":[],"mappings":"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"}
|