@memberjunction/server 2.45.0 → 2.46.0

package/src/resolvers/AskSkipResolver.ts

@@ -2044,8 +2044,10 @@ cycle.`);
                 responsePhase: SkipResponsePhase.AnalysisComplete,
                 techExplanation: analysisDetail.techExplanation,
                 userExplanation: analysisDetail.userExplanation,
-                scriptText: analysisDetail.scriptText,
+                executionResults: analysisDetail.executionResults,
                 tableDataColumns: analysisDetail.tableDataColumns,
+                componentOptions: analysisDetail.componentOptions,
+                artifactRequest: analysisDetail.artifactRequest
               });
             } else if (detail?.responsePhase === SkipResponsePhase.ClarifyingQuestion) {
               const clarifyingQuestionDetail = <SkipAPIClarifyingQuestionResponse>detail;
@@ -2567,6 +2569,7 @@ cycle.`);
               item.Type = 'sql';
               item.SQL = dr.text;
               item.AdditionalDescription = dr.description;
+              item.CodeName = dr.codeName;
               if (!(await item.LoadData(dataSource, false, false, 0, user)))
                 throw new Error(`SQL data request failed: ${item.DataLoadingError}`);
               break;
@@ -2681,7 +2684,7 @@ cycle.`);
     dataSource: DataSource,
     startTime: Date
   ): Promise<{ AIMessageConversationDetailID: string }> {
-    const sTitle = apiResponse.title;
+    const sTitle = apiResponse.title || apiResponse.reportTitle;
     const sResult = JSON.stringify(apiResponse);
 
     // first up, let's see if Skip asked us to create an artifact or add a new version to an existing artifact, or NOT

package/dist/entitySubclasses/DuplicateRunEntity.server.d.ts

@@ -1,6 +0,0 @@
-import { DuplicateRunEntity } from "@memberjunction/core-entities";
-export declare class DuplicateRunEntity_Server extends DuplicateRunEntity {
-    Save(): Promise<boolean>;
-}
-export declare function LoadDuplicateRunEntityServerSubClass(): void;
-//# sourceMappingURL=DuplicateRunEntity.server.d.ts.map

package/dist/entitySubclasses/DuplicateRunEntity.server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DuplicateRunEntity.server.d.ts","sourceRoot":"","sources":["../../src/entitySubclasses/DuplicateRunEntity.server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,qBACa,yBAA0B,SAAQ,kBAAkB;IAChD,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;CAiBxC;AAED,wBAAgB,oCAAoC,SAAK"}

package/dist/entitySubclasses/DuplicateRunEntity.server.js

@@ -1,32 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { BaseEntity, PotentialDuplicateRequest } from "@memberjunction/core";
-import { RegisterClass } from "@memberjunction/global";
-import { DuplicateRunEntity } from "@memberjunction/core-entities";
-import { DuplicateRecordDetector } from "@memberjunction/ai-vector-dupe";
-let DuplicateRunEntity_Server = class DuplicateRunEntity_Server extends DuplicateRunEntity {
-    async Save() {
-        const saveResult = await super.Save();
-        if (saveResult && this.EndedAt === null) {
-            const duplicateRecordDetector = new DuplicateRecordDetector();
-            let request = new PotentialDuplicateRequest();
-            request.EntityID = this.EntityID;
-            request.ListID = this.SourceListID;
-            request.Options = {
-                DuplicateRunID: this.ID,
-            };
-            const response = await duplicateRecordDetector.getDuplicateRecords(request, this.ContextCurrentUser);
-        }
-        return saveResult;
-    }
-};
-DuplicateRunEntity_Server = __decorate([
-    RegisterClass(BaseEntity, 'Duplicate Runs')
-], DuplicateRunEntity_Server);
-export { DuplicateRunEntity_Server };
-export function LoadDuplicateRunEntityServerSubClass() { }
-//# sourceMappingURL=DuplicateRunEntity.server.js.map

package/dist/entitySubclasses/DuplicateRunEntity.server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DuplicateRunEntity.server.js","sourceRoot":"","sources":["../../src/entitySubclasses/DuplicateRunEntity.server.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGlE,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,kBAAkB;IACtD,KAAK,CAAC,IAAI;QACb,MAAM,UAAU,GAAY,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAC/C,IAAI,UAAU,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAEtC,MAAM,uBAAuB,GAA4B,IAAI,uBAAuB,EAAE,CAAC;YACvF,IAAI,OAAO,GAA8B,IAAI,yBAAyB,EAAE,CAAC;YACzE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;YACnC,OAAO,CAAC,OAAO,GAAG;gBACd,cAAc,EAAE,IAAI,CAAC,EAAE;aAC1B,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACzG,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ,CAAA;AAlBY,yBAAyB;IADrC,aAAa,CAAC,UAAU,EAAE,gBAAgB,CAAC;GAC/B,yBAAyB,CAkBrC;;AAED,MAAM,UAAU,oCAAoC,KAAI,CAAC"}

package/dist/entitySubclasses/reportEntity.server.d.ts

@@ -1,6 +0,0 @@
-import { ReportEntity } from "@memberjunction/core-entities";
-export declare class ReportEntity_Server extends ReportEntity {
-    Save(): Promise<boolean>;
-}
-export declare function LoadReportEntityServerSubClass(): void;
-//# sourceMappingURL=reportEntity.server.d.ts.map

package/dist/entitySubclasses/reportEntity.server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"reportEntity.server.d.ts","sourceRoot":"","sources":["../../src/entitySubclasses/reportEntity.server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAA6C,MAAM,+BAA+B,CAAC;AAGxG,qBACa,mBAAoB,SAAQ,YAAY;IAMpC,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;CAmHxC;AAED,wBAAgB,8BAA8B,SAAK"}

package/dist/entitySubclasses/reportEntity.server.js

@@ -1,103 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { BaseEntity, Metadata, RunView } from "@memberjunction/core";
-import { RegisterClass, SafeJSONParse } from "@memberjunction/global";
-import { ReportEntity } from "@memberjunction/core-entities";
-let ReportEntity_Server = class ReportEntity_Server extends ReportEntity {
-    async Save() {
-        try {
-            const config = this.Configuration && this.Configuration.length > 0 ? SafeJSONParse(this.Configuration) : null;
-            const oldTextConfig = this.GetFieldByName('Configuration')?.OldValue;
-            const oldConfig = oldTextConfig && oldTextConfig.length > 0 ? SafeJSONParse(oldTextConfig) : null;
-            if ((config && oldConfig) || (config && !this.IsSaved)) {
-                let createSnapshot = false;
-                let createReportVersion = false;
-                if (this.IsSaved) {
-                    const castedConfig = config;
-                    const castedOldConfig = oldConfig;
-                    const dataContextChanged = Object.keys(castedConfig.dataContext || {})?.length !== Object.keys(castedOldConfig.dataContext || {})?.length;
-                    const executionResultsChanged = JSON.stringify(castedConfig.executionResults) !== JSON.stringify(castedOldConfig.executionResults);
-                    const analysisChanged = castedConfig.analysis !== castedOldConfig.analysis;
-                    delete castedConfig.dataContext;
-                    delete castedConfig.analysis;
-                    delete castedConfig.executionResults;
-                    delete castedOldConfig.dataContext;
-                    delete castedOldConfig.executionResults;
-                    delete castedOldConfig.analysis;
-                    const configChanged = JSON.stringify(castedConfig) !== JSON.stringify(castedOldConfig);
-                    createSnapshot = dataContextChanged || executionResultsChanged || analysisChanged;
-                    createReportVersion = configChanged;
-                }
-                else {
-                    createSnapshot = true;
-                    createReportVersion = true;
-                }
-                const wasNewRecord = !this.IsSaved;
-                const saveResult = await super.Save();
-                if (saveResult && (createSnapshot || createReportVersion)) {
-                    let success = true;
-                    const md = new Metadata();
-                    if (createReportVersion) {
-                        const reportVersion = await md.GetEntityObject('MJ: Report Versions', this.ContextCurrentUser);
-                        reportVersion.ReportID = this.ID;
-                        let newVersionNumber = 1;
-                        if (!wasNewRecord) {
-                            const rv = new RunView();
-                            const rvResult = await rv.RunView({
-                                Fields: ['VersionNumber'],
-                                EntityName: 'MJ: Report Versions',
-                                ExtraFilter: `ReportID = '${this.ID}'`,
-                                MaxRows: 1,
-                                OrderBy: 'VersionNumber DESC',
-                            }, this.ContextCurrentUser);
-                            if (rvResult.Success && rvResult.Results.length > 0) {
-                                newVersionNumber = parseInt(rvResult.Results[0].VersionNumber) + 1;
-                            }
-                            else {
-                                newVersionNumber = 1;
-                                console.warn('ReportEntity_Server.Save(): No report versions found for report ID:', this.ID);
-                                console.warn('ReportEntity_Server.Save(): Using version number 1 for new report version');
-                            }
-                        }
-                        reportVersion.Name = this.Name;
-                        reportVersion.Description = this.Description;
-                        reportVersion.VersionNumber = newVersionNumber;
-                        reportVersion.Configuration = JSON.stringify(this.Configuration);
-                        success = success && await reportVersion.Save();
-                        if (!success) {
-                            console.error('ReportEntity_Server.Save(): Error saving report version\n' + reportVersion.LatestResult.Message);
-                        }
-                    }
-                    if (createSnapshot) {
-                        const snapshot = await md.GetEntityObject('Report Snapshots', this.ContextCurrentUser);
-                        snapshot.ReportID = this.ID;
-                        snapshot.UserID = this.ContextCurrentUser.ID;
-                        snapshot.ResultSet = JSON.stringify(this.Configuration);
-                        success = success && await snapshot.Save();
-                    }
-                    return success;
-                }
-                else {
-                    return saveResult;
-                }
-            }
-            else {
-                return super.Save();
-            }
-        }
-        catch (e) {
-            console.error('Error in ReportEntity_Server.Save():', e);
-            return false;
-        }
-    }
-};
-ReportEntity_Server = __decorate([
-    RegisterClass(BaseEntity, 'Reports')
-], ReportEntity_Server);
-export { ReportEntity_Server };
-export function LoadReportEntityServerSubClass() { }
-//# sourceMappingURL=reportEntity.server.js.map

package/dist/entitySubclasses/reportEntity.server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"reportEntity.server.js","sourceRoot":"","sources":["../../src/entitySubclasses/reportEntity.server.ts"],"names":[],"mappings":"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"}

package/dist/entitySubclasses/userViewEntity.server.d.ts

@@ -1,13 +0,0 @@
-import { EntityInfo } from "@memberjunction/core";
-import { AIModelEntityExtended, UserViewEntityExtended } from '@memberjunction/core-entities';
-export declare class UserViewEntity_Server extends UserViewEntityExtended {
-    protected get SmartFilterImplemented(): boolean;
-    protected get AIVendorName(): string;
-    protected GetAIModel(): Promise<AIModelEntityExtended>;
-    GenerateSmartFilterWhereClause(prompt: string, entityInfo: EntityInfo): Promise<{
-        whereClause: string;
-        userExplanation: string;
-    }>;
-    GenerateSysPrompt(entityInfo: EntityInfo): string;
-}
-//# sourceMappingURL=userViewEntity.server.d.ts.map

package/dist/entitySubclasses/userViewEntity.server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"userViewEntity.server.d.ts","sourceRoot":"","sources":["../../src/entitySubclasses/userViewEntity.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAsB,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAiB,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAM5G,qBACa,qBAAsB,SAAQ,sBAAsB;IAI7D,cAAuB,sBAAsB,IAAI,OAAO,CAEvD;IAMD,SAAS,KAAK,YAAY,IAAI,MAAM,CAEnC;cAMe,UAAU,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAc/C,8BAA8B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAC,CAAC;IAuErI,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;CAoH3D"}

package/dist/entitySubclasses/userViewEntity.server.js

@@ -1,205 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { CleanJSON, MJGlobal, RegisterClass } from "@memberjunction/global";
-import { BaseEntity, LogError, Metadata } from "@memberjunction/core";
-import { UserViewEntityExtended } from '@memberjunction/core-entities';
-import { BaseLLM, GetAIAPIKey } from "@memberjunction/ai";
-import { AIEngine } from "@memberjunction/aiengine";
-import { LoadOpenAILLM } from "@memberjunction/ai-openai";
-LoadOpenAILLM();
-let UserViewEntity_Server = class UserViewEntity_Server extends UserViewEntityExtended {
-    get SmartFilterImplemented() {
-        return true;
-    }
-    get AIVendorName() {
-        return 'OpenAI';
-    }
-    async GetAIModel() {
-        await AIEngine.Instance.Config(false, this.ContextCurrentUser);
-        const models = AIEngine.Instance.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' &&
-            m.Vendor.trim().toLowerCase() === this.AIVendorName.trim().toLowerCase());
-        models.sort((a, b) => b.PowerRank - a.PowerRank);
-        return models[0];
-    }
-    async GenerateSmartFilterWhereClause(prompt, entityInfo) {
-        try {
-            const model = await this.GetAIModel();
-            const llm = MJGlobal.Instance.ClassFactory.CreateInstance(BaseLLM, model.DriverClass, GetAIAPIKey(model.DriverClass));
-            const chatParams = {
-                model: model.APINameOrName,
-                messages: [
-                    {
-                        role: 'system',
-                        content: this.GenerateSysPrompt(entityInfo)
-                    },
-                    {
-                        role: 'user',
-                        content: `${prompt}`,
-                    },
-                ],
-            };
-            const result = await llm.ChatCompletion(chatParams);
-            if (result && result.data) {
-                const llmResponse = result.data.choices[0].message.content;
-                if (llmResponse) {
-                    try {
-                        const cleansed = CleanJSON(llmResponse);
-                        if (!cleansed)
-                            throw new Error('Invalid JSON response from AI: ' + llmResponse);
-                        const parsed = JSON.parse(cleansed);
-                        if (parsed.whereClause && parsed.whereClause.length > 0) {
-                            const trimmed = parsed.whereClause.trim();
-                            let ret = '';
-                            if (trimmed.toLowerCase().startsWith('where '))
-                                ret = trimmed.substring(6);
-                            else
-                                ret = parsed.whereClause;
-                            return {
-                                whereClause: ret,
-                                userExplanation: parsed.userExplanationMessage
-                            };
-                        }
-                        else if (parsed.whereClause !== undefined && parsed.whereClause !== null) {
-                            return {
-                                whereClause: '',
-                                userExplanation: parsed.userExplanationMessage
-                            };
-                        }
-                        else {
-                            throw new Error('Invalid response from AI, no whereClause property found in response: ' + llmResponse);
-                        }
-                    }
-                    catch (e) {
-                        LogError(e);
-                        throw new Error('Error parsing JSON response from AI: ' + llmResponse);
-                    }
-                }
-                else
-                    throw new Error('Null response from AI');
-            }
-            else
-                throw new Error('No result returned from AI');
-        }
-        catch (e) {
-            LogError(e);
-            throw e;
-        }
-    }
-    GenerateSysPrompt(entityInfo) {
-        const processedViews = [entityInfo.BaseView];
-        const md = new Metadata();
-        const listsEntity = md.EntityByName("Lists");
-        const listDetailsEntity = md.EntityByName("List Details");
-        const gptSysPrompt = `You are an expert in SQL and Microsoft SQL Server.
-You will be provided a user prompt representing how they want to filter the data.
-You may *NOT* use JOINS, only sub-queries for related tables. 
-
-I am a bot and can only understand JSON. Your response must be parsable into this type:
-const returnType = {
-    whereClause: string,
-    orderByClause: string
-    userExplanationMessage: string
-};
-
-In MemberJunction, we have a concept called "Entities" and these are metadata constructs that wrap SQL tables and views. The entity that we are currently 
-building a filter for is called "${entityInfo.Name}" and has an ID of "${entityInfo.ID}" 
-
-You won't be using this Entity name or ID in your SQL, unless you need to use it for List filtering (more on that below).
-
-The view that the user is querying is called ${entityInfo.BaseView} and has these fields:
-${entityInfo.Fields.map(f => {
-            let ret = `${f.Name} (${f.Type})`;
-            if (f.RelatedEntity) {
-                ret += ` (fkey to ${f.RelatedEntityBaseView})`;
-            }
-            return ret;
-        }).join(',')}`;
-        const fkeyFields = entityInfo.Fields.filter(f => f.RelatedEntity && f.RelatedEntity.length > 0);
-        const fkeyBaseViewsDistinct = fkeyFields.map(f => f.RelatedEntityBaseView).filter((v, i, a) => a.indexOf(v) === i);
-        const relationships = `
-In addition, ${entityInfo.BaseView} has links to other views, as shown here, you can use these views in sub-queries to achieve the request from the user.
-If there are multiple filters related to a single related view, attempt to combine them into a single sub-query for efficiency.
-${fkeyBaseViewsDistinct.map(v => {
-            if (processedViews.indexOf(v) === -1) {
-                const e = md.Entities.find(e => e.BaseView === v);
-                if (e) {
-                    processedViews.push(v);
-                    return `* ${e.SchemaName}.${e.BaseView}: ${e.Fields.map(ef => {
-                        return ef.Name + ' (' + ef.Type + ')';
-                    }).join(',')}`;
-                }
-                else
-                    return '';
-            }
-            else
-                return '';
-        }).join('\n')}
-${entityInfo.RelatedEntities.map(r => {
-            const e = md.Entities.find(e => e.Name === r.RelatedEntity);
-            if (e) {
-                if (processedViews.indexOf(e.BaseView) === -1) {
-                    processedViews.push(e.BaseView);
-                    return `* ${e.SchemaName}.${e.BaseView}: ${e.Fields.map(ef => {
-                        let ret = `${ef.Name} (${ef.Type})`;
-                        if (ef.RelatedEntity) {
-                            ret += ` (fkey to ${ef.RelatedEntityBaseView})`;
-                        }
-                        return ret;
-                    }).join(',')}`;
-                }
-                else
-                    return '';
-            }
-            else
-                return '';
-        }).join('\n')}
-
-<IMPORTANT - LISTS FEATURE> 
-In addition to the above related views, a user may talk about "Lists" in their request. A List is a static set of records modeled in our database with the ${listsEntity.SchemaName}.vwLists view and 
-the ${listsEntity.SchemaName}.vwListDetails view. ${listsEntity.SchemaName}.vwLists contains the list "header" information with these columns:
-${listsEntity.Fields.map(f => {
-            return f.Name + ' (' + f.SQLFullType + ')';
-        }).join(', ')}
-The vwListDetails view contains the list "detail" information with these columns which is basically the records that are part of the list. ${listsEntity.SchemaName}.vwListDetails contains these columns:
-${listDetailsEntity.Fields.map(f => {
-            return f.Name + ' (' + f.SQLFullType + ')';
-        }).join(', ')}.
-
-If a user is asking to use a list in creating a view, you need to use a sub-query along these lines:
-
-ID IN (SELECT RecordID FROM ${listsEntity.SchemaName}.vwListDetails WHERE ListID='My List ID')
-
-In this example we're assuming the user has asked us to filter to include only records that are part of the list with the ID of 'My List ID'. In reality the prompt you will have will have a UUID/GUID type ID not a text string like this. 
-You can use any fields at the detail level filter the records and of course combine this type of list-oriented sub-query with other filters as appropriate to satisfy the user's request.
-
-It is also possible that a user will provide ONLY the name of the list they want to filter on. If they provide the List ID, use it with a query like the above. However, if ONLY a List name is provided, you can do as follows: use this style of query with a join to the vwLists view (the list "header") to filter on the name
-of the view or other header information if they want to filter on other list header attributes you can do this. Here is an example:
-
-ID IN (SELECT ld.RecordID FROM ${listsEntity.SchemaName}.vwListDetails ld INNER JOIN ${listsEntity.SchemaName}.vwLists l ON ld.ListID=l.ID WHERE l.Name='My List Name')
-
-No need to use table aliasing if you're just using the vwListDetails view, in that simple subquery it is automatic and unnecessary. If you need to join to the vwLists view, you can use the aliases "l" and "ld", as shown in the example above.
-
-</IMPORTANT - LISTS FEATURE>
-<IMPORTANT - OTHER VIEWS>
-The user might reference other "views" in their request. In the user's terminology a view is what we call a "User View" in MemberJunction system-speak. The idea is a user might ask for a filter that includes or excludes
-records from another view. Unlike Lists, which are STATIC sets of records, User Views are dynamic and can change based on the underlying data. So, what we need to do is use a sub-query that pulls in the SQL for the other view
-The user will be referring to the other view by name, so what you need to do when generating SQL for this scenario is to simply embed a sub-query along the lines of this example, updated of course in the context of the user's request and the rest of any filters you are building:
-    ID IN ({%UserView "ViewID"%}) -- this is for filtering the primary key using other User Views for this entity: "${entityInfo.Name}"
-    AccountID IN ({%UserView "ViewID"%}) -- this is an example where the foreign key relationship for the AccountID field in this entity (${entityInfo.Name}) links to another entity hypothetically called "Accounts" and we want to use an Accounts view for filtering in some way 
-By including this sub-query in your generated WHERE clause, it will give me what I need to dynamically replace the {%UserView "View Name"%} with the actual SQL for the view that the user is referring to. Since that actual SQL
-can change over time, I don't want to embed it directly here but rather have it templatized and each time it is run, I will pre-process the SQL to replace the template with the actual SQL for the view.
-</IMPORTANT - OTHER VIEWS>
-`;
-        return gptSysPrompt + (processedViews.length > 1 ? relationships : '') + `
-        **** REMEMBER **** I am a BOT, do not return anything other than JSON to me or I will choke on your response!`;
-    }
-};
-UserViewEntity_Server = __decorate([
-    RegisterClass(BaseEntity, 'User Views')
-], UserViewEntity_Server);
-export { UserViewEntity_Server };
-//# sourceMappingURL=userViewEntity.server.js.map

package/dist/entitySubclasses/userViewEntity.server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"userViewEntity.server.js","sourceRoot":"","sources":["../../src/entitySubclasses/userViewEntity.server.ts"],"names":[],"mappings":"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"}

package/src/entitySubclasses/DuplicateRunEntity.server.ts

@@ -1,27 +0,0 @@
-import { BaseEntity, PotentialDuplicateRequest } from "@memberjunction/core";
-import { RegisterClass } from "@memberjunction/global";
-import { DuplicateRunEntity } from "@memberjunction/core-entities";
-import { DuplicateRecordDetector } from "@memberjunction/ai-vector-dupe";
-
-@RegisterClass(BaseEntity, 'Duplicate Runs')
-export class DuplicateRunEntity_Server extends DuplicateRunEntity  {
-    public async Save(): Promise<boolean> {
-        const saveResult: boolean = await super.Save();
-        if (saveResult && this.EndedAt === null) {
-            // do something
-            const duplicateRecordDetector: DuplicateRecordDetector = new DuplicateRecordDetector();
-            let request: PotentialDuplicateRequest = new PotentialDuplicateRequest();
-            request.EntityID = this.EntityID;
-            request.ListID = this.SourceListID;
-            request.Options = {
-                DuplicateRunID: this.ID,
-            };
-            
-            const response = await duplicateRecordDetector.getDuplicateRecords(request, this.ContextCurrentUser);
-        }
-
-        return saveResult;
-    }
-}
-
-export function LoadDuplicateRunEntityServerSubClass() {}

package/src/entitySubclasses/reportEntity.server.ts

@@ -1,130 +0,0 @@
-import { BaseEntity, Metadata, RunView } from "@memberjunction/core";
-import { RegisterClass, SafeJSONParse } from "@memberjunction/global";
-import { ReportEntity, ReportSnapshotEntity, ReportVersionEntity } from "@memberjunction/core-entities";
-import { SkipAPIAnalysisCompleteResponse } from "@memberjunction/skip-types";
-
-@RegisterClass(BaseEntity, 'Reports')
-export class ReportEntity_Server extends ReportEntity  {
-    /**
-     * The server side Report Entity sub-class has a simple logic that will create a snapshot of the report when it is first created and each time it is modified, but only
-     * if it is either newly created or if the Configuration field has changed.
-     * @returns 
-     */
-    public async Save(): Promise<boolean> {
-        try {
-            // first let's get the actual parsed object for the Configuration field
-            const config = this.Configuration && this.Configuration.length > 0 ? SafeJSONParse(this.Configuration) : null;
-            const oldTextConfig = this.GetFieldByName('Configuration')?.OldValue;
-            const oldConfig = oldTextConfig && oldTextConfig.length > 0 ? SafeJSONParse(oldTextConfig) : null;
- 
-            if ( (config && oldConfig) || (config && !this.IsSaved) ) {
-                let createSnapshot = false;
-                let createReportVersion = false;
-                if (this.IsSaved) {
-                    // existing record
-                    // we nave a configuration and an old configuration, so we can compare them, cast them to their strong types first
-                    const castedConfig = config as SkipAPIAnalysisCompleteResponse;
-                    const castedOldConfig = oldConfig as SkipAPIAnalysisCompleteResponse;
-
-                    // Next, we need to see if the data context has changed at all. We do this by comparing the # of items in the data context. a Data context's items are immutable and we only add new Data Context Items
-                    // so we can simply check to see if we have new data context items or not
-                    const dataContextChanged = Object.keys(castedConfig.dataContext || {})?.length !== Object.keys(castedOldConfig.dataContext || {})?.length;
-
-                    // next up, we check to see if anything in the execution results changed. The simple way to do that is convert the execution results back to a string and compare those strings
-                    const executionResultsChanged = JSON.stringify(castedConfig.executionResults) !== JSON.stringify(castedOldConfig.executionResults);
-
-                    // next up we check to see if the analysis changed, which would also represent a "data" change
-                    const analysisChanged = castedConfig.analysis !== castedOldConfig.analysis;
-
-                    // finally, we check to see if the configuration itself has OUTSIDE of the data elements we just checked. We do that by deleting those properties from those objects, converting to strings
-                    // and comparing them
-                    delete castedConfig.dataContext;
-                    delete castedConfig.analysis;
-                    delete castedConfig.executionResults;
-
-                    delete castedOldConfig.dataContext;
-                    delete castedOldConfig.executionResults;
-                    delete castedOldConfig.analysis;
-
-                    // we can now compare the two objects
-                    const configChanged = JSON.stringify(castedConfig) !== JSON.stringify(castedOldConfig);
-
-                    // now our logic is this - if the DATA changed, but the configuration did NOT change, that means we want to create a new SNAPSHOT of the report - which is the data changing side
-                    // if the configuration changed at all we wnat to create a new Report Version. Sometimes both changd and we do both
-                    createSnapshot = dataContextChanged || executionResultsChanged || analysisChanged;
-                    createReportVersion = configChanged;
-                }
-                else {
-                    // we have a new record set createSnapshot to true and createReportVersion to true
-                    createSnapshot = true;
-                    createReportVersion = true;
-                }
-
-                const wasNewRecord: boolean = !this.IsSaved;
-                const saveResult: boolean = await super.Save();
-                if (saveResult && (createSnapshot || createReportVersion)) {
-                    // here we either have a new record or the configuration has changed, so we need to create a snapshot of the report
-                    let success: boolean = true;
-                    const md = new Metadata();
-
-                    if (createReportVersion) {
-                        const reportVersion = await md.GetEntityObject<ReportVersionEntity>('MJ: Report Versions', this.ContextCurrentUser);
-                        reportVersion.ReportID = this.ID;
-                        // const get highest new version number already in DB
-                        let newVersionNumber: number = 1;
-                        if (!wasNewRecord) {
-                            const rv = new RunView();
-                            const rvResult = await rv.RunView({
-                                Fields: ['VersionNumber'],
-                                EntityName: 'MJ: Report Versions',
-                                ExtraFilter: `ReportID = '${this.ID}'`,
-                                MaxRows: 1,
-                                OrderBy: 'VersionNumber DESC',
-                            }, this.ContextCurrentUser);
-                            if (rvResult.Success && rvResult.Results.length > 0) {
-                                newVersionNumber = parseInt(rvResult.Results[0].VersionNumber) + 1;
-                            }
-                            else {
-                                newVersionNumber = 1; // this is an error state as we previously had a saved report, BUT there were no saved versions for the report, so we are going to use 1 here, but let's log a warning
-                                console.warn('ReportEntity_Server.Save(): No report versions found for report ID:', this.ID);
-                                console.warn('ReportEntity_Server.Save(): Using version number 1 for new report version');
-                            }
-                        }
-                        reportVersion.Name = this.Name; // copy current name to the new version
-                        reportVersion.Description = this.Description; // copy current description to the new version
-                        reportVersion.VersionNumber = newVersionNumber;
-                        reportVersion.Configuration = JSON.stringify(this.Configuration);
-                        success = success && await reportVersion.Save();
-                        if (!success) {
-                            console.error('ReportEntity_Server.Save(): Error saving report version\n' + reportVersion.LatestResult.Message);
-                        }
-                    }
-
-                    if (createSnapshot) {
-                        const snapshot = await md.GetEntityObject<ReportSnapshotEntity>('Report Snapshots', this.ContextCurrentUser);
-                        snapshot.ReportID = this.ID;
-                        snapshot.UserID = this.ContextCurrentUser.ID;
-                        // in the snapshot entity the ResultSet column is the Configuration column from the Report entity
-                        snapshot.ResultSet = JSON.stringify(this.Configuration);
-                        success = success && await snapshot.Save();
-                    }
-
-                    return success;
-                }        
-                else {
-                    return saveResult;    
-                }    
-            }
-            else {
-                // no configuration or no parseable configuration, so we just call super.Save();
-                return super.Save();
-            }
-        }
-        catch (e) {
-            console.error('Error in ReportEntity_Server.Save():', e);
-            return false;
-        }
-    }
-}
-
-export function LoadReportEntityServerSubClass() {}