init 3

Author: paulparkinson

Dockerfile

@@ -1,5 +1,21 @@
-FROM openjdk:11-jre-slim
+FROM maven:3.6.3-openjdk-11 AS maven_build
+#COPY pom.xml /tmp/
+#COPY src /tmp/src/
+COPY * /tmp/
+WORKDIR /tmp/
+FROM openjdk
+EXPOSE 8080
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} oracleai-0.0.1-SNAPSHOT.jar
+ENTRYPOINT ["java","-jar","/oracleai-0.0.1-SNAPSHOT.jar"]
+#ARG JAR_FILE=target/*.jar
+#COPY ${JAR_FILE} app.jar
+#ENTRYPOINT ["java","-jar","/app.jar"]
 
-ENTRYPOINT ["java", "-jar", "/usr/share/oracleai/oracleai.jar"]
 
-ADD target/oracleai-0.0.1-SNAPSHOT.jar /usr/share/oracleai/oracleai.jar
+
+#FROM openjdk:11-jre-slim
+#
+#ENTRYPOINT ["java", "-jar", "/usr/share/oracleai/oracleai.jar"]
+#
+#ADD target/oracleai-0.0.1-SNAPSHOT.jar /usr/share/oracleai/oracleai.jar

build_and_run.sh

@@ -3,4 +3,4 @@
 #source ~/Downloads/env.properties
 source env.properties
 
-mvn clean package ; java -Djava.security.debug="access,failure"  -jar target/oracleai-0.0.1-SNAPSHOT.jar
+mvn clean package ; java -jar target/oracleai-0.0.1-SNAPSHOT.jar

env.properties

@@ -1,21 +1,20 @@
 #!/bin/bash
 
-## Add exports here... For example...
-#export COHERE_KEY="mykeyvalue"
-#export OPENAI_KEY="mykeyvalue"
-#export OCICONFIG_FILE=~/.oci/config
-#export OCICONFIG_PROFILE=DEFAULT
-#only set region to override the default found in OCI config, eg if using a feature only avaiable in a certain region
-#export REGION="US_CHICAGO_1"
-#export COMPARTMENT_ID="ocid1.compartment.oc1..mycompartmentvalue"
-#export OBJECTSTORAGE_NAMESPACE="myobjectstorenamespacename"
-#export OBJECTSTORAGE_BUCKETNAME="myobjectstorebucketname"
-#export ORDS_ENDPOINT_URL="myordsendpointurl"
-#export OCI_VISION_SERVICE_ENDPOINT="https://vision.aiservice.myregion.oci.oraclecloud.com"
-#export OCI_SPEECH_SERVICE_ENDPOINT="https://speech.aiservice.myregion.oci.oraclecloud.com"
-#export OCI_GENAI_SERVICE_ENDPOINT="https://genai.aiservice.us-chicago-1.oci.oraclecloud.com"
+## Add exports here...
+export OCICONFIG_FILE=~/.oci/config
+export OCICONFIG_PROFILE=DEFAULT
+export COMPARTMENT_ID="ocid1.compartment.oc1..mycompartmentvalue"
+export OBJECTSTORAGE_NAMESPACE="myobjectstorenamespacename"
+export OBJECTSTORAGE_BUCKETNAME="myobjectstorebucketname"
+export ORDS_ENDPOINT_URL="https://myordsendpointurl"
+export ORDS_ENDPOINT_URL="https://rddainsuh6u1okc-aidatabaseworkshop.adb.us-ashburn-1.oraclecloudapps.com/ords/aiuser/_sdw/"
+export OCI_VISION_SERVICE_ENDPOINT="https://vision.aiservice.myregion.oci.oraclecloud.com"
+export OCI_SPEECH_SERVICE_ENDPOINT="https://speech.aiservice.myregion.oci.oraclecloud.com"
+export OCI_GENAI_SERVICE_ENDPOINT="https://genai.aiservice.us-chicago-1.oci.oraclecloud.com"
+
+export COHERE_KEY="mykeyvalue"
+export OPENAI_KEY="mykeyvalue"
 
 ## The following are only applicable when using Kubernetes...
 #export KUBECONFIG=~/.kube/config-mykubeconfig
 #export DOCKER_REGISTRY=us-myregion-1.ocir.io/myocirnamespacename/myocirfolder
-

sql/aiuser-tables-indexes-functions.sql

@@ -1,5 +1,3 @@
---run as aiuser
-
 CREATE TABLE aivision_results
     (id RAW (16) NOT NULL,
      date_loaded TIMESTAMP WITH TIME ZONE,
@@ -10,10 +8,12 @@ CREATE TABLE aivision_results
 /
 
 create index aivisionresultsindex on aivision_results(textfromai) indextype is ctxsys.context;
+/
+
 --select index_name, index_type, status from user_indexes where index_name = 'AIVISIONAIRESULTSINDEX';
 --select idx_name, idx_table, idx_text_name from ctx_user_indexes;
 --select token_text from dr$aivisionresultsindex$i;
-/
+
 
 CREATE OR REPLACE FUNCTION VISIONAI_RESULTS_TEXT_SEARCH(p_sql IN VARCHAR2) RETURN SYS_REFCURSOR AS refcursor SYS_REFCURSOR;
 BEGIN
@@ -50,10 +50,10 @@ dbms_cloud.create_credential (
 );
 END;
 
---The following two functions (text and object detection) are indentical
+--The following two functions (text and object detection) are identical
 --except for the json_table parsing for the textfromai field,
 --and so technically the p_featureType is not necessary and the function could be made to handle/parse both types,
---however, for readability they are broken into two distinct functions
+--however, for readability they are broken into two distinct functions.
 
 
 CREATE OR REPLACE FUNCTION VISIONAI_TEXTDETECTION (

sql/create_aiuser.sql

@@ -1,9 +1,6 @@
---run as admin
-
 CREATE USER aiuser identified BY [Yourpassword];
 grant CREATE session TO aiuser;
-grant RESOURCE, db_developer_role TO aiuser;
+grant RESOURCE TO aiuser;
 grant unlimited tablespace TO aiuser;
-grant EXECUTE ON javascript TO aiuser;
-grant EXECUTE dynamic mle TO aiuser;
 grant execute on DBMS_CLOUD to aiuser;
+