Update app.py
Browse files
app.py
CHANGED
@@ -25,12 +25,14 @@ logging.basicConfig(
|
|
25 |
)
|
26 |
logger = logging.getLogger(__name__)
|
27 |
|
|
|
28 |
# 模型配置
|
29 |
GEMINI_MODELS = {
|
30 |
"gemini-2.0-flash-exp": "gemini-2.0-flash-exp",
|
31 |
"gemini-2.5-flash-preview-05-20": "gemini-2.5-flash-preview-05-20",
|
32 |
"gemini-2.5-flash": "gemini-2.5-flash",
|
33 |
-
"gemini-2.5-flash-preview-04-17": "gemini-2.5-flash-preview-04-17"
|
|
|
34 |
}
|
35 |
|
36 |
# 支持的模型列表
|
@@ -64,15 +66,28 @@ SUPPORTED_MODELS = [
|
|
64 |
"root": "gemini-2.5-flash",
|
65 |
"parent": None,
|
66 |
"description": "gemini-2.5-flash稳定经典专业模型"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
67 |
}
|
68 |
]
|
69 |
|
70 |
|
71 |
def get_model_name(requested_model: str) -> str:
|
72 |
"""获取实际的Gemini模型名称"""
|
|
|
73 |
return GEMINI_MODELS.get(requested_model, "gemini-2.5-flash")
|
74 |
|
75 |
|
|
|
|
|
76 |
def convert_messages(messages):
|
77 |
content_parts = []
|
78 |
system_instruction = None
|
|
|
25 |
)
|
26 |
logger = logging.getLogger(__name__)
|
27 |
|
28 |
+
|
29 |
# 模型配置
|
30 |
GEMINI_MODELS = {
|
31 |
"gemini-2.0-flash-exp": "gemini-2.0-flash-exp",
|
32 |
"gemini-2.5-flash-preview-05-20": "gemini-2.5-flash-preview-05-20",
|
33 |
"gemini-2.5-flash": "gemini-2.5-flash",
|
34 |
+
"gemini-2.5-flash-preview-04-17": "gemini-2.5-flash-preview-04-17",
|
35 |
+
"gemini-2.5-pro": "gemini-2.5-pro"
|
36 |
}
|
37 |
|
38 |
# 支持的模型列表
|
|
|
66 |
"root": "gemini-2.5-flash",
|
67 |
"parent": None,
|
68 |
"description": "gemini-2.5-flash稳定经典专业模型"
|
69 |
+
},
|
70 |
+
{
|
71 |
+
"id": "gemini-2.5-pro",
|
72 |
+
"object": "model",
|
73 |
+
"created": int(time.time()),
|
74 |
+
"owned_by": "google",
|
75 |
+
"permission": [],
|
76 |
+
"root": "gemini-2.5-pro",
|
77 |
+
"parent": None,
|
78 |
+
"description": "gemini-2.5-pro稳定经典专业模型"
|
79 |
}
|
80 |
]
|
81 |
|
82 |
|
83 |
def get_model_name(requested_model: str) -> str:
|
84 |
"""获取实际的Gemini模型名称"""
|
85 |
+
print(f"实际模型名称:{GEMINI_MODELS.get(requested_model)}")
|
86 |
return GEMINI_MODELS.get(requested_model, "gemini-2.5-flash")
|
87 |
|
88 |
|
89 |
+
|
90 |
+
|
91 |
def convert_messages(messages):
|
92 |
content_parts = []
|
93 |
system_instruction = None
|