Skip to content

Commit 73b8716

Browse files
committed
14.03.11: fixes
1 parent 1146046 commit 73b8716

File tree

4 files changed

+24
-26
lines changed

4 files changed

+24
-26
lines changed

api_logic_server_cli/api_logic_server.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
1313
'''
1414

15-
__version__ = "14.03.10"
15+
__version__ = "14.03.11"
1616
recent_changes = \
1717
f'\n\nRecent Changes:\n' +\
18-
"\t02/11/2024 - 14.03.10: fixes for LogicBank date defaulting \n"\
19-
"\t02/09/2024 - 14.03.09: webg APILOGICPROJECT_LOGIC_ENABLED \n"\
20-
"\t02/05/2024 - 14.03.08: webg SendWhen \n"\
18+
"\t02/13/2024 - 14.03.11: fixes [78: Keycloak, 79: boolean defaulting, 80: Send If missing attribute] \n"\
2119
"\t01/31/2024 - 14.03.00: Issue 76: exp ending in right paren, Issue 74: Multi-db fix, extended default options, if-based Nat Lang formulas \n"\
2220
"\t01/29/2024 - 14.02.34: save docs/response.json to fix bad rules for IS_GENAI_DEMO, LogicBank 1.20.23 (all defaults) \n"\
2321
"\t01/26/2024 - 14.02.31: genai_logic fail-safe, Issue 74: Multi-db fix, support models named Rule, wg logic discovery, if formula \n"\

api_logic_server_cli/prototypes/manager/.vscode/launch.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"internalConsoleOptions": "openOnSessionStart"
2525
},
2626
{
27-
"name": " 1.1 GENAI - Iterate (first, add prompt to system/genai/temp/<project>)",
27+
"name": " - 1.1 GENAI - Iterate (first, add prompt to system/genai/temp/<project>)",
2828
"type": "debugpy",
2929
"request": "launch",
3030
"program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -43,7 +43,7 @@
4343
"internalConsoleOptions": "openOnSessionStart"
4444
},
4545
{
46-
"name": " 1.2 GENAI - Retry from repaired chatgpt response",
46+
"name": " - 1.2 GENAI - Retry from repaired chatgpt response",
4747
"type": "debugpy",
4848
"request": "launch",
4949
"program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -63,7 +63,7 @@
6363
"internalConsoleOptions": "openOnSessionStart"
6464
},
6565
{
66-
"name": " 1.3 GENAI - Retry from repaired model",
66+
"name": " - 1.3 GENAI - Retry from repaired model",
6767
"type": "debugpy",
6868
"request": "launch",
6969
"program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -84,7 +84,7 @@
8484
"internalConsoleOptions": "openOnSessionStart"
8585
},
8686
{
87-
"name": " 1.4 GENAI - Postgresql",
87+
"name": " - 1.4 GENAI - Postgresql",
8888
"type": "debugpy",
8989
"request": "launch",
9090
"program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -124,21 +124,7 @@
124124
"internalConsoleOptions": "openOnSessionStart"
125125
},
126126
{
127-
"name": " - API Logic Server Run (run project from manager)",
128-
"type": "debugpy",
129-
"request": "launch",
130-
"cwd": "${workspaceFolder}/${input:runProjectName}",
131-
"env": {
132-
"PYTHONHASHSEED": "0",
133-
"APILOGICSERVER_DEBUG": "False",
134-
"OPT_LOCKING": "optional"},
135-
"justMyCode": false,
136-
"program": "api_logic_server_run.py",
137-
"redirectOutput": true,
138-
"console": "integratedTerminal"
139-
},
140-
{
141-
"name": "ApiLogicServer Create nw_sample_nocust",
127+
"name": " - ApiLogicServer Create nw_sample_nocust",
142128
"type": "debugpy",
143129
"request": "launch",
144130
"program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -157,7 +143,7 @@
157143
"internalConsoleOptions": "openOnSessionStart"
158144
},
159145
{
160-
"name": "ApiLogicServer Create nw_sample With Customizations",
146+
"name": " - ApiLogicServer Create nw_sample With Customizations",
161147
"type": "debugpy",
162148
"request": "launch",
163149
"program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -175,6 +161,20 @@
175161
"console": "internalConsole",
176162
"internalConsoleOptions": "openOnSessionStart"
177163
},
164+
{
165+
"name": "API Logic Server Run (run project from manager)",
166+
"type": "debugpy",
167+
"request": "launch",
168+
"cwd": "${workspaceFolder}/${input:runProjectName}",
169+
"env": {
170+
"PYTHONHASHSEED": "0",
171+
"APILOGICSERVER_DEBUG": "False",
172+
"OPT_LOCKING": "optional"},
173+
"justMyCode": false,
174+
"program": "api_logic_server_run.py",
175+
"redirectOutput": true,
176+
"console": "integratedTerminal"
177+
},
178178
{
179179
"name": "App Model Editor - Prepare",
180180
"type": "node",

docker/api_logic_server.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# GA release -- DELETE BUILD DIRS FIRST
33

4-
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:14.03.07 -o type=image --platform=linux/arm64,linux/amd64 .
4+
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:14.03.11 -o type=image --platform=linux/arm64,linux/amd64 .
55
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:latest -o type=image --platform=linux/arm64,linux/amd64 .
66
# docker pull apilogicserver/api_logic_server:latest
77

docker/webgenie_docker/build_web_genie.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if [ "$1" = "local" ]
7474
else
7575
# stand-alone test in terminal - cd $webgen_ai_docker-src, and...
7676
# docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:1.0.0 -o type=image --platform=linux/arm64,linux/amd64 .
77-
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:14.03.07 -o type=image --platform=linux/arm64,linux/amd64 .
77+
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:14.03.11 -o type=image --platform=linux/arm64,linux/amd64 .
7878
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:latest -o type=image --platform=linux/arm64,linux/amd64 .
7979
fi
8080

0 commit comments

Comments
 (0)