@memberjunction/server 2.112.0 → 2.113.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 +951 -808
- 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 +43 -53
- 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 +3 -1
- 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 +2 -3
- 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 +6 -3
- 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 +10 -22
- 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 +7 -9
- 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 +788 -658
- package/dist/generated/generated.d.ts.map +1 -1
- package/dist/generated/generated.js +2050 -3054
- 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 +10 -15
- 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 +13 -18
- 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 +30 -28
- 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 +50 -60
- package/dist/resolvers/AskSkipResolver.js.map +1 -1
- package/dist/resolvers/ComponentRegistryResolver.d.ts.map +1 -1
- package/dist/resolvers/ComponentRegistryResolver.js +38 -36
- 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 +40 -43
- 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 +6 -8
- 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 +28 -27
- 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 +14 -15
- 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 +44 -48
- 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 +16 -14
- package/dist/rest/EntityCRUDHandler.js.map +1 -1
- package/dist/rest/RESTEndpointHandler.d.ts.map +1 -1
- package/dist/rest/RESTEndpointHandler.js +25 -23
- 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 +21 -17
- 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 +6 -4
- 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 +1 -0
- 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 +39 -36
- package/src/agents/skip-agent.ts +1200 -1067
- package/src/agents/skip-sdk.ts +851 -877
- package/src/apolloServer/index.ts +2 -2
- package/src/auth/AuthProviderFactory.ts +14 -8
- package/src/auth/BaseAuthProvider.ts +4 -5
- package/src/auth/IAuthProvider.ts +2 -2
- package/src/auth/exampleNewUserSubClass.ts +2 -9
- package/src/auth/index.ts +26 -31
- package/src/auth/initializeProviders.ts +3 -3
- package/src/auth/newUsers.ts +134 -166
- package/src/auth/providers/Auth0Provider.ts +5 -5
- package/src/auth/providers/CognitoProvider.ts +10 -7
- package/src/auth/providers/GoogleProvider.ts +5 -4
- package/src/auth/providers/MSALProvider.ts +5 -5
- package/src/auth/providers/OktaProvider.ts +7 -6
- package/src/config.ts +54 -63
- package/src/context.ts +30 -42
- package/src/entitySubclasses/entityPermissions.server.ts +3 -3
- package/src/generated/generated.ts +40442 -48106
- package/src/generic/KeyInputOutputTypes.ts +6 -3
- package/src/generic/ResolverBase.ts +78 -119
- package/src/generic/RunViewResolver.ts +23 -27
- package/src/index.ts +48 -66
- package/src/resolvers/ActionResolver.ts +57 -46
- package/src/resolvers/AskSkipResolver.ts +533 -607
- package/src/resolvers/ComponentRegistryResolver.ts +562 -547
- package/src/resolvers/CreateQueryResolver.ts +655 -683
- package/src/resolvers/DatasetResolver.ts +6 -5
- package/src/resolvers/EntityCommunicationsResolver.ts +1 -1
- package/src/resolvers/EntityRecordNameResolver.ts +5 -9
- package/src/resolvers/EntityResolver.ts +7 -9
- package/src/resolvers/FileCategoryResolver.ts +2 -2
- package/src/resolvers/FileResolver.ts +4 -4
- package/src/resolvers/GetDataContextDataResolver.ts +118 -106
- package/src/resolvers/GetDataResolver.ts +205 -194
- package/src/resolvers/MergeRecordsResolver.ts +5 -5
- package/src/resolvers/PotentialDuplicateRecordResolver.ts +1 -1
- package/src/resolvers/QueryResolver.ts +78 -95
- package/src/resolvers/ReportResolver.ts +2 -2
- package/src/resolvers/RunAIAgentResolver.ts +828 -818
- package/src/resolvers/RunAIPromptResolver.ts +709 -693
- package/src/resolvers/RunTemplateResolver.ts +103 -105
- package/src/resolvers/SqlLoggingConfigResolver.ts +72 -69
- package/src/resolvers/SyncDataResolver.ts +352 -386
- package/src/resolvers/SyncRolesUsersResolver.ts +350 -387
- package/src/resolvers/TaskResolver.ts +115 -110
- package/src/resolvers/TransactionGroupResolver.ts +138 -143
- package/src/resolvers/UserFavoriteResolver.ts +8 -17
- package/src/resolvers/UserViewResolver.ts +12 -17
- package/src/rest/EntityCRUDHandler.ts +268 -291
- package/src/rest/RESTEndpointHandler.ts +776 -782
- package/src/rest/ViewOperationsHandler.ts +195 -191
- package/src/scheduler/LearningCycleScheduler.ts +52 -8
- package/src/services/ScheduledJobsService.ts +132 -129
- package/src/services/TaskOrchestrator.ts +776 -792
- package/src/types.ts +9 -15
- package/src/util.ts +109 -112
|
@@ -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
|
|
15
|
+
import { LogError, LogStatus, Metadata, RunView, CompositeKey } from '@memberjunction/core';
|
|
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
|
|
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(
|
|
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 ? publicUrl || `${baseUrl}:${graphqlPort}${graphqlRootPath}` : undefined,
|
|
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(
|
|
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
|
|
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 =
|
|
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,9 +829,7 @@ 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
|
-
})
|
|
833
|
-
.map((f) => `[${f.Name}]`)
|
|
834
|
-
.join(',');
|
|
832
|
+
}).map(f => `[${f.Name}]`).join(',');
|
|
835
833
|
let sql = '';
|
|
836
834
|
switch (e.RowsToPackWithSchema) {
|
|
837
835
|
case 'All':
|
|
@@ -894,14 +892,9 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
894
892
|
});
|
|
895
893
|
}
|
|
896
894
|
else {
|
|
897
|
-
return [
|
|
898
|
-
...new Set([
|
|
899
|
-
...f.EntityFieldValues.map((v) => {
|
|
895
|
+
return [...new Set([...f.EntityFieldValues.map((v) => {
|
|
900
896
|
return { value: v.Value, displayValue: v.Value };
|
|
901
|
-
}),
|
|
902
|
-
...values,
|
|
903
|
-
]),
|
|
904
|
-
];
|
|
897
|
+
}), ...values])];
|
|
905
898
|
}
|
|
906
899
|
}
|
|
907
900
|
}
|
|
@@ -924,7 +917,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
924
917
|
return result.recordset.map((r) => {
|
|
925
918
|
return {
|
|
926
919
|
value: r[f.Name],
|
|
927
|
-
displayValue: r[f.Name]
|
|
920
|
+
displayValue: r[f.Name]
|
|
928
921
|
};
|
|
929
922
|
});
|
|
930
923
|
}
|
|
@@ -939,18 +932,15 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
939
932
|
async refreshSkipEntities(dataSource) {
|
|
940
933
|
try {
|
|
941
934
|
const md = new Metadata();
|
|
942
|
-
const skipSpecialIncludeEntities = (configInfo.askSkip?.entitiesToSend?.includeEntitiesFromExcludedSchemas ?? [])
|
|
935
|
+
const skipSpecialIncludeEntities = (configInfo.askSkip?.entitiesToSend?.includeEntitiesFromExcludedSchemas ?? [])
|
|
936
|
+
.map((e) => e.trim().toLowerCase());
|
|
943
937
|
const entities = md.Entities.filter((e) => {
|
|
944
938
|
if (!configInfo.askSkip.entitiesToSend.excludeSchemas.includes(e.SchemaName) ||
|
|
945
939
|
skipSpecialIncludeEntities.includes(e.Name.trim().toLowerCase())) {
|
|
946
940
|
const sd = e.ScopeDefault?.trim();
|
|
947
941
|
if (sd && sd.length > 0) {
|
|
948
942
|
const scopes = sd.split(',').map((s) => s.trim().toLowerCase()) ?? ['all'];
|
|
949
|
-
return
|
|
950
|
-
scopes.length === 0 ||
|
|
951
|
-
scopes.includes('all') ||
|
|
952
|
-
scopes.includes('ai') ||
|
|
953
|
-
skipSpecialIncludeEntities.includes(e.Name.trim().toLowerCase()));
|
|
943
|
+
return !scopes || scopes.length === 0 || scopes.includes('all') || scopes.includes('ai') || skipSpecialIncludeEntities.includes(e.Name.trim().toLowerCase());
|
|
954
944
|
}
|
|
955
945
|
else {
|
|
956
946
|
return true;
|
|
@@ -970,7 +960,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
970
960
|
async BuildSkipEntities(dataSource, forceRefresh = false, refreshIntervalMinutes = 15) {
|
|
971
961
|
try {
|
|
972
962
|
const now = Date.now();
|
|
973
|
-
const cacheExpired = now - AskSkipResolver_1.__lastRefreshTime > refreshIntervalMinutes * 60 * 1000;
|
|
963
|
+
const cacheExpired = (now - AskSkipResolver_1.__lastRefreshTime) > (refreshIntervalMinutes * 60 * 1000);
|
|
974
964
|
if (forceRefresh || cacheExpired || AskSkipResolver_1.__skipEntitiesCache$.value === null) {
|
|
975
965
|
console.log(`Forcing Skip Entities refresh: ${forceRefresh}, Cache Expired: ${cacheExpired}`);
|
|
976
966
|
const newData = this.refreshSkipEntities(dataSource);
|
|
@@ -991,10 +981,10 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
991
981
|
schemaName: e.SchemaName,
|
|
992
982
|
baseView: e.BaseView,
|
|
993
983
|
description: e.Description,
|
|
994
|
-
fields: await Promise.all(e.Fields.filter(
|
|
984
|
+
fields: await Promise.all(e.Fields.filter(f => {
|
|
995
985
|
const scopes = f.ScopeDefault?.split(',').map((s) => s.trim().toLowerCase());
|
|
996
986
|
return !scopes || scopes.length === 0 || scopes.includes('all') || scopes.includes('ai');
|
|
997
|
-
}).map(
|
|
987
|
+
}).map(f => {
|
|
998
988
|
return this.PackSingleSkipEntityField(f, dataSource);
|
|
999
989
|
})),
|
|
1000
990
|
relatedEntities: e.RelatedEntities.map((r) => {
|
|
@@ -1002,7 +992,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1002
992
|
}),
|
|
1003
993
|
rowsPacked: e.RowsToPackWithSchema,
|
|
1004
994
|
rowsSampleMethod: e.RowsToPackSampleMethod,
|
|
1005
|
-
rows: await this.PackEntityRows(e, dataSource)
|
|
995
|
+
rows: await this.PackEntityRows(e, dataSource)
|
|
1006
996
|
};
|
|
1007
997
|
return ret;
|
|
1008
998
|
}
|
|
@@ -1140,7 +1130,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1140
1130
|
if (await dataContextEntity.Save()) {
|
|
1141
1131
|
DataContextId = convoEntity.DataContextID;
|
|
1142
1132
|
convoEntity.DataContextID = dataContextEntity.ID;
|
|
1143
|
-
if (!
|
|
1133
|
+
if (!await convoEntity.Save()) {
|
|
1144
1134
|
LogError(`Error saving conversation entity for conversation: ${ConversationId}`, undefined, convoEntity.LatestResult);
|
|
1145
1135
|
}
|
|
1146
1136
|
}
|
|
@@ -1213,7 +1203,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1213
1203
|
executionResults: analysisDetail.executionResults,
|
|
1214
1204
|
tableDataColumns: analysisDetail.tableDataColumns,
|
|
1215
1205
|
componentOptions: analysisDetail.componentOptions,
|
|
1216
|
-
artifactRequest: analysisDetail.artifactRequest
|
|
1206
|
+
artifactRequest: analysisDetail.artifactRequest
|
|
1217
1207
|
});
|
|
1218
1208
|
}
|
|
1219
1209
|
else if (detail?.responsePhase === SkipResponsePhase.ClarifyingQuestion) {
|
|
@@ -1578,7 +1568,7 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1578
1568
|
newVersion = 1;
|
|
1579
1569
|
}
|
|
1580
1570
|
else {
|
|
1581
|
-
const ei = md.EntityByName(
|
|
1571
|
+
const ei = md.EntityByName("MJ: Conversation Artifact Versions");
|
|
1582
1572
|
const sSQL = `SELECT ISNULL(MAX(Version),0) AS MaxVersion FROM [${ei.SchemaName}].[${ei.BaseView}] WHERE ConversationArtifactID = '${artifactId}'`;
|
|
1583
1573
|
try {
|
|
1584
1574
|
const request = new mssql.Request(dataSource);
|
|
@@ -1701,13 +1691,13 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1701
1691
|
type: 'ConversationStatusUpdate',
|
|
1702
1692
|
conversationID: convoEntity.ID,
|
|
1703
1693
|
status: status,
|
|
1704
|
-
timestamp: new Date().toISOString()
|
|
1694
|
+
timestamp: new Date().toISOString()
|
|
1705
1695
|
};
|
|
1706
1696
|
pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
|
|
1707
1697
|
pushStatusUpdates: {
|
|
1708
1698
|
message: JSON.stringify(statusMessage),
|
|
1709
|
-
sessionId: userPayload.sessionId
|
|
1710
|
-
}
|
|
1699
|
+
sessionId: userPayload.sessionId
|
|
1700
|
+
}
|
|
1711
1701
|
});
|
|
1712
1702
|
LogStatus(`Published conversation status update for ${convoEntity.ID}: ${status}`);
|
|
1713
1703
|
}
|
|
@@ -1717,12 +1707,12 @@ let AskSkipResolver = class AskSkipResolver {
|
|
|
1717
1707
|
return true;
|
|
1718
1708
|
}
|
|
1719
1709
|
getAgentNoteTypeIDByName(name, defaultNoteType = 'AI') {
|
|
1720
|
-
const noteTypeID = AIEngine.Instance.AgentNoteTypes.find(
|
|
1710
|
+
const noteTypeID = AIEngine.Instance.AgentNoteTypes.find(nt => nt.Name.trim().toLowerCase() === name.trim().toLowerCase())?.ID;
|
|
1721
1711
|
if (noteTypeID) {
|
|
1722
1712
|
return noteTypeID;
|
|
1723
1713
|
}
|
|
1724
1714
|
else {
|
|
1725
|
-
const defaultNoteTypeID = AIEngine.Instance.AgentNoteTypes.find(
|
|
1715
|
+
const defaultNoteTypeID = AIEngine.Instance.AgentNoteTypes.find(nt => nt.Name.trim().toLowerCase() === defaultNoteType.trim().toLowerCase())?.ID;
|
|
1726
1716
|
return defaultNoteTypeID;
|
|
1727
1717
|
}
|
|
1728
1718
|
}
|