ApiLogicServer 15.0.25__py3-none-any.whl → 15.0.26__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.25"  # last public release: 15.00.22 (15.00.12)
+__version__ = "15.00.26"  # last public release: 15.00.25 (15.00.12)
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t06/24/2024 - 15.00.25: Tech Preview: als genai-app w/ sra provider+model+grid, import fix, bug [96] \n"\
+    "\t06/25/2024 - 15.00.26: Tech Preview: als genai-app w/ sra provider+model+grid_cascadeAdd, 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/genai/genai_admin_app.py

@@ -38,7 +38,7 @@ class JSResponseFormat(BaseModel):  # must match system/genai/prompt_inserts/res
 
 class GenAIAdminApp:
 
-    def __init__(self, project: Project, app_name: str, schema: str, genai_version: OpenAI):  #  TODO: type??
+    def __init__(self, project: Project, app_name: str, schema: str, genai_version: str):
         self.start_time = time.time()
         
         self.api_version = genai_version
@@ -82,6 +82,7 @@ class GenAIAdminApp:
         shutil.copytree(self.react_admin_template_path, self.ui_project_path, dirs_exist_ok=True)
 
         # self.parse_resources()
+        self.standard_imports = self.read_standard_imports()
         self.a_generate_resource_files()
         self.b_generate_app_js()
         # comes from copytree, above -- self.c_generate_data_provider()
@@ -94,27 +95,36 @@ class GenAIAdminApp:
         log.info('> npm install')
         log.info('> npm start')
 
+    def read_standard_imports(self) -> List[str]:
+        '''grr
+        
+        openAI very often ignores the EXACTLY imports,<br>
+        so read them manually for later resource creation
+        '''
+        learning = self.admin_app_resource_learning.splitlines()
+        result_lines = []
+        preamble_done = False
+        for each_line in learning:
+            if '<sample-code' in each_line:
+                preamble_done = True
+                continue
+            if 'end mandatory imports' in each_line:
+                result_lines.append(each_line) 
+                result_lines.append("") 
+                break
+            if preamble_done:
+                result_lines.append(each_line)              
+        return result_lines
+
 
     def a_generate_resource_files(self):
 
-        def fix_resource(raw_source: str) -> str:
-            ''' Remove code occasional begin/end code markers <br>
-            And horrific override of ChatGPT refusal to generate imports AS DIRECTED!
+        def fix_resource(genai_app: GenAIAdminApp, raw_source: str) -> str:
+            ''' Remove occasional begin/end code markers <br>
+            And horrific override of ChatGPT refusal to generate imports AS DIRECTED!<br>
             ToDo: lint, and repeat generation if errors detected
             '''
-            mandatory_imports = '''
-// begin MANDATORY imports (always generated EXACTLY)
-import React from 'react';
-import { List, FunctionField, Datagrid, TextField, DateField, NumberField } from 'react-admin';
-import { ReferenceField, ReferenceManyField } from 'react-admin';
-import { TabbedShowLayout, Tab, SimpleShowLayout, TextInput, NumberInput, DateTimeInput } from 'react-admin';
-import { ReferenceInput, SelectInput, SimpleForm, Show, Edit, Create } from 'react-admin';
-import { Filter, Pagination, BooleanField, BooleanInput, Labeled } from 'react-admin'; 
-import { Grid, Typography, Box, Divider } from '@mui/material';
-// end mandatory imports
-
-// generate pages and components...
-'''
+
             source_lines = raw_source.splitlines()
             result_lines = []
             imports_done = False
@@ -126,7 +136,7 @@ import { Grid, Typography, Box, Divider } from '@mui/material';
                     else:
                         break
                 if do_mandatory_imports := True and not imports_done and '= (props) =>' in each_line:
-                    result_lines = mandatory_imports.split('\n')
+                    result_lines = list(genai_app.standard_imports)
                     imports_done = True
                 result_lines.append(each_line)              
             # return source_lines as a string
@@ -150,7 +160,7 @@ import { Grid, Typography, Box, Divider } from '@mui/material';
                                              response_as=JSResponseFormat)
             response_dict = json.loads(output)
             target_file = self.ui_src_path / f"{each_resource_name}.js"
-            source_code = fix_resource(response_dict['code'])
+            source_code = fix_resource(self, response_dict['code'])
             utils.write_file(target_file, source_code)
             log.info(f"\n✅ Wrote: {target_file}")
 

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

@@ -16,7 +16,10 @@ import { ReferenceField, ReferenceManyField } from 'react-admin';
 import { TabbedShowLayout, Tab, SimpleShowLayout, TextInput, NumberInput, DateTimeInput } from 'react-admin';
 import { ReferenceInput, SelectInput, SimpleForm, Show, Edit, Create } from 'react-admin';
 import { Filter, Pagination, BooleanField, BooleanInput, Labeled } from 'react-admin'; 
-import { Grid, Typography, Box, Divider } from '@mui/material';
+import { EditButton, DeleteButton, CreateButton } from 'react-admin';
+import { Grid, Typography, Box, Divider, Button } from '@mui/material';
+import { useRecordContext, useRedirect, Link, required } from 'react-admin';
+import AddIcon from '@mui/icons-material/Add';
 // end mandatory imports
 
 // Filter for Customer List
@@ -79,8 +82,11 @@ export const CustomerShow = (props) => {
                             <DateField source="CreatedOn" label="Created On" />
                             <NumberField source="amount_total" label="Amount Total" options={{ style: 'currency', currency: 'USD' }} />
                             <DateField source="date_shipped" label="Date Shipped" />
+                            <EditButton />
+                            <DeleteButton />
                         </Datagrid>
                     </ReferenceManyField>
+                    <AddOrderButton />
                 </Tab>
                 ...
             </TabbedShowLayout>
@@ -88,6 +94,29 @@ export const CustomerShow = (props) => {
     );
 };
 
+// Custom Add Order Button
+const AddOrderButton = () => {
+    const record = useRecordContext();
+    const redirect = useRedirect();
+    
+    const handleClick = () => {
+        // Use the newer React Admin approach for pre-filling forms
+        redirect(`/Order/create?source=${encodeURIComponent(JSON.stringify({ customer_id: record?.id }))}`);
+    };
+
+    return (
+        <Button
+            variant="contained"
+            color="primary"
+            startIcon={<AddIcon />}
+            onClick={handleClick}
+            sx={{ mt: 2 }}
+        >
+            Add New Order
+        </Button>
+    );
+};
+
 // Customer Create
 export const CustomerCreate = (props) => {
     return (
@@ -162,7 +191,12 @@ For each resource (`Customer`, `Order` etc) and **fully** implement:
 Use:
 
 - `<ReferenceField>` for foreign key displays
-- `<ReferenceInput>` for foreign key input
+- `<ReferenceInput>` for foreign key input, like this (IMPORTANT: validate is on SelectInput, NEVER ReferenceInput )
+```
+<ReferenceInput source="customer_id" reference="Customer" fullWidth>
+    <SelectInput optionText="name" validate={required()} />
+</ReferenceInput>
+```
 - `<ReferenceManyField>` for tabbed child lists
 
 Use the attribute order from the schema.

{apilogicserver-15.0.25.dist-info → apilogicserver-15.0.26.dist-info}/METADATA

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

{apilogicserver-15.0.25.dist-info → apilogicserver-15.0.26.dist-info}/RECORD

@@ -1,5 +1,5 @@
 api_logic_server_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_logic_server_cli/api_logic_server.py,sha256=3wWWl50qub5ryRBWJusrB42CIOuoIBOE1e09HjNKMkE,96384
+api_logic_server_cli/api_logic_server.py,sha256=3u1SUUCgh3cRxHuhflye-1IMuzwrJp3QONSz1o04tZw,96395
 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
@@ -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=GWtgynqOzUJOK1n_AalJPbzWxjGrqcc9Bw4rCQ5mfas,9627
+api_logic_server_cli/genai/genai_admin_app.py,sha256=IO9aSvOXmY5wiJl74awPo3PxE1ibKjqtUDbpik46NkE,9754
 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
@@ -1211,7 +1211,7 @@ api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.
 api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.sh,sha256=aWX9fa8fe6aO9ifBIZEgGY5UGh4I0arOoCwBzDsxgU8,893
 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 copy.md,sha256=cDkLjSRPZxfmgDZhObilm1K67ZweOv9TkGT6cTpZNOM,6741
-api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-Resource-Learning-Prompt.md,sha256=9smWe64B73X6xnxkPU-rLD4l2x692iAVf2zf0NAfsB4,6899
+api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-Resource-Learning-Prompt.md,sha256=L2nPSDJ3NzGHwQziN2d6z2PoH4RKGo6tuCGEGgLyhOE,8063
 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
@@ -2275,9 +2275,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.25.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
-apilogicserver-15.0.25.dist-info/METADATA,sha256=S1JbGhtzVFAiIu32hv3hVni1sa6t11SxWQJVdfg8ucE,6553
-apilogicserver-15.0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-apilogicserver-15.0.25.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
-apilogicserver-15.0.25.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
-apilogicserver-15.0.25.dist-info/RECORD,,
+apilogicserver-15.0.26.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
+apilogicserver-15.0.26.dist-info/METADATA,sha256=38bB2lGjbj1sZM1OjXOJsv8EsfcgbRW4HLOKFEibN6g,6553
+apilogicserver-15.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+apilogicserver-15.0.26.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
+apilogicserver-15.0.26.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
+apilogicserver-15.0.26.dist-info/RECORD,,