ApiLogicServer 15.0.22__py3-none-any.whl → 15.0.23__py3-none-any.whl

api_logic_server_cli/api_logic_server.py

@@ -12,10 +12,10 @@ ApiLogicServer CLI: given a database url, create [and run] customizable ApiLogic
 Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
 '''
 
-__version__ = "15.00.22"  # last public release: 15.00.19 (15.00.12)
+__version__ = "15.00.23"  # last public release: 15.00.22 (15.00.12)
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t06/22/2024 - 15.00.21: Tech Preview: als genai-app w/ sra provider, import fix, bug [96] \n"\
+    "\t06/23/2024 - 15.00.23: Tech Preview: als genai-app w/ sra provider+model, import fix, bug [96] \n"\
     "\t06/10/2024 - 15.00.12: MCP Security, win fixes for readme, graphics quotes \n"\
     "\t06/08/2024 - 15.00.10: MCP, optional shortening of stacktrace lines, bugfix[92] \n"\
     "\t05/16/2024 - 14.05.00: safrs 3.1.7, running mcp preview \n"\

api_logic_server_cli/api_logic_server_info.yaml

@@ -1,3 +1,3 @@
-last_created_date: June 22, 2025 16:02:13
+last_created_date: June 23, 2025 06:19:07
 last_created_project_name: ../../../servers/basic_demo
-last_created_version: 15.00.20
+last_created_version: 15.00.22

api_logic_server_cli/genai/genai_admin_app.py

@@ -43,10 +43,17 @@ class GenAIAdminApp:
         
         self.api_version = genai_version
         self.project_root = project.project_directory_path
+        self.app_templates_path = genai_svcs.get_manager_path(use_env=True).joinpath('system/genai/app_templates')
+
         self.dbml_path = self.project_root / "docs/db.dbml"
-        self.admin_yaml_path = self.project_root / f"ui/admin/{schema}"
         self.discovery_path = self.project_root / "docs/mcp_learning/mcp_discovery.json"
 
+        self.admin_yaml_path = self.project_root / f"ui/admin/{schema}"
+        self.admin_config_prompt_path = self.app_templates_path / f"app_learning/Admin-config-prompt.md"
+        self.admin_json_api_model_prompt_path = self.app_templates_path / f"app_learning/Admin-json-api-model-prompt.md"
+        assert self.admin_config_prompt_path.exists(), "sys err - self.admin_config_prompt_path"
+        assert self.admin_json_api_model_prompt_path.exists(), "sys err - self.admin_json_api_model_prompt_path"
+
         self.ui_project_path = self.project_root / f"ui/{app_name}"
         self.ui_src_path = self.ui_project_path / "src"
 
@@ -60,13 +67,17 @@ class GenAIAdminApp:
 
         # self.schema = utils.read_file(self.dbml_path)
         self.schema_yaml = utils.read_file(self.admin_yaml_path)
-        self.schema = yaml.safe_load(self.schema_yaml)
-
-
-        self.resources = {}
-        ''' dict keyed by resource_name (todo: relns?) '''
-        self.resource_names = []
-        ''' array of resource names '''
+        self.schema_dict = yaml.safe_load(self.schema_yaml)
+        self.admin_config_prompt = utils.read_file(self.admin_config_prompt_path)
+        self.admin_json_api_model_prompt = utils.read_file(self.admin_json_api_model_prompt_path)
+        config_prompt_parts = self.admin_config_prompt.split('<resources></resources>')
+        self.resources = self.schema_dict['resources']
+        # convert self.resources dict to text lines
+        self.resource_lines = json.dumps(self.resources, indent=4)
+        resources_dict = "\n".join([f"- {name}: {details}" for name, details in self.resources.items()])
+        config_prompt = config_prompt_parts[0] + "\n<resources>\n" + self.resource_lines + config_prompt_parts[1]
+        self.schema = config_prompt + self.admin_json_api_model_prompt
+        self.schema_lines = self.schema.split('\n')  # for debug
 
         shutil.copytree(self.react_admin_template_path, self.ui_project_path, dirs_exist_ok=True)
 
@@ -111,7 +122,7 @@ class GenAIAdminApp:
             return "\n".join(result_lines)
 
 
-        for each_resource_name, each_resource in self.schema['resources'].items():
+        for each_resource_name, each_resource in self.resources.items():
             # image moves app gen time from 70 -> 130 secs
             example_image_content_unused = [
                 {

api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-config-prompt.md

@@ -0,0 +1,18 @@
+Backend JSONAPI endpoint metadata is described in the following <resources> section , each key is a resource collection endpoint name.
+The tab_groups attribute describes the resource relationships, with fks being the foreign keys of the related resource.
+user_key tells which attribute should be shown when referencing the resource. for example, if the user_key is "name", the resource should be be shown by its "name" in the UI, while its reference should be by its "id".
+
+<resources></resources> 
+
+Most of the time, the resource name key will be the same as the type, 
+so you can use an instance type to get the resource configuration.
+
+ignore SPAPage and SPASection resources.
+
+This resource configuration can be used when importing the Config getConf() function in the react code, for example:
+
+<javascriptCode>
+import { getConf } from '../../Config';
+const conf = getConf();
+const resources = conf.resources;
+</javascriptCode>

api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-json-api-model-prompt.md

@@ -0,0 +1,89 @@
+This JSONAPI is fetched using the react-admin dataProvider (useDataprovider hook).
+All resources have a "type" and "id" attributes (according to the JSONAPI specification).
+
+Besides the regular parameters, the dataProvider is extended to interpret the "include" meta parameter to retrieve included relationships.
+
+<javascriptCode>
+dataProvider.getList(resourceName, {
+            pagination: { page: 1, perPage: 10 },
+            meta: { include: ["relationship_name"]}
+})
+</javascriptCode>
+
+attributes are inlined in the instance: 
+for example, if the resource is "some_resource" and the attribute is "name", then 'some_resource.name' will be the attribute value.
+
+included relationships are inlined in the instance:
+for example, if the resource is "some_resource" and the relationship is "relationship_name", the included data will be in the instance "relationship_name" key (some_resource.relationship_name).
+So:
+some_resource.relationship_name.id will be the id of the included (toone) relationship.
+some_resource.relationship_name will be an array of included (tomany) relationships.
+
+instances have a "relationships" key, which contains a dictionary of the relationships, for example, 
+following is the response for a resource with a tomany relationship named "tomany_relationships_name"
+<json>
+{
+    "tomany_relationships_name": {
+        "data": [
+            {
+                "id": "1",
+                "type": "Transaction"
+            }
+        ],
+        "meta": {
+            "count": 1,
+            "limit": 5,
+            "total": 1
+        }
+    },
+    "toone_relationsip_name": {
+        "data": {
+            "id": "1",
+            "type": "Customer"
+        }
+    }
+}
+</json>
+
+The actual relationship data is in the "data" key of the relationship.
+for example, the 'instance.tomany_relationships_name' will be an array of the instances data of the related resource:
+<json>
+[
+    {
+        "id": "1",
+        "ja_type": "Transaction",
+        "attributes": {
+            "Type": "withdrawal",
+            "account_id": 1,
+            "amount": 500,
+            "description": "Grocery Shopping",
+            "transaction_date": "2022-03-01"
+        },
+        "Type": "withdrawal",
+        "account_id": 1,
+        "amount": 500,
+        "description": "Grocery Shopping",
+        "transaction_date": "2022-03-01",
+        "relationships": {
+            "account": {
+                "data": null
+            }
+        },
+        "account": null
+    }
+]
+</json>
+
+similarly, the 'instance.toone_relationship_name' will be the instance data of the related resource:
+<json>
+{
+    "id": "1",
+    "credit_limit": 10000,
+    "first_name": "Alice",
+    "last_name": "Brown",
+}
+</json>
+if a toone relationship is empty, it's value will be null.
+
+if you want to fetch all related resources, you can use the 'meta: { include: ["+all"]}' parameter in the dataProvider.getList call.
+

{apilogicserver-15.0.22.dist-info → apilogicserver-15.0.23.dist-info}/METADATA

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

{apilogicserver-15.0.22.dist-info → apilogicserver-15.0.23.dist-info}/RECORD

@@ -1,6 +1,6 @@
 api_logic_server_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_logic_server_cli/api_logic_server.py,sha256=yhZnp9SRr2FkXBMV3RpqNne3fHgHy7dTf6Rqv12POfw,96373
-api_logic_server_cli/api_logic_server_info.yaml,sha256=6bRQOWkk7ELzCQ6bBf6AWbVcVAVqrV8dJU0bSwQwEUs,128
+api_logic_server_cli/api_logic_server.py,sha256=fU5lBs9fB7FoO7xp4haYugQK_k8Wa25SxEtlHlvUqls,96379
+api_logic_server_cli/api_logic_server_info.yaml,sha256=Rmy2DSMNBLtlV9PP_hqmn2FojD2AAinPVOfnTbwu6oE,128
 api_logic_server_cli/cli.py,sha256=bSc3sj9df94pIx0HyRYKOojOv3M360UNQgieJAgg9IM,85002
 api_logic_server_cli/cli_args_base.py,sha256=lr27KkOB7_WpZwTs7LgiK8LKDIHMKQkoZCTnE99BFxw,3280
 api_logic_server_cli/cli_args_project.py,sha256=I5no_fGRV_ZsK3SuttVDAaQYI4Q5zCjx6LojGkM024w,4645
@@ -476,7 +476,7 @@ api_logic_server_cli/genai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 api_logic_server_cli/genai/client.py,sha256=36gyz-dqxj4dJj1SGtO9NZsy9-cfnf4d7uahHimwqHk,772
 api_logic_server_cli/genai/genai.py,sha256=rt4XW_xmo-D5fLD8DQBHMjrU7Teflw43S8lR-tJd4KU,47014
 api_logic_server_cli/genai/genai_admin_app copy.py,sha256=d1E6kNVhq-xqhUh2j52V4cOTJxEiZgWhja1_kLJXKX8,4665
-api_logic_server_cli/genai/genai_admin_app.py,sha256=2MGg86hdrjiL352RcaG96aNCeALM7LI-PHXAKymGP3o,8420
+api_logic_server_cli/genai/genai_admin_app.py,sha256=Za05GVi_lQHW5n6D_jPcJQ4f4A_MUqOBLODmDXGno7Y,9603
 api_logic_server_cli/genai/genai_fatal_excp.py,sha256=1FmDVcXVRqmG0JMVZ7l4KqMOdpff3KGZ2LPAGtw304Q,179
 api_logic_server_cli/genai/genai_graphics.py,sha256=9ao0os6rUKY5u2caeLtgyDsNEuVQXq4KcKV575fNC58,20610
 api_logic_server_cli/genai/genai_logic_builder.py,sha256=u_89UtrALIfcMtW6p0SZ78lCmwRqerA5igyY2hDvjlk,26150
@@ -1212,6 +1212,8 @@ api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.
 api_logic_server_cli/prototypes/manager/system/genai/.DS_Store,sha256=ndrcwHjeXXcVbvjdiQNuyCtmI6m-kvDLoEnr0fFJsuY,6148
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-Resource-Learning-Prompt.md,sha256=VzsqOAnN6cOCWmPtVObNy9VgptJIy88sfOFIa5bgcqw,3562
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-js-Learning-Prompt.md,sha256=75FA3txqJ1viIyqt9O6nGpi17As7aSgVyUJ1rImriKc,2054
+api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-config-prompt.md,sha256=fyP8X1q9tM3i6bTVioa7ieM_aTUfk4GPo08aOWZ60-0,932
+api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-json-api-model-prompt.md,sha256=5Zp9q_lpY225qceQ3UhF4Fyd-85hDKkD-r3BWYmcs6Y,2890
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/notes.md,sha256=0m0eGWrmznV8s6Z0pegSrceGHXs6pmdnMUK5gaHijVk,187
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/z-unused-Admin-App-Learning-Prompt.md,sha256=umbU4-AQ42dTshT3m3bmBpu2omYb1eYfT40VCDsuVmc,5297
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/react-admin-template/.DS_Store,sha256=AnV79PLm6F_E6PkLoTv-GaJZpUGP_xdRkNEqrAYGYuE,6148
@@ -2272,9 +2274,9 @@ api_logic_server_cli/tools/mini_skel/database/system/SAFRSBaseX.py,sha256=p8C7AF
 api_logic_server_cli/tools/mini_skel/database/system/TestDataBase.py,sha256=U02SYqThsbY5g3DX7XGaiMxjZBuOpzvtPS6RfI1WQFg,371
 api_logic_server_cli/tools/mini_skel/logic/declare_logic.py,sha256=fTrlHyqMeZsw_TyEXFa1VlYBL7fzjZab5ONSXO7aApo,175
 api_logic_server_cli/tools/mini_skel/logic/load_verify_rules.py,sha256=Rr5bySJpYCZmNPF2h-phcPJ53nAOPcT_ohZpCD93-a0,7530
-apilogicserver-15.0.22.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
-apilogicserver-15.0.22.dist-info/METADATA,sha256=QGaKZ_0oEmVt8fF9aQ851OVFcXejmDx_4pVenZfkTeU,6553
-apilogicserver-15.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-apilogicserver-15.0.22.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
-apilogicserver-15.0.22.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
-apilogicserver-15.0.22.dist-info/RECORD,,
+apilogicserver-15.0.23.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
+apilogicserver-15.0.23.dist-info/METADATA,sha256=eg8g5J_kp79GVy4Ss0BHev7r7zz_5kdQTienVcNYsYU,6553
+apilogicserver-15.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+apilogicserver-15.0.23.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
+apilogicserver-15.0.23.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
+apilogicserver-15.0.23.dist-info/RECORD,,