Skip to content

Commit e7ecae2

Browse files
lmfarley10JBAnderson5
authored andcommitted
Added license headers, removed old 3p licenses, updated readme-old instructions, added trust rest to gitignore, renamed mkdocs to deployment docs to avoid confusion
1 parent 0ac25a5 commit e7ecae2

File tree

282 files changed

+245
-761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+245
-761
lines changed

.gitignore

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ __pycache__/
5757
!/vbcs_oda_archives/vbcs_apps/vbcs-askdata/webApps/nl2sqlbot/resources/images/*
5858

5959
# Added images for documentation (redacted)
60-
!mkdocs/docs/deployment/business_media/media/*
61-
!mkdocs/docs/deployment/apex/media/*
62-
!mkdocs/docs/deployment/images/*
63-
!mkdocs/docs/deployment/lb/media/*
64-
!mkdocs/docs/deployment/terraform/*
60+
!deployment-docs/docs/deployment/business_media/media/*
61+
!deployment-docs/docs/deployment/apex/media/*
62+
!deployment-docs/docs/deployment/images/*
63+
!deployment-docs/docs/deployment/lb/media/*
64+
!deployment-docs/docs/deployment/terraform/*
6565

6666
*.jpeg
67-
!mkdocs/docs/deployment/business_media/media/*
67+
!deployment-docs/docs/deployment/business_media/media/*
6868

6969
*.jpg
7070
!/vbcs_oda_archives/vbcs_apps/vbcs-askdata/webApps/nl2sqlbot/resources/images/*
@@ -98,37 +98,37 @@ clientApp/autoprompt/ConfigFile.properties
9898
clientApp/autoprompt/semantic_suggest_runbook.md
9999

100100
# File with reference to orahub repo
101-
mkdocs/mkdocs.yml
101+
deployment-docs/mkdocs.yml
102102

103103
# Reference to api gateway
104-
# mkdocs/docs/deployment/adw_private.md # cleaned up sensitive info
104+
# deployment-docs/docs/deployment/adw_private.md # cleaned up sensitive info
105105

106106
# Reference to idcs discovery url
107-
#mkdocs/docs/deployment/business_api_gateway.md # cleaned up/masked sensitive data
107+
#deployment-docs/docs/deployment/business_api_gateway.md # cleaned up/masked sensitive data
108108

109109
# Reference to oda instance
110-
# mkdocs/docs/deployment/business_idcs.md # cleaned/masked data
110+
# deployment-docs/docs/deployment/business_idcs.md # cleaned/masked data
111111

112112
# Reference to oracle redis
113-
# mkdocs/docs/deployment/nl2sql_engine.md # removed sensitive data. There are a lot of references to websocket... maybe we can remove this in the near future
113+
# deployment-docs/docs/deployment/nl2sql_engine.md # removed sensitive data. There are a lot of references to websocket... maybe we can remove this in the near future
114114

115115
# Reference to API GW url
116-
# mkdocs/docs/deployment/oda.md # masked sensitive data
116+
# deployment-docs/docs/deployment/oda.md # masked sensitive data
117117

118118
# Reference to OCI tenancy
119-
# mkdocs/docs/deployment/trust-service.c.md # cleaned sensitive data. There are a couple references to artifactory here
120-
# mkdocs/docs/deployment/trust-service.md # cleaned
119+
# deployment-docs/docs/deployment/trust-service.c.md # cleaned sensitive data. There are a couple references to artifactory here
120+
# deployment-docs/docs/deployment/trust-service.md # cleaned
121121

122122
# Reference to IDCS/API GW
123-
# mkdocs/docs/deployment/trust-ui.md
124-
# mkdocs/docs/deployment/validation.md # cleaned
125-
# mkdocs/docs/deployment/VBCS.md # masked
123+
# deployment-docs/docs/deployment/trust-ui.md
124+
# deployment-docs/docs/deployment/validation.md # cleaned
125+
# deployment-docs/docs/deployment/VBCS.md # masked
126126

127127
# ips
128-
# /mkdocs/docs/rest/nl2sql-trust/installation.md # masked ips
128+
# /deployment-docs/docs/rest/nl2sql-trust/installation.md # masked ips
129129

130130
# Reference to OCIDs
131-
/mkdocs/Finetune-DAC/finetune-dac-python.py
131+
/deployment-docs/Finetune-DAC/finetune-dac-python.py
132132

133133
# Binaries
134134
/oda/callGenAiSQLEndPointv2(1.0).zip
@@ -153,6 +153,10 @@ mkdocs/mkdocs.yml
153153
# Sensitive info
154154
/promotion/
155155

156+
# Adding entire rest trust directory for now, since there's a dependency on dotmap
157+
# can maybe add delta review for next release
158+
/rest/
159+
156160
# Random IPs
157161
/rest/nl2sql-trust/conf/dev_trust_config.json
158162
/rest/nl2sql-trust/conf/metadata_v2.json
@@ -244,7 +248,8 @@ mkdocs/mkdocs.yml
244248
/rest/script/upload_os_trust_config.sh
245249

246250
# tenancy name reference
247-
/rest/script/nl2sql_rest.service
251+
# masked data, required for starting trust service
252+
# /rest/script/nl2sql_rest.service
248253

249254
# ips
250255
/rest/script/upload.sh

README-old.md

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,80 @@ Below are the various requirements and findings from deploying the infrastructur
100100
- Provided an example entry with sample embedding
101101

102102
### Trust REST Framework
103-
Haven't gotten this far, but the basic prompt endpoint does use the trust library table.
103+
- Missing instructions for installing pip
104+
105+
sudo dnf install python3.11-pip
106+
sudo update-alternatives --install /usr/bin/pip pip /bin/pip3.11 40
107+
which pip
108+
pip --version
109+
110+
curl command to install oci oci needs to be fixed
111+
sudo bash -c "$(curl -L https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/install/install.sh)" \
112+
--accept-all-defaults \
113+
--install-dir /usr/local/bin \
114+
--exec-dir /usr/local/bin
115+
116+
Step 3 of firewall ports missing firewall reset command
117+
sudo systemctl restart firewalld
118+
119+
Instant Client Instructions are ambiguous
120+
121+
For Oracle Linux 8
122+
sudo dnf install oracle-instantclient-release-23ai-el8
123+
124+
For Oracle Linux 9
125+
sudo dnf install oracle-instantclient-release-23ai-el9
126+
127+
Current instructions instruct to follow the instructions according to the ADW version, but don't reference where to find
128+
instrucitons according to ADW version
129+
130+
Install sql client (linux 8 & 9)
131+
sudo yum install oracle-instantclient-sqlplus
132+
133+
Install sql tools
134+
sudo yum install oracle-instantclient-tools
135+
136+
Step 5, possible to omit?
137+
- Only necessary if python not working as expected
138+
139+
Step 7 is included in step 6, pip install pytest
140+
- Can be omitted
141+
142+
Validation instruction for nl2sql getprompt method missing payload, endpoint expects POST
143+
curl -vvv -X POST "http://<nl2sql>:8002/getprompt" -H "Content-Type: application/json" -d '{"question": "Show me the project names"}'
144+
145+
Also the default code in the clientApp directory in the repo exposes the trust helper on port 8001 by default, but the config in the trust-config.json expects port 8002
146+
147+
Step 8 references artifact repository to pull from, can't use for publishing. Need to use e.g. this repo instead
148+
149+
Step 9 requires wallet for version W21 or older
150+
- The artifact repo referenced doesn't have W22 version, not sure where to find it
151+
152+
Step 9 & 10 ask to configure trust_config.json, but ask to pull json from external repo. Trust_config.json is already included in repo under nl2sql-main/rest/nl2sql-trust/conf/
153+
154+
Configure trust_config then upload to object storage bucket under <env>/config/
155+
156+
Trust config expects dedicated ai cluster endpoint (dac)
157+
- provided on demand llama model endpoint instead (don't have dac on tenancy)
158+
159+
Missing instructions to set up object storage (assumes the following structure)
160+
- (env) e.g. dev
161+
- wallet
162+
- wallet.zip
163+
- config
164+
- trust-config.json
165+
- metadata_v2.json # instructions currently refer to "metadata.json"
166+
167+
Missing execute permission on restart bash script
168+
chmod +x
104169

105170
## APEX
106-
tbd ...
171+
APEX app is in object storage
172+
Got sql from object storage
107173

108174
### Troubleshooting
109175

110176
1. Graph isn't showing in Table Graph VB App
111177
- Solution: Make sure to assign user role to idcs group in app settings
178+
179+
Developers choosing to distribute a binary implementation of this project are responsible for obtaining and providing all required licenses and copyright notices for the third-party code used in order to ensure compliance with their respective open source licenses.

0 commit comments

Comments
 (0)