dbm-graph-api 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "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.1",
+    "dbm": "^1.1.2",
     "ws": "^8.18.0"
   },
   "optionalDependencies": {

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

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

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

@@ -2,11 +2,12 @@ import DbmGraphApi from "../../../../index.js";
 export {default as EditBaseObject} from "./EditBaseObject.js";
 
 export {default as SetField} from "./SetField.js";
+export {default as SetIdentifier} from "./SetIdentifier.js";
 export {default as SetUrl} from "./SetUrl.js";
 export {default as AddIncomingRelation} from "./AddIncomingRelation.js";
 export {default as AddOutgoingRelation} from "./AddOutgoingRelation.js";
 
-let fullSetup = function() {
+export const fullSetup = function() {
     let prefix = "graphApi/admin/edit/";
     {
         let name = "setField";
@@ -14,6 +15,12 @@ let fullSetup = function() {
         currentSelect.item.register(prefix + name);
     }
 
+    {
+        let name = "setIdentifier";
+        let currentSelect = new DbmGraphApi.admin.edit.SetIdentifier();
+        currentSelect.item.register(prefix + name);
+    }
+
     {
         let name = "setUrl";
         let currentSelect = new DbmGraphApi.admin.edit.SetUrl();
@@ -31,6 +38,4 @@ let fullSetup = function() {
         let currentSelect = new DbmGraphApi.admin.edit.AddOutgoingRelation();
         currentSelect.item.register(prefix + name);
     }
-}
-
-export {fullSetup};
+}

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

@@ -0,0 +1,75 @@
+import Dbm from "dbm";
+
+export default class SeoSummary extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getData(aData, aEncodeSession) {
+        let returnObject = {};
+
+        let imageId = aData["id"];
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let item = await database.createObject("private", ["aiGeneratedAltText"]);
+
+        returnObject["id"] = item.id;
+        returnObject["imageId"] = imageId;
+        
+        let image = database.getObject(imageId);
+        let fields = await image.getFields();
+
+        let url = fields["resizeUrl"];
+        if(url) {
+            url = url.split("{scale}").join("width=1024,height=1024")
+        }
+
+        returnObject["url"] = url;
+
+        let instructions = "Generate an alt text for the image. Respond with only a json object {altText: string}, no markdown.";
+
+        let body = {
+            "model": "gpt-4o",
+            "response_format": { "type": "json_object" },
+            "max_tokens": 300,
+            "messages": [
+              {"role":"system","content": instructions},
+              {
+                "role": "user",
+                "content": [
+                  {
+                    "type": "image_url",
+                    "image_url": {
+                      "url": url
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+
+        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();
+        console.log(data);
+        await item.updateField("response", data);
+
+        let message = data.choices[0].message;
+        console.log(message.content);
+        let responseContent = JSON.parse(message.content);
+        console.log(responseContent);
+        
+        returnObject["altText"] = responseContent["altText"];
+        
+        return returnObject;
+    }
+}

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

@@ -26,6 +26,7 @@ export default class SeoSummary extends Dbm.core.BaseObject {
 
         let body = {
             "model": "gpt-4o-mini",
+            "response_format": { "type": "json_object" },
             "messages": [
                {"role":"system","content": instructions},
                {"role": "user", "content": contentString}

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

@@ -20,7 +20,8 @@ export default class UploadS3 extends Dbm.core.BaseObject {
     async getData(aData, aEncodeSession) {
         let returnObject = {};
 
-        let fileName = aData["fileName"].toLowerCase();
+        let originalFileName = aData["fileName"];
+        let fileName = originalFileName.toLowerCase();
         let mimeType = aData["mimeType"];
 
         fileName = fileName.replace(/[åäã]/gi, 'a');
@@ -46,7 +47,8 @@ export default class UploadS3 extends Dbm.core.BaseObject {
         fullPath = fullPath.split("{date}").join(dateDay);
         fullPath = fullPath.split("{generatedId}").join(generatedId);
 
-        //METODO: add to database
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let item = await database.createObject("public", ["image"]);
 
         fileName = fullPath + fileName;
         let acl = this.item.acl;
@@ -60,8 +62,18 @@ export default class UploadS3 extends Dbm.core.BaseObject {
 
         let presignedUrl = await getSignedUrl(this.item.client, command, { expiresIn: 360 });
 
+        await item.setIdentifier(generatedId);
+        await item.updateField("name", originalFileName);
+        await item.updateField("path", fileName);
+        await item.updateField("originalFileName", originalFileName);
+        await item.updateField("url", this.item.publicPath + fileName);
+        await item.updateField("resizeUrl", this.item.publicResizePath + fileName);
+
+        returnObject["id"] = item.id;
         returnObject["identifier"] = generatedId;
         returnObject["url"] = presignedUrl;
+        returnObject["name"] = fileName;
+        returnObject["originalFileName"] = fileName;
         returnObject["publicUrl"] = this.item.publicPath + fileName;
         returnObject["publicResizeUrl"] = this.item.publicResizePath + fileName;
         returnObject["acl"] = acl;

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 AltText} from "./AltText.js";
 
 import UploadS3 from "./UploadS3.js";
 

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

@@ -108,6 +108,13 @@ let fullEncodeSetup = function() {
         currentEncode.item.register(encodePrefix + name);
         currentEncode.item.setValue("encodingType", name);
     }
+
+    {
+        let name = "image";
+        let currentEncode = new DbmGraphApi.range.encode.Image();
+        currentEncode.item.register(encodePrefix + name);
+        currentEncode.item.setValue("encodingType", name);
+    }
 }
 
 export {fullEncodeSetup};
@@ -124,6 +131,7 @@ let fullDataSetup = function() {
     registerDataFunction("example", new DbmGraphApi.data.Example());
     registerDataFunction("admin/freeUrl", new DbmGraphApi.data.FreeUrl());
     registerDataFunction("admin/seoSummary", new DbmGraphApi.data.SeoSummary());
+    registerDataFunction("admin/altText", new DbmGraphApi.data.AltText());
 }
 
 export {fullDataSetup};

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

@@ -33,4 +33,12 @@ export default class EncodeBaseObject extends Dbm.core.BaseObject {
 
         return {};
     }
+
+    _dataOrNull(aData) {
+        if(aData === undefined) {
+            return null;
+        }
+
+        return aData;
+    }
 }

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

@@ -0,0 +1,27 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class Image extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        let fields = await object.getFields();
+        returnObject["originalFileName"] = fields["originalFileName"];
+        returnObject["path"] = fields["path"];
+        returnObject["url"] = fields["url"];
+        returnObject["resizeUrl"] = fields["resizeUrl"];
+        returnObject["altText"] = this._dataOrNull(fields["altText"]);
+
+        await aEncodingSession.encodeSingle(aId, "identifier");
+        await aEncodingSession.encodeSingle(aId, "name");
+
+        return returnObject;
+    }
+}

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

@@ -9,4 +9,5 @@ export {default as UrlRequest} from "./UrlRequest.js";
 export {default as Url} from "./Url.js";
 export {default as Breadcrumb} from "./Breadcrumb.js";
 export {default as NavigationName} from "./NavigationName.js";
-export {default as Type} from "./Type.js";
+export {default as Type} from "./Type.js";
+export {default as Image} from "./Image.js";