Feature/refactor

functions/src/genkit-functions/analyzeStorageImage.ts

@@ -3,9 +3,7 @@ import * as genkitFunctions from '@genkit-ai/firebase/functions'
 import * as z from 'zod'
 import { analyzeStorageInputSchema } from '../schemas/analyzeStorageInputSchema'
 import { analyzeStorageOutputSchema } from '../schemas/analyzeStorageOutputSchema'
-import { isGenkitEnabled } from '../utils/genkitUtils'
 
-// Cloud Storage からファイルを読み込み、Gemini Flash 1.5 で要約する関数
 export const analyzeStorageImage = genkitFunctions.onFlow(
   {
     name: `analyzeStorageImage`,
@@ -17,8 +15,6 @@ export const analyzeStorageImage = genkitFunctions.onFlow(
     authPolicy: genkitFunctions.noAuth(),
   },
   async (input) => {
-    if (!(await isGenkitEnabled())) throw new Error(`Genkit が無効になっています。`)
-
     const analyzeFilePrompt = await prompt<z.infer<typeof analyzeStorageInputSchema>>(`analyze`)
     const result = await analyzeFilePrompt.generate({ input })
 

functions/src/genkit-functions/analyzeWebContents.ts

@@ -20,7 +20,7 @@ export const analyzeWebContents = genkitFunctions.onFlow(
   async (input) => {
     const result = await generate({
       model: gemini15Flash,
-      prompt: `以下のウェブページの内容を分析してください。：${input}`,
+      prompt: `Analyze the content of the following webpage: ${input}`,
       tools: [webLoader],
       output: {
         format: `text`,

functions/src/genkit-functions/anonymousFirestoreChatbot.ts

@@ -6,7 +6,7 @@ import * as config from '../config/firebase'
 import { db } from '../config/firebase'
 import { chatbotInputSchema } from '../schemas/chatbotInputSchema'
 import { chatbotOutputSchema } from '../schemas/chatbotOutputSchema'
-import { createChatbotInput, isGenkitEnabled } from '../utils/genkitUtils'
+import { createChatbotInput } from '../utils/genkitUtils'
 
 export const anonymousFirestoreChatbot = genkitFunctions.onFlow(
   {
@@ -15,21 +15,15 @@ export const anonymousFirestoreChatbot = genkitFunctions.onFlow(
       cors: true,
       secrets: [config.googleAIapiKey],
     },
-    inputSchema: z.object({
-      userId: z.string(),
-      chatId: z.string(),
-      currentQuery: z.string(),
-    }),
+    inputSchema: chatbotInputSchema,
     outputSchema: chatbotOutputSchema,
     authPolicy: firebaseAuth((user) => {
       if (user.firebase?.sign_in_provider !== `anonymous`) {
-        throw new Error(`匿名認証されたユーザーのみがアクセスできます`)
+        throw new Error(`Only anonymously authenticated users can access this function`)
       }
     }),
   },
   async (input) => {
-    if (!(await isGenkitEnabled())) throw new Error(`Genkit が無効になっています。`)
-
     const userDoc = await db.collection(`users`).doc(input.userId).get()
     const userData = userDoc.data()
 

functions/src/genkit-functions/generateImage.ts

@@ -1,16 +1,13 @@
 import { prompt } from '@genkit-ai/dotprompt'
 import * as genkitFunctions from '@genkit-ai/firebase/functions'
 import * as z from 'zod'
-import { googleAIapiKey } from '../config/firebase'
 import { generateImageInputSchema } from '../schemas/generateImageInputSchema'
 
-// 画像出力の Genkit Functions
 export const generateImage = genkitFunctions.onFlow(
   {
     name: `generateImage`,
     httpsOptions: {
       cors: true,
-      secrets: [googleAIapiKey],
     },
     inputSchema: generateImageInputSchema,
     authPolicy: genkitFunctions.noAuth(),

functions/src/genkit-functions/noAuthFunction.ts

@@ -2,10 +2,9 @@ import { prompt } from '@genkit-ai/dotprompt'
 import * as genkitFunctions from '@genkit-ai/firebase/functions'
 import * as z from 'zod'
 import * as config from '../config/firebase'
-import { chatbotInputSchema } from '../schemas/chatbotInputSchema'
-import { chatbotOutputSchema } from '../schemas/chatbotOutputSchema'
+import { noAuthInputSchema } from '../schemas/noAuthInputSchema'
+import { noAuthOutputSchema } from '../schemas/noAuthOutputSchema'
 
-// 認証なしの Genkit Functions
 export const noAuthFunction = genkitFunctions.onFlow(
   {
     name: `noAuthFunction`,
@@ -14,11 +13,11 @@ export const noAuthFunction = genkitFunctions.onFlow(
       secrets: [config.googleAIapiKey],
     },
     authPolicy: genkitFunctions.noAuth(),
-    inputSchema: chatbotInputSchema,
-    outputSchema: chatbotOutputSchema,
+    inputSchema: noAuthInputSchema,
+    outputSchema: noAuthOutputSchema,
   },
   async (input) => {
-    const chatbotPrompt = await prompt<z.infer<typeof chatbotInputSchema>>(`chatbot`)
+    const chatbotPrompt = await prompt<z.infer<typeof noAuthInputSchema>>(`chatbot`)
     const result = await chatbotPrompt.generate({ input })
     return result.output()
   }

functions/src/schemas/chatbotInputSchema.ts

@@ -2,25 +2,6 @@ import * as z from 'zod'
 
 export const chatbotInputSchema = z.object({
   userId: z.string(),
+  chatId: z.string(),
   currentQuery: z.string(),
-  chatHistory: z.array(
-    z.object({
-      role: z.enum([`user`, `assistant`]),
-      content: z.string(),
-      timestamp: z.string(),
-    })
-  ),
-  userProfile: z.object({
-    name: z.string(),
-    preferredLanguage: z.string(),
-    accountType: z.string(),
-  }),
-  productCatalog: z.array(
-    z.object({
-      id: z.string(),
-      name: z.string(),
-      details: z.string(),
-      price: z.number(),
-    })
-  ),
 })

functions/src/schemas/noAuthInputSchema.ts

@@ -0,0 +1,26 @@
+import * as z from 'zod'
+
+export const noAuthInputSchema = z.object({
+  userId: z.string(),
+  currentQuery: z.string(),
+  chatHistory: z.array(
+    z.object({
+      role: z.enum([`user`, `assistant`]),
+      content: z.string(),
+      timestamp: z.string(),
+    })
+  ),
+  userProfile: z.object({
+    name: z.string(),
+    preferredLanguage: z.string(),
+    accountType: z.string(),
+  }),
+  productCatalog: z.array(
+    z.object({
+      id: z.string(),
+      name: z.string(),
+      details: z.string(),
+      price: z.number(),
+    })
+  ),
+})

functions/src/schemas/noAuthOutputSchema.ts

@@ -0,0 +1,7 @@
+import * as z from 'zod'
+
+export const noAuthOutputSchema = z.object({
+  response: z.string(),
+  suggestedActions: z.array(z.string()),
+  sentiment: z.enum([`positive`, `neutral`, `negative`]),
+})

functions/src/utils/genkitUtils.ts

@@ -1,18 +1,12 @@
 import { defineTool } from '@genkit-ai/ai'
 import * as cheerio from 'cheerio'
 import * as z from 'zod'
-import { db } from '../config/firebase'
 import { chatbotInputSchema } from '../schemas/chatbotInputSchema'
 
-export async function isGenkitEnabled(): Promise<boolean> {
-  const appConfDoc = await db.collection(`appConf`).doc(`config`).get()
-  return appConfDoc.data()?.genkitEnabled ?? false
-}
-
 export const webLoader = defineTool(
   {
     name: `webLoader`,
-    description: `指定されたURLにアクセスし、ウェブページの内容を取得します。`,
+    description: `Accesses the specified URL and retrieves the content of the webpage.`,
     inputSchema: z.object({ url: z.string().url() }),
     outputSchema: z.string(),
   },
@@ -31,15 +25,15 @@
 export function createChatbotInput(
   userId: string,
   currentQuery: string,
   userData: any,
   chatData: any,
   productData: any
 ): z.infer<typeof chatbotInputSchema> {
   return {
     userId,
     currentQuery,
     chatHistory:
       chatData?.messages?.map((message: any) => ({
         role: message.role as `user` | `assistant`,
         content: message.content,
         timestamp: message.timestamp,

terraform/authentication.tf

@@ -1,4 +1,4 @@
-# Firebase Authentication のプロビジョニング
+# Provisioning Firebase Authentication
 resource "google_identity_platform_config" "default" {
   provider = google-beta
   project  = var.project_id
@@ -7,8 +7,8 @@ resource "google_identity_platform_config" "default" {
   ]
 }
 
-# Firebase Authentication が依存する Identity Platform のプロビジョニング
-# 今回は匿名認証のみ有効化
+# Provisioning Identity Platform which Firebase Authentication depends on
+# Only anonymous authentication is enabled for this configuration
 resource "google_identity_platform_project_default_config" "default" {
   provider = google-beta
   project  = var.project_id

terraform/backend.tf

@@ -1,4 +1,4 @@
-# Terraform のバックエンドを GCS に設定
+# Configure Terraform backend to use Google Cloud Storage (GCS)
 terraform {
   backend "gcs" {
     bucket = "backend"

terraform/firestore.tf

@@ -1,8 +1,7 @@
-# Firestore のマスタデータ管理　(アプリケーション設定と Genkit 参照用のサンプルデータ)
+# Firestore master data management (Application settings and sample data for Genkit reference)
 locals {
   docs = [
-    # アプリケーション設定
-    # 今回は、Genkit を意図しない使用を防ぐために有効無効フラグを用意している
+    # Application settings
     {
       collection  = "appConf"
       document_id = "config"
@@ -11,8 +10,8 @@ locals {
       })
     },
 
-    # チャットボットを使用するダミーユーザー
-    # functions/src/genkit-functions が実際に参照する Firestore データ
+    # Dummy users for chatbot interaction
+    # Firestore data actually referenced by functions/src/genkit-functions
     {
       collection  = "users"
       document_id = "user123"
@@ -44,7 +43,7 @@ locals {
       })
     },
 
-    # ユーザーのチャット履歴
+    # User chat history
     {
       collection  = "users/user123/chatHistory"
       document_id = "chat123"
@@ -108,7 +107,7 @@ locals {
       })
     },
 
-    # 商品マスタ
+    # Product catalog
     {
       collection  = "productCatalog"
       document_id = "tablet_1"
@@ -121,7 +120,7 @@ locals {
   ]
 }
 
-# Firestore データベースのプロビジョニング
+# Provisioning Firestore database
 resource "google_firestore_database" "firestore" {
   provider         = google-beta
   project          = var.project_id
@@ -130,13 +129,13 @@ resource "google_firestore_database" "firestore" {
   type             = "FIRESTORE_NATIVE"
   concurrency_mode = "OPTIMISTIC"
 
-  # Firebase が Google Cloud プロジェクトで有効になる前に Firestore を初期化する前に待つ
+  # Wait for Firebase to be enabled in the Google Cloud project before initializing Firestore
   depends_on = [
     google_firebase_project.default,
   ]
 }
 
-# Firestore のセキュリティルールをローカルファイルから作成
+# Create Firestore security rules from local file
 resource "google_firebaserules_ruleset" "firestore" {
   provider = google-beta
   project  = var.project_id
@@ -151,26 +150,26 @@ resource "google_firebaserules_ruleset" "firestore" {
     create_before_destroy = true
   }
 
-  # Firestore がプロビジョニングされる前にこのルールセットを作成する前に待つ
+  # Wait for Firestore to be provisioned before creating this ruleset
   depends_on = [
     google_firestore_database.firestore,
   ]
 }
 
-# Firestore インスタンスのルールセットを解放
+# Release ruleset for Firestore instance
 resource "google_firebaserules_release" "firestore" {
   provider     = google-beta
   name         = "cloud.firestore"
   ruleset_name = google_firebaserules_ruleset.firestore.name
   project      = var.project_id
 
-  # Firestore がプロビジョニングされる前にこのルールセットを解放する前に待つ
+  # Wait for Firestore to be provisioned before releasing this ruleset
   depends_on = [
     google_firestore_database.firestore,
   ]
 }
 
-# Firestore にマスタデータを追加
+# Add master data to Firestore
 resource "google_firestore_document" "docs" {
   for_each    = { for doc in local.docs : doc.document_id => doc }
   provider    = google-beta
@@ -185,7 +184,7 @@ resource "google_firestore_document" "docs" {
 }
 
 # Firebase Firestore Index
-# 今後書くコレクションのインデックスを定義する場合はコメントアウトを外して適宜編集してください
+# To define indexes for future collections, uncomment and edit as needed
 # resource "google_firestore_index" "user-index" {
 #   project = var.project_id
 #   collection = "user"

terraform/main.tf

@@ -1,4 +1,4 @@
-# 必要な API を有効化
+# Enable necessary APIs
 resource "google_project_service" "default" {
   provider = google-beta.no_user_project_override
   project  = var.project_id
@@ -17,12 +17,12 @@ resource "google_project_service" "default" {
   disable_on_destroy = false
 }
 
-# 上記で作成した新しいプロジェクトに Firebase サービスを有効化
+# Enable Firebase services for the newly created project above
 resource "google_firebase_project" "default" {
   provider = google-beta
   project  = var.project_id
 
-  # 必要な API が有効化されるまで待つ
+  # Wait for the necessary APIs to be enabled
   depends_on = [
     google_project_service.default
   ]

terraform/provider.tf

@@ -1,4 +1,4 @@
-# Terraform のプロバイダをバージョンごとに設定
+# Configure Terraform providers with specific versions
 terraform {
   required_providers {
     google-beta = {
@@ -8,14 +8,14 @@ terraform {
   }
 }
 
-# プロバイダを設定して、リソースブロックで指定されたプロジェクトを使用してクォータチェックを行う
+# Configure provider to perform quota checks using the project specified in resource blocks
 provider "google-beta" {
   user_project_override = true
   billing_project       = var.project_id
 }
 
-# プロバイダを設定して、リソースブロックで指定されたプロジェクトを使用してクォータチェックを行わない
-# このプロバイダはプロジェクト作成時とサービス初期化時にのみ使用する
+# Configure provider to not perform quota checks using the project specified in resource blocks
+# This provider is used only for project creation and service initialization
 provider "google-beta" {
   alias                 = "no_user_project_override"
   user_project_override = false