Merge remote-tracking branch 'origin/main'

GoogleCloudPlatform · Dec 30, 2024 · 9fc1774 · 9fc1774
2 parents 2725c70 + b56b508
commit 9fc1774
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 32 deletions.
diff --git a/ai-patterns/summarization-langchain4j-ollama/pom.xml b/ai-patterns/summarization-langchain4j-ollama/pom.xml
@@ -17,7 +17,7 @@
     <java.version>21</java.version>
     <spring-cloud.version>2023.0.1</spring-cloud.version>
     <testcontainers.version>1.20.4</testcontainers.version>
-    <langchain4j.version>0.36.2</langchain4j.version>
+    <langchain4j.version>1.0.0-alpha1</langchain4j.version>
   </properties>
 
   <dependencies>

diff --git a/sessions/fall24/books-genai-vertex-springai/README.md b/sessions/fall24/books-genai-vertex-springai/README.md
@@ -221,6 +221,14 @@ gcloud projects add-iam-policy-binding ${PROJECT_ID} \
 gcloud projects add-iam-policy-binding ${PROJECT_ID} \
     --member="serviceAccount:${PROJECT_NUMBER}[email protected]" \
     --role="roles/eventarc.eventReceiver"
+
+export ORG_ID=$(gcloud organizations list --format="value(name)")
+cat <<EOF > policy.yaml
+constraint: constraints/iam.allowedPolicyMemberDomains
+listPolicy:
+  allValues: ALLOW
+EOF
+gcloud resource-manager org-policies set-policy policy.yaml --organization=${ORG_ID}
 ```
 
 Create VPC connectors for Cloud Run to connect to alloy

diff --git a/sessions/next24/books-genai-vertex/policy.yaml b/sessions/next24/books-genai-vertex/policy.yaml
@@ -0,0 +1,3 @@
+constraint: constraints/iam.allowedPolicyMemberDomains
+listPolicy:
+ allValues: ALLOW
diff --git a/sessions/next24/sql/books-ddl.sql b/sessions/next24/sql/books-ddl.sql
@@ -11,7 +11,7 @@ create TABLE authors (
     author_id SERIAL PRIMARY KEY,
     name VARCHAR(255) NOT NULL,
     bio TEXT,
-    embedding public.vector GENERATED ALWAYS AS (public.embedding('textembedding-gecko@003'::text, bio)) STORED
+    embedding public.vector GENERATED ALWAYS AS (public.embedding('text-embedding-004'::text, bio)) STORED
 );
 
 -- 2. Books Table
@@ -32,7 +32,7 @@ create TABLE public.pages (
     book_id INT NOT NULL,
     page_number INT NOT NULL,
     content TEXT,
-    embedding public.vector GENERATED ALWAYS AS (public.embedding('textembedding-gecko@003'::text, content)) STORED,
+    embedding public.vector GENERATED ALWAYS AS (public.embedding('text-embedding-004'::text, content)) STORED,
     CONSTRAINT fk_pages
         FOREIGN KEY(book_id)
         REFERENCES Books(book_id)
@@ -43,7 +43,7 @@ create TABLE bookSummaries (
     summary_id SERIAL PRIMARY KEY,
     book_id INT UNIQUE NOT NULL,
     summary TEXT NOT NULL,
-    embedding public.vector GENERATED ALWAYS AS (public.embedding('textembedding-gecko@003'::text, summary)) STORED,
+    embedding public.vector GENERATED ALWAYS AS (public.embedding('text-embedding-004'::text, summary)) STORED,
     CONSTRAINT fk_book_summary
         FOREIGN KEY(book_id)
         REFERENCES Books(book_id)
@@ -54,4 +54,4 @@ CREATE INDEX idx_pages_book_id ON pages (book_id);
 CREATE INDEX idx_books_author_id ON books (author_id);
 CREATE INDEX idx_books_book_id ON books (book_id);
 CREATE INDEX idx_pages_author_id ON authors (author_id);
---CREATE INDEX idx_hnsw_co_pages_embedding ON pages USING hnsw (embedding vector_cosine_ops) WITH (m = 16, ef_construction = 64);
+--CREATE INDEX idx_hnsw_co_pages_embedding ON pages USING hnsw (embedding vector_cosine_ops) WITH (m = 16, ef_construction = 64);
diff --git a/sessions/next24/terraform/terraform.tfvars b/sessions/next24/terraform/terraform.tfvars
diff --git a/sessions/terraform/.terraform.lock.hcl b/sessions/terraform/.terraform.lock.hcl
diff --git a/sessions/next24/terraform/README.MD → sessions/terraform/README.MD b/sessions/next24/terraform/README.MD → sessions/terraform/README.MD
diff --git a/sessions/terraform/alloydb-auth-proxy b/sessions/terraform/alloydb-auth-proxy
diff --git a/sessions/next24/terraform/main.tf → sessions/terraform/main.tf b/sessions/next24/terraform/main.tf → sessions/terraform/main.tf
@@ -207,7 +207,6 @@ resource "google_alloydb_instance" "primary" {
   machine_config {
     cpu_count = 2
   }
-
   depends_on = [google_alloydb_cluster.default]
 }
 
@@ -220,10 +219,6 @@ locals {
     "books-genai-jit" = {
       image = "${var.region}-docker.pkg.dev/${var.project_id}/books-genai-jit/books-genai:latest",
       env = "jit"
-    },
-    "books-genai-native" = {
-      image = "${var.region}-docker.pkg.dev/${var.project_id}/books-genai-native/books-genai:latest",
-      env = "native"
     }
   }
   alloydb_ip = google_alloydb_instance.primary.ip_address
@@ -279,6 +274,10 @@ resource "google_cloud_run_service" "cloud_run" {
           name  = "DB_URL"
           value =  "jdbc:postgresql://${local.alloydb_ip}:5432/library"
         }
+        env {
+          name  = "VERTEX_AI_GEMINI_MODEL"
+          value = var.model_id
+        }
         env {
           name  = "VERTEX_AI_GEMINI_PROJECT_ID"
           value = var.project_id

diff --git a/sessions/terraform/policy.yaml b/sessions/terraform/policy.yaml
@@ -0,0 +1,3 @@
+constraint: constraints/iam.allowedPolicyMemberDomains
+listPolicy:
+  allValues: ALLOW
diff --git a/sessions/next24/terraform/variables.tf → sessions/terraform/variables.tf b/sessions/next24/terraform/variables.tf → sessions/terraform/variables.tf
@@ -2,7 +2,10 @@ variable "project_id" {
   type        = string
   description = "The GCP project ID."
 }
-
+variable "model_id" {
+  type        = string
+  description = "ID of large language model in vertexai"
+}
 variable "project_number" {
   type        = string
   description = "The GCP project ID."