dbm-graph-api 1.1.15 → 1.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.741.0",
     "@aws-sdk/s3-request-presigner": "^3.741.0",
-    "dbm": "^1.1.11",
+    "dbm": "^1.1.12",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

package/src/dbm-graph-api/admin/edit/AddObjectType.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class AddObjectType extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.addObjectType(aData["value"]);
+    }
+}

package/src/dbm-graph-api/admin/edit/RemoveObjectType.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class AddObjectType extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.removeObjectType(aData["value"]);
+    }
+}

package/src/dbm-graph-api/admin/edit/ReplaceMultipleIncomingRelations.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class ReplaceMultipleIncomingRelations extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.replaceMultipleIncomingRelations(aData["value"], aData["type"], aData["objectType"]);
+    }
+}

package/src/dbm-graph-api/admin/edit/ReplaceMultipleOutgoingRelations.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class ReplaceMultipleOutgoingRelations extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.replaceMultipleOutgoingRelations(aData["value"], aData["type"]), aData["objectType"];
+    }
+}

package/src/dbm-graph-api/admin/edit/index.js

@@ -10,6 +10,11 @@ export {default as AddOutgoingRelation} from "./AddOutgoingRelation.js";
 export {default as ClearCloudflareCache} from "./ClearCloudflareCache.js";
 export {default as ReplaceIncomingRelation} from "./ReplaceIncomingRelation.js";
 export {default as ReplaceOutgoingRelation} from "./ReplaceOutgoingRelation.js";
+export {default as ReplaceMultipleIncomingRelations} from "./ReplaceMultipleIncomingRelations.js";
+export {default as ReplaceMultipleOutgoingRelations} from "./ReplaceMultipleOutgoingRelations.js";
+export {default as AddObjectType} from "./AddObjectType.js";
+export {default as RemoveObjectType} from "./RemoveObjectType.js";
+
 
 export const fullSetup = function() {
     let prefix = "graphApi/admin/edit/";
@@ -61,9 +66,33 @@ export const fullSetup = function() {
         currentSelect.item.register(prefix + name);
     }
 
+    {
+        let name = "replaceMultipleIncomingRelations";
+        let currentSelect = new DbmGraphApi.admin.edit.ReplaceMultipleIncomingRelations();
+        currentSelect.item.register(prefix + name);
+    }
+
+    {
+        let name = "replaceMultipleOutgoingRelations";
+        let currentSelect = new DbmGraphApi.admin.edit.ReplaceMultipleOutgoingRelations();
+        currentSelect.item.register(prefix + name);
+    }
+
     {
         let name = "clearCache";
         let currentSelect = new DbmGraphApi.admin.edit.ClearCloudflareCache();
         currentSelect.item.register(prefix + name);
     }
+
+    {
+        let name = "addObjectType";
+        let currentSelect = new DbmGraphApi.admin.edit.AddObjectType();
+        currentSelect.item.register(prefix + name);
+    }
+
+    {
+        let name = "removeObjectType";
+        let currentSelect = new DbmGraphApi.admin.edit.RemoveObjectType();
+        currentSelect.item.register(prefix + name);
+    }
 }

package/src/dbm-graph-api/data/HelpSectionSuggestions.js

@@ -0,0 +1,69 @@
+import Dbm from "dbm";
+
+export default class HelpSectionSuggestions extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getData(aData, aEncodeSession) {
+
+        await aEncodeSession.outputController.requireRole("admin");
+
+        let returnObject = {};
+
+        let content = aData["value"];
+        returnObject["content"] = content;
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let item = await database.createObject("private", ["aiGeneratedHelpSectionSuggestions"]);
+        await item.updateField("content", content);
+        returnObject["id"] = item.id;
+
+        let alreadyAdded = [
+            "All about this section"
+        ];
+
+        let alreadyAddedString = "The page already have these faq sections: " + JSON.stringify(alreadyAdded);
+
+        let contentString = JSON.stringify(content);
+
+        let instructions = "Generate a seo description for the page data provided by the user. Split up the description into different lines and only keep the ones that can be used to link to this page. {additionalInstructions} Respond with only a json object {seoDescription: string, linkTitles: array of string}, no markdown.";
+        instructions = instructions.split("{data}").join(contentString);
+        
+        let additionalInstructions = "";
+        instructions = instructions.split("{additionalInstructions}").join(additionalInstructions);
+
+        let body = {
+            "model": "gpt-4o",
+            "response_format": { "type": "json_object" },
+            "messages": [
+               {"role":"system","content": instructions},
+               /*{"role": "user", "content": alreadyAddedString},*/
+               {"role": "user", "content": contentString}
+           ],
+            "temperature": 0.1
+       }
+
+        let headers = {
+            "Content-Type": "application/json",
+            'Authorization': 'Bearer ' + Dbm.getInstance().repository.getItem("openAi").token
+        }
+        
+        let response = await fetch('https://api.openai.com/v1/chat/completions', {
+            method: "POST",
+            headers: headers,
+            body: JSON.stringify(body),
+        });
+
+        let data = await response.json();
+        await item.updateField("response", data);
+
+        let message = data.choices[0].message;
+        let responseContent = JSON.parse(message.content);
+        console.log(responseContent);
+        
+        returnObject["titles"] = responseContent;
+        
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/data/index.js

@@ -2,6 +2,7 @@ export {default as Example} from "./Example.js";
 export {default as UploadS3} from "./UploadS3.js";
 export {default as FreeUrl} from "./FreeUrl.js";
 export {default as SeoSummary} from "./SeoSummary.js";
+export {default as HelpSectionSuggestions} from "./HelpSectionSuggestions.js";
 export {default as AltText} from "./AltText.js";
 export {default as Breadcrumb} from "./Breadcrumb.js";
 export {default as Question} from "./Question.js";

package/src/dbm-graph-api/index.js

@@ -208,6 +208,7 @@ let fullDataSetup = function() {
 
     registerDataFunction("admin/freeUrl", new DbmGraphApi.data.FreeUrl());
     registerDataFunction("admin/seoSummary", new DbmGraphApi.data.SeoSummary());
+    registerDataFunction("admin/helpSectionSuggestions", new DbmGraphApi.data.HelpSectionSuggestions());
     registerDataFunction("admin/altText", new DbmGraphApi.data.AltText());
 
     registerDataFunction("server/status", new DbmGraphApi.data.server.Status());

package/src/dbm-graph-api/range/encode/Relations.js

@@ -18,6 +18,16 @@ export default class Relations extends EncodeBaseObject {
 
         returnObject["relations"] = relations;
 
+        {
+            let ids = Dbm.utils.ArrayFunctions.mapField(relations["in"], "id");
+            await aEncodingSession.encodeObjects(database.getObjects(ids), "objectTypes");
+        }
+        {
+            let ids = Dbm.utils.ArrayFunctions.mapField(relations["out"], "id");
+            await aEncodingSession.encodeObjects(database.getObjects(ids), "objectTypes");
+        }
+
+
         return returnObject;
     }
 }

package/src/dbm-graph-api/schema/JsonLdGenerator.js

@@ -32,28 +32,49 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
         let site = Dbm.getInstance().repository.getItem("site");
         let fields = await aDatabaseObject.getFields();
     
-        return {
+        let returnObject = {
             "@type": "Organization",
             "@id": this.baseUrl + "/" + "#organization",
             "url": this.baseUrl + "/",
             "name": fields["name"] ? fields["name"] : site.name,
         };
 
-        //Logo
+        let image = await aDatabaseObject.singleObjectRelationQuery("in:isLogoFor:image");
+        if(image) {
+            let fields = await image.getFields();
+            returnObject["logo"] = fields["url"];
+        }
+
+        return returnObject;
     }
 
     async encodeLocalBusiness(aDatabaseObject) {
 
+
         let site = Dbm.getInstance().repository.getItem("site");
 
         let type = await aDatabaseObject.singleObjectRelationQuery("in:for:schema/type");
-        let typeName = await type.getIdentifier();
+        let typeName = "LocalBusiness";
+        if(type) {
+            typeName = await type.getIdentifier();
+        }
+        
         let fields = await aDatabaseObject.getFields();
 
+        let baseUrl = this.baseUrl;
+
+        let representingPage = await aDatabaseObject.singleObjectRelationQuery("in:pageRepresentationFor:page");
+        if(representingPage) {
+            baseUrl += await representingPage.getUrl();
+        }
+        else {
+            baseUrl += "/";
+        }
+
         let returnObject = {
             "@type": typeName,
-            "@id": this.baseUrl + "/" + "#local-business",
-            "url": this.baseUrl + "/",
+            "@id": baseUrl  + "#local-business",
+            "url": baseUrl,
             "name": fields["name"] ? fields["name"] : site.name,
             "telephone": fields["phoneNumber"],
             "email": fields["email"],
@@ -93,6 +114,12 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
             };
         }
 
+        let image = await aDatabaseObject.singleObjectRelationQuery("in:isMainImageFor:image");
+        if(image) {
+            let fields = await image.getFields();
+            returnObject["image"] = fields["url"];
+        }
+
         return returnObject;
     }
     
@@ -107,13 +134,19 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
             returnArray.push(await this.encodeWebsiteEntity(website));
 
             let organization = await website.singleObjectRelationQuery("out:by:organization");
-            returnArray.push(await this.encodeOrganizationEntity(organization));
-
-            let currentArray = await website.objectRelationQuery("out:by:organization,in:in:localBusiness");
-            let currentArrayLength = currentArray.length;
-            for(let i = 0; i < currentArrayLength; i++) {
-                let currentLocalBusiness = currentArray[i];
-                returnArray.push(await this.encodeLocalBusiness(currentLocalBusiness));
+            if(organization) {
+                returnArray.push(await this.encodeOrganizationEntity(organization));
+
+                let currentArray = await website.objectRelationQuery("out:by:organization,in:in:localBusiness");
+                let currentArrayLength = currentArray.length;
+                for(let i = 0; i < currentArrayLength; i++) {
+                    let currentLocalBusiness = currentArray[i];
+                    if(currentLocalBusiness) {
+                        console.log(currentLocalBusiness);
+                        returnArray.push(await this.encodeLocalBusiness(currentLocalBusiness));
+                        console.log("-");
+                    }
+                }
             }
         }
     
@@ -140,7 +173,27 @@ export default class JsonLdGenerator extends Dbm.core.BaseObject{
               "@id": fullUrl +"#breadcrumb"
             },
             
-          }
+          };
+
+          let image = await aPage.singleObjectRelationQuery("in:isMainImageFor:image");
+            if(image) {
+                let fields = await image.getFields();
+
+                let imageObject =  {
+                    "@type": "ImageObject",
+                    "url": fields["url"]
+                };
+                pageObject["primaryImageOfPage"] = imageObject;
+            }
+
+
+            let representingEntity = await aPage.singleObjectRelationQuery("out:pageRepresentationFor:localBusiness");
+            if(representingEntity) {
+                pageObject["mainEntity"] = {
+                    "@id": fullUrl + "#local-business"
+                }
+            }
+
           returnArray.push(pageObject);
 
           let urlParts = url.split("/");