ApiLogicServer 15.0.58__py3-none-any.whl → 15.0.61__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.58"  # last public release: 15.00.52 (15.00.12)
+__version__ = "15.00.61"  # last public release: 15.00.52 (15.00.12)
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t07/25/2024 - 15.00.58: system vibe support -- initial testing, build fix \n"\
+    "\t07/27/2024 - 15.00.61: no mgr fix, confluent-kafka==2.6.0 for 3.13, system vibe support -- initial testing \n"\
     "\t07/20/2024 - 15.00.52: Python 3.13 compatibility fixes - psycopg2→psycopg3, SQLAlchemy 2.0+, pkg_resources→importlib.metadata.  mgr dbs \n"\
     "\t07/17/2024 - 15.00.49: venv fix+, ext bldr * fix, copilot vibe tweaks - creation, mcp logic, basic_demo autonums \n"\
     "\t07/10/2024 - 15.00.41: copilot vibe support for logic, UI, MCP,  bug[98] \n"\
@@ -1081,8 +1081,12 @@ class ProjectRun(Project):
         self.venv_path = Path(sys.prefix) if is_docker() == False else Path('/home/api_logic_server/api_logic_server_cli')
         self.manager_path = self.venv_path.parent
         check_system_genai = self.manager_path.joinpath('system/genai/temp')
-        if not check_system_genai.exists():
-            self.manager_path = (self.venv_path / '../api_logic_server_cli/prototypes/manager').resolve()
+        if not check_system_genai.exists():  # user did not als start - use the manager in the venv
+            my_loc = os.path.abspath(__file__)
+            api_logic_server_dir_path = Path(os.path.dirname(my_loc))
+            self.manager_path = api_logic_server_dir_path / 'prototypes/manager'
+            assert self.manager_path.is_dir(), f"Manager path {self.manager_path} does not exist"
+            # self.manager_path = (self.venv_path / '../api_logic_server_cli/prototypes/manager').resolve()
             log.debug(f'.. ..Manager path from dev env - customizations not active')  # eg ...ApiLogicServer-src/api_logic_server_cli/prototypes/manager
         log.debug(f'.. ..Manager path: {self.manager_path}')  
         # log.debug(f'.. ..Interp path: {self.manager_path / 'venv/bin/python'}')

api_logic_server_cli/create_from_model/meta_model.py

@@ -42,7 +42,7 @@ class ResourceAttribute():
             if lower_name.endswith(each_non_fav):
                 self.non_favorite = True
                 break
-        if each_attribute.server_default is not None and hasattr(each_attribute.server_default.arg, 'text'):
+        if each_attribute.server_default is not None and "arg" in dir(each_attribute.server_default) and hasattr(each_attribute.server_default.arg, 'text'):
             self.default = each_attribute.server_default.arg.text
         resource.attributes.append(self)
 

api_logic_server_cli/genai/genai_svcs.py

@@ -973,7 +973,7 @@ def get_manager_path(project: object = None) -> Path:
     * Possibly could add cli arg later
 
     Args:
-        use_env: bool if cannot find manager from project, use install location
+        project: instance of Project - best practice is caller provides, so can use install loc if cannot find manager
 
     Returns:
         Path: Manager path (contains system/genai)
@@ -984,7 +984,7 @@ def get_manager_path(project: object = None) -> Path:
         check_system_genai = result_path.joinpath('system/genai/temp')    
         if check_system_genai.exists():
             return result_path
-        return result_path
+        return result_path # todo - verify what this does (should not occur)
 
     result_path = Path(os.getcwd())  # normal case - project at manager root
     check_system_genai = result_path.joinpath('system/genai/temp')    

api_logic_server_cli/prototypes/manager/samples/readme_samples.md

@@ -13,7 +13,7 @@ For example, create Northwind and basic_demo like this:
 ```bash
 genai-logic create  --project_name=nw --db_url=sqlite:///samples/dbs/nw.sqlite
 
-genai-logic create --project_name=basic_demo --db_url=sqlite:///samples/dbs/basic_demo
+genai-logic create --project_name=basic_demo --db_url=sqlite:///samples/dbs/basic_demo.sqlite
 ```
 
 ## Database Connectivity

{apilogicserver-15.0.58.dist-info → apilogicserver-15.0.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ApiLogicServer
-Version: 15.0.58
+Version: 15.0.61
 Author-email: Val Huber <apilogicserver@gmail.com>
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://www.genai-logic.com
@@ -66,7 +66,7 @@ Requires-Dist: psutil==6.0.0
 Requires-Dist: pandas==2.2.2
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: GeoAlchemy2==0.12.5
-Requires-Dist: confluent-kafka==2.3.0
+Requires-Dist: confluent-kafka==2.6.0
 Requires-Dist: translate==3.6.1
 Requires-Dist: libretranslatepy==2.1.1
 Requires-Dist: reportlab==4.2.0

{apilogicserver-15.0.58.dist-info → apilogicserver-15.0.61.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=UbLp0zHkFtW4gNx-XiM-DyEwdKPMfaBrHSxvk19CuLo,103596
+api_logic_server_cli/api_logic_server.py,sha256=3bftUXTUpj5H3Qv-X09Bu800tOEcZqz6LjDSg-dcSLQ,103984
 api_logic_server_cli/api_logic_server_info.yaml,sha256=kmtXD4fOxapV6jpXO9rsmYe8mq9Bz0PvghUVbRMvVWM,128
 api_logic_server_cli/cli.py,sha256=gd_uHrUanp705EryYAdkY5D9LJJvvSEHUwoylm-G6sw,87355
 api_logic_server_cli/cli_args_base.py,sha256=7cVM6BeizwttYAwUu1FUyuLuvWufvgt0TFeA8FI6tu0,3304
@@ -13,7 +13,7 @@ api_logic_server_cli/create_from_model/api_expose_api_models_creator.py,sha256=V
 api_logic_server_cli/create_from_model/api_logic_server_utils.py,sha256=H0t_hpN6TGzhe9CAzkonX3dUvZ2k9qeemKHexoXtIQI,28624
 api_logic_server_cli/create_from_model/create_db_from_model.py,sha256=2H7slGnk39XOSnvL7vxrg6Ewx4bxeBJBgLo8fcXHTB4,4382
 api_logic_server_cli/create_from_model/dbml.py,sha256=m1yRnes5DXPMQrFBFJM2CuDhIfVFywSM6nDX7k19BLU,11573
-api_logic_server_cli/create_from_model/meta_model.py,sha256=ERf7tSgnSJSeRMVyggkdg-lvORQZSbfK0KMpL63qSEY,5837
+api_logic_server_cli/create_from_model/meta_model.py,sha256=bzkpaC0ePrxpAPiJGh5GbSrZ7N-DETL5eW6-LxcmOZs,5885
 api_logic_server_cli/create_from_model/model_creation_services.py,sha256=B86ljgUR98H_dCaxqiw-flrbvc05-XXtkC5It2BSezs,41479
 api_logic_server_cli/create_from_model/ont_build.py,sha256=YRZutNtIFCuc1r73jSHJbDPtLTQZLoStCM9ShWyKG4g,67063
 api_logic_server_cli/create_from_model/ont_create.py,sha256=Zj9kGaJ_zWJ_0sdgbWKRhJOvlkI_Ktce3M7B5ZQ5_6o,16750
@@ -380,7 +380,7 @@ api_logic_server_cli/genai/genai_fatal_excp.py,sha256=1FmDVcXVRqmG0JMVZ7l4KqMOdp
 api_logic_server_cli/genai/genai_graphics.py,sha256=9ao0os6rUKY5u2caeLtgyDsNEuVQXq4KcKV575fNC58,20610
 api_logic_server_cli/genai/genai_logic_builder.py,sha256=u_89UtrALIfcMtW6p0SZ78lCmwRqerA5igyY2hDvjlk,26150
 api_logic_server_cli/genai/genai_mcp.py,sha256=Q2fVXwoIetYTSHuNHTke_ITsb-nu_L4kusPpTAkze1Q,1434
-api_logic_server_cli/genai/genai_svcs.py,sha256=VDgoKOO5jnNhxz8Q0w524LXPJSuK9gBMf8ivsUJ7EYE,50579
+api_logic_server_cli/genai/genai_svcs.py,sha256=ML8Ox9ZWAedELUnGHFoJ91VnpIM4-5-RyC2WZu8vJGg,50668
 api_logic_server_cli/genai/genai_utils.py,sha256=DTlWTnW5_2pzX4q1VG1tWqoZPVObDHR97SVe0z8Z3rs,17102
 api_logic_server_cli/genai/json2rules.py,sha256=ykoxxgZgqllzt8Ud06S-R_3QtumxXfmF5ksYC0Hh2Sk,2645
 api_logic_server_cli/model_migrator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -676,6 +676,7 @@ api_logic_server_cli/prototypes/basic_demo/iteration/logic/declare_logic.py,sha2
 api_logic_server_cli/prototypes/basic_demo/iteration/ui/admin/admin.yaml,sha256=uqxqYNMbKm4aCaTOy5CnlAtYccYM32-oQLVi5K6tfNI,3554
 api_logic_server_cli/prototypes/basic_demo/logic/declarative-vs-procedural-comparison.html,sha256=GUzgmnWdT709M5mPJGyfF1ARzzz3y5guASDBWeG43PU,3915
 api_logic_server_cli/prototypes/basic_demo/logic/procedural/declarative-vs-procedural-comparison.md,sha256=lBUyilpqRPrL-d4yp55gRyRLaeYNzbArktMOaTD5IUw,12193
+api_logic_server_cli/prototypes/basic_demo/logic/procedural/declarative-vs-procedural-comparison.png,sha256=4jZRhM4raP95KOhbUEzlDRT-K9olwbVI6PVMZKi8j84,904211
 api_logic_server_cli/prototypes/basic_demo/ui/my-react-app/README.md,sha256=h7ePuwOqn3jv7YkjM4ruaP5rpYBmr_4Q3NChhb8pVJ4,452
 api_logic_server_cli/prototypes/basic_demo/ui/my-react-app/README_create_react_app.md,sha256=cOr7x6X9RmqjITtafhsqQTg8vl1Ob8X0WC78WL21CdE,3359
 api_logic_server_cli/prototypes/basic_demo/ui/my-react-app/package-lock.json,sha256=dG1s4WtUFp0ZhVWGwp_Ocv-Ii2c92Xb4FWqHFc0m7KU,698058
@@ -793,7 +794,7 @@ api_logic_server_cli/prototypes/manager/.vscode/.copilot-instructions.md,sha256=
 api_logic_server_cli/prototypes/manager/.vscode/ApiLogicServer.code-workspace,sha256=yC_pOIZN5o5Qiw3t2kBPsiO01Mgp3VEbAizYx1T3aPI,282
 api_logic_server_cli/prototypes/manager/.vscode/launch.json,sha256=alh_fiuqMjY-uIk4ghfwyMs3y-U2dYr1W6rS9ncpNEY,33491
 api_logic_server_cli/prototypes/manager/.vscode/settings.json,sha256=Zj9oPObeI-KVh1l4b3uuF1vkezKomVqnhP241h6ZB-M,619
-api_logic_server_cli/prototypes/manager/samples/readme_samples.md,sha256=DnrKgO4byYk1zu2PxCuHfu--0lMAjPD_0LeMW7estLA,3153
+api_logic_server_cli/prototypes/manager/samples/readme_samples.md,sha256=Ixk5QEhFixfLNWqu0GJYOlbqGBql2lOj0xfKsU80W7M,3160
 api_logic_server_cli/prototypes/manager/samples/dbs/readme_dbs.md,sha256=FvxzBqR00Kgc5Z76JOslHju6HYmsYOwkoARe_U-dnY0,570
 api_logic_server_cli/prototypes/manager/samples/docker_samples/run_sample_docker.sh,sha256=P_p_w4qu6Uw_JxTNCmej7XV8cdwCMUnq2HMrN5bFuZs,860
 api_logic_server_cli/prototypes/manager/samples/docker_samples/run_web_genai.sh,sha256=vA8dxmnau59OQ1NPvDP0O65fmSVQLcfk4TjFM3kLE-o,127
@@ -2264,9 +2265,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.58.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
-apilogicserver-15.0.58.dist-info/METADATA,sha256=BqHpzi5mFlS3OeeUU6M9g_wusLE--g3kn6jDeifLtog,6653
-apilogicserver-15.0.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-apilogicserver-15.0.58.dist-info/entry_points.txt,sha256=W9EVNvf09h8n6rJChmVj2gzxVQ6BXXZa2x3wri0lFGc,259
-apilogicserver-15.0.58.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
-apilogicserver-15.0.58.dist-info/RECORD,,
+apilogicserver-15.0.61.dist-info/licenses/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
+apilogicserver-15.0.61.dist-info/METADATA,sha256=XCn1Gvxvgb5EYfs8PTo-ln6F_AzmcpiLpwI_PXGxoao,6653
+apilogicserver-15.0.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+apilogicserver-15.0.61.dist-info/entry_points.txt,sha256=W9EVNvf09h8n6rJChmVj2gzxVQ6BXXZa2x3wri0lFGc,259
+apilogicserver-15.0.61.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
+apilogicserver-15.0.61.dist-info/RECORD,,