init

app.py

@@ -16,6 +16,10 @@ import pandas as pd
 import re
 import time
 
+from google.oauth2.service_account import Credentials
+import vertexai
+from vertexai.generative_models import GenerativeModel
+
 # From other files
 from storage_service import GoogleCloudStorage
 from assignment_ui import create_assignment_ui
@@ -56,6 +60,19 @@ OPEN_AI_MODERATION_CLIENT = OpenAI(api_key=OPEN_AI_MODERATION_BOT1)
 GCS_SERVICE = GoogleCloudStorage(GCS_KEY)
 GCS_CLIENT = GCS_SERVICE.client
 
+# Google aiplatform
+google_service_account_info_dict = json.loads(GCS_KEY)
+GOOGPE_SCOPES = ["https://www.googleapis.com/auth/cloud-platform"]
+google_creds = Credentials.from_service_account_info(
+    google_service_account_info_dict, scopes=GOOGPE_SCOPES
+)
+vertexai.init(
+    project="junyiacademy",
+    service_account=google_service_account_info_dict,
+    credentials=google_creds,
+)
+
+
 _AssignmentService = AssignmentService(GCS_SERVICE)
 _SubmissionService = SubmissionService(GCS_SERVICE)
 _DashboardService = DashboardService(_AssignmentService, _SubmissionService)
@@ -171,11 +188,25 @@ def generate_topics(model, max_tokens, sys_content, scenario, eng_level, user_ge
     }
 
     try:
-        response = OPEN_AI_CLIENT.chat.completions.create(**request_payload)
-        content = response.choices[0].message.content
-        topics = json.loads(content)["topics"]
+        # response = OPEN_AI_CLIENT.chat.completions.create(**request_payload)
+        # content = response.choices[0].message.content
+        # topics = json.loads(content)["topics"]
+        # print(f"====generate_topics====")
+        # print(topics)
+        # gr_update = gr.update(choices=topics, visible=True)
+    
+        model_name = "gemini-1.5-pro"
+        gemini_model = GenerativeModel(model_name=model_name)
+        model_response = gemini_model.generate_content(
+            f"{sys_content}, {user_content}"
+        )
+        content = model_response.candidates[0].content.parts[0].text
         print(f"====generate_topics====")
-        print(topics)
+        print(content)
+        print("=====")
+        if "```json" in content:
+            content = content.replace("```json", "").replace("```", "")
+        topics = json.loads(content)["topics"]
         gr_update = gr.update(choices=topics, visible=True)
     except Exception as e:
         print(f"An error occurred while generating topics: {e}")

requirements.txt

@@ -6,5 +6,6 @@ google-auth-httplib2
 google-auth-oauthlib
 google-cloud-storage
 google-cloud-bigquery
+vertexai
 
 fastapi==0.112.2