Skip to content

Commit

Permalink
ALS release 14.01.00
Browse files Browse the repository at this point in the history
  • Loading branch information
valhuber committed Jan 7, 2025
1 parent c441209 commit d4bd095
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 45 deletions.
46 changes: 2 additions & 44 deletions api_logic_server_cli/api_logic_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,64 +12,22 @@
Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
'''

__version__ = "14.00.58"
__version__ = "14.01.00"
recent_changes = \
f'\n\nRecent Changes:\n' +\
"\t01/06/2024 - 14.00.58: genai test+ data creation, test data typing, lb 1.20.21, safrs 0106, clearer work file names, simpler CLI for genai-utils --rebuild, TestBase \n"\
"\t01/05/2024 - 14.00.53: response2code runs, first run: als genai-utils --rebuild-test-data \n"\
"\t01/03/2024 - 14.00.51: aggr dflts, LB 1.20.20, running load_test_data proto, colorama \n"\
"\t12/30/2024 - 14.00.49: genai fixes: submit, readme, etc \n"\
"\t12/29/2024 - 14.00.48: LB 01.20.18 with resettable singleton \n"\
"\t12/29/2024 - 14.00.47: BLT runs with multi-db (multi_db with auth special-dirs case) \n"\
"\t12/28/2024 - 14.00.45: Win fix for genai_svcs WebG logging \n"\
"\t12/27/2024 - 14.00.44: refactored genai_utils, logicbank-1.20.17 (excp fix) \n"\
"\t12/27/2024 - 14.00.42: colorama failed, LogicBank 01.20.16 missing attrs excp with all excps, fail-save rules, excp content \n"\
"\t12/26/2024 - 14.00.40: LogicBank 01.20.14 - missing attrs excp with all excps, fail-save rules \n"\
"\t12/24/2024 - 14.00.39: post_error missing from genai_svcs#fix_model_lines \n"\
"\t12/23/2024 - 14.00.38: import creates db, models and test data (not rules), readme_wg_dev_merge.md \n"\
"\t12/22/2024 - 14.00.36: many: prompt includes, relative create_db_models db, check class no base, \n"\
"\t12/22/2024 - 14.00.35: safrs 3.1.6, models_2_code recovery, with newline \n"\
"\t12/21/2024 - 14.00.32: successful [assisted] import of export, fix genai_svcs.model2code, fix safrs_basex removal, with option for just opt_lock for clean models \n"\
"\t12/20/2024 - 14.00.28: model driven api (fails multi-db), import(ish), missing active_rules, logicbank 1.20.12 - fail-save rules, BLT files for N8N \n"\
"\t12/17/2024 - 14.00.25: add wg_dev_merge projects, fix fixup bug that (lost initial data models), n8n fixes \n"\
"\t12/17/2024 - 14.00.23: Integration: add nw:employee.email, fix workflow_integration.py \n"\
"\t12/16/2024 - 14.00.22: Integration: simplified RowMapper, prelim n8n, bug fix ref no-rule classes \n"\
"\t12/15/2024 - 14.00.20: LogicBank reports missing attrs, kafka/kafka_producer.py#send_kafka_message - RowDictMapper now optional \n"\
"\t12/12/2024 - 14.00.19: genai: genai-logic --logic, utils/fixup+, no dup derivations, --use-active-rules, active rules > 5, no initial logic, use_case \n"\
"\t01/06/2024 - 14.01.00: N8N, Rebuild test data, Fixup, Project Import, Improved reporting of missing attributes, Simplified RowDictMaper \n"\
"\t11/18/2024 - 12.02.00: genai: 'qualified any' now supported in logic training \n"\
"\t10/31/2024 - 12.01.00: genai: informal rules (eg, Sum of employee salaries cannot exceed department budget) \n"\
"\t10/21/2024 - 12.00.04: sra 10-22, Prelim support genai --using=dir/project \n"\
"\t10/12/2024 - 12.00.02: Natural Language Logic \n"\
"\t10/17/2024 - 11.02.19: singular classes, expanded doc/prompts, logic work-arounds, docs/logic, logic learning, readme \n"\
"\t10/11/2024 - 11.02.14: NL/Logic with test data calcs, sra 10-07-2024, genai-logic, cs, iteration rebuild \n"\
"\t10/07/2024 - 11.02.06: sra 10-7-2024 (constraint handling) \n"\
"\t10/01/2024 - 11.02.05: logic bank dup derivations detected, sra 10-1-2024 \n"\
"\t09/21/2024 - 11.02.00: er diagrams, GenAI: genai-create, genai-iterate, and conversations \n"\
"\t09/04/2024 - 11.01.15: APILOGICPROJECT_LOG_CONFIG, _STOP_OK, _EXTERNAL_HOST, _EXTERNAL_PORT \n"\
"\t09/03/2024 - 11.01.11: logicbank 1.20.7, safrs 3.1.4, sra Aug17, behave_run err-check[70], genai decimals \n"\
"\t08/21/2024 - 11.01.02: Bug 68: nested quotes, internal (BLT path, exp tests) \n"\
"\t08/18/2024 - 11.01.00: Genai: simpler prompts, diagnostics, ChatGPT4 \n"\
"\t08/09/2024 - 11.00.20: GenAI hardening, diagnostics \n"\
"\t08/02/2024 - 11.00.07: App Model Editor UI rework, docs and fix for kc and export \n"\
"\t07/25/2024 - 11.00.00: Keycloak, App Model Editor \n"\
"\t06/06/2024 - 10.04.48: config-driven admin.yaml security config \n"\
"\t06/04/2024 - 10.04.47: ont cascade add, mgr: fix missing env, docker mgr, BLT behave logs, add-cust \n"\
"\t05/25/2024 - 10.04.32: mgr: pycharm, load readme from git \n"\
"\t05/24/2024 - 10.04.24: default ont creation (w/ security), logic/svc discovery, nw+ app_model_custom.yaml \n"\
"\t05/04/2024 - 10.04.01: genai w/ restart, logic insertion, use Numeric, genai-cust, pg, 57 \n"\
"\t04/05/2024 - 10.03.66: ApiLogicServer start, als create from-model (eg copilot) \n"\
"\t03/28/2024 - 10.03.46: Python 3.12, View support, CLI option-names, Keycloak preview \n"\
"\t02/24/2024 - 10.03.04: Issue 45 (RowDictMapper joins), Issue 44 (defaulting), Issue 43 (rebuild no yaml), Tests \n"\
"\t02/16/2024 - 10.02.05: kafka_producer.send_kafka_message, sample md fixes, docker ENV, pg authdb, issue 42 \n"\
"\t02/07/2024 - 10.02.00: BugFix[38]: foreign-key/getter collision \n"\
"\t01/31/2024 - 10.01.28: LogicBank fix, sample-ai, better rules example \n"\
"\t01/03/2024 - 10.01.00: Quoted col names \n"\
"\t12/21/2023 - 10.00.01: Fix < Python 3.11 \n"\
"\t12/19/2023 - 10.00.00: Kafka pub/sub, Fix MySQL CHAR/String, list/hash/set types \n"\
"\t12/06/2023 - 09.06.00: Oracle Thick, Integration Sample, No sql logging in rules, curl post \n"\
"\t09/14/2023 - 09.03.00: Oracle support \n"\
"\t09/09/2023 - 09.02.24: Cleanup of table vs. class \n"\
"\t06/24/2023 - 09.00.01: PyMysql \n"\
"\t06/22/2023 - 09.00.00: Optimistic Locking, safrs 310, SQLAlchemy 2.0.15 \n"\
"\t05/01/2023 - 08.03.06: allocation sample \n"\
"\t04/26/2023 - 08.03.00: virt attrs (Issue 56), safrs 3.0.2, readme updates, LogicBank 1.8.4 \n"\
Expand Down
2 changes: 1 addition & 1 deletion docker/api_logic_server.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# GA release -- DELETE BUILD DIRS FIRST

# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:14.00.00 -o type=image --platform=linux/arm64,linux/amd64 .
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:14.01.00 -o type=image --platform=linux/arm64,linux/amd64 .
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:latest -o type=image --platform=linux/arm64,linux/amd64 .

# Beta - test codespaces with tutorial, API_Fiddle (change .devcontainer.json -> apilogicserver/api_logic_server_x)
Expand Down
101 changes: 101 additions & 0 deletions docker/webgenie_docker/WebG_Docker_build_failed_log.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
venv) val@Vals-MPB-14 ApiLogicServer-src % sh docker/webgenie_docker/build_web_genie_local.sh local


Build Web/GenAI Docker locally (no push to docker hub)

pwd: /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src

To build api_logic_server_local image:
.. 1. BLT (with tomato), or
.. 2. See 'Internal' at docker/api_logic_server.Dockerfile
Verify pwd = ApiLogicServer-src, local image ready (see above)>

pwd: /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git


Clean webgen_ai_docker

+ rm -rf webgen_ai_docker
+ cp -r /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/docker/webgenie_docker/webgen_ai_docker ./
+ cd webgen_ai_docker
+ touch webgenai_env
+ git clone https://github.com/ApiLogicServer/sra --depth=1
Cloning into 'sra'...
remote: Enumerating objects: 637, done.
remote: Counting objects: 100% (637/637), done.
remote: Compressing objects: 100% (527/527), done.
remote: Total 637 (delta 107), reused 444 (delta 71), pack-reused 0 (from 0)
Receiving objects: 100% (637/637), 23.71 MiB | 31.83 MiB/s, done.
Resolving deltas: 100% (107/107), done.
+ git clone https://github.com/ApiLogicServer/webgenai
Cloning into 'webgenai'...
remote: Enumerating objects: 2738, done.
remote: Counting objects: 100% (251/251), done.
remote: Compressing objects: 100% (158/158), done.
remote: Total 2738 (delta 172), reused 155 (delta 81), pack-reused 2487 (from 1)
Receiving objects: 100% (2738/2738), 8.35 MiB | 7.49 MiB/s, done.
Resolving deltas: 100% (1599/1599), done.
+ cd webgenai
+ git pull
Already up to date.
+ cd ..
+ '[' local = local ']'
+ docker build -f /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/docker/webgenie_docker/webgen_ai_docker/webgenie_local.Dockerfile -t apilogicserver/web_genai --no-cache --rm .
[+] Building 12.8s (9/23) docker:desktop-linux
=> [internal] load build definition from webgenie_local.Dockerfile 0.0s
=> => transferring dockerfile: 1.74kB 0.0s
=> [internal] load metadata for docker.io/apilogicserver/api_logic_server_local:latest 0.0s
=> [internal] load .dockerignore 0.0s
=> => transferring context: 2B 0.0s
=> [ 1/19] FROM docker.io/apilogicserver/api_logic_server_local:latest 0.2s
=> [internal] load build context 0.4s
=> => transferring context: 65.28MB 0.4s
=> [ 2/19] RUN apt-get update 1.9s
=> [ 3/19] RUN apt-get install -y nginx jq sqlite3 3.6s
=> [ 4/19] RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y 6.7s
=> ERROR [ 5/19] RUN apt-get update && apt-get install wget -y && mkdir -p -m 755 /etc/apt/keyr 0.4s
------
> [ 5/19] RUN apt-get update && apt-get install wget -y && mkdir -p -m 755 /etc/apt/keyrings && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && apt update && apt install gh -y:
0.221 Get:1 http://deb.debian.org/debian bullseye InRelease [116 kB]
0.266 Get:2 http://deb.debian.org/debian-security bullseye-security InRelease [27.2 kB]
0.277 Err:1 http://deb.debian.org/debian bullseye InRelease
0.277 At least one invalid signature was encountered.
0.294 Get:3 https://packages.microsoft.com/debian/11/prod bullseye InRelease [3650 B]
0.302 Err:2 http://deb.debian.org/debian-security bullseye-security InRelease
0.302 At least one invalid signature was encountered.
0.303 Get:4 https://deb.nodesource.com/node_20.x nodistro InRelease [12.1 kB]
0.314 Get:5 http://deb.debian.org/debian bullseye-updates InRelease [44.1 kB]
0.326 Err:3 https://packages.microsoft.com/debian/11/prod bullseye InRelease
0.326 At least one invalid signature was encountered.
0.344 Err:4 https://deb.nodesource.com/node_20.x nodistro InRelease
0.344 At least one invalid signature was encountered.
0.366 Err:5 http://deb.debian.org/debian bullseye-updates InRelease
0.366 At least one invalid signature was encountered.
0.369 Reading package lists...
0.377 W: GPG error: http://deb.debian.org/debian bullseye InRelease: At least one invalid signature was encountered.
0.377 E: The repository 'http://deb.debian.org/debian bullseye InRelease' is not signed.
0.377 W: GPG error: http://deb.debian.org/debian-security bullseye-security InRelease: At least one invalid signature was encountered.
0.377 E: The repository 'http://deb.debian.org/debian-security bullseye-security InRelease' is not signed.
0.377 W: GPG error: https://packages.microsoft.com/debian/11/prod bullseye InRelease: At least one invalid signature was encountered.
0.377 E: The repository 'https://packages.microsoft.com/debian/11/prod bullseye InRelease' is not signed.
0.377 W: GPG error: https://deb.nodesource.com/node_20.x nodistro InRelease: At least one invalid signature was encountered.
0.377 E: The repository 'https://deb.nodesource.com/node_20.x nodistro InRelease' is not signed.
0.377 W: GPG error: http://deb.debian.org/debian bullseye-updates InRelease: At least one invalid signature was encountered.
0.377 E: The repository 'http://deb.debian.org/debian bullseye-updates InRelease' is not signed.
------
webgenie_local.Dockerfile:14
--------------------
13 |
14 | >>> RUN apt-get update && apt-get install wget -y \
15 | >>> && mkdir -p -m 755 /etc/apt/keyrings \
16 | >>> && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
17 | >>> && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
18 | >>> && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
19 | >>> && apt update \
20 | >>> && apt install gh -y
21 |
--------------------
ERROR: failed to solve: process "/bin/sh -c apt-get update && apt-get install wget -y && mkdir -p -m 755 /etc/apt/keyrings && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && apt update && apt install gh -y" did not complete successfully: exit code: 100

View build details: docker-desktop://dashboard/build/desktop-linux/desktop-linux/lnc1cu8gin07ngddwhy2tfi57
(venv) val@Vals-MPB-14 ApiLogicServer-src %

0 comments on commit d4bd095

Please sign in to comment.