Merge branch 'main' into aliottoman-patch-8

Author: anshoracle

ai/gen-ai-agents/custom_rag_agent/config.py

@@ -31,22 +31,24 @@
 
 # embeddings
 EMBED_MODEL_ID = "cohere.embed-multilingual-v3.0"
+# EMBED_MODEL_ID = "cohere.embed-multilingual-image-v3.0"
 
 # LLM
 # this is the default model
 LLM_MODEL_ID = "meta.llama-3.3-70b-instruct"
 TEMPERATURE = 0.1
-MAX_TOKENS = 1024
+MAX_TOKENS = 2048
 
 # for the UI
 LANGUAGE_LIST = ["same as the question", "en", "fr", "it", "es"]
-MODEL_LIST = ["meta.llama-3.3-70b-instruct", "cohere.command-r-plus-08-2024"]
+# replaced command-r with command-a
+MODEL_LIST = ["meta.llama-3.3-70b-instruct", "cohere.command-a-03-2025"]
 
 ENABLE_USER_FEEDBACK = True
 
 # semantic search
 TOP_K = 6
-COLLECTION_LIST = ["BOOKS", "CNAF"]
+COLLECTION_LIST = ["DEV_COACHING", "BOOKS", "CNAF"]
 
 # OCI general
 COMPARTMENT_ID = "ocid1.compartment.oc1..aaaaaaaaushuwb2evpuf7rcpl4r7ugmqoe7ekmaiik3ra3m7gec3d234eknq"
@@ -69,3 +71,8 @@
 # for loading
 CHUNK_SIZE = 2000
 CHUNK_OVERLAP = 100
+
+# for MCP server
+TRANSPORT = "streamable-http"
+HOST = "0.0.0.0"
+PORT = 9000

ai/gen-ai-agents/custom_rag_agent/mcp_semantic_search.py

@@ -0,0 +1,122 @@
+"""
+Semantic Search exposed as an MCP tool
+
+Author: L. Saetta
+License: MIT
+"""
+
+from typing import Annotated
+from pydantic import Field
+import oracledb
+from fastmcp import FastMCP
+from langchain_community.vectorstores.utils import DistanceStrategy
+from langchain_community.embeddings import OCIGenAIEmbeddings
+from langchain_community.vectorstores.oraclevs import OracleVS
+from utils import get_console_logger
+
+from config import DEBUG
+from config import AUTH, EMBED_MODEL_ID, SERVICE_ENDPOINT, COMPARTMENT_ID
+from config import TRANSPORT, HOST, PORT
+from config_private import CONNECT_ARGS
+
+logger = get_console_logger()
+
+mcp = FastMCP("Demo Semantic Search as MCP server")
+
+
+#
+# Helper functions
+#
+def get_connection():
+    """
+    get a connection to the DB
+    """
+    return oracledb.connect(**CONNECT_ARGS)
+
+
+def get_embedding_model():
+    """
+    Create the Embedding Model
+    """
+    embed_model = OCIGenAIEmbeddings(
+        auth_type=AUTH,
+        model_id=EMBED_MODEL_ID,
+        service_endpoint=SERVICE_ENDPOINT,
+        compartment_id=COMPARTMENT_ID,
+    )
+    return embed_model
+
+
+@mcp.tool
+def semantic_search(
+    query: Annotated[
+        str, Field(description="The search query to find relevant documents.")
+    ],
+    top_k: Annotated[int, Field(description="TOP_K parameter for search")] = 5,
+    collection_name: Annotated[
+        str, Field(description="The name of DB table")
+    ] = "BOOKS",
+) -> dict:
+    """
+    Perform a semantic search based on the provided query.
+    Args:
+        query (str): The search query.
+        top_k (int): The number of top results to return.
+    Returns:
+        dict: a dictionary containing the relevant documents.
+    """
+    try:
+        # must be the same embedding model used during load in the Vector Store
+        embed_model = get_embedding_model()
+
+        # get a connection to the DB and init VS
+        with get_connection() as conn:
+            v_store = OracleVS(
+                client=conn,
+                table_name=collection_name,
+                distance_strategy=DistanceStrategy.COSINE,
+                embedding_function=embed_model,
+            )
+
+            relevant_docs = v_store.similarity_search(query=query, k=top_k)
+
+            if DEBUG:
+                logger.info("Result from similarity search:")
+                logger.info(relevant_docs)
+
+    except Exception as e:
+        logger.error("Error in vector_store.invoke: %s", e)
+        error = str(e)
+        return {"error": error}
+
+    result = {"relevant_docs": relevant_docs}
+
+    return result
+
+@mcp.tool
+def get_collections() -> list:
+    """
+    Get the list of collections (DB tables) available in the Oracle Vector Store.
+    Returns:
+        list: A list of collection names.
+    """
+    with get_connection() as conn:
+        cursor = conn.cursor()
+        
+        cursor.execute(
+            """SELECT DISTINCT utc.table_name
+            FROM user_tab_columns utc
+            WHERE utc.data_type = 'VECTOR'
+            ORDER BY 1 ASC"""
+        )
+        collections = [row[0] for row in cursor.fetchall()]
+        return collections
+    
+if __name__ == "__main__":
+    mcp.run(
+        transport=TRANSPORT,
+        # Bind to all interfaces
+        host=HOST,
+        port=PORT,
+        log_level="INFO",
+    )

app-dev/devops-and-containers/oke/oke-rm/README.md

@@ -16,13 +16,13 @@ This stack is used to create the initial network infrastructure for OKE. When co
 * By default, everything is private, but there is the possibility to create public subnets
 * Be careful when modifying the default values, as inputs are not validated
 
-[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/technology-engineering/releases/download/oke-rm-1.1.1/infra.zip)
+[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/technology-engineering/releases/download/oke-rm-1.1.2/infra.zip)
 
 ## Step 2: Create the OKE control plane
 
 This stack is used to create the OKE control plane ONLY.
 
-[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/technology-engineering/releases/download/oke-rm-1.1.1/oke.zip)
+[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/technology-engineering/releases/download/oke-rm-1.1.2/oke.zip)
 
 Also note that if the network infrastructure is located in a different compartment than the OKE cluster AND you are planning to use the OCI_VCN_NATIVE CNI,
 you must add these policies:

app-dev/devops-and-containers/oke/oke-rm/infra/infra.zip

@@ -3,7 +3,7 @@ resource "oci_core_security_list" "bastion_security_list" {
   vcn_id         = local.vcn_id
   display_name = "bastion-sec-list"
   ingress_security_rules {
-    protocol = "6"
+    protocol = local.tcp_protocol
     source_type = "CIDR_BLOCK"
     source   = "0.0.0.0/0"
     description = "Allow SSH connections to the subnet. Can be deleted if only using OCI Bastion subnet"

app-dev/devops-and-containers/oke/oke-rm/infra/modules/network/bastion-sl.tf

@@ -7,7 +7,7 @@ resource "oci_core_network_security_group" "cp_nsg" {
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_1" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -23,7 +23,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_1"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_2" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.cp_nsg.id
   stateless = false
@@ -39,7 +39,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_2"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_3" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "CIDR_BLOCK"
   source = var.bastion_subnet_cidr
   stateless = false
@@ -57,7 +57,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_3"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_4" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.pod_nsg.0.id
   stateless = false
@@ -74,7 +74,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_4"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_5" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.pod_nsg.0.id
   stateless = false
@@ -91,7 +91,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_5"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_6" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -107,7 +107,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_6"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_7" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "1"
+  protocol                  = local.icmp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -121,7 +121,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_7"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_8" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "CIDR_BLOCK"
   source = var.cp_allowed_source_cidr
   stateless = false
@@ -137,7 +137,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_ingress_8"
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_1" {
   direction                 = "EGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   destination_type = "NETWORK_SECURITY_GROUP"
   destination = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -153,7 +153,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_1" {
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_2" {
   direction                 = "EGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   destination_type = "NETWORK_SECURITY_GROUP"
   destination = oci_core_network_security_group.pod_nsg.0.id
   stateless = false
@@ -165,7 +165,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_2" {
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_3" {
   direction                 = "EGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   destination_type = "SERVICE_CIDR_BLOCK"
   destination = lookup(data.oci_core_services.all_oci_services.services[0], "cidr_block")
   stateless = false
@@ -176,7 +176,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_3" {
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_4" {
   direction                 = "EGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   destination_type = "NETWORK_SECURITY_GROUP"
   destination = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -193,7 +193,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_4" {
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_5" {
   direction                 = "EGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   destination_type = "NETWORK_SECURITY_GROUP"
   destination = oci_core_network_security_group.cp_nsg.id
   stateless = false
@@ -209,7 +209,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_5" {
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_6" {
   direction                 = "EGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "1"
+  protocol                  = local.icmp_protocol
   destination_type = "NETWORK_SECURITY_GROUP"
   destination = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -223,7 +223,7 @@ resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_6" {
 resource "oci_core_network_security_group_security_rule" "oke_cp_nsg_egress_7" {
   direction                 = "EGRESS"
   network_security_group_id = oci_core_network_security_group.cp_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   destination_type = "CIDR_BLOCK"
   destination = var.cp_egress_cidr
   stateless = false

app-dev/devops-and-containers/oke/oke-rm/infra/modules/network/cp-nsg.tf

@@ -7,7 +7,7 @@ resource "oci_core_network_security_group" "fss_nsg" {
 resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_1" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.fss_nsg.id
-  protocol                  = "17"  # UDP
+  protocol                  = local.udp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -23,7 +23,7 @@ resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_1" {
 resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_2" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.fss_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -39,7 +39,7 @@ resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_2" {
 resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_3" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.fss_nsg.id
-  protocol                  = "17"  # UDP
+  protocol                  = local.udp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -55,7 +55,7 @@ resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_3" {
 resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_4" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.fss_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false
@@ -71,7 +71,7 @@ resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_4" {
 resource "oci_core_network_security_group_security_rule" "fss_ingress_rule_5" {
   direction                 = "INGRESS"
   network_security_group_id = oci_core_network_security_group.fss_nsg.id
-  protocol                  = "6"
+  protocol                  = local.tcp_protocol
   source_type = "NETWORK_SECURITY_GROUP"
   source = oci_core_network_security_group.worker_nsg.id
   stateless = false