ApiLogicServer 15.0.20__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.20"  # 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/19/2024 - 15.00.20: Tech Preview: als genai-app, 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 19, 2025 16:11:17
+last_created_date: June 23, 2025 06:19:07
 last_created_project_name: ../../../servers/basic_demo
-last_created_version: 15.00.19
+last_created_version: 15.00.22

api_logic_server_cli/genai/genai_admin_app.py

@@ -43,28 +43,41 @@ 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"
 
         self.app_templates_path = genai_svcs.get_manager_path(use_env=True).joinpath('system/genai/app_templates')
         self.react_admin_template_path = self.app_templates_path / 'react-admin-template'
         self.prompts_path = self.app_templates_path / "app_learning"
-        self.admin_app_learning = utils.read_file(self.prompts_path / "Admin-App-Learning-Prompt.md")
+        # self.admin_app_learning = utils.read_file(self.prompts_path / "Admin-App-Learning-Prompt.md")
+        self.admin_app_resource_learning = utils.read_file(self.prompts_path / "Admin-App-Resource-Learning-Prompt.md")
+        self.admin_app_js_learning = utils.read_file(self.prompts_path / "Admin-App-js-Learning-Prompt.md")
         self.image_url = self.prompts_path / 'Order-Page.png'  # did not seem to help, made it 2x slower
 
         # 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)
 
@@ -109,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 = [
                 {
@@ -126,7 +139,7 @@ class GenAIAdminApp:
             ]
             messages = [
                 {"role": "user", "content": "You are a helpful expert in react and JavaScript"},
-                {"role": "user", "content": self.admin_app_learning},
+                {"role": "user", "content": self.admin_app_resource_learning},
                 # {"role": "user", "content": example_image_content},
                 {"role": "user", "content": f'Schema:\n{self.schema_yaml}'},
                 {"role": "user", "content": f'Generate the full javascript source code for the `{each_resource_name}.js` React Admin file, formatted as a JSResponseFormat'}]
@@ -143,10 +156,23 @@ class GenAIAdminApp:
 
 
     def b_generate_app_js(self):
+
+        def fix_app(raw_source: str) -> str:
+            ''' Remove code occasional begin/end code markers <br>
+            '''
+            source_lines = raw_source.splitlines()
+            result_lines = []
+            data_provider_import = False
+            do_fixup = False
+            for each_line in source_lines:
+                # fixes here
+                result_lines.append(each_line)                
+            return "\n".join(result_lines)  # return source_lines as a string
+
         messages = []
         messages = [
             {"role": "user", "content": "You are a helpful expert in react and JavaScript"},
-            {"role": "user", "content": self.admin_app_learning},
+            {"role": "user", "content": self.admin_app_js_learning},
             {"role": "user", "content": f'Schema:\n{self.schema_yaml}'},
             {"role": "user", "content": f'Generate the complete App.js that wires together the above resources. for the `app.js` React Admin file, formatted as a JSResponseFormat.'}]
         save_response = self.project_root / f"docs/admin_app/app.js"
@@ -156,7 +182,9 @@ class GenAIAdminApp:
                                             response_as=JSResponseFormat)
         response_dict = json.loads(output)
         target_file = self.ui_src_path / "App.js"
-        utils.write_file(target_file, response_dict['code'])
+        source_code = response_dict['code']
+        source_code = fix_app(source_code)
+        utils.write_file(target_file, source_code)
 
         log.info(f"✅ Wrote: {target_file}\n")
 

api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-Resource-Learning-Prompt.md

@@ -0,0 +1,119 @@
+## Context
+
+Generate a per-resource file for a React Admin application using the following instructions.  
+The result must be a runnable React app (`npm start`) that connects to the supplied JSON:API, with fully implemented components (no placeholders or empty files).
+
+
+---
+
+### Per-Resource Files (Required)
+
+For each resource (`Customer`, `Order` etc):
+
+* Create a source file under `src/`, e.g., `Customer.js`
+* Each file must **fully** implement:
+    * `CustomerList`
+    * `CustomerShow`
+    * `CustomerCreate`
+    * `CustomerEdit`
+
+Use:
+
+- `<ReferenceField>` for foreign key displays
+- `<ReferenceInput>` for foreign key input
+- `<ReferenceManyField>` for tabbed child lists
+- For show pages
+
+  * Always start with `<SimpleShowLayout>`, followed by a `<TabbedShowLayout>` for related data
+    * DO NOT start with `<TabbedShowLayout>`
+
+ALWAYS include these 2 imports at the top of the file, with this EXACT formatting, whether or not they are used:
+
+```jsx
+import React from 'react';
+import { List, FunctionField, Datagrid, TextField, DateField, NumberField, ReferenceField, ReferenceManyField, Show, TabbedShowLayout, Tab, SimpleShowLayout, TextInput, NumberInput, DateTimeInput, ReferenceInput, SelectInput, Create, SimpleForm, Edit, Filter, Pagination, BooleanField, BooleanInput } from 'react-admin';  // mandatory import
+```
+You may add other imports, but be sure all those are included.
+
+DO NOT use `<EmailInput>` - use `<TextInput>`.
+
+DO NOT put `<ReferenceField>` in `<Datagrid>`.
+
+Do **not leave any file empty**.
+
+---
+
+## App Features
+
+### Multi-Page
+
+For each resource:
+
+- Create a **List page** showing 7 user-friendly columns
+- Add **pagination**, **sorting**, and **filtering**
+- Link each row to a **Display (Show) page**
+
+### Multi-Resource
+
+Each **Display Page** should:
+
+- Show all fields in a **multi-column layout**
+- Include a **tab sheet** (`<TabbedShowLayout>`) for each related resource using `<ReferenceManyField>`
+- Link child rows to their own display page
+
+Example:  
+
+- Customer Display has tab for OrderList 
+
+  - The tab (with OrderList) is shown *below* all the Customer fields.
+- Each Order in the tab links to Order Display
+
+### Automatic Joins
+
+For foreign keys:
+
+- Display joined value (e.g., `product.name` instead of `product_id`)
+- Use first string field from parent table containing `name`, `title`, or `description`
+
+Numeric Primary key fields:
+
+- Display at the end of forms/lists
+
+### Lookups (Foreign Keys)
+
+For foreign key fields:
+
+- Provide auto-complete dropdown (`<ReferenceInput>`)
+- For numeric foreign keys, use the joined string field as lookup text
+
+### Cascade Add
+
+When adding a child row as a detail in a Master / Detail,
+default the Foreign Key to the Parent (Master) Primary Key.
+
+## Implementation
+
+### Architecture
+
+- **Framework**: React 18 + react-admin 4.x
+- **Data Provider**: Custom pre-built in src/rav4-jsonapi-client
+- **CORS**: Ensure API allows `http://localhost:3000`
+
+```py
+  from flask_cors import CORS  
+  CORS(app, origins='*')  # or restrict to localhost:3000
+```
+- **Project Setup**:
+
+  - Use `create-react-app`
+  - Include: `react-admin`, `@mui/material`, `@emotion/react`, `@emotion/styled`, `react-router-dom`
+  - Do not use any deprecated or unmaintained libraries
+  - Include complete and correct `App.js`, `index.js`, `dataProvider.js`, and `index.html`
+---
+
+## Response Format
+
+Format the response as a JSResponseFormat:
+
+class JSResponseFormat(BaseModel):  # must match system/genai/prompt_inserts/response_format.prompt
+    code : str # generated javascript code (only)

api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-js-Learning-Prompt.md

@@ -0,0 +1,71 @@
+
+
+### App Wiring
+
+Sample code for react `App.js` (follow these guidelines EXACTLY):
+
+```jsx
+// begin constant imports (always included) -- generate this code EXACTLY
+import React from 'react';
+import { Admin, Resource, Loading } from 'react-admin';  // val? loading
+import { jsonapiClient } from "./rav4-jsonapi-client/ra-jsonapi-client";
+import { createTheme } from '@mui/material/styles';
+import { useConf, loadHomeConf } from "./Config";  // val ??
+// end constant imports
+
+// import each resource, e.g.
+import { CustomerList, CustomerShow, CustomerCreate, CustomerEdit } from './Customer';
+...
+
+const theme = createTheme({
+    palette: {
+        primary: { main: '#1976d2' },    // Material-UI default blue
+        secondary: { main: '#1565c0' },  // A darker blue, or choose another color
+    },
+    typography: { fontSize: 14 },
+});
+
+const App = () => {
+  const [conf, setConf] = React.useState({});
+  
+  React.useEffect(() => {
+    const fetchData = async () => {
+      try {
+        console.log('loading HomeConf-1')
+        const conf = await loadHomeConf()
+        setConf(conf)
+        setLoading(false);
+        console.log('AppConf0: ', conf);
+      } catch (error) {
+        console.error('Error fetching data:', error);
+        sessionStorage.removeItem("raSpa");
+      }
+    };
+    fetchData();
+  }, []);
+
+  if (loading) {
+    return <Loading loadingPrimary="Loading..." loadingSecondary="Please wait" />;
+  }
+  const dataProvider = jsonapiClient(conf.api_root, { conf: {} }, null);
+
+  return (
+        // register each resource (do NOT generate {dataProvider(conf.api_root)}...
+        <Admin dataProvider={dataProvider} theme={theme}>
+            <Resource name="Customer" list={CustomerList} show={CustomerShow} edit={CustomerEdit} create={CustomerCreate} />
+...
+        </Admin>
+    );
+};
+
+export default App;
+```
+
+---
+
+## Response Format
+
+Format the response as a JSResponseFormat:
+
+class JSResponseFormat(BaseModel):  # must match system/genai/prompt_inserts/response_format.prompt
+    code : str # generated javascript code (only)

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.
+

api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/{Admin-App-Learning-Prompt.md → z-unused-Admin-App-Learning-Prompt.md}

@@ -56,12 +56,7 @@ default the Foreign Key to the Parent (Master) Primary Key.
 ### Architecture
 
 - **Framework**: React 18 + react-admin 4.x
-- **Data Provider**: Custom `dataProvider.js` using `fetchUtils` (no external `ra-jsonapi-client`)
-
-  - Must support: `getList`, `getOne`, `getMany`, `getManyReference`, `create`, `update`, `delete`
-  - Must support: filters, joins, sorting, pagination
-
-- **Backend**: JSON:API per `mcp_discovery.json`
+- **Data Provider**: Custom pre-built in src/rav4-jsonapi-client
 - **CORS**: Ensure API allows `http://localhost:3000`
 
 ```py
@@ -116,19 +111,19 @@ Do **not leave any file empty**.
 
 ### App Wiring
 
-Sample code for `App.js`:
-
+Sample code for `App.js` (follow these guidelines EXACTLY):
 
 ```jsx
+// begin constant imports (always included) -- generate this code EXACTLY
 import React from 'react';
-import { Admin, Resource } from 'react-admin';
+import { Admin, Resource, Loading } from 'react-admin';  // val? loading
 import { createTheme } from '@mui/material/styles';
+import { useConf, loadHomeConf } from "./Config";  // val ??
+// end constant imports
 
-// import each resource
+// import each resource, e.g.
 import { CustomerList, CustomerShow, CustomerCreate, CustomerEdit } from './Customer';
 ...
-// import the data provider
-import { dataProvider } from './dataProvider';
 
 const theme = createTheme({
     palette: {
@@ -139,8 +134,32 @@ const theme = createTheme({
 });
 
 const App = () => {
-    return (
-        <Admin dataProvider={dataProvider}>  // register each resource...
+  const [conf, setConf] = React.useState({});
+  
+  React.useEffect(() => {
+    const fetchData = async () => {
+      try {
+        console.log('loading HomeConf-1')
+        const conf = await loadHomeConf()
+        setConf(conf)
+        setLoading(false);
+        console.log('AppConf0: ', conf);
+      } catch (error) {
+        console.error('Error fetching data:', error);
+        sessionStorage.removeItem("raSpa");
+      }
+    };
+    fetchData();
+  }, []);
+
+  if (loading) {
+    return <Loading loadingPrimary="Loading..." loadingSecondary="Please wait" />;
+  }
+  const dataProvider = jsonapiClient(conf.api_root, { conf: {} }, null);
+
+  return (
+        // register each resource (do NOT generate {dataProvider(conf.api_root)}...
+        <Admin dataProvider={dataProvider} theme={theme}>
             <Resource name="Customer" list={CustomerList} show={CustomerShow} edit={CustomerEdit} create={CustomerCreate} />
 ...
         </Admin>
@@ -150,16 +169,6 @@ const App = () => {
 export default App;
 ```
 
-For dataProvider:
-
-1. be sure it includes the braces: `import { dataProvider }`
-2. Do Not generate either:
-
-```jsx
-import jsonServerProvider from 'ra-data-json-server'
-const dataProvider = jsonServerProvider('http://api.example.com');
-```
-
 ---
 
 ## Response Format

api_logic_server_cli/prototypes/manager/system/genai/app_templates/react-admin-template/package.json

@@ -10,11 +10,14 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^13.5.0",
+    "compare-versions": "^6.1.1",
+    "keycloak-js": "^26.2.0",
     "react": "^19.1.0",
     "react-admin": "^5.8.3",
     "react-dom": "^19.1.0",
     "react-router-dom": "^7.6.2",
     "react-scripts": "5.0.1",
+    "url-join": "^5.0.0",
     "web-vitals": "^2.1.4"
   },
   "scripts": {