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

@@ -783,7 +783,7 @@ def genai_graphics(ctx, using, genai_version: str, replace_with: str):
 
 @main.command("genai-app", cls=HideDunderCommand)
 @click.option('--app-name', 'app_name',
-              default='react_admin',
+              default='react_app',
               help="Name of generated app in ui/")
 @click.option('--schema',
               default='admin.yaml',

api_logic_server_cli/genai/genai_admin_app.py

@@ -45,6 +45,11 @@ class GenAIAdminApp:
         self.project_root = project.project_directory_path
         self.app_templates_path = genai_svcs.get_manager_path(use_env=True).joinpath('system/genai/app_templates')
 
+        log.info(f'\ngenai_app here..')
+        log.info(f'..model: {schema}')
+        log.info(f'..diagnostics: docs/admin_app')
+        log.info(f'..templates: {str(self.app_templates_path)}')
+
         self.dbml_path = self.project_root / "docs/db.dbml"
         self.discovery_path = self.project_root / "docs/mcp_learning/mcp_discovery.json"
 
@@ -87,13 +92,13 @@ class GenAIAdminApp:
         self.b_generate_app_js()
         # comes from copytree, above -- self.c_generate_data_provider()
 
-        log.info(f"✅ Completed in [{str(int(time.time() - self.start_time))} secs] \n\n")
+        log.info(f"..✅ Completed in [{str(int(time.time() - self.start_time))} secs]")
 
-        log.info(f"✅ Next Steps:\n")
+        log.info(f"\n✅ Next Steps:\n")
         log.info('Start the API Logic Project: F5')
         log.info(f'> cd ui/{app_name}')
         log.info('> npm install')
-        log.info('> npm start')
+        log.info('> npm start\n')
 
     def read_standard_imports(self) -> List[str]:
         '''grr
@@ -135,7 +140,7 @@ class GenAIAdminApp:
                         continue
                     else:
                         break
-                if do_mandatory_imports := True and not imports_done and '= (props) =>' in each_line:
+                if do_mandatory_imports := True and not imports_done and ' props ' in each_line:
                     result_lines = list(genai_app.standard_imports)
                     imports_done = True
                 result_lines.append(each_line)              
@@ -162,7 +167,7 @@ class GenAIAdminApp:
             target_file = self.ui_src_path / f"{each_resource_name}.js"
             source_code = fix_resource(self, response_dict['code'])
             utils.write_file(target_file, source_code)
-            log.info(f"\n✅ Wrote: {target_file}")
+            log.info(f"..✅ Wrote: {each_resource_name}.js")
 
 
     def b_generate_app_js(self):
@@ -201,5 +206,5 @@ class GenAIAdminApp:
         source_code = fix_app(source_code)
         utils.write_file(target_file, source_code)
 
-        log.info(f"✅ Wrote: {target_file}\n")
+        log.info(f"..✅ Wrote: App.js")
 

api_logic_server_cli/genai/genai_svcs.py

@@ -81,7 +81,7 @@ try:  # this is just for WebGenAI
 
     # Add the file handler to the logger
     log.addHandler(file_handler)
-    log.setLevel(logging.DEBUG)
+    # log.setLevel(logging.DEBUG)
     
 except Exception as exc:
     pass # this is just for WebGenAI, ok to ignore error
@@ -932,7 +932,7 @@ def call_chatgpt(messages: List[Dict[str, str]], api_version: str, using: str, r
         messages_for_print = string_to_lines(messages_for_print)  # Removed to avoid altering messages
         with open(request_path, "w") as request_file:  # save for debug
             json.dump(messages_for_print, request_file, indent=4)
-        log.info(f'.. saved request: {using}/request.json')
+        log.debug(f'.. saved request: {using}/request.json')
         client = get_ai_client()
         # response_format = "json_object" if wg_response else {"type": "text"}
         completion = client.beta.chat.completions.parse(
@@ -941,7 +941,7 @@ def call_chatgpt(messages: List[Dict[str, str]], api_version: str, using: str, r
             # temperature=self.project.genai_temperature,  values .1 and .7 made students / charges fail
             model=model  # for own model, use "ft:gpt-4o-2024-08-06:personal:logicbank:ARY904vS" 
         )
-        log.info(f'ChatGPT ({str(int(time.time() - start_time))} secs) - response at: system/genai/temp/chatgpt_original.response')
+        log.debug(f'OpenAI ({str(int(time.time() - start_time))} secs) - response at: system/genai/temp/chatgpt_original.response')
         
         data = completion.choices[0].message.content
 

api_logic_server_cli/logging.yml

@@ -72,8 +72,23 @@ loggers:
         handlers: [console]
         propagate: no
 
+    api_logic_server_cli.genai.genai_svcs:   
+        level: INFO
+        handlers: [console]
+        propagate: no
+
+    openai:   
+        level: WARNING
+        handlers: [console]
+        propagate: no
+
+    httpx:   
+        level: WARNING
+        handlers: [console]
+        propagate: no
+
     api_logic_server_cli.genai.genai_admin_app:   
-        level: DEBUG
+        level: INFO
         handlers: [console]
         propagate: no
 

api_logic_server_cli/prototypes/{nw/ui/react_admin → basic_demo/customizations/ui/reference_react_app}/README.md

@@ -4,8 +4,6 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo
 
 GenAI-Logic (`als genai-app`) then [created this project](https://apilogicserver.github.io/Docs/Admin-Vibe/).
 
-Repairs were required: search `src` for #FIXEDME.  It started but failed to run.
-
 <br>
 
 # To run the app:

api_logic_server_cli/prototypes/{nw/ui/react_admin → basic_demo/customizations/ui/reference_react_app}/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": {

api_logic_server_cli/prototypes/basic_demo/customizations/ui/reference_react_app/src/App.js

@@ -0,0 +1,61 @@
+import React from 'react';
+import { Admin, Resource, Loading } from 'react-admin';
+import { jsonapiClient } from "./rav4-jsonapi-client/ra-jsonapi-client";
+import { createTheme } from '@mui/material/styles';
+import { useConf, loadHomeConf } from "./Config";
+// Import resource components
+import { CustomerList, CustomerShow, CustomerCreate, CustomerEdit } from './Customer';
+import { ItemList, ItemShow, ItemCreate, ItemEdit } from './Item';
+import { OrderList, OrderShow, OrderCreate, OrderEdit } from './Order';
+import { ProductList, ProductShow, ProductCreate, ProductEdit } from './Product';
+import { SysEmailList, SysEmailShow, SysEmailCreate, SysEmailEdit } from './SysEmail';
+import { SysMcpList, SysMcpShow, SysMcpCreate, SysMcpEdit } from './SysMcp';
+
+const theme = createTheme({
+    palette: {
+        primary: { main: '#1976d2' },
+        secondary: { main: '#1565c0' },
+    },
+    typography: { fontSize: 14 },
+});
+
+const App = () => {
+  const [conf, setConf] = React.useState({});
+  const [loading, setLoading] = React.useState(true);
+
+  React.useEffect(() => {
+    const fetchData = async () => {
+      try {
+        console.log('loading HomeConf-1');
+        const confResult = await loadHomeConf();
+        setConf(confResult);
+        setLoading(false);
+        console.log('AppConf0: ', confResult);
+      } 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 (
+    <Admin dataProvider={dataProvider} theme={theme}>
+      {/* Register resources */}
+      <Resource name="Customer" list={CustomerList} show={CustomerShow} edit={CustomerEdit} create={CustomerCreate} />
+      <Resource name="Item" list={ItemList} show={ItemShow} edit={ItemEdit} create={ItemCreate} />
+      <Resource name="Order" list={OrderList} show={OrderShow} edit={OrderEdit} create={OrderCreate} />
+      <Resource name="Product" list={ProductList} show={ProductShow} edit={ProductEdit} create={ProductCreate} />
+      <Resource name="SysEmail" list={SysEmailList} show={SysEmailShow} edit={SysEmailEdit} create={SysEmailCreate} />
+      <Resource name="SysMcp" list={SysMcpList} show={SysMcpShow} edit={SysMcpEdit} create={SysMcpCreate} />
+    </Admin>
+  );
+};
+
+export default App;