ApiLogicServer 15.0.47__py3-none-any.whl → 15.0.54__py3-none-any.whl

api_logic_server_cli/prototypes/manager/samples/readme_samples.md

@@ -6,32 +6,46 @@ The created `samples/nw_sample` illustrates important customization sample code
 
 ## Sqlite Sample Databases
 
-The `samples/db` files are symbolic links to pre-installed sqlite databases.  These allow you to explore creating projects from existing databases.
+The `samples/db` files are pre-installed sqlite databases.  These allow you to explore creating projects from existing databases.
 
-For example, create Northwind like this:
+For example, create Northwind and basic_demo like this:
 
 ```bash
 genai-logic create  --project_name=nw --db_url=sqlite:///samples/dbs/nw.sqlite
-```
 
-> Note: If the symbolic links are missing, it is probably due to permission issues, e.g., on windows you must run the Shell with Admin privileges.  You can continue using the abbeviations instead of a standard SQLAlchemy database uri.
+genai-logic create --project_name=basic_demo --db_url=sqlite:///samples/dbs/basic_demo
+```
 
 ## Database Connectivity
 
 Sample project creation commands:
 
 ```bash
-genai-logic create
-genai-logic create-and-run
-genai-logic create --db_url=sqlite:////Users/val/dev/todo_example/todos.db --project_name=todo
+# local sqlite
 genai-logic create --db_url=sqlite:///c:\genai-logic\nw.sqlite --project_name=nw
-genai-logic create --db_url=sqlite:///ai.sqlite --project_name=ai --open_with=code
-genai-logic create --db_url=mysql+pymysql://root:p@mysql-container:3306/classicmodels --project_name=/localhost/docker_db_project
-genai-logic create --db_url='mssql+pyodbc://sa:Posey3861@localhost:1433/NORTHWND?driver=ODBC+Driver+18+for+SQL+Server&trusted_connection=no&Encrypt=no'
+genai-logic create --db_url=sqlite:///samples/dbs/todos.sqlite --project_name=todo
+genai-logic create --db_url=sqlite:////Users/val/dev/ApiLogicServer/ApiLogicServer-dev/clean/ApiLogicServer/samples/dbs/todos.sqlite --project_name=todo
+
+# from localhost to mysql container
+genai-logic create --db_url=mysql+pymysql://root:p@localhost:3306/classicmodels --project_name=docker_classicmodels
+genai-logic create --db_url=mysql+pymysql://root:p@localhost:3306/Chinook --project_name=docker_chinook
+
+# from container to mysql container  replace localhost with....
+genai-logic create --db_url=mysql+pymysql://root:p@mysql-container:3306/Chinook --project_name=/localhost/docker_chinook
+
+# microsoft sql server (setup: https://apilogicserver.github.io/Docs/Install-pyodbc/)
+genai-logic create --db_url='mssql+pyodbc://sa:Posey3861@localhost:1433/NORTHWND?driver=ODBC+Driver+18+for+SQL+Server&trusted_connection=no&Encrypt=no' --project-name=NORTHWND
+
+# oracle
 genai-logic create --project_name=oracle_hr --db_url='oracle+oracledb://hr:tiger@localhost:1521/?service_name=ORCL'
+
+# postgres
+genai-logic create --db_url=postgresql://postgres:p@localhost/northwind --project-name=nw-postgres
 genai-logic create --db_url=postgresql://postgres:p@10.0.0.234/postgres
 genai-logic create --project_name=my_schema --db_url=postgresql://postgres:p@localhost/my_schema
-genai-logic create --db_url=postgresql+psycopg2://postgres:password@localhost:5432/postgres?options=-csearch_path%3Dmy_db_schema
+genai-logic create --db_url=postgresql://postgres:password@localhost:5432/postgres?options=-csearch_path%3Dmy_db_schema
+
+# pythonanywhere
 genai-logic create --project_name=Chinook \
   --host=ApiLogicServer.pythonanywhere.com --port= \
   --db_url=mysql+pymysql://ApiLogicServer:@ApiLogicServer.mysql.pythonanywhere-services.com/ApiLogicServer\$Chinook

api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/requirements-no-cli.txt

@@ -1,9 +1,9 @@
 PyJWT==2.6.0
 python-dateutil==2.8.2
 six==1.16.0
-SQLAlchemy==1.4.29
-Flask-SQLAlchemy==2.5.1
-SQLAlchemy-Utils==0.38.2
+SQLAlchemy>=2.0.0
+Flask-SQLAlchemy>=3.0.0
+SQLAlchemy-Utils>=0.38.2
 Werkzeug==2.2.3
 logicbankutils==0.6.0
 inflect==5.0.2
@@ -25,7 +25,8 @@ PyMySQL==1.0.2
 cryptography==36.0.1
 requests==2.27.1
 gunicorn==20.1.0
-psycopg2-binary==2.9.5
+psycopg2-binary>=2.9.5; python_version < '3.13'
+psycopg[binary]>=3.1.0; python_version >= '3.13'
 DotMap==1.3.25
 WTForms==2.3.3
 behave==1.2.6

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

@@ -10,7 +10,7 @@ Sample code (follow these guidelines EXACTLY):
 ```
 <sample-code>
 // begin MANDATORY imports (always generated EXACTLY)
-import React from 'react';
+import React, { useState } from 'react';
 import { List, FunctionField, Datagrid, TextField, EmailField, DateField, NumberField } from 'react-admin';
 import { ReferenceField, ReferenceManyField } from 'react-admin';
 import { TabbedShowLayout, Tab, SimpleShowLayout, TextInput, NumberInput, DateTimeInput } from 'react-admin';

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

@@ -11,6 +11,7 @@
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^13.5.0",
     "compare-versions": "^6.1.1",
+    "js-yaml": "^4.1.0",
     "keycloak-js": "^26.2.0",
     "react": "^19.1.0",
     "react-admin": "^5.8.3",

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/venv_setup/requirements-no-cli.txt

@@ -1,9 +1,9 @@
 PyJWT==2.6.0
 python-dateutil==2.8.2
 six==1.16.0
-SQLAlchemy==1.4.29
-Flask-SQLAlchemy==2.5.1
-SQLAlchemy-Utils==0.38.2
+SQLAlchemy>=2.0.0
+Flask-SQLAlchemy>=3.0.0
+SQLAlchemy-Utils>=0.38.2
 Werkzeug==2.2.3
 logicbankutils==0.6.0
 inflect==5.0.2
@@ -25,7 +25,8 @@ PyMySQL==1.0.2
 cryptography==36.0.1
 requests==2.27.1
 gunicorn==20.1.0
-psycopg2-binary==2.9.5
+psycopg2-binary>=2.9.5; python_version < '3.13'
+psycopg[binary]>=3.1.0; python_version >= '3.13'
 DotMap==1.3.25
 WTForms==2.3.3
 behave==1.2.6

api_logic_server_cli/prototypes/manager/system/install-ApiLogicServer-dev/install-ApiLogicServer-dev.ps1

@@ -4,7 +4,10 @@ param(
     [String]$IDE
 )
 
-SRA="venv/lib/python3.12/site-packages/api_logic_server_cli/create_from_model/safrs-react-admin-npm-build"
+# $SRA="venv/lib/python3.12/site-packages/api_logic_server_cli/create_from_model/safrs-react-admin-npm-build"
+
+$venvPath = "venv\Lib\site-packages"
+$SRA = Join-Path $venvPath "api_logic_server_cli\create_from_model\safrs-react-admin-npm-build"
 
 if (Test-Path -Path $SRA) {
     Write-Output " "
@@ -12,7 +15,7 @@ if (Test-Path -Path $SRA) {
     Write-Output " "
 } else {
     Write-Output " "
-    Write-Output "Safrs React Admin (SRA) not found - please fix line above"
+    Write-Output "Safrs React Admin (SRA) not found - please fix line above for $SRA"
     Write-Output " "
     Exit 1
 }
@@ -28,8 +31,9 @@ if($IDE -eq "") {
     Write-Output " "
     Write-Output " IMPORTANT - create a folder, then install:"
     Write-Output "   > mkdir ApiLogicServer"
+    Write-Output "   > pip install ApiLogicServer"
     Write-Output " "
-    Write-Output "   > .\Install-ApiLogicServer-Dev [ vscode | charm | x ]"
+    Write-Output "   > .\system\install-ApiLogicServer-dev\install-ApiLogicServer-dev.ps1 vscode"
     Write-Output " "
     Exit
 }

api_logic_server_cli/prototypes/ont_app/ontimize_seed/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontimize-app",
-  "version": "15.6.0-NEXT-2",
+  "version": "15.6.0-NEXT-7",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --port 4299",
@@ -30,7 +30,7 @@
     "@angular/router": "^15.2.10",
     "@angular/service-worker": "^15.2.10",
     "@angular/upgrade": "^15.2.10",
-    "ontimize-web-ngx": "15.6.0-next.4",
+    "ontimize-web-ngx": "15.6.0-next.7",
     "ontimize-web-ngx-charts": "15.2.0-next.3",
     "ontimize-web-ngx-filemanager": "^15.1.0-next.0",
     "ontimize-web-ngx-map": "15.0.0",

api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/codegen.py

@@ -8,6 +8,7 @@ from collections import defaultdict
 from importlib import import_module
 from inspect import FullArgSpec  # val-311
 from keyword import iskeyword
+from typing import TYPE_CHECKING
 
 import sqlalchemy
 import sqlalchemy.exc
@@ -22,7 +23,8 @@ import yaml
 import datetime
 
 # The generic ARRAY type was introduced in SQLAlchemy 1.1
-from api_logic_server_cli.create_from_model.model_creation_services import ModelCreationServices
+if TYPE_CHECKING:
+    from api_logic_server_cli.create_from_model.model_creation_services import ModelCreationServices
 from api_logic_server_cli.create_from_model.meta_model import Resource, ResourceRelationship, ResourceAttribute
 
 log = logging.getLogger(__name__)
@@ -818,7 +820,7 @@ class CodeGenerator(object):
         """ not used by API Logic Server """
         self.noinflect = noinflect
         self.noclasses = noclasses
-        self.model_creation_services = model_creation_services  # type: ModelCreationServices
+        self.model_creation_services = model_creation_services  # type: "ModelCreationServices"
         self.generate_relationships_on = "parent"  # "child"
         """ FORMERLY, relns were genned ONLY on parent (== 'parent') """
         self.indentation = indentation

api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/main.py

@@ -4,11 +4,23 @@ import argparse
 import io
 import sys
 
-import pkg_resources
+try:
+    from importlib import metadata
+except ImportError:
+    # Python < 3.8
+    import pkg_resources as metadata_fallback
+    
+    class MetadataWrapper:
+        @staticmethod
+        def version(name):
+            return metadata_fallback.get_distribution(name).version
+    
+    metadata = MetadataWrapper()
+
 from sqlalchemy.engine import create_engine
 from sqlalchemy.schema import MetaData
 
-from sqlacodegen_wrapper.sqlacodegen_wrapper import CodeGenerator
+from .codegen import CodeGenerator
 
 
 def main(calling_args=None):
@@ -30,8 +42,11 @@ def main(calling_args=None):
         args = parser.parse_args()
 
     if args.version:
-        version = pkg_resources.get_distribution('sqlacodegen').parsed_version
-        print(version.public)
+        try:
+            version = metadata.version('sqlacodegen')
+            print(version)
+        except Exception:
+            print("sqlacodegen version unknown")
         return
     if not args.url:
         print('You must supply a url\n', file=sys.stderr)
@@ -39,7 +54,12 @@ def main(calling_args=None):
         return
 
     # Use reflection to fill in the metadata
-    engine = create_engine(args.url)
+    # For Python 3.13+, force PostgreSQL URLs to use psycopg3 dialect
+    engine_url = args.url
+    if sys.version_info >= (3, 13) and engine_url.startswith('postgresql://'):
+        engine_url = engine_url.replace('postgresql://', 'postgresql+psycopg://', 1)
+    
+    engine = create_engine(engine_url)
     try:
         # dirty hack for sqlite  TODO review ApiLogicServer
         engine.execute("""PRAGMA journal_mode = OFF""")

api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen_wrapper.py

@@ -29,6 +29,11 @@ The ctor then calls `create_resource_list`, to create the `resource_list`
 
 import sys, logging, inspect, builtins, os, argparse, tempfile, atexit, shutil, io
 import traceback
+try:
+    from importlib.metadata import version as get_version
+except ImportError:
+    # Python < 3.8 fallback
+    from importlib_metadata import version as get_version
 
 import safrs
 from sqlalchemy import CHAR, Column, DateTime, Float, ForeignKey, Index, Integer, String, TIMESTAMP, Table, Text, UniqueConstraint, text
@@ -44,17 +49,23 @@ from io import StringIO
 from sqlalchemy.engine import create_engine
 from sqlalchemy.schema import MetaData
 from flask_cors import CORS
-from sqlacodegen_wrapper.sqlacodegen.sqlacodegen.codegen import CodeGenerator
-from api_logic_server_cli.create_from_model.model_creation_services import ModelCreationServices
+from .sqlacodegen.sqlacodegen.codegen import CodeGenerator
+from .sqlacodegen.sqlacodegen.main import main as codegen
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from api_logic_server_cli.create_from_model.model_creation_services import ModelCreationServices
 from pathlib import Path
 from shutil import copyfile
 import os, sys
 from pathlib import Path
 from os.path import abspath
 from api_logic_server_cli.cli_args_project import Project
-import oracledb
-
 log = logging.getLogger(__name__)
+try:
+    import oracledb
+except ImportError:
+    log.error("oracledb dll not found, Oracle support disabled")
+    oracledb = None
 
 MODEL_DIR = tempfile.mkdtemp()  # directory where the generated models.py will be saved
 on_import = False
@@ -91,8 +102,11 @@ def get_args():
     args = parser.parse_args()
 
     if args.version:
-        version = pkg_resources.get_distribution("sqlacodegen").parsed_version # noqa: F821
-        log.debug(version.public)
+        try:
+            version_str = get_version("sqlacodegen")
+            log.debug(version_str)
+        except Exception:
+            log.debug("sqlacodegen version not found")
         exit()
     if not args.url:
         log.debug("You must supply a url\n", file=sys.stderr)
@@ -133,7 +147,7 @@ uri_info = """Examples:
   ApiLogicServer create-and-run --db_url=mssql+pyodbc://sa:Posey3861@localhost:1433/NORTHWND?driver=ODBC+Driver+17+for+SQL+Server&trusted_connection=no
   ApiLogicServer create-and-run --db_url=postgresql://postgres:p@10.0.0.234/postgres
   ApiLogicServer create --project_name=my_schema --db_url=postgresql://postgres:p@localhost/my_schema
-  ApiLogicServer create --db_url=postgresql+psycopg2://postgres:password@localhost:5432/postgres?options=-csearch_path%3Dmy_db_schema
+  ApiLogicServer create --db_url=postgresql://postgres:password@localhost:5432/postgres?options=-csearch_path%3Dmy_db_schema
   ApiLogicServer create --project_name=Chinook \
     --host=ApiLogicServer.pythonanywhere.com --port= \
     --db_url=mysql+pymysql://ApiLogicServer:***@ApiLogicServer.mysql.pythonanywhere-services.com/ApiLogicServer$Chinook
@@ -199,7 +213,13 @@ def create_models_memstring(args) -> str:
 
     if os.getenv('APILOGICSERVER_ORACLE_THICK'):
         oracledb.init_oracle_client(lib_dir=os.getenv('APILOGICSERVER_ORACLE_THICK'))
-    engine = create_engine(args.url)  # type _engine.Engine
+    
+    # For Python 3.13+, force PostgreSQL URLs to use psycopg3 dialect
+    engine_url = args.url
+    if sys.version_info >= (3, 13) and engine_url.startswith('postgresql://'):
+        engine_url = engine_url.replace('postgresql://', 'postgresql+psycopg://', 1)
+    
+    engine = create_engine(engine_url)  # type _engine.Engine
 
     metadata = MetaData()
     if os.getenv('APILOGICSERVER_ORACLE_THICK'):
@@ -292,7 +312,7 @@ if on_import:
             models_f.write(models)
         # atexit.register(lambda : shutil.rmtree(MODEL_DIR))
 
-    import models
+    import models  # type: ignore  # dynamically created module
 
 
 def start_api(HOST="0.0.0.0", PORT=5000):
@@ -338,7 +358,7 @@ if __name__ == "__main__":
 
 
 
-def create_models_py(model_creation_services: ModelCreationServices, abs_db_url: str, project_directory: str):
+def create_models_py(model_creation_services: "ModelCreationServices", abs_db_url: str, project_directory: str):
     """
     Create `models.py` (using sqlacodegen, via this wrapper at create_models_py() ).
 

{apilogicserver-15.0.47.dist-info → apilogicserver-15.0.54.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: ApiLogicServer
-Version: 15.0.47
+Version: 15.0.54
 Author-email: Val Huber <apilogicserver@gmail.com>
-License: BSD-3-Clause
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://www.genai-logic.com
 Project-URL: Docs, https://apilogicserver.github.io/Docs/Doc-Home/
 Project-URL: Source, https://github.com/ApiLogicServer/ApiLogicServer-src
@@ -11,8 +11,8 @@ Keywords: Flask,SQLAlchemy,Rules,WebApp,Microservice,ReactAdmin,Angular
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.10
@@ -39,7 +39,7 @@ Requires-Dist: itsdangerous==2.1.2
 Requires-Dist: Jinja2==3.1.5
 Requires-Dist: MarkupSafe==2.1.3
 Requires-Dist: six==1.16.0
-Requires-Dist: SQLAlchemy==2.0.15
+Requires-Dist: SQLAlchemy>=2.0.39
 Requires-Dist: Werkzeug==2.3.3
 Requires-Dist: safrs>=3.1.7
 Requires-Dist: Flask-Admin==1.5.7
@@ -55,7 +55,8 @@ Requires-Dist: PyMySQL==1.0.3
 Requires-Dist: oracledb==2.1.2
 Requires-Dist: requests==2.31.0
 Requires-Dist: gunicorn==20.1.0
-Requires-Dist: psycopg2-binary==2.9.9
+Requires-Dist: psycopg2-binary>=2.9.5; python_version < "3.13"
+Requires-Dist: psycopg[binary]>=3.1.0; python_version >= "3.13"
 Requires-Dist: dotmap==1.3.25
 Requires-Dist: WTForms==2.3.3
 Requires-Dist: behave==1.2.6