@memberjunction/server 2.111.0 → 2.112.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/skip-agent.d.ts +4 -4
- package/dist/agents/skip-agent.d.ts.map +1 -1
- package/dist/agents/skip-agent.js +808 -951
- package/dist/agents/skip-agent.js.map +1 -1
- package/dist/agents/skip-sdk.d.ts +1 -1
- package/dist/agents/skip-sdk.d.ts.map +1 -1
- package/dist/agents/skip-sdk.js +53 -43
- package/dist/agents/skip-sdk.js.map +1 -1
- package/dist/apolloServer/index.js +1 -1
- package/dist/auth/AuthProviderFactory.d.ts +1 -1
- package/dist/auth/AuthProviderFactory.d.ts.map +1 -1
- package/dist/auth/AuthProviderFactory.js +1 -3
- package/dist/auth/AuthProviderFactory.js.map +1 -1
- package/dist/auth/BaseAuthProvider.d.ts +1 -1
- package/dist/auth/BaseAuthProvider.d.ts.map +1 -1
- package/dist/auth/BaseAuthProvider.js +3 -2
- package/dist/auth/BaseAuthProvider.js.map +1 -1
- package/dist/auth/IAuthProvider.d.ts +1 -1
- package/dist/auth/IAuthProvider.d.ts.map +1 -1
- package/dist/auth/exampleNewUserSubClass.d.ts.map +1 -1
- package/dist/auth/exampleNewUserSubClass.js +1 -1
- package/dist/auth/exampleNewUserSubClass.js.map +1 -1
- package/dist/auth/index.d.ts +1 -1
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +6 -6
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/initializeProviders.js +1 -1
- package/dist/auth/initializeProviders.js.map +1 -1
- package/dist/auth/newUsers.d.ts +1 -1
- package/dist/auth/newUsers.d.ts.map +1 -1
- package/dist/auth/newUsers.js +7 -7
- package/dist/auth/newUsers.js.map +1 -1
- package/dist/auth/providers/Auth0Provider.d.ts +1 -1
- package/dist/auth/providers/Auth0Provider.d.ts.map +1 -1
- package/dist/auth/providers/Auth0Provider.js +1 -1
- package/dist/auth/providers/Auth0Provider.js.map +1 -1
- package/dist/auth/providers/CognitoProvider.d.ts +1 -1
- package/dist/auth/providers/CognitoProvider.d.ts.map +1 -1
- package/dist/auth/providers/CognitoProvider.js +3 -6
- package/dist/auth/providers/CognitoProvider.js.map +1 -1
- package/dist/auth/providers/GoogleProvider.d.ts +1 -1
- package/dist/auth/providers/GoogleProvider.d.ts.map +1 -1
- package/dist/auth/providers/GoogleProvider.js +1 -1
- package/dist/auth/providers/GoogleProvider.js.map +1 -1
- package/dist/auth/providers/MSALProvider.d.ts +1 -1
- package/dist/auth/providers/MSALProvider.d.ts.map +1 -1
- package/dist/auth/providers/MSALProvider.js +1 -1
- package/dist/auth/providers/MSALProvider.js.map +1 -1
- package/dist/auth/providers/OktaProvider.d.ts +1 -1
- package/dist/auth/providers/OktaProvider.d.ts.map +1 -1
- package/dist/auth/providers/OktaProvider.js +1 -1
- package/dist/auth/providers/OktaProvider.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +22 -10
- package/dist/config.js.map +1 -1
- package/dist/context.d.ts +1 -1
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +9 -7
- package/dist/context.js.map +1 -1
- package/dist/entitySubclasses/entityPermissions.server.d.ts +1 -1
- package/dist/entitySubclasses/entityPermissions.server.d.ts.map +1 -1
- package/dist/entitySubclasses/entityPermissions.server.js +1 -1
- package/dist/entitySubclasses/entityPermissions.server.js.map +1 -1
- package/dist/generated/generated.d.ts +648 -648
- package/dist/generated/generated.d.ts.map +1 -1
- package/dist/generated/generated.js +2986 -1133
- package/dist/generated/generated.js.map +1 -1
- package/dist/generic/KeyInputOutputTypes.d.ts +1 -1
- package/dist/generic/KeyInputOutputTypes.d.ts.map +1 -1
- package/dist/generic/KeyInputOutputTypes.js +1 -1
- package/dist/generic/KeyInputOutputTypes.js.map +1 -1
- package/dist/generic/ResolverBase.d.ts +1 -1
- package/dist/generic/ResolverBase.d.ts.map +1 -1
- package/dist/generic/ResolverBase.js +15 -10
- package/dist/generic/ResolverBase.js.map +1 -1
- package/dist/generic/RunViewResolver.d.ts +1 -1
- package/dist/generic/RunViewResolver.d.ts.map +1 -1
- package/dist/generic/RunViewResolver.js +15 -15
- package/dist/generic/RunViewResolver.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +18 -9
- package/dist/index.js.map +1 -1
- package/dist/resolvers/ActionResolver.d.ts +2 -2
- package/dist/resolvers/ActionResolver.d.ts.map +1 -1
- package/dist/resolvers/ActionResolver.js +28 -30
- package/dist/resolvers/ActionResolver.js.map +1 -1
- package/dist/resolvers/AskSkipResolver.d.ts +2 -2
- package/dist/resolvers/AskSkipResolver.d.ts.map +1 -1
- package/dist/resolvers/AskSkipResolver.js +60 -50
- package/dist/resolvers/AskSkipResolver.js.map +1 -1
- package/dist/resolvers/ComponentRegistryResolver.d.ts.map +1 -1
- package/dist/resolvers/ComponentRegistryResolver.js +36 -38
- package/dist/resolvers/ComponentRegistryResolver.js.map +1 -1
- package/dist/resolvers/CreateQueryResolver.d.ts +1 -1
- package/dist/resolvers/CreateQueryResolver.d.ts.map +1 -1
- package/dist/resolvers/CreateQueryResolver.js +43 -40
- package/dist/resolvers/CreateQueryResolver.js.map +1 -1
- package/dist/resolvers/DatasetResolver.d.ts.map +1 -1
- package/dist/resolvers/DatasetResolver.js +1 -1
- package/dist/resolvers/DatasetResolver.js.map +1 -1
- package/dist/resolvers/EntityRecordNameResolver.d.ts +1 -1
- package/dist/resolvers/EntityRecordNameResolver.d.ts.map +1 -1
- package/dist/resolvers/EntityRecordNameResolver.js +1 -1
- package/dist/resolvers/EntityRecordNameResolver.js.map +1 -1
- package/dist/resolvers/EntityResolver.d.ts.map +1 -1
- package/dist/resolvers/EntityResolver.js +1 -1
- package/dist/resolvers/EntityResolver.js.map +1 -1
- package/dist/resolvers/FileCategoryResolver.js +1 -1
- package/dist/resolvers/FileCategoryResolver.js.map +1 -1
- package/dist/resolvers/FileResolver.js +1 -1
- package/dist/resolvers/FileResolver.js.map +1 -1
- package/dist/resolvers/GetDataContextDataResolver.d.ts +1 -1
- package/dist/resolvers/GetDataContextDataResolver.d.ts.map +1 -1
- package/dist/resolvers/GetDataContextDataResolver.js +5 -5
- package/dist/resolvers/GetDataContextDataResolver.js.map +1 -1
- package/dist/resolvers/GetDataResolver.d.ts.map +1 -1
- package/dist/resolvers/GetDataResolver.js +8 -6
- package/dist/resolvers/GetDataResolver.js.map +1 -1
- package/dist/resolvers/MergeRecordsResolver.d.ts +3 -3
- package/dist/resolvers/MergeRecordsResolver.d.ts.map +1 -1
- package/dist/resolvers/MergeRecordsResolver.js +3 -3
- package/dist/resolvers/MergeRecordsResolver.js.map +1 -1
- package/dist/resolvers/PotentialDuplicateRecordResolver.d.ts +1 -1
- package/dist/resolvers/PotentialDuplicateRecordResolver.d.ts.map +1 -1
- package/dist/resolvers/PotentialDuplicateRecordResolver.js +1 -1
- package/dist/resolvers/PotentialDuplicateRecordResolver.js.map +1 -1
- package/dist/resolvers/QueryResolver.d.ts.map +1 -1
- package/dist/resolvers/QueryResolver.js +11 -11
- package/dist/resolvers/QueryResolver.js.map +1 -1
- package/dist/resolvers/ReportResolver.js +1 -1
- package/dist/resolvers/ReportResolver.js.map +1 -1
- package/dist/resolvers/RunAIAgentResolver.d.ts.map +1 -1
- package/dist/resolvers/RunAIAgentResolver.js +27 -28
- package/dist/resolvers/RunAIAgentResolver.js.map +1 -1
- package/dist/resolvers/RunAIPromptResolver.d.ts.map +1 -1
- package/dist/resolvers/RunAIPromptResolver.js +31 -31
- package/dist/resolvers/RunAIPromptResolver.js.map +1 -1
- package/dist/resolvers/RunTemplateResolver.d.ts.map +1 -1
- package/dist/resolvers/RunTemplateResolver.js +9 -9
- package/dist/resolvers/RunTemplateResolver.js.map +1 -1
- package/dist/resolvers/SqlLoggingConfigResolver.d.ts.map +1 -1
- package/dist/resolvers/SqlLoggingConfigResolver.js +10 -10
- package/dist/resolvers/SqlLoggingConfigResolver.js.map +1 -1
- package/dist/resolvers/SyncDataResolver.d.ts +1 -1
- package/dist/resolvers/SyncDataResolver.d.ts.map +1 -1
- package/dist/resolvers/SyncDataResolver.js +15 -14
- package/dist/resolvers/SyncDataResolver.js.map +1 -1
- package/dist/resolvers/SyncRolesUsersResolver.d.ts +1 -1
- package/dist/resolvers/SyncRolesUsersResolver.d.ts.map +1 -1
- package/dist/resolvers/SyncRolesUsersResolver.js +48 -44
- package/dist/resolvers/SyncRolesUsersResolver.js.map +1 -1
- package/dist/resolvers/TaskResolver.d.ts.map +1 -1
- package/dist/resolvers/TaskResolver.js +7 -7
- package/dist/resolvers/TaskResolver.js.map +1 -1
- package/dist/resolvers/TransactionGroupResolver.d.ts +1 -1
- package/dist/resolvers/TransactionGroupResolver.d.ts.map +1 -1
- package/dist/resolvers/TransactionGroupResolver.js +12 -12
- package/dist/resolvers/TransactionGroupResolver.js.map +1 -1
- package/dist/resolvers/UserFavoriteResolver.d.ts +1 -1
- package/dist/resolvers/UserFavoriteResolver.d.ts.map +1 -1
- package/dist/resolvers/UserFavoriteResolver.js +1 -1
- package/dist/resolvers/UserFavoriteResolver.js.map +1 -1
- package/dist/resolvers/UserViewResolver.d.ts.map +1 -1
- package/dist/resolvers/UserViewResolver.js.map +1 -1
- package/dist/rest/EntityCRUDHandler.d.ts +1 -1
- package/dist/rest/EntityCRUDHandler.d.ts.map +1 -1
- package/dist/rest/EntityCRUDHandler.js +14 -16
- package/dist/rest/EntityCRUDHandler.js.map +1 -1
- package/dist/rest/RESTEndpointHandler.d.ts.map +1 -1
- package/dist/rest/RESTEndpointHandler.js +23 -25
- package/dist/rest/RESTEndpointHandler.js.map +1 -1
- package/dist/rest/ViewOperationsHandler.d.ts +1 -1
- package/dist/rest/ViewOperationsHandler.d.ts.map +1 -1
- package/dist/rest/ViewOperationsHandler.js +17 -21
- package/dist/rest/ViewOperationsHandler.js.map +1 -1
- package/dist/scheduler/LearningCycleScheduler.d.ts.map +1 -1
- package/dist/scheduler/LearningCycleScheduler.js.map +1 -1
- package/dist/services/ScheduledJobsService.d.ts.map +1 -1
- package/dist/services/ScheduledJobsService.js +4 -6
- package/dist/services/ScheduledJobsService.js.map +1 -1
- package/dist/services/TaskOrchestrator.d.ts +1 -1
- package/dist/services/TaskOrchestrator.d.ts.map +1 -1
- package/dist/services/TaskOrchestrator.js +30 -30
- package/dist/services/TaskOrchestrator.js.map +1 -1
- package/dist/types.d.ts +3 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +0 -1
- package/dist/types.js.map +1 -1
- package/dist/util.d.ts +1 -1
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +2 -2
- package/dist/util.js.map +1 -1
- package/package.json +36 -37
- package/src/agents/skip-agent.ts +1067 -1200
- package/src/agents/skip-sdk.ts +877 -851
- package/src/apolloServer/index.ts +2 -2
- package/src/auth/AuthProviderFactory.ts +8 -14
- package/src/auth/BaseAuthProvider.ts +5 -4
- package/src/auth/IAuthProvider.ts +2 -2
- package/src/auth/exampleNewUserSubClass.ts +9 -2
- package/src/auth/index.ts +31 -26
- package/src/auth/initializeProviders.ts +3 -3
- package/src/auth/newUsers.ts +166 -134
- package/src/auth/providers/Auth0Provider.ts +5 -5
- package/src/auth/providers/CognitoProvider.ts +7 -10
- package/src/auth/providers/GoogleProvider.ts +4 -5
- package/src/auth/providers/MSALProvider.ts +5 -5
- package/src/auth/providers/OktaProvider.ts +6 -7
- package/src/config.ts +63 -54
- package/src/context.ts +42 -30
- package/src/entitySubclasses/entityPermissions.server.ts +3 -3
- package/src/generated/generated.ts +48130 -39930
- package/src/generic/KeyInputOutputTypes.ts +3 -6
- package/src/generic/ResolverBase.ts +119 -78
- package/src/generic/RunViewResolver.ts +27 -23
- package/src/index.ts +66 -42
- package/src/resolvers/ActionResolver.ts +46 -57
- package/src/resolvers/AskSkipResolver.ts +607 -533
- package/src/resolvers/ComponentRegistryResolver.ts +547 -562
- package/src/resolvers/CreateQueryResolver.ts +683 -655
- package/src/resolvers/DatasetResolver.ts +5 -6
- package/src/resolvers/EntityCommunicationsResolver.ts +1 -1
- package/src/resolvers/EntityRecordNameResolver.ts +9 -5
- package/src/resolvers/EntityResolver.ts +9 -7
- package/src/resolvers/FileCategoryResolver.ts +2 -2
- package/src/resolvers/FileResolver.ts +4 -4
- package/src/resolvers/GetDataContextDataResolver.ts +106 -118
- package/src/resolvers/GetDataResolver.ts +194 -205
- package/src/resolvers/MergeRecordsResolver.ts +5 -5
- package/src/resolvers/PotentialDuplicateRecordResolver.ts +1 -1
- package/src/resolvers/QueryResolver.ts +95 -78
- package/src/resolvers/ReportResolver.ts +2 -2
- package/src/resolvers/RunAIAgentResolver.ts +818 -828
- package/src/resolvers/RunAIPromptResolver.ts +693 -709
- package/src/resolvers/RunTemplateResolver.ts +105 -103
- package/src/resolvers/SqlLoggingConfigResolver.ts +69 -72
- package/src/resolvers/SyncDataResolver.ts +386 -352
- package/src/resolvers/SyncRolesUsersResolver.ts +387 -350
- package/src/resolvers/TaskResolver.ts +110 -115
- package/src/resolvers/TransactionGroupResolver.ts +143 -138
- package/src/resolvers/UserFavoriteResolver.ts +17 -8
- package/src/resolvers/UserViewResolver.ts +17 -12
- package/src/rest/EntityCRUDHandler.ts +291 -268
- package/src/rest/RESTEndpointHandler.ts +782 -776
- package/src/rest/ViewOperationsHandler.ts +191 -195
- package/src/scheduler/LearningCycleScheduler.ts +8 -52
- package/src/services/ScheduledJobsService.ts +129 -132
- package/src/services/TaskOrchestrator.ts +792 -776
- package/src/types.ts +15 -9
- package/src/util.ts +112 -109
|
@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
};
|
|
13
13
|
var AskSkipResolver_1;
|
|
14
14
|
import { Arg, Ctx, Field, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
|
|
15
|
-
import { LogError, LogStatus, Metadata, RunView, CompositeKey } from '@memberjunction/
|
|
15
|
+
import { LogError, LogStatus, Metadata, RunView, CompositeKey, } from '@memberjunction/global';
|
|
16
16
|
import { BehaviorSubject } from 'rxjs';
|
|
17
17
|
import { take } from 'rxjs/operators';
|
|
18
18
|
import { UserCache } from '@memberjunction/sqlserver-dataprovider';
|
|
@@ -20,7 +20,7 @@ import { DataContext } from '@memberjunction/data-context';
|
|
|
20
20
|
import { LoadDataContextItemsServer } from '@memberjunction/data-context-server';
|
|
21
21
|
LoadDataContextItemsServer();
|
|
22
22
|
import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';
|
|
23
|
-
import { apiKey as callbackAPIKey, baseUrl, publicUrl, configInfo, graphqlPort, graphqlRootPath } from '../config.js';
|
|
23
|
+
import { apiKey as callbackAPIKey, baseUrl, publicUrl, configInfo, graphqlPort, graphqlRootPath, } from '../config.js';
|
|
24
24
|
import mssql from 'mssql';
|
|
25
25
|
import { registerEnumType } from 'type-graphql';
|
|
26
26
|
import { MJGlobal, CopyScalarsAndArrays } from '@memberjunction/global';
|
|
@@ -60,7 +60,7 @@ class ActiveConversationStreams {
|
|
|
60
60
|
lastStatus: status,
|
|
61
61
|
lastUpdate: now,
|
|
62
62
|
startTime: now,
|
|
63
|
-
sessionIds: sessionId ? new Set([sessionId]) : new Set()
|
|
63
|
+
sessionIds: sessionId ? new Set([sessionId]) : new Set(),
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
}
|
|
@@ -83,7 +83,7 @@ class ActiveConversationStreams {
|
|
|
83
83
|
lastStatus: 'Processing...',
|
|
84
84
|
lastUpdate: now,
|
|
85
85
|
startTime: now,
|
|
86
|
-
sessionIds: new Set([sessionId])
|
|
86
|
+
sessionIds: new Set([sessionId]),
|
|
87
87
|
});
|
|
88
88
|
}
|
|
89
89
|
}
|
|
@@ -110,7 +110,7 @@ class ActiveConversationStreams {
|
|
|
110
110
|
staleConversations.push(conversationId);
|
|
111
111
|
}
|
|
112
112
|
});
|
|
113
|
-
staleConversations.forEach(conversationId => {
|
|
113
|
+
staleConversations.forEach((conversationId) => {
|
|
114
114
|
this.streams.delete(conversationId);
|
|
115
115
|
LogStatus(`Cleaned up stale stream for conversation ${conversationId}`);
|
|
116
116
|
});
|
|
@@ -418,7 +418,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
418
418
|
userEmail: contextUser.Email,
|
|
419
419
|
userName: contextUser.Name,
|
|
420
420
|
userID: contextUser.ID,
|
|
421
|
-
...additionalTokenInfo
|
|
421
|
+
...additionalTokenInfo,
|
|
422
422
|
};
|
|
423
423
|
accessToken = registerAccessToken(undefined, 1000 * 60 * 10, tokenInfo);
|
|
424
424
|
}
|
|
@@ -433,9 +433,9 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
433
433
|
organizationID: skipConfigInfo.orgID,
|
|
434
434
|
organizationInfo: configInfo?.askSkip?.organizationInfo,
|
|
435
435
|
apiKeys: this.buildSkipAPIKeys(),
|
|
436
|
-
callingServerURL: accessToken ?
|
|
436
|
+
callingServerURL: accessToken ? publicUrl || `${baseUrl}:${graphqlPort}${graphqlRootPath}` : undefined,
|
|
437
437
|
callingServerAPIKey: accessToken ? callbackAPIKey : undefined,
|
|
438
|
-
callingServerAccessToken: accessToken ? accessToken.Token : undefined
|
|
438
|
+
callingServerAccessToken: accessToken ? accessToken.Token : undefined,
|
|
439
439
|
};
|
|
440
440
|
}
|
|
441
441
|
async buildSkipLearningAPIRequest(learningCycleId, lastLearningCycleDate, includeEntities, includeQueries, includeNotes, includeRequests, dataSource, contextUser, forceEntitiesRefresh = false, includeCallBackKeyAndAccessToken = false) {
|
|
@@ -452,7 +452,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
452
452
|
notes: baseRequest.notes,
|
|
453
453
|
noteTypes: baseRequest.noteTypes,
|
|
454
454
|
requests: baseRequest.requests,
|
|
455
|
-
apiKeys: baseRequest.apiKeys
|
|
455
|
+
apiKeys: baseRequest.apiKeys,
|
|
456
456
|
};
|
|
457
457
|
return input;
|
|
458
458
|
}
|
|
@@ -476,7 +476,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
476
476
|
description: c.Description,
|
|
477
477
|
messages: await this.LoadConversationDetailsIntoSkipMessages(dataSource, c.ID),
|
|
478
478
|
createdAt: c.__mj_CreatedAt,
|
|
479
|
-
updatedAt: c.__mj_UpdatedAt
|
|
479
|
+
updatedAt: c.__mj_UpdatedAt,
|
|
480
480
|
};
|
|
481
481
|
}));
|
|
482
482
|
}
|
|
@@ -547,7 +547,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
547
547
|
conversationID: conversationId.toString(),
|
|
548
548
|
dataContext: CopyScalarsAndArrays(dataContext),
|
|
549
549
|
requestPhase,
|
|
550
|
-
artifacts: artifacts
|
|
550
|
+
artifacts: artifacts,
|
|
551
551
|
};
|
|
552
552
|
return input;
|
|
553
553
|
}
|
|
@@ -557,19 +557,19 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
557
557
|
const rv = new RunView();
|
|
558
558
|
const results = await rv.RunViews([
|
|
559
559
|
{
|
|
560
|
-
EntityName:
|
|
560
|
+
EntityName: 'MJ: Conversation Artifacts',
|
|
561
561
|
ExtraFilter: `ConversationID='${conversationId}'`,
|
|
562
|
-
OrderBy:
|
|
562
|
+
OrderBy: '__mj_CreatedAt',
|
|
563
563
|
},
|
|
564
564
|
{
|
|
565
|
-
EntityName:
|
|
566
|
-
OrderBy:
|
|
565
|
+
EntityName: 'MJ: Artifact Types',
|
|
566
|
+
OrderBy: 'Name',
|
|
567
567
|
},
|
|
568
568
|
{
|
|
569
|
-
EntityName:
|
|
569
|
+
EntityName: 'MJ: Conversation Artifact Versions',
|
|
570
570
|
ExtraFilter: `ConversationArtifactID IN (SELECT ID FROM [${ei.SchemaName}].[${ei.BaseView}] WHERE ConversationID='${conversationId}')`,
|
|
571
|
-
OrderBy: 'ConversationArtifactID, __mj_CreatedAt'
|
|
572
|
-
}
|
|
571
|
+
OrderBy: 'ConversationArtifactID, __mj_CreatedAt',
|
|
572
|
+
},
|
|
573
573
|
], contextUser);
|
|
574
574
|
if (results && results.length > 0 && results.every((r) => r.Success)) {
|
|
575
575
|
const types = results[1].Results.map((a) => {
|
|
@@ -580,13 +580,13 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
580
580
|
contentType: a.ContentType,
|
|
581
581
|
enabled: a.IsEnabled,
|
|
582
582
|
createdAt: a.__mj_CreatedAt,
|
|
583
|
-
updatedAt: a.__mj_UpdatedAt
|
|
583
|
+
updatedAt: a.__mj_UpdatedAt,
|
|
584
584
|
};
|
|
585
585
|
return retVal;
|
|
586
586
|
});
|
|
587
587
|
const allConvoArtifacts = results[0].Results.map((a) => {
|
|
588
588
|
const rawVersions = results[2].Results;
|
|
589
|
-
const thisArtifactsVersions = rawVersions.filter(rv => rv.ConversationArtifactID === a.ID);
|
|
589
|
+
const thisArtifactsVersions = rawVersions.filter((rv) => rv.ConversationArtifactID === a.ID);
|
|
590
590
|
const versionsForThisArtifact = thisArtifactsVersions.map((v) => {
|
|
591
591
|
const versionRetVal = {
|
|
592
592
|
id: v.ID,
|
|
@@ -596,7 +596,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
596
596
|
content: v.Content,
|
|
597
597
|
comments: v.Comments,
|
|
598
598
|
createdAt: v.__mj_CreatedAt,
|
|
599
|
-
updatedAt: v.__mj_UpdatedAt
|
|
599
|
+
updatedAt: v.__mj_UpdatedAt,
|
|
600
600
|
};
|
|
601
601
|
return versionRetVal;
|
|
602
602
|
});
|
|
@@ -608,9 +608,9 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
608
608
|
sharingScope: a.SharingScope,
|
|
609
609
|
versions: versionsForThisArtifact,
|
|
610
610
|
conversationId: a.ConversationID,
|
|
611
|
-
artifactType: types.find((t => t.id === a.ArtifactTypeID)
|
|
611
|
+
artifactType: types.find((t) => t.id === a.ArtifactTypeID),
|
|
612
612
|
createdAt: a.__mj_CreatedAt,
|
|
613
|
-
updatedAt: a.__mj_UpdatedAt
|
|
613
|
+
updatedAt: a.__mj_UpdatedAt,
|
|
614
614
|
};
|
|
615
615
|
return artifactRetVal;
|
|
616
616
|
});
|
|
@@ -626,7 +626,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
626
626
|
throw new Error(`User ${userPayload.email} not found in UserCache`);
|
|
627
627
|
const dataContext = new DataContext();
|
|
628
628
|
await dataContext.Load(DataContextId, dataSource, true, false, 0, user);
|
|
629
|
-
const input = await this.buildSkipChatAPIRequest([], '', dataContext, 'run_existing_script', false, false, false, false, user, dataSource, false, false);
|
|
629
|
+
const input = (await this.buildSkipChatAPIRequest([], '', dataContext, 'run_existing_script', false, false, false, false, user, dataSource, false, false));
|
|
630
630
|
input.scriptText = ScriptText;
|
|
631
631
|
return this.handleSimpleSkipChatPostRequest(input, undefined, undefined, undefined, userPayload.userRecord, userPayload);
|
|
632
632
|
}
|
|
@@ -692,13 +692,13 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
692
692
|
pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
|
|
693
693
|
pushStatusUpdates: {
|
|
694
694
|
message: JSON.stringify(statusMessage),
|
|
695
|
-
sessionId: userPayload.sessionId
|
|
696
|
-
}
|
|
695
|
+
sessionId: userPayload.sessionId,
|
|
696
|
+
},
|
|
697
697
|
});
|
|
698
698
|
LogStatus(`Re-attached session ${userPayload.sessionId} to active stream for conversation ${ConversationId}, last status: ${lastStatusMessage}`);
|
|
699
699
|
return {
|
|
700
700
|
lastStatusMessage,
|
|
701
|
-
startTime: startTime || convoEntity.__mj_UpdatedAt
|
|
701
|
+
startTime: startTime || convoEntity.__mj_UpdatedAt,
|
|
702
702
|
};
|
|
703
703
|
}
|
|
704
704
|
else {
|
|
@@ -712,13 +712,13 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
712
712
|
pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
|
|
713
713
|
pushStatusUpdates: {
|
|
714
714
|
message: JSON.stringify(statusMessage),
|
|
715
|
-
sessionId: userPayload.sessionId
|
|
716
|
-
}
|
|
715
|
+
sessionId: userPayload.sessionId,
|
|
716
|
+
},
|
|
717
717
|
});
|
|
718
718
|
LogStatus(`Re-attached session ${userPayload.sessionId} to conversation ${ConversationId}, but stream is inactive`);
|
|
719
719
|
return {
|
|
720
720
|
lastStatusMessage: 'Processing...',
|
|
721
|
-
startTime: convoEntity.__mj_UpdatedAt
|
|
721
|
+
startTime: convoEntity.__mj_UpdatedAt,
|
|
722
722
|
};
|
|
723
723
|
}
|
|
724
724
|
}
|
|
@@ -818,7 +818,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
818
818
|
createdAt: e.__mj_CreatedAt,
|
|
819
819
|
updatedAt: e.__mj_UpdatedAt,
|
|
820
820
|
};
|
|
821
|
-
})
|
|
821
|
+
}),
|
|
822
822
|
};
|
|
823
823
|
});
|
|
824
824
|
}
|
|
@@ -829,7 +829,9 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
829
829
|
const fields = e.Fields.filter((f) => {
|
|
830
830
|
const scopes = f.ScopeDefault?.split(',').map((s) => s.trim().toLowerCase());
|
|
831
831
|
return !scopes || scopes.length === 0 || scopes.includes('all') || scopes.includes('ai');
|
|
832
|
-
})
|
|
832
|
+
})
|
|
833
|
+
.map((f) => `[${f.Name}]`)
|
|
834
|
+
.join(',');
|
|
833
835
|
let sql = '';
|
|
834
836
|
switch (e.RowsToPackWithSchema) {
|
|
835
837
|
case 'All':
|
|
@@ -892,9 +894,14 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
892
894
|
});
|
|
893
895
|
}
|
|
894
896
|
else {
|
|
895
|
-
return [
|
|
897
|
+
return [
|
|
898
|
+
...new Set([
|
|
899
|
+
...f.EntityFieldValues.map((v) => {
|
|
896
900
|
return { value: v.Value, displayValue: v.Value };
|
|
897
|
-
}),
|
|
901
|
+
}),
|
|
902
|
+
...values,
|
|
903
|
+
]),
|
|
904
|
+
];
|
|
898
905
|
}
|
|
899
906
|
}
|
|
900
907
|
}
|
|
@@ -917,7 +924,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
917
924
|
return result.recordset.map((r) => {
|
|
918
925
|
return {
|
|
919
926
|
value: r[f.Name],
|
|
920
|
-
displayValue: r[f.Name]
|
|
927
|
+
displayValue: r[f.Name],
|
|
921
928
|
};
|
|
922
929
|
});
|
|
923
930
|
}
|
|
@@ -932,15 +939,18 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
932
939
|
async refreshSkipEntities(dataSource) {
|
|
933
940
|
try {
|
|
934
941
|
const md = new Metadata();
|
|
935
|
-
const skipSpecialIncludeEntities = (configInfo.askSkip?.entitiesToSend?.includeEntitiesFromExcludedSchemas ?? [])
|
|
936
|
-
.map((e) => e.trim().toLowerCase());
|
|
942
|
+
const skipSpecialIncludeEntities = (configInfo.askSkip?.entitiesToSend?.includeEntitiesFromExcludedSchemas ?? []).map((e) => e.trim().toLowerCase());
|
|
937
943
|
const entities = md.Entities.filter((e) => {
|
|
938
944
|
if (!configInfo.askSkip.entitiesToSend.excludeSchemas.includes(e.SchemaName) ||
|
|
939
945
|
skipSpecialIncludeEntities.includes(e.Name.trim().toLowerCase())) {
|
|
940
946
|
const sd = e.ScopeDefault?.trim();
|
|
941
947
|
if (sd && sd.length > 0) {
|
|
942
948
|
const scopes = sd.split(',').map((s) => s.trim().toLowerCase()) ?? ['all'];
|
|
943
|
-
return !scopes ||
|
|
949
|
+
return (!scopes ||
|
|
950
|
+
scopes.length === 0 ||
|
|
951
|
+
scopes.includes('all') ||
|
|
952
|
+
scopes.includes('ai') ||
|
|
953
|
+
skipSpecialIncludeEntities.includes(e.Name.trim().toLowerCase()));
|
|
944
954
|
}
|
|
945
955
|
else {
|
|
946
956
|
return true;
|
|
@@ -960,7 +970,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
960
970
|
async BuildSkipEntities(dataSource, forceRefresh = false, refreshIntervalMinutes = 15) {
|
|
961
971
|
try {
|
|
962
972
|
const now = Date.now();
|
|
963
|
-
const cacheExpired =
|
|
973
|
+
const cacheExpired = now - AskSkipResolver_1.__lastRefreshTime > refreshIntervalMinutes * 60 * 1000;
|
|
964
974
|
if (forceRefresh || cacheExpired || AskSkipResolver_1.__skipEntitiesCache$.value === null) {
|
|
965
975
|
console.log(`Forcing Skip Entities refresh: ${forceRefresh}, Cache Expired: ${cacheExpired}`);
|
|
966
976
|
const newData = this.refreshSkipEntities(dataSource);
|
|
@@ -981,10 +991,10 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
981
991
|
schemaName: e.SchemaName,
|
|
982
992
|
baseView: e.BaseView,
|
|
983
993
|
description: e.Description,
|
|
984
|
-
fields: await Promise.all(e.Fields.filter(f => {
|
|
994
|
+
fields: await Promise.all(e.Fields.filter((f) => {
|
|
985
995
|
const scopes = f.ScopeDefault?.split(',').map((s) => s.trim().toLowerCase());
|
|
986
996
|
return !scopes || scopes.length === 0 || scopes.includes('all') || scopes.includes('ai');
|
|
987
|
-
}).map(f => {
|
|
997
|
+
}).map((f) => {
|
|
988
998
|
return this.PackSingleSkipEntityField(f, dataSource);
|
|
989
999
|
})),
|
|
990
1000
|
relatedEntities: e.RelatedEntities.map((r) => {
|
|
@@ -992,7 +1002,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
992
1002
|
}),
|
|
993
1003
|
rowsPacked: e.RowsToPackWithSchema,
|
|
994
1004
|
rowsSampleMethod: e.RowsToPackSampleMethod,
|
|
995
|
-
rows: await this.PackEntityRows(e, dataSource)
|
|
1005
|
+
rows: await this.PackEntityRows(e, dataSource),
|
|
996
1006
|
};
|
|
997
1007
|
return ret;
|
|
998
1008
|
}
|
|
@@ -1130,7 +1140,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1130
1140
|
if (await dataContextEntity.Save()) {
|
|
1131
1141
|
DataContextId = convoEntity.DataContextID;
|
|
1132
1142
|
convoEntity.DataContextID = dataContextEntity.ID;
|
|
1133
|
-
if (!await convoEntity.Save()) {
|
|
1143
|
+
if (!(await convoEntity.Save())) {
|
|
1134
1144
|
LogError(`Error saving conversation entity for conversation: ${ConversationId}`, undefined, convoEntity.LatestResult);
|
|
1135
1145
|
}
|
|
1136
1146
|
}
|
|
@@ -1203,7 +1213,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1203
1213
|
executionResults: analysisDetail.executionResults,
|
|
1204
1214
|
tableDataColumns: analysisDetail.tableDataColumns,
|
|
1205
1215
|
componentOptions: analysisDetail.componentOptions,
|
|
1206
|
-
artifactRequest: analysisDetail.artifactRequest
|
|
1216
|
+
artifactRequest: analysisDetail.artifactRequest,
|
|
1207
1217
|
});
|
|
1208
1218
|
}
|
|
1209
1219
|
else if (detail?.responsePhase === SkipResponsePhase.ClarifyingQuestion) {
|
|
@@ -1568,7 +1578,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1568
1578
|
newVersion = 1;
|
|
1569
1579
|
}
|
|
1570
1580
|
else {
|
|
1571
|
-
const ei = md.EntityByName(
|
|
1581
|
+
const ei = md.EntityByName('MJ: Conversation Artifact Versions');
|
|
1572
1582
|
const sSQL = `SELECT ISNULL(MAX(Version),0) AS MaxVersion FROM [${ei.SchemaName}].[${ei.BaseView}] WHERE ConversationArtifactID = '${artifactId}'`;
|
|
1573
1583
|
try {
|
|
1574
1584
|
const request = new mssql.Request(dataSource);
|
|
@@ -1691,13 +1701,13 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1691
1701
|
type: 'ConversationStatusUpdate',
|
|
1692
1702
|
conversationID: convoEntity.ID,
|
|
1693
1703
|
status: status,
|
|
1694
|
-
timestamp: new Date().toISOString()
|
|
1704
|
+
timestamp: new Date().toISOString(),
|
|
1695
1705
|
};
|
|
1696
1706
|
pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
|
|
1697
1707
|
pushStatusUpdates: {
|
|
1698
1708
|
message: JSON.stringify(statusMessage),
|
|
1699
|
-
sessionId: userPayload.sessionId
|
|
1700
|
-
}
|
|
1709
|
+
sessionId: userPayload.sessionId,
|
|
1710
|
+
},
|
|
1701
1711
|
});
|
|
1702
1712
|
LogStatus(`Published conversation status update for ${convoEntity.ID}: ${status}`);
|
|
1703
1713
|
}
|
|
@@ -1707,12 +1717,12 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1707
1717
|
return true;
|
|
1708
1718
|
}
|
|
1709
1719
|
getAgentNoteTypeIDByName(name, defaultNoteType = 'AI') {
|
|
1710
|
-
const noteTypeID = AIEngine.Instance.AgentNoteTypes.find(nt => nt.Name.trim().toLowerCase() === name.trim().toLowerCase())?.ID;
|
|
1720
|
+
const noteTypeID = AIEngine.Instance.AgentNoteTypes.find((nt) => nt.Name.trim().toLowerCase() === name.trim().toLowerCase())?.ID;
|
|
1711
1721
|
if (noteTypeID) {
|
|
1712
1722
|
return noteTypeID;
|
|
1713
1723
|
}
|
|
1714
1724
|
else {
|
|
1715
|
-
const defaultNoteTypeID = AIEngine.Instance.AgentNoteTypes.find(nt => nt.Name.trim().toLowerCase() === defaultNoteType.trim().toLowerCase())?.ID;
|
|
1725
|
+
const defaultNoteTypeID = AIEngine.Instance.AgentNoteTypes.find((nt) => nt.Name.trim().toLowerCase() === defaultNoteType.trim().toLowerCase())?.ID;
|
|
1716
1726
|
return defaultNoteTypeID;
|
|
1717
1727
|
}
|
|
1718
1728
|
}
|