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

api_logic_server_cli/api_logic_server.py

@@ -12,10 +12,11 @@ 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.47"  # last public release: 15.00.41 (15.00.12)
+__version__ = "15.00.52"  # last public release: 15.00.47 (15.00.12)
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t07/14/2024 - 15.00.47: venv fix, copilot vibe tweaks - creation, mcp logic, basic_demo autonums \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"\
     "\t06/30/2024 - 15.00.33: Tech Preview: genai-logic genai-add-app --vibe, bug [96, 97] \n"\
     "\t06/10/2024 - 15.00.12: MCP Security, win fixes for readme, graphics quotes \n"\
@@ -463,6 +464,13 @@ def create_project_and_overlay_prototypes(project: 'ProjectRun', msg: str) -> st
         copy_sqlite = True
         if copy_sqlite == False or "sqlite" not in project.abs_db_url:
             db_uri = get_windows_path_with_slashes(project.abs_db_url)
+            
+            # Convert PostgreSQL URL for Python 3.13+ compatibility
+            import sys
+            if sys.version_info >= (3, 13) and db_uri.startswith('postgresql://'):
+                db_uri = db_uri.replace('postgresql://', 'postgresql+psycopg://')
+                log.debug(f'.. ..Converted PostgreSQL URL for Python 3.13+: {db_uri}')
+            
             create_utils.replace_string_in_file(search_for="replace_db_url",
                                 replace_with=db_uri,
                                 in_file=f'{project.project_directory}/config/config.py')
@@ -915,7 +923,10 @@ def start_open_with(project: Project):
 
 def invoke_extended_builder(builder_path, db_url, project_directory, model_creation_services):
     # spec = importlib.util.spec_from_file_location("module.name", "/path/to/file.py")
-    spec = importlib.util.spec_from_file_location("module.name", builder_path)
+    use_builder_path = builder_path
+    if builder_path == '*':
+        use_builder_path = Path('extended_builder.py')
+    spec = importlib.util.spec_from_file_location("module.name", use_builder_path)
     extended_builder = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(extended_builder)  # runs "bare" module code (e.g., initialization)
     extended_builder.extended_builder(db_url, project_directory, model_creation_services)  # extended_builder.MyClass()
@@ -1194,8 +1205,8 @@ class ProjectRun(Project):
             log.debug(f'.. .. ..Copying sqlite database to: database/{self.bind_key}_db.sqlite')
             db_loc = self.abs_db_url.replace("sqlite:///", "")
             if os.name == "nt":
-                if db_loc.startswith("C:\C:"):  # windows
-                    db_loc = db_loc.replace("C:\C:", "C:")  # remove unk junk
+                if db_loc.startswith(r"C:\C:"):  # windows
+                    db_loc = db_loc.replace(r"C:\C:", "C:")  # remove unk junk
             target_db_loc_actual = str(self.project_directory_path.joinpath(f'database/{self.bind_key}_db.sqlite'))
             # target: /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/servers/NW_NoCust/database/Todo_db.sqlite
             # e.g.,   /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/servers/NW_NoCust/database

api_logic_server_cli/api_logic_server_info.yaml

@@ -1,3 +1,3 @@
-last_created_date: July 14, 2025 19:56:50
-last_created_project_name: ApiLogicProject
-last_created_version: 15.00.46
+last_created_date: July 20, 2025 08:02:02
+last_created_project_name: samples/nw_sample_nocust
+last_created_version: 15.00.52

api_logic_server_cli/cli.py

@@ -188,14 +188,16 @@ def main(ctx):
         Creation is from your database (--db-url identifies a SQLAlchemy database)
 
 \b
-        Doc: https://apilogicserver.github.io/Docs
+        Synonym to genai-logic: gail | gal
+\b
+        Doc: https://apilogicserver.github.io/Docs/Doc-Home/
         And: https://apilogicserver.github.io/Docs/Database-Connectivity/
 \b
     Suggestions:
 
 \b
-        ApiLogicServer start                                # create and manage projects
-        ApiLogicServer create --db-url= --project-name=     # defaults to Northwind sample
+        genai-logic start                                # create and manage projects
+        genai-logic create --db-url= --project-name=     # defaults to Northwind sample
     """
     pass  # all commands come through here
 
@@ -1083,13 +1085,13 @@ def genai_iterate(ctx, project_name: str, using: str):
               help="your_code.py for additional build automation")
 @click.option('--include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include, exclude")
 @click.option('--include-tables', 'include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include, exclude")
 @click.option('--infer_primary_key/--no_infer_primary_key',
               default=False, is_flag=True,
-              help="xInfer primary_key for unique cols")
+              help="Infer primary_key for unique cols")
 @click.option('--infer-primary-key/--no-infer-primary-key', 'infer_primary_key',
               default=False, is_flag=True,
               help="Infer primary-key for unique cols")
@@ -1250,22 +1252,22 @@ def create(ctx, project_name: str, db_url: str, not_exposed: str, api_name: str,
               help="Swagger hostname (default is localhost)")
 @click.option('--extended_builder',
               default=f'',
-              help="your_code.py for additional build automation")
+              help="your python for additional build automation")
 @click.option('--extended-builder', 'extended_builder',
               default=f'',
-              help="your_code.py for additional build automation")
+              help="your python for additional build automation")
 @click.option('--include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include / exclude")
 @click.option('--include-tables', 'include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include / exclude")
 @click.option('--infer_primary_key/--no_infer_primary_key',
               default=False, is_flag=True,
-              help="Infer primary-key for unique cols")
+              help="Infer primary key for unique cols")
 @click.option('--infer-primary-key/--no-infer-primary-key', 'infer_primary_key',
               default=False, is_flag=True,
-              help="Infer primary-key for unique cols")
+              help="Unique cols infer primary key")
 @click.pass_context
 def create_and_run(ctx, project_name: str, db_url: str, not_exposed: str, api_name: str,
         from_git: str,
@@ -1280,11 +1282,13 @@ def create_and_run(ctx, project_name: str, db_url: str, not_exposed: str, api_na
         host: str,
         port: str,
         swagger_host: str,
-        favorites: str, non_favorites: str,
+        favorites: str, 
+        non_favorites: str,
         extended_builder: str,
         include_tables: str,
         multi_api: click.BOOL,
-        opt_locking: str, opt_locking_attr: str,
+        opt_locking: str, 
+        opt_locking_attr: str,
         id_column_alias: str,
         infer_primary_key: click.BOOL):
     """
@@ -2122,7 +2126,7 @@ if __name__ == '__main__':  # debugger & python command line start here
             "show-args" in api_logic_server_info_file_dict:
         print_args(commands, f'\nCommand Line Arguments:')
     python_version = sys.version_info
-    assert python_version[0] >= 3 and python_version[1] in [10,11,12], \
-        "... Requires Python >=3.10, !=3.11.0, !=3.11.1, 3.12"
+    assert python_version[0] >= 3 and python_version[1] in [10,11,12, 13], \
+        "... Requires Python >=3.10, !=3.11.0, !=3.11.1, 3.12, 3.13"
     main()
 

api_logic_server_cli/create_from_model/api_logic_server_utils.py

@@ -293,10 +293,13 @@ def get_abs_db_url(msg, project: Project, is_auth: bool = False):
             else:
                 rtn_abs_db_url = f'sqlite:///{str(project.api_logic_server_dir_path.joinpath("prototypes/sample_ai/database/chatgpt/sample_ai_items.sqlite"))}'
                 # log.info('.. using installed nw sample database')
-        else:
+        else:  # for win, might be: sqlite:////C:\\Users\\val\\dev\\ApiLogicServer\\ApiLogicServer-dev\\org_git\\ApiLogicServer-src\\api_logic_server_cli\\database\\mcp.sqlite
             url = url_to_process[10: len(url_to_process)]
+            if url_to_process.startswith('sqlite:////c:'):
+                url = url_to_process[11: len(url_to_process)]
             rtn_abs_db_url = abspath(url)
             rtn_abs_db_url = 'sqlite:///' + rtn_abs_db_url
+            pass
     elif url_to_process == 'sqlsvr-sample':  # work-around - VSCode run config arg parsing
         rtn_abs_db_url = 'mssql+pyodbc://sa:Posey3861@localhost:1433/SampleDB?driver=ODBC+Driver+18+for+SQL+Server&trusted_connection=no&Encrypt=no'
     elif url_to_process == 'sqlsvr-nwlogic':  # work-around - VSCode run config arg parsing

api_logic_server_cli/manager.py

@@ -36,9 +36,9 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
         samples (bool, optional): Whether to create large samples (prevent win max file length)
     """    
     
-    def create_sym_links(cli_path: Path, mgr_path: Path):
+    def copy_sqlite_dbs(cli_path: Path, mgr_path: Path):
         """
-        Creates symbolic links to sample dbs and prompts (clearer than db abbreviations).
+        Copy sample sqlite databases to mgr/samples/dbs (clearer than db abbreviations).
 
         Args:
             cli_path (Path): loc of cli.py in the manager's venv
@@ -48,16 +48,27 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
             Creates a symbolic link from 'cli_path/database/basic_demo.sqlite' to 'mgr_path/samples/dbs/basic_demo'.
 
         """
-        
-        # create symbolic link - thanks https://www.geeksforgeeks.org/python/python-os-symlink-method/
-        try:
-            os.symlink(cli_path.parent / 'database/basic_demo.sqlite', mgr_path / 'samples/dbs/basic_demo.sqlite')
-            os.symlink(cli_path.parent / 'database/nw-gold.sqlite', mgr_path / 'samples/dbs/nw.sqlite')
-            os.symlink(cli_path.parent / 'database/Chinook_Sqlite.sqlite', mgr_path / 'samples/dbs/chinook.sqlite')
-            os.symlink(cli_path.parent / 'database/classicmodels.sqlite', mgr_path / 'samples/dbs/classicmodels.sqlite')
-            log.debug("✅ Manager Creation - SymLink created: samples/dbs/")
-        except Exception as e:
-            log.debug(f"❌ Manager Creation - SymLink creation failed: {str(e)}")
+        if use_syn_link := False:
+            # could create symbolic link - thanks https://www.geeksforgeeks.org/python/python-os-symlink-method/
+            # but this fails on windows due to permissions
+            try:
+                os.symlink(cli_path.parent / 'database/basic_demo.sqlite', mgr_path / 'samples/dbs/basic_demo.sqlite')
+                os.symlink(cli_path.parent / 'database/nw-gold.sqlite', mgr_path / 'samples/dbs/nw.sqlite')
+                os.symlink(cli_path.parent / 'database/Chinook_Sqlite.sqlite', mgr_path / 'samples/dbs/chinook.sqlite')
+                os.symlink(cli_path.parent / 'database/classicmodels.sqlite', mgr_path / 'samples/dbs/classicmodels.sqlite')
+                log.debug("✅ Manager Creation - SymLink created: samples/dbs/")
+            except Exception as e:
+                log.debug(f"❌ Manager Creation - Copy samples/dbs SymLink creation failed: {str(e)}")
+        else:
+            try:
+                copyfile(cli_path.parent / 'database/basic_demo.sqlite', mgr_path / 'samples/dbs/basic_demo.sqlite')
+                copyfile(cli_path.parent / 'database/nw-gold.sqlite', mgr_path / 'samples/dbs/nw.sqlite')
+                copyfile(cli_path.parent / 'database/Chinook_Sqlite.sqlite', mgr_path / 'samples/dbs/chinook.sqlite')
+                copyfile(cli_path.parent / 'database/classicmodels.sqlite', mgr_path / 'samples/dbs/classicmodels.sqlite')
+                copyfile(cli_path.parent / 'database/todos.sqlite', mgr_path / 'samples/dbs/todos.sqlite')
+                log.debug("✅ Manager Creation - Created: samples/dbs/")
+            except Exception as e:
+                log.debug(f"❌ Manager Creation - Copy samples/dbs creation failed: {str(e)}")
 
 
     log = logging.getLogger(__name__)
@@ -218,7 +229,7 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
         create_utils.replace_string_in_file(search_for = 'cli_path',
                                             replace_with=str(cli_str),
                                             in_file=vscode_launch_path)
-        create_sym_links(cli_path=cli_path, mgr_path=to_dir)
+        copy_sqlite_dbs(cli_path=cli_path, mgr_path=to_dir)
 
     if env_path.exists():
         create_utils.replace_string_in_file(search_for = 'APILOGICSERVER_AUTO_OPEN=code',

api_logic_server_cli/prototypes/base/config/config.py

@@ -133,6 +133,12 @@ class Config:
     SQLALCHEMY_DATABASE_URI : typing.Optional[str] = f"replace_db_url"
     # override SQLALCHEMY_DATABASE_URI here as required
 
+    # Python 3.13+ compatibility: Convert PostgreSQL URLs to use psycopg3
+    import sys
+    if sys.version_info >= (3, 13) and SQLALCHEMY_DATABASE_URI.startswith('postgresql://'):
+        SQLALCHEMY_DATABASE_URI = SQLALCHEMY_DATABASE_URI.replace('postgresql://', 'postgresql+psycopg://')
+        app_logger.debug(f'config.py - converted PostgreSQL URL for Python 3.13+: {SQLALCHEMY_DATABASE_URI}')
+
     BACKTIC_AS_QUOTE = False # use backtic as quote for table names for API Bridge
     if SQLALCHEMY_DATABASE_URI.startswith("mysql") or SQLALCHEMY_DATABASE_URI.startswith("mariadb"):
         BACKTIC_AS_QUOTE = True
@@ -145,6 +151,11 @@ class Config:
     if os.getenv('SQLALCHEMY_DATABASE_URI'):  # e.g. export SECURITY_ENABLED=true
         SQLALCHEMY_DATABASE_URI = os.getenv('SQLALCHEMY_DATABASE_URI')
         app_logger.debug(f'.. overridden from env variable: {SQLALCHEMY_DATABASE_URI}')
+        
+        # Python 3.13+ compatibility: Convert PostgreSQL URLs to use psycopg3 (for env override)
+        if sys.version_info >= (3, 13) and SQLALCHEMY_DATABASE_URI.startswith('postgresql://'):
+            SQLALCHEMY_DATABASE_URI = SQLALCHEMY_DATABASE_URI.replace('postgresql://', 'postgresql+psycopg://')
+            app_logger.debug(f'config.py - converted PostgreSQL URL for Python 3.13+: {SQLALCHEMY_DATABASE_URI}')
 
 
     # KEYCLOAK Args
@@ -178,6 +189,10 @@ class Config:
     # Begin Multi-Database URLs (from ApiLogicServer add-db...)
     auth_db_path = str(project_path.joinpath('database/authentication_db.sqlite'))
     SQLALCHEMY_DATABASE_URI_AUTHENTICATION = f'sqlite:///{auth_db_path}'
+    # Python 3.13+ compatibility: Convert PostgreSQL URLs to use psycopg3 (for env override)
+    if sys.version_info >= (3, 13) and SQLALCHEMY_DATABASE_URI_AUTHENTICATION.startswith('postgresql://'):
+        SQLALCHEMY_DATABASE_URI_AUTHENTICATION = SQLALCHEMY_DATABASE_URI_AUTHENTICATION.replace('postgresql://', 'postgresql+psycopg://')
+        app_logger.debug(f'config.py - converted PostgreSQL URL for Python 3.13+: {SQLALCHEMY_DATABASE_URI_AUTHENTICATION}')
     app_logger.info(f'config.py - SQLALCHEMY_DATABASE_URI_AUTHENTICATION: {SQLALCHEMY_DATABASE_URI_AUTHENTICATION}\n')
 
     # as desired, use env variable: export SQLALCHEMY_DATABASE_URI='sqlite:////Users/val/dev/servers/docker_api_logic_project/database/db.sqliteXX'

api_logic_server_cli/prototypes/base/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/.vscode/settings.json

@@ -20,5 +20,5 @@
     "workbench.editorAssociations": {
         "*.md": "vscode.markdown.preview.editor"
     },
-    "workbench.colorTheme": "Visual Studio Light"
+    "workbench.colorTheme": "Arduino Light"
 }

api_logic_server_cli/prototypes/manager/{run_sample.sh → samples/docker_samples/run_sample_docker.sh}

@@ -14,8 +14,8 @@ if [ $# -eq 0 ]
     # echo "shell: $SHELL"
     echo " eg:"
     echo " "
-    echo "   > cd webgenai  # or ApiLogicServer"
-    echo "   > sh run_sample.sh nw_sample_nocust"
+    echo "   > cd ApiLogicServer # ONLY if already running under docker"
+    echo "   > sh samples/docker_samples/run_sample_docker.sh nw_sample_nocust"
     echo " "
     exit 0
 fi
@@ -26,5 +26,5 @@ if [ "$1" = "$" ]
     sample="nw_sample"
   fi
 
-cd samples/$sample
-docker run -it --rm --name api_logic_project -p 5656:5656 --env-file ./devops/docker-standard-image/env.list -v ./:/app apilogicserver/web_genai python3 /app/api_logic_server_run.py
+pushd samples/$sample
+docker run -it --rm --name api_logic_project_${sample}_$(date +%s) -p 5656:5656 --env-file ./devops/docker-standard-image/env.list -v ./:/app apilogicserver/web_genai python3 /app/api_logic_server_run.py

api_logic_server_cli/prototypes/manager/samples/docker_samples/run_web_genai.sh

@@ -0,0 +1,5 @@
+# Run WebGenAI docker container
+
+# sh samples/docker_samples/run_web_genai.sh
+
+docker compose -f webgenai/docker-compose.yml up

api_logic_server_cli/prototypes/manager/samples/readme_samples.md

@@ -6,7 +6,7 @@ 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:
 
@@ -14,24 +14,36 @@ For example, create Northwind like this:
 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.
-
 ## 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/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,8 +49,11 @@ 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
@@ -91,8 +99,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 +144,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 +210,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 +309,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 +355,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() ).