Skip to content

Commit b7d927b

Browse files
lmfarley10JBAnderson5
authored andcommitted
Added documentation, redacted images, fixed bug with table graph ui, added sample csv for vendors, updated readme, added licenses
1 parent 8eac16d commit b7d927b

File tree

307 files changed

+3561
-727
lines changed

Some content is hidden

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

307 files changed

+3561
-727
lines changed

.gitignore

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,23 @@ __pycache__/
5555
!clientApp/trusted.png
5656
!clientApp/untrusted.png
5757
!/vbcs_oda_archives/vbcs_apps/vbcs-askdata/webApps/nl2sqlbot/resources/images/*
58-
!nl2sql-main/vbcs_oda_archives/vbcs_apps/vbcs-askdata/webApps/nl2sqlbot/resources/images
58+
59+
# 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/*
5965

6066
*.jpeg
67+
!mkdocs/docs/deployment/business_media/media/*
68+
6169
*.jpg
6270
!/vbcs_oda_archives/vbcs_apps/vbcs-askdata/webApps/nl2sqlbot/resources/images/*
71+
6372
*.gif
6473
*.webp
74+
6575
*.ico
6676
!/vbcs_oda_archives/vbcs_apps/vbcs-askdata/webApps/nl2sqlbot/resources/images/*
6777

@@ -91,31 +101,31 @@ clientApp/autoprompt/semantic_suggest_runbook.md
91101
mkdocs/mkdocs.yml
92102

93103
# Reference to api gateway
94-
mkdocs/docs/deployment/adw_private.md
104+
# mkdocs/docs/deployment/adw_private.md # cleaned up sensitive info
95105

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

99109
# Reference to oda instance
100-
mkdocs/docs/deployment/business_idcs.md
110+
# mkdocs/docs/deployment/business_idcs.md # cleaned/masked data
101111

102112
# Reference to oracle redis
103-
mkdocs/docs/deployment/nl2sql_engine.md
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
104114

105115
# Reference to API GW url
106-
mkdocs/docs/deployment/oda.md
116+
# mkdocs/docs/deployment/oda.md # masked sensitive data
107117

108118
# Reference to OCI tenancy
109-
mkdocs/docs/deployment/trust-service.c.md
110-
mkdocs/docs/deployment/trust-service.md
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
111121

112122
# Reference to IDCS/API GW
113-
mkdocs/docs/deployment/trust-ui.md
114-
mkdocs/docs/deployment/validation.md
115-
mkdocs/docs/deployment/VBCS.md
123+
# mkdocs/docs/deployment/trust-ui.md
124+
# mkdocs/docs/deployment/validation.md # cleaned
125+
# mkdocs/docs/deployment/VBCS.md # masked
116126

117127
# ips
118-
/mkdocs/docs/rest/nl2sql-trust/installation.md
128+
# /mkdocs/docs/rest/nl2sql-trust/installation.md # masked ips
119129

120130
# Reference to OCIDs
121131
/mkdocs/Finetune-DAC/finetune-dac-python.py

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2024 Oracle and/or its affiliates.
1+
Copyright (c) 2025 Oracle and/or its affiliates.
22

33
The Universal Permissive License (UPL), Version 1.0
44

NOTICE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
This software is licensed under the Universal Permissive License (UPL) 1.0
2+
3+
The Universal Permissive License (UPL), Version 1.0
4+
Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.

README.md

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,30 @@ I ran a dry deployment using the cleaned repo on our tenancy. Listed are some of
6464
- Would have to be refactored if using e.g. cohere on demand
6565
- The existing documentation suggests deploying api gateway on private subnet due to lack of authentication.
6666
- I was able to deploy the api gateway on public subnet with oauth2.0 authentication to idcs server and invoke from oda with token, so not sure why private subnet deployment for api gateway is suggested
67+
- Possible separate deployment down the line for connecting customer vpn
6768
- The existing code expects api keys and wallets configured directly on the server, at least for the client business engine
69+
- Possible future code refactor
6870
- Redis is required but no instructions given
6971
- There was no example data given for the vendors table, so I exported the table from the main deployment as a csv and imported to ours
7072
- Vendors table is for client business db
71-
- How do we want to provide this csv?
73+
- Provided csv in clientApp folder
7274
- The business app is dependent on the trust db (trust library), i.e. the trusted prompts, which isn't intuitive
7375
- The code expects the TRUST_LIBRARY table to have at least one entry, otherwise it bombs
7476
- I provided a sample entry in the sql file
75-
The sql for the client business db is outside the clientapp directory, & there are no instructions given on which db to upload to (upload to business db)
76-
77-
The business app is exposed on an API Gateway with the main entry /prompt, which maps to <business-app-ip>:8000... this will be used by ODA app.
77+
- The sql for the client business db is outside the clientapp directory
78+
- There are no instructions given on which db to upload to
79+
- Execute nl2sql_datamodel_schema on business db
80+
- sample_setup_ras seems to apply to trust db
81+
- sample_setup_ras wasn't required to run the business app
82+
- The business app is exposed on an API Gateway with the main entry /prompt, which maps to <business-app-ip>:8000... this will be used by ODA app.
7883

7984
There are a handful of files required and provided within the repo, but no instructions on how/when to use them.
8085
Examples include :
81-
1. Under sql, nl2sql_datamodel_schema.sql needds to be ran in the trust database
82-
- Was able to run the client engine without the sql/sample_setup_ras.sql file.
83-
- This is a prequisite to run the business client engine, which isn't intuitive
84-
2. Within the rest (trust) directory there are docker files... I think we can remove these?
86+
1. Within the rest (trust) directory there are docker files... I think we can remove these?
8587
- Haven't tested full trust deployment yet.
86-
87-
Some files I don't think are necessary at all
88-
1. autoprompt
8988
2. mkdocs... this is documentation we can perhaps repurpose (at least the md files)
89+
- Repurposed documentation in latest commit
90+
3. sqlGenApp. Not sure where this is used
9091

9192
Below are the various requirements and findings from deploying the infrastructure components on our tenancy -
9293

@@ -105,31 +106,33 @@ Below are the various requirements and findings from deploying the infrastructur
105106

106107
1. The zipped askdata vbcs app in here looks to be outdated.
107108
- It's a more simple implementation, which might be best for now
109+
- The deployment with the extra navigation pane uses new apis on the engine
110+
- These apis haven't been pushed to main yet
108111
2. Reference to websocket - to be deprecated? Need to test if working without
109112
- Tested, seems to be unnecessary
110-
3. App import relies on various images in the directory... do we want to provide these images in the repo?
111-
- I'm going to include them for now, since they are dependencies
112113

113114
### API Gateway
114115
1. API Gateway is configured with Single Authentication OAuth2.0 which requires a vault.
115116
2. The existing mkdocs documentation said to deploy the api gateway to private subnet due to lack of authentication... authentication can be added to api gateway on public subnet
117+
- Can possibly add different implementation later for connecting to customer vpn
116118

117119
### Redis
118120
1. Redis is required but there were no instructions given on configuration
119121

120122
### Generative AI
121123
1. Existing deployment was using dedicated ai cluster/data science. I was able to get it to work with on demand model.
122124
- Code is hard coded to handle only the llama models. Cohere models would require refactoring.
125+
- Haven't tested the deployment with dedicated cluster. This would require gpus which we don't have for our tenancy
126+
- Haven't tested data science deployment
123127

124128
### NL2SQL Business Engine
125-
1. The code is currently expecting the user to upload their own api keys
129+
1. The code is currently expecting the user to upload their own api keys to the server
126130
2. Database wallets need to be uploaded manually
127131
3. png files trusted & untrusted.png are required to run the server.
128-
4. autoprompt - need to test if working without (deprecated?)
129132

130133
### Client Database
131134
1. The vendors table didn't have any example data. I had to export the table from the existing implementation and import as csv
132-
- Do we want to include this csv in the repo, or add to object storage bucket and provide link?
135+
- Included csv in repo
133136

134137
### Trust Database
135138
1. Engine code expects at least one entry in Trust library table before execution
@@ -139,5 +142,9 @@ Below are the various requirements and findings from deploying the infrastructur
139142
Haven't gotten this far, but the basic prompt endpoint does use the trust library table.
140143

141144
## APEX
142-
tbd ... do we want to include this in the first version?
145+
tbd ...
146+
147+
### Troubleshooting
143148

149+
1. Graph isn't showing in Table Graph VB App
150+
- Solution: Make sure to assign user role to idcs group in app settings

0 commit comments

Comments
 (0)