ApiLogicServer 15.0.25__py3-none-any.whl → 15.0.27__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.27"  # 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/26/2024 - 15.00.27: Tech Preview: als genai-app w/ sra provider+model+grid_cascadeAdd, imports, 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 23, 2025 06:19:07
-last_created_project_name: ../../../servers/basic_demo
-last_created_version: 15.00.22
+last_created_date: June 26, 2025 08:44:28
+last_created_project_name: ../../../servers/mycircles
+last_created_version: 15.00.26

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/basic_demo/customizations/ui/basic_demo_app/README.md

@@ -0,0 +1,17 @@
+# Getting Started with Genai-Logic react-admin
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).  For more information, see [README_create_react_app](README_create_react_app.md).
+
+GenAI-Logic (`als genai-app`) then [created this project](https://apilogicserver.github.io/Docs/Admin-Vibe/).
+
+<br>
+
+# To run the app:
+
+```bash
+cd ui/react-admin
+npm install
+npm start
+```
+
+Open your browser at [http://localhost:3000](http://localhost:3000).

api_logic_server_cli/prototypes/basic_demo/customizations/ui/basic_demo_app/README_create_react_app.md

@@ -0,0 +1,70 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
+
+The page will reload when you make changes.\
+You may also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can't go back!**
+
+If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
+
+You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
+
+### Analyzing the Bundle Size
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
+
+### Making a Progressive Web App
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
+
+### Advanced Configuration
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
+
+### Deployment
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
+
+### `npm run build` fails to minify
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)