Updates to fix URLs in Output of TF script for Chat with your Data

cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/README.md

@@ -124,7 +124,7 @@ Example of output:
 ```
 Apply complete! Resources: 5 added, 0 changed, 0 destroyed.
 Outputs:
-ADW_Database_db_connection = tolist([
+adb_database_db_connection = tolist([
   {
     "all_connection_strings" = tomap({
       "HIGH" = "adb.us-ashburn-1.oraclecloud.com:1522/rddainsuh6u1okc_moviestreamworkshopg_high.adb.oraclecloud.com"
@@ -169,7 +169,7 @@ ADW_Database_db_connection = tolist([
     ])
   },
 ])
-Database_Actions = [
+database_actions = [
   "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/ords/sql-developer",
 ]
 adb_admin_password = <sensitive>
@@ -182,10 +182,10 @@ database_fully_qualified_name = "rddainsuh6u1okc-moviestreamworkshopg.adb.us-ash
 graph_studio_url = [
   "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/graphstudio/",
 ]
-machine_learning_user_management_url = [
-  "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/omlusers/",
+machine_learning_ui_url = [
+  "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/oml/index.html",
 ]
-select_ai_demo_url = "https://rddainsuh6u1okc-moviestreamworkshopg.adb.us-ashburn-1.oraclecloudapps.com/ords/r/moviestream/chatdb" 
+askoracle_select_ai_app_url = "https://rddainsuh6u1okc-moviestreamworkshopg.adb.us-ashburn-1.oraclecloudapps.com/ords/r/moviestream/chatdb" 
 
 ```
 
@@ -231,8 +231,8 @@ https://RDDAINSUH6U1OKC-ORACLEMOVIESTREAM.adb.us-ashburn-1.oraclecloudapps.com/o
 
 The stack's job output also includes URLs that take you directly to the tools.
 
-Access Link is the machine_learning_user_management_url URL from the output. Example:
-https://RDDAINSUH6U1OKC-ORACLEMOVIESTREAM.adb.us-ashburn-1.oraclecloudapps.com/omlusers/
+Access Link is the machine_learning_ui_url URL from the output. Example:
+https://RDDAINSUH6U1OKC-ORACLEMOVIESTREAM.adb.us-ashburn-1.oraclecloudapps.com/oml/index.html
 
 
 
@@ -538,7 +538,7 @@ Example of output:
 ```
 Apply complete! Resources: 5 added, 0 changed, 0 destroyed.
 Outputs:
-ADW_Database_db_connection = tolist([
+adb_database_db_connection = tolist([
   {
     "all_connection_strings" = tomap({
       "HIGH" = "adb.us-ashburn-1.oraclecloud.com:1522/rddainsuh6u1okc_moviestreamworkshopg_high.adb.oraclecloud.com"
@@ -583,7 +583,7 @@ ADW_Database_db_connection = tolist([
     ])
   },
 ])
-Database_Actions = [
+database_actions = [
   "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/ords/sql-developer",
 ]
 adb_admin_password = <sensitive>
@@ -596,10 +596,10 @@ database_fully_qualified_name = "rddainsuh6u1okc-moviestreamworkshopg.adb.us-ash
 graph_studio_url = [
   "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/graphstudio/",
 ]
-machine_learning_user_management_url = [
-  "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/omlusers/",
+machine_learning_ui_url = [
+  "https://RDDAINSUH6U1OKC-MOVIESTREAMWORKSHOPG.adb.us-ashburn-1.oraclecloudapps.com/oml/index.html",
 ]
-select_ai_demo_url = "https://rddainsuh6u1okc-moviestreamworkshopg.adb.us-ashburn-1.oraclecloudapps.com/ords/r/moviestream/chatdb" 
+askoracle_select_ai_app_url = "https://rddainsuh6u1okc-moviestreamworkshopg.adb.us-ashburn-1.oraclecloudapps.com/ords/r/moviestream/chatdb" 
 
 ```
 
@@ -645,8 +645,8 @@ https://RDDAINSUH6U1OKC-ORACLEMOVIESTREAM.adb.us-ashburn-1.oraclecloudapps.com/o
 
 The stack's job output also includes URLs that take you directly to the tools.
 
-Access Link is the machine_learning_user_management_url URL from the output. Example:
-https://RDDAINSUH6U1OKC-ORACLEMOVIESTREAM.adb.us-ashburn-1.oraclecloudapps.com/omlusers/
+Access Link is the machine_learning_ui_url URL from the output. Example:
+https://RDDAINSUH6U1OKC-ORACLEMOVIESTREAM.adb.us-ashburn-1.oraclecloudapps.com/oml/index.html
 
 
 ## <a name="documentation"></a>Documentation
@@ -665,4 +665,3 @@ We welcome your feedback. To post feedback, submit feature ideas or report bugs,
 ## <a name="known-issues"></a>Known Issues
 **At the moment, there are no known issues for this solution**
 
-

cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/modules/cloud-foundation-library/database/adb/outputs.tf

@@ -35,16 +35,16 @@ output "graph_studio_url" {
   value = [for b in oci_database_autonomous_database.adw : b.connection_urls.0.graph_studio_url]
 }
 
-output "machine_learning_user_management_url" {
-  value = [for b in oci_database_autonomous_database.adw : b.connection_urls.0.machine_learning_user_management_url]
+output "machine_learning_ui_url" {
+  value = [for b in oci_database_autonomous_database.adw : b.connection_urls.0.machine_learning_notebook_url]
 }
 
 output "adb_wallet_content" {
 value = oci_database_autonomous_database_wallet.autonomous_database_wallet["adw"].content
 }
 
 output "database_fully_qualified_name" {
-  value = lower(trimsuffix(trimprefix(join("\n", [for b in oci_database_autonomous_database.adw : b.connection_urls.0.graph_studio_url]), "https://"), "/graphstudio/?sso=true"))
+  value = trimprefix(split("/graphstudio", lower(join("\n", [for b in oci_database_autonomous_database.adw : b.connection_urls.0.graph_studio_url])))[0], "https://")
 }
 
 output "adw" {
@@ -58,7 +58,6 @@ output "apex_url" {
   value = [for b in oci_database_autonomous_database.adw : b.connection_urls.0.apex_url]
 }
 
-output "select_ai_demo_url" {
-  value = join("", [lower(trimsuffix(join("\n", [for b in oci_database_autonomous_database.adw : b.connection_urls.0.graph_studio_url]), "/graphstudio/?sso=true")),"/ords/r/moviestream/chatdb"])
+output "askoracle_select_ai_app_url" {
+  value = join("", [split("/graphstudio", lower(join("\n", [for b in oci_database_autonomous_database.adw : b.connection_urls.0.graph_studio_url])))[0], "/ords/r/moviestream/chatdb"])
 }
-

cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/outputs.tf

@@ -19,34 +19,34 @@ output "adb_user_password" {
   value = "watchS0meMovies#"
 }
 
-output "ADW_Database_db_connection" {
+output "adb_database_db_connection" {
   value = module.adb.db_connection
 }
 
 output "database_fully_qualified_name" {
   value = module.adb.database_fully_qualified_name
 }
 
-output "ADW_Database_ip" {
+output "adb_database_private_endpoint_ip" {
   value = module.adb.private_endpoint_ip
 }
 
-output "Database_Actions" {
+output "database_actions" {
   value = module.adb.url
 }
 
 output "graph_studio_url" {
   value = module.adb.graph_studio_url
 }
 
-output "machine_learning_user_management_url" {
-  value = module.adb.machine_learning_user_management_url
+output "machine_learning_ui_url" {
+  value = module.adb.machine_learning_ui_url
 }
 
 output "apex_url" {
   value = module.adb.apex_url
 }
 
-output "select_ai_demo_url" {
-  value = module.adb.select_ai_demo_url
+output "askoracle_select_ai_app_url" {
+  value = module.adb.askoracle_select_ai_app_url
 }

cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/provisioners.tf

@@ -9,9 +9,10 @@ resource "null_resource" "sqlcl-create-usr" {
                 echo 'Download the apex applications'
                 chmod 777 ./scripts/
                 # wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f101.sql -P ./scripts/
-                #old f101 wget https://github.com/oracle-devrel/oracle-autonomous-database-samples/blob/main/apex/select-ai-chat/f101.sql?raw=true -P ./scripts/
-                wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/nZNjLXKzOO23bwedhMxks1E4uMIC-wT3hIh0cpUvvltH-h84ngcLKcWuQUcdfN4g/n/c4u02/b/hosted_workshops/o/f101.sql -P ./scripts/
+                # old f101 wget https://github.com/oracle-devrel/oracle-autonomous-database-samples/blob/main/apex/select-ai-chat/f101.sql?raw=true -P ./scripts/
+                # wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/nZNjLXKzOO23bwedhMxks1E4uMIC-wT3hIh0cpUvvltH-h84ngcLKcWuQUcdfN4g/n/c4u02/b/hosted_workshops/o/f101.sql -P ./scripts/
                 wget https://objectstorage.us-ashburn-1.oraclecloud.com/p/6Oy9O8JVmddTzPQ8PsavtpzByQhjo4jGP1mRC3MK3o7QE7vGXKb8573-6etTdGUy/n/c4u04/b/building_blocks_utilities/o/select-ai-apex-demo/f100-genai-project.sql -P ./scripts/
+                wget https://adwc4pm.objectstorage.us-sanjose-1.oci.customer-oci.com/p/L2B_ow1NawG1bfrocaajfSOSMxcwF2IRrKr_lCjLPQzTcDbY-T7cdBOyuvNmZtRE/n/adwc4pm/b/chatdbapp/o/f101v5.4.sql -P ./scripts/
 
                 # install the data
 
@@ -28,7 +29,8 @@ resource "null_resource" "sqlcl-create-usr" {
 
                 rm -rf tables.sql
                 rm -rf ./scripts/f100-genai-project.sql
-                rm -rf ./scripts/f101.sql?raw=true
+              #  rm -rf ./scripts/f101.sql
+                rm -rf ./scripts/f101v5.4.sql
                 rm -rf ./scripts/install-apex-app.sql
             EOT
         }

cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/schema.yaml

@@ -225,15 +225,15 @@ variables:
     required: true
     visible: false 
 outputs:
-  ADW_Database_db_connection:
+  adb_database_db_connection:
     type: string
-    title: ADW_Database_db_connection
+    title: adb_database_db_connection
     visible: true
-  ADW_Database_private_endpoint_ip:
+  adb_database_private_endpoint_ip:
     type: string
-    title: ADW_Database_private_endpoint_ip
+    title: adb_database_private_endpoint_ip
     visible: true
-  Database_Actions:
+  database_actions:
     type: link
     title: url
     visible: true
@@ -245,17 +245,17 @@ outputs:
     type: link
     title: graph_studio_url
     visible: false
-  machine_learning_user_management_url:
+  machine_learning_ui_url:
     type: link
-    title: machine_learning_user_management_url
+    title: machine_learning_ui_url
     visible: true
   apex_url:
     type: link
     title: apex_url
     visible: true    
-  select_ai_demo_url:
+  askoracle_select_ai_app_url:
     type: link
-    title: select_ai_demo_url
+    title: askoracle_select_ai_app_url
     visible: true      
   adb_admin_password:
     type: string
@@ -272,16 +272,15 @@ outputs:
 outputGroups:
   - title: Database details
     outputs:
-      - ADW_Database_db_connection
-      - ADW_Database_private_endpoint_ip
+      - adb_database_db_connection
+      - adb_database_private_endpoint_ip
       - database_fully_qualified_name
   - title: ADB user details
     outputs: 
-      - Database_Actions
+      - database_actions
       - apex_url
       - graph_studio_url
-      - machine_learning_user_management_url
+      - machine_learning_ui_url
       - adb_user_name
       - adb_user_password
 primaryOutputButton: graph_studio_url
-

cloud-foundation/solutions/Deploy-ChatDB-Autonomous-Database-oci-genai-demonstration/scripts/install-apex-app.sql.tmpl

@@ -21,7 +21,7 @@ BEGIN
 
 END;
 /
-@./scripts/f101.sql?raw=true
+@./scripts/f101v5.4.sql
 
 -- GenAI Projects App 
 BEGIN