ApiLogicServer 15.0.27__py3-none-any.whl → 15.0.32__py3-none-any.whl

api_logic_server_cli/prototypes/nw/ui/reference_react_app/src/rav4-jsonapi-client/resourceLookup.ts

@@ -0,0 +1,124 @@
+interface Relationship {
+    data: null | { id: string; type: string } | Array<{ id: string; type: string }>;
+    relationships?: { [key: string]: Relationship };
+}
+
+/**
+ * A map-like class that maps resource linkage objects {id: 1, type: "user"} to concrete resources with attributes and
+ * relationships
+ */
+export default class ResourceLookup {
+    lookup: Map<any, any>;
+    includes: string[];
+
+    /**
+     * Constructs a new lookup map
+     * @param {Object} response A JSON API response, in JSON format
+     */
+    constructor(response: any) {
+        this.lookup = new Map();
+        this.includes = [];
+
+        // If the response wasn't a JSON dictionary, we can't and don't need to build a lookup
+        if (typeof response !== 'object') return;
+
+        let resources;
+        // if (response.hasOwnProperty('included')) {
+        if (Object.prototype.hasOwnProperty.call(response, 'included')) {
+            resources = [...response.data, ...response.included];
+        } else {
+            resources = response.data;
+        }
+
+        // Iterate over each resource returned and put each in the lookup
+        for (const entry of resources) {
+            const key = this.getKey(entry);
+            this.lookup.set(key, entry);
+        }
+    }
+
+    /**
+     * Calculates a hashable key for JSON API resources
+     * @param resource A resource linkage object
+     * @returns {string}
+     */
+    getKey(resource: any) {
+        return `${resource.type}:${resource.id}`;
+    }
+
+    /**
+     * Looks up a resource
+     * @param resource A resource linkage object
+     * @returns {Object}
+     */
+    get(resource: any) {
+        // If we don't have included data for this resource, just return the Resource Linkage object, since that's still
+        // useful
+        if (this.has(resource)) {
+            return this.lookup.get(this.getKey(resource));
+        } else {
+            return structuredClone(resource);
+        }
+    }
+
+    /**
+     * Returns true if the resource is in the lookup
+     * @param resource
+     * @returns {boolean}
+     */
+    has(resource: any) {
+        return this.lookup.has(this.getKey(resource));
+    }
+
+    /**
+     * Converts a JSON API data object (with id, type, and attributes fields) into a flattened object
+     * @param {Object} response A JSON API data object
+     */
+    unwrapData(response: any) {
+        // The base resource object, merge the attributes and the id/type fields
+        const result = Object.assign(
+            {
+                id: response?.id,
+                ja_type: response?.type,
+                type: response?.Type || response?.type,
+                attributes: response.attributes || {},
+            },
+            response.attributes
+        );
+
+        // Deal with relationships
+        if (Object.prototype.hasOwnProperty.call(response, 'relationships')) {
+            result.relationships = response.relationships;
+            for (const [relationshipName, relationship] of Object.entries(response.relationships)) {
+                if ((relationship as Relationship).data === null) {
+                    result[relationshipName] = null;
+                }
+
+                if (!(relationship as Relationship).data) {
+                    continue;
+                } else if (Array.isArray((relationship as Relationship).data && (relationship as Relationship).data)) {
+                    result[relationshipName] = (relationship as Relationship).data?.map((linkage: any) => {
+                        const resource = this.get(linkage);
+                        const lresult = structuredClone(this.unwrapData(resource));
+                        Object.entries(lresult.attributes || {}).map(([key, value]) => {
+                            lresult[key] = value;
+                        });
+                        result.relationships[relationshipName].data = result[relationshipName];
+                        return lresult;
+                    });
+                } else if ((relationship as Relationship).data?.id) {
+                    const resource = this.get((relationship as Relationship).data);
+                    result[relationshipName] = this.unwrapData(resource);
+                    result.relationships[relationshipName].data = result[relationshipName];
+                }
+            }
+        }
+
+        try {
+            JSON.stringify(structuredClone(result));
+        } catch (e) {
+            return null;
+        }
+        return structuredClone(result);
+    }
+}

api_logic_server_cli/prototypes/nw/ui/reference_react_app/src/rav4-jsonapi-client/styles.module.css

@@ -0,0 +1,9 @@
+/* add css module styles here (optional) */
+
+.test {
+  margin: 2em;
+  padding: 0.5em;
+  border: 2px solid #000;
+  font-size: 2em;
+  text-align: center;
+}

api_logic_server_cli/prototypes/nw_no_cust/Tutorial.md

@@ -135,8 +135,8 @@ To apply customizations, in a terminal window for your project:
 **2. Apply Customizations:** in the terminal window of your IDE:
 
 ```bash
-ApiLogicServer add-cust
-ApiLogicServer add-auth --db_url=auth  # version 10.3.14 or greater
+genai-logic add-cust
+genai-logic add-auth --db_url=auth  # version 10.3.14 or greater
 ```
 
 **3. Restart the server, login as `admin`**

api_logic_server_cli/prototypes/sqlite/devops/docker-compose-dev-azure/azure-deploy.sh

@@ -57,7 +57,7 @@ echo " "
 if [ ! -f "./database/authentication_models.py" ] 
 then
     echo "\nYou need to activate security first.  With mysql-container running...\n" 
-    echo "ApiLogicServer add-auth --project_name=. --db_url=mysql+pymysql://root:p@localhost:3306/authdb"
+    echo "genai-logic add-auth --project_name=. --db_url=mysql+pymysql://root:p@localhost:3306/authdb"
     echo "\nRebuild your image"
     echo "\nThen, stop mysql-container\n"
     exit 1

api_logic_server_cli/{prototypes/basic_demo/customizations/logic/logic_discovery → templates}/mcp_client_executor_request.py

@@ -10,6 +10,8 @@ import requests
 from logic_bank.logic_bank import Rule
 from logic_bank.exec_row_logic.logic_row import LogicRow
 from database import models
+from database.mcp_models import SysMcp as SysMcp  # type: ignore
+from sqlalchemy import Column, Integer, String, DECIMAL, Boolean
 from logic_bank.util import ConstraintException
 import integration.mcp.mcp_client_executor as mcp_client_executor
 
@@ -27,7 +29,7 @@ def declare_logic():
     """
 
 
-    def mcp_client_executor_event(row: models.SysMcp, old_row: models.SysMcp, logic_row: LogicRow):
+    def mcp_client_executor_event(row: SysMcp, old_row: SysMcp, logic_row: LogicRow):
         """ 
 
         #als: create an MCP request.  See https://apilogicserver.github.io/Docs/Integration-MCP/
@@ -45,4 +47,4 @@ def declare_logic():
         result = mcp_client_executor.mcp_client_executor(row.request)
         pass
 
-    Rule.row_event(on_class=models.SysMcp, calling=mcp_client_executor_event)  # see above
+    Rule.row_event(on_class=SysMcp, calling=mcp_client_executor_event)  # see above

{apilogicserver-15.0.27.dist-info → apilogicserver-15.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ApiLogicServer
-Version: 15.0.27
+Version: 15.0.32
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://www.genai-logic.com