Merge branch 'main' into jbj980125

Author: al3xne

ai/generative-ai-service/decode-Images-and-Videos-with-OCI-GenAI/requirements.txt

@@ -1,5 +1,5 @@
-streamlit==1.33.0
+streamlit==1.37.0
 oci==3.50.1
 Pillow
 opencv-python-headless==4.10.0.84
-tqdm==4.66.1
+tqdm==4.66.3

ai/generative-ai-service/rag-genai/files/LangChainRAG.py

@@ -4,7 +4,7 @@
 from langchain_core.prompts import PromptTemplate
 from langchain_community.llms import OCIGenAI
 from langchain_community.document_loaders import UnstructuredURLLoader
-compartment_id = "ocid1.compartment.oc1..aaaaaaaa7ggqkd4ptkeb7ugk6ipsl3gqjofhkr6yacluwj4fitf2ufrdm65q"
+compartment_id = "<compartment ID>"
 embeddings = OCIGenAIEmbeddings(model_id="cohere.embed-english-light-v3.0",service_endpoint="https://inference.generativeai.us-chicago-1.oci.oraclecloud.com",compartment_id= compartment_id,)
 testurls = ['https://docs.oracle.com/iaas/odsaz/odsa-rotate-wallet.html', 'https://docs.oracle.com/iaas/odsaz/odsa-change-password.html', 'https://docs.oracle.com/iaas/odsaz/odsa-database-actions.html']
 loader = UnstructuredURLLoader(urls=testurls)

app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/README.md

@@ -64,7 +64,7 @@ IAM user option will work on both cases above, as local and as OCI Function.
 
 ## Build and test
 
-During following the steps of the <a href="../java-helloworld-with-local-dev-and-oci-functions">Hello function example </a> adjust the <a href="https://github.com/oracle-devrel/technology-engineering/blob/main/app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/files/src/main/java/com/example/HelloAIFunction.java#L93">line 93</a> to match your <code>GenAI service OCID</code>. 
+During following the steps of the <a href="../java-helloworld-with-local-dev-and-oci-functions">Hello function example </a> adjust the <a href="https://github.com/oracle-devrel/technology-engineering/blob/main/app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/files/src/main/java/com/example/HelloAIFunction.java#L131">line 131</a> to match your <code>GenAI service model OCID</code>. 
 
 <p>
 
@@ -74,21 +74,56 @@ Testing with curl (or copy-pasting the API Gateway deployment url to a browser):
 
 <pre>
 curl https://n3yu.....ghhi.apigateway.eu-frankfurt-1.oci.customer-oci.com/
-What happened today 06/13/2024 100 years ago ?
 
-June 13, 2024 is June 13, 1924. Here are some events that occurred on this date:
+What happened today 01/17/2025 100 years ago ?
+On January 17th, 1925, 100 years ago, the following events took place:
+- In the US, President Calvin Coolidge delivered his annual State of the Union address to Congress. He discussed the thriving state of the national economy, emphasizing the record-high production of American industries and the growth of the country's merchant marine fleet. Coolidge also urged Congress to pass legislation facilitating world trade and improving diplomatic relations.
+- The first Winter Sports Week was held in Chamonix, France. This event eventually evolved into the prestigious Chamonix International Festival of Sports and Cinema.
+- The play "The New York Idea" by Langdon Mitchell premiered at the Ambassador Theatre on Broadway. It ran for 144 performances and received critical acclaim.
+- The silent film "The Gold Rush" directed by Charlie Chaplin was released in the United States. It's a classic comedy that tells the story of a prospector during the Klondike Gold Rush. Chaplin's unique brand of physical comedy and the film's innovative effects delighted audiences.
+- In Germany, the Weimar Republic experienced a political scandal known as the "German-Russian Trade and Credit Agreement." The agreement, which granted Germany a loan of 300 million marks from Russia, was signed secretly, leading to accusations of mismanagement and lack of transparency in the government. This incident further destabilized the already fragile Weimar Republic.
+</pre>
 
-1. The German airline Deutsche Lufthansa (DL) was officially founded on June 13, 1924. It is Germany's largest airline and is one of the world's largest airlines in terms of overall passengers carried.
- 
-2. The British Broadcasting Corporation (BBC) aired its first radio broadcast. 
+# Native image using GraalVM
+
+GraalVM compiles your Java functions ahead of time into standalone binaries that start instantly, provide peak performance with no warmup, and use fewer resources. The key GraalVM benefits are: Low Resource Usage: Java applications compiled ahead-of-time by GraalVM require less memory and CPU to run.
+
+<p>
+
+To do this a Docker multi-stage build is used.
+
+<p>
+
+Before building the native image let's do a full maven build for the project to create the necessary libraries under <code>target/lib</code>:
+
+<pre>
+mvn clean install
+</pre>
 
-3. The Hollywood Sign was officially dedicated in California, marking the beginning of Hollywood's rise to prominence in the American film industry. 
+Then build the Docker container using <a href="./files/Dockerfile.native">multi-stage Docker file</a> including the GraalVM native image compilation:
 
-4. The Ford Motor Company introduced the firstassembly line to mass produce cars, making cars more accessible to the general public. 
+<pre>
+docker build -f Dockerfile.native -t fra.ocir.io/&lt;YOUR OCI TENANCY NAMESPACE&gt;/helloworldai-java:2 .
+</pre>
+
+The GraalVM compilation stage requires quite a bit resources from your localhost so in case for example using Rancher desktop
+think of increasing the CPU and memory for it to make the build faster.
+
+<p>
+
+In the <a href="./files/Dockerfile.native">Dockerfile.native</a> two things are important: Including the <a href="./files/reflection.json">reflection.json</a> with the proper function class name and passing Fn FDK libraries with <code>"-Djava.library.path=/lib"</code> in the container CMD along with the <code>"com.example.HelloAIFunction::handleRequest"</code> function handler.
 
-5. The German aerospace company Zeppelin began constructing the Hindenburg, a large passenger airship.
+<p>
+
+After the build push the container to OCIR repo:
+
+<pre>
+docker push fra.ocir.io/&lt;YOUR OCI TENANCY NAMESPACE&gt;/helloworldai-java:2
 </pre>
 
+Finally deploy the container to your OCI Function by replacing the container using the Cloud UI by editing the function and changing the container from <code>helloworldai-java:1</code> to <code>helloworldai-java:2</code>. Then test it.
+
+
 # Useful Links
 
 - [OCI Functions](https://docs.oracle.com/en-us/iaas/Content/Functions/Concepts/functionsoverview.htm)
@@ -99,6 +134,8 @@ June 13, 2024 is June 13, 1924. Here are some events that occurred on this date:
     - The Fn project is an open-source container-native serverless platform that you can run anywhere -- any cloud or on-premise. It’s easy to use, supports every programming language, and is extensible and performant
 - [OCI GenAI](https://www.oracle.com/artificial-intelligence/generative-ai/generative-ai-service/)
     - Discover the power of generative AI models equipped with advanced language comprehension for building the next generation of enterprise applications. Oracle Cloud Infrastructure (OCI) Generative AI is a fully managed service for seamlessly integrating these versatile language models into a wide range of use cases, including writing assistance, summarization, analysis, and chat
+- [OCI Functions with GraalVM](https://github.com/shaunsmith/graalvm-fn-init-images)
+    - Discover GraalVM Native Image -based functions with this example GitHub repo
 - [Oracle](https://www.oracle.com/)
     - Oracle Website
 

app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/files/Dockerfile.native

@@ -0,0 +1,20 @@
+FROM container-registry.oracle.com/graalvm/native-image:23-ol8 AS native
+WORKDIR /app
+
+COPY target .
+ADD reflection.json .
+
+RUN native-image \
+     -H:ReflectionConfigurationFiles=/app/reflection.json \
+     -Ob \
+     -H:Name=Hello \
+     -cp "/app/Helloaifunc-1.0-SNAPSHOT.jar:/app/lib/*"  \
+        com.fnproject.fn.runtime.EntryPoint
+
+FROM fnproject/fn-java-fdk:jre17-1.0.198 as fdk
+
+FROM container-registry.oracle.com/os/oraclelinux:8-slim
+COPY --from=native /app/Hello .
+COPY --from=fdk /function/runtime/* .
+ENTRYPOINT [ "./Hello" ]
+CMD [ "com.example.HelloAIFunction::handleRequest", "-Djava.library.path=/lib"]

app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/files/pom.xml

@@ -8,6 +8,26 @@
     <artifactId>Helloaifunc</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <build>
+        <plugins>
+            <plugin>
+                <!-- Copy dependencies -->
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -33,7 +53,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -67,6 +87,11 @@
             <scope>runtime</scope>
             <version>3.37.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.79</version>
+        </dependency>
     </dependencies>
 
 </project>

app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/files/reflection.json

@@ -0,0 +1,10 @@
+[
+    {
+      "name": "com.example.HelloAIFunction",
+      "allDeclaredMethods": true,
+      "methods": [
+        { "name": "<init>", "parameterTypes": [] }
+      ]
+    }
+]
+

app-dev/devops-and-containers/functions/java-helloworld-AI-with-local-dev-and-oci-functions/files/src/main/java/com/example/HelloAIFunction.java

@@ -70,7 +70,7 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 public class HelloAIFunction {
 
     // FILL IN PROPER VALUES FOR OCI GENAI SERVICE
-    private static final String ENDPOINT       = "https://inference.generativeai.us-chicago-1.oci.oraclecloud.com";
+    private static final String ENDPOINT       = "https://inference.generativeai.eu-frankfurt-1.oci.oraclecloud.com";
     private static final Region REGION         = Region.EU_FRANKFURT_1;
 
     // FILL IN PROPER VALUES FOR IAM USER WHEN NOT USING INSTANCE_PRINCIPAL IN OCI FUNCTION

app-dev/devops-and-containers/functions/java-helloworld-with-local-dev-and-oci-functions/README.md

@@ -130,8 +130,6 @@ docker login ams.ocir.io -u '<YOUR OCI TENANCY NAMESPACE>/oracleidentitycl
 docker push fra.ocir.io/<YOUR OCI TENANCY NAMESPACE>/helloworld-java:1
 </pre>
 
-<p>
-
 The last step is to create the Function Application and the function deployment for it. This can be easily done using the Cloud UI. 
 
 <p>

cloud-infrastructure/ai-infra-gpu/ai-infrastructure/rag-langchain-vllm-mistral/files/requirements.txt

@@ -41,7 +41,7 @@ hyperframe==6.0.1
 idna==3.7
 interegular==0.3.3
 jieba3k==0.35.1
-Jinja2==3.1.4
+Jinja2==3.1.5
 joblib==1.4.0
 jsonpatch==1.33
 jsonpointer==2.4

data-platform/core-converged-db/ai-vector-search/README.md

@@ -4,16 +4,19 @@ Oracle AI Vector Search is designed for Artificial Intelligence (AI) workloads a
 
 If you are interested in Database 23ai , [please see our page here](https://github.com/oracle-devrel/technology-engineering/tree/main/data-platform/core-converged-db/database-23ai).
 
-Reviewed Date: 20.08.2024
+Reviewed Date: 21.01.2025
 
 # Useful Links
 
 ## Documentation  
 
+- [What is a Vector Database](https://www.oracle.com/database/vector-database/)
 - [Oracle.com](https://www.oracle.com/database/ai-vector-search/)
+- [Oracle AI Vector Search Technical Architecture (interactive diagram)](https://docs.oracle.com/en/database/oracle/oracle-database/23/vsiad/aivs_genarch.html)
 - [Oracle AI Vector Search User's Guide](https://docs.oracle.com/en/database/oracle/oracle-database/23/vecse/overview-ai-vector-search.html)
 - [PL/SQL Packages and Types Reference: DBMS_VECTOR](https://docs.oracle.com/en/database/oracle/oracle-database/23/arpls/dbms_vector1.html#GUID-F9FCB225-821A-4CCA-92B5-58B9927234FA)
 - [PL/SQL Packages and Types Reference: DBMS_VECTOR_CHAIN](https://docs.oracle.com/en/database/oracle/oracle-database/23/arpls/dbms_vector_chain1.html#GUID-D80DDBEF-F1A9-4267-9D3C-A54D237D95C1)
+- [DBMS_HYBRID_VECTOR.SEARCH PL/SQL function](https://docs.oracle.com/en/database/oracle/oracle-database/23/vecse/search.html#GUID-A386BDB0-35D0-41E1-8F41-49AEBEC13BFC)
 - [Oracle AI Vector Search FAQ](https://www.oracle.com/database/ai-vector-search/faq/)
 
 ## Blogs & Videos
@@ -36,10 +39,11 @@ Reviewed Date: 20.08.2024
 ## Blogs
 
 - [Getting started with vectors in 23ai](https://blogs.oracle.com/coretec/post/getting-started-with-vectors-in-23ai)
+- [Hybrid Vector Index - a combination of AI Vector Search with Text Search](https://blogs.oracle.com/coretec/post/hybrid-vector-index-the-combination-of-full-text-and-semantic-vector-search)
 
 ## Videos
 
-- [Ai Vector Search](https://youtu.be/_tOGB9l8cvg)
+- [AI Vector Search](https://youtu.be/_tOGB9l8cvg)
 
 # License