规范化vertex ai的调用方式

* GoogleAuthUtils.GoogleGenaiClient.generate_content() 调用增加了timeout参数 默认为300秒
* 规范化VertexAI调用方式

---------

Merge request URL: https://g-ldyi2063.coding.net/p/dev/d/modalDeploy/git/merge/4827?initial=true
Co-authored-by: shuohigh@gmail.com
This commit is contained in:
2025-06-19 16:41:28 +08:00
committed by Coding
parent 5e3c91f194
commit 2389b4b77f
10 changed files with 2276 additions and 1468 deletions

110
tests/google_test_case.py Normal file
View File

@@ -0,0 +1,110 @@
import json
import os
import unittest
from loguru import logger
from google.genai import types
from pydantic import BaseModel
from BowongModalFunctions.utils.HTTPUtils import GoogleAuthUtils
class BaseResponse(BaseModel):
message: str
class GoogleTestCase(unittest.IsolatedAsyncioTestCase):
service_account_info: dict = {
"type": "service_account",
"project_id": "gen-lang-client-0413414134",
"private_key_id": "48c91fc4cae8158edaad1f52577e4c98143a8cd9",
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzNfkzjGOSAv+e\nHSWOEq87sE8cNdt0AXdAyRL66rMuerGjGpOoP5Ok/LfZrx7DdGg7f9w1DZmw8P81\nvj7s2ZchEGfRrDVQNigaogJzDWQBnCUZBMmaFBcnMndPDb9gqM9fP4gWJoAcRoxw\nFzBi7sPdl5C5Y24UdoHky6z+YKHtLqo3kdB+qXCsJR8U4eqJG16EW/OlS26L/hSP\n8tLNFI3SgcJiRWeCO5pRRpX6nfGf5wju0KMaJKzBRbDJwF3NEj3nmoXSfyoD+itV\nuv5DDCwojB/4nLT2EuxAr5vyY+JY6LmCZhWgPcXy60nsDcUxJzcvRaCsb+C2exZR\n9q4jgXUdAgMBAAECggEAOfle6Zcj6us/aBYDvSc8OvH5VaXynV+QBYxGsJdWadXV\nO29wjwAqMjhy/V/ScuZohb8CLMN+kagU13z4/EQTyOV2wHSWNqGebac1ZaTSUlcC\nBUrwMQEI0GxZ/l/zJkDV/PkffBLuZLdJ3UUTKR4WjMvoTKDmzoXb1XkyOIRoPcLN\nQXqGRl2A/BLgL0mxZsnvBXavcp0o4TfIxC73+ZEnJmrbuoHlDGbXWQvSOGJbi3gE\nLLSJ/+Sn2o9nhHPJI3M9xfMHnU7Fwo5Dt+vSl/Vn4+dvNd2djEjefQTSU19yE6n8\nW5/QzriG4IClBEjqTxYxnL+VQNmUm5dwXqB0C2ph/QKBgQDZ8gKJgU4xH0Woxh+d\nh5AjjnKVk0YlCS9MNA9VlGu2O8ohVj9LZ4azNfYyZMp5DP4gXW21elZWwRyfvSv0\nRlo1CrQIZwY/ETw8NOp9L8+OXQinjL8pLuqYo8rWU4jwdyHrBlwic0KSSOq785Xk\nmdSdU3NOPqTnnUHnDrJLFyEFowKBgQDSgI9v798XAgNhwRLVAwyXTf1N39R8jAl6\nm+m3xzPEblnOKp04cMcjjhV8AqNadg5bZ1Io5Qwy30PofcQmNLCCXs31gCn+0c0i\nEehSXz+QgkNmSxWLXl3SODWY4XN7ThmLJcL36iebKF8t50xvzKbER0xEMwzrrmVq\nW0YwpjfGPwKBgF7Plyb2Z2ubLRSUy+AdvyiYqWREYzltW3QNGbajEJCARhhmirZk\n3QZNLUMS8bnjWxH9UuKly7WF4Mvk4aAsksWMWHFnUCJTfx657mBzUhmeg0tQQUDL\nNicc6fp+8I2bZdf2NlKOTaGRsvv8pXKDMSkXyot5WQehM7AuhoWAFE99AoGAWJ8F\nREQBcQdI8zO8wO8asuyDkvCD3bd7GiJfwB5eXflzV4e7TxKz0/UyeFYH/cKsArE5\n9ruPai9ywIOKO+d81DYjkZLWm1Aqg4h0fZFaCnW8+Gjt9hHRf/poHif0XVohCOLp\n9UOgTwMtJv80v/Cx2PqHUkMH0oVGbwNkRoEEBDMCgYEAvf7a3Xxjl3Ymmy+15oOW\n+iX0/3Ntmr6TUjxFzRRnamO3CO7Vm3qCLOceE2C5/TCi07NxGXkY/NIEUywBGrLe\nSmm2ny5/u6vrDygZMGSB59RVnrAiX7zkqaIy6pY6cgPRQhclHZ9s34Nnd1J2GM4v\nxfdWj16ZNTMAaaWd9u+nZhg=\n-----END PRIVATE KEY-----\n",
"client_email": "gemini-api@gen-lang-client-0413414134.iam.gserviceaccount.com",
"client_id": "116149182781835050625",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/gemini-api%40gen-lang-client-0413414134.iam.gserviceaccount.com",
"universe_domain": "googleapis.com"
}
bucket_name = "dy-media-storage"
cloudflare_project_id = "67720b647ff2b55cf37ba3ef9e677083"
cloudflare_gateway_id = "bowong-dev"
async def test_google_new_token(self):
cred = await GoogleAuthUtils.get_google_auth_jwt(service_account_info=self.service_account_info,
scopes=[
'https://www.googleapis.com/auth/cloud-platform'])
self.assertIsNotNone(cred)
async def test_google_cloud_storage_upload(self):
filepath = "./videos/input_1.mp4"
cred = await GoogleAuthUtils.get_google_auth_jwt(service_account_info=self.service_account_info,
scopes=[
'https://www.googleapis.com/auth/cloud-platform'])
prefix = "test/123"
filename = os.path.basename(filepath)
with open(filepath, 'rb') as file:
response = await GoogleAuthUtils.google_upload_file(file_stream=file,
content_type="video/mp4",
google_api_key=cred.access_token,
bucket_name=self.bucket_name,
filename=f"{prefix}/{filename}")
logger.info(response.model_dump_json(indent=2))
self.assertIsNotNone(response)
async def test_google_inference_with_sdk(self):
cred = await GoogleAuthUtils.get_google_auth_jwt(service_account_info=self.service_account_info,
scopes=[
'https://www.googleapis.com/auth/cloud-platform'])
logger.info(cred.model_dump_json(indent=2))
client = GoogleAuthUtils.GoogleGenaiClient(
cloudflare_project_id=self.cloudflare_project_id,
cloudflare_gateway_id=self.cloudflare_gateway_id,
google_project_id=self.service_account_info.get('project_id'),
regions=['us-central1'], access_token=cred.access_token,
)
result = client.generate_content(model_id="gemini-2.5-flash",
contents=[types.Content(role='user',
parts=[
types.Part(file_data=types.FileData(
mime_type="video/mp4",
file_uri="gs://dy-media-storage/videos/035b3053-73f8-45b7-9bf8-428df9025608.mp4"
)),
types.Part.from_text(
text="帮我总结一下这个视频里有什么"),
])],
config=types.GenerateContentConfig(
temperature=0.1,
top_p=0.7,
safety_settings=[
types.SafetySetting(
category=types.HarmCategory.HARM_CATEGORY_HARASSMENT,
threshold=types.HarmBlockThreshold.BLOCK_NONE,
),
types.SafetySetting(
category=types.HarmCategory.HARM_CATEGORY_CIVIC_INTEGRITY,
threshold=types.HarmBlockThreshold.BLOCK_NONE,
),
types.SafetySetting(
category=types.HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
threshold=types.HarmBlockThreshold.BLOCK_NONE,
),
types.SafetySetting(
category=types.HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
threshold=types.HarmBlockThreshold.BLOCK_NONE,
),
types.SafetySetting(
category=types.HarmCategory.HARM_CATEGORY_HATE_SPEECH,
threshold=types.HarmBlockThreshold.BLOCK_NONE,
)
],
response_mime_type="application/json",
response_schema=BaseResponse
))
logger.info(result.model_dump_json(indent=2, exclude_none=True))
self.assertIsNotNone(result)
if __name__ == '__main__':
unittest.main()