改进provider
This commit is contained in:
1 parent
d6e990f1da
commit
78ee7f9e88
6 files changed
+30
-24
No files matched your search
@@ -15,6 +15,7 @@ from urllib.parse import urlparse
|
|||||||
import httpx
|
import httpx
|
||||||
import tiktoken
|
import tiktoken
|
||||||
|
|
||||||
|
from docutranslate.agents.provider import get_provider_by_domain
|
||||||
from docutranslate.agents.thinking.thinking_factory import get_thinking_mode, ProviderType
|
from docutranslate.agents.thinking.thinking_factory import get_thinking_mode, ProviderType
|
||||||
from docutranslate.logger import global_logger
|
from docutranslate.logger import global_logger
|
||||||
from docutranslate.utils.utils import get_httpx_proxies
|
from docutranslate.utils.utils import get_httpx_proxies
|
||||||
@@ -303,7 +304,7 @@ class Agent:
|
|||||||
# 新增:初始化 encoding 用于估算
|
# 新增:初始化 encoding 用于估算
|
||||||
self.encoding = self._get_encoding_for_model(self.model_id)
|
self.encoding = self._get_encoding_for_model(self.model_id)
|
||||||
|
|
||||||
self.provider=config.provider if config.provider is not None else self.domain
|
self.provider=config.provider if config.provider is not None else get_provider_by_domain(self.domain)
|
||||||
|
|
||||||
def _get_encoding_for_model(self, model_name: str):
|
def _get_encoding_for_model(self, model_name: str):
|
||||||
"""获取 tiktoken encoding,如果失败则使用 cl100k_base 兜底"""
|
"""获取 tiktoken encoding,如果失败则使用 cl100k_base 兜底"""
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
from .provider import get_provider_by_domain,ProviderType
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
from typing import TypeAlias, Literal
|
||||||
|
|
||||||
|
ProviderType: TypeAlias = Literal["ollama", "bigmodel", "aliyun", "volces", "google", "siliconflow", "default"]
|
||||||
|
|
||||||
|
def get_provider_by_domain(domain:str)->ProviderType:
|
||||||
|
if domain == "open.bigmodel.cn":
|
||||||
|
return "bigmodel"
|
||||||
|
elif domain == "dashscope.aliyuncs.com":
|
||||||
|
return "aliyun"
|
||||||
|
elif domain == "ark.cn-beijing.volces.com":
|
||||||
|
return "volces"
|
||||||
|
elif domain == "generativelanguage.googleapis.com":
|
||||||
|
return "google"
|
||||||
|
elif domain == "api.siliconflow.cn":
|
||||||
|
return "siliconflow"
|
||||||
|
return "default"
|
||||||
@@ -1,13 +1,14 @@
|
|||||||
from typing import TypeAlias, Literal, Any
|
from typing import TypeAlias, Literal, Any
|
||||||
|
|
||||||
ProviderType: TypeAlias = Literal["ollama", "open.bigmodel.cn", "dashscope.aliyuncs.com", "ark.cn-beijing.volces.com", "generativelanguage.googleapis.com", "api.siliconflow.cn", "api.302.ai","api.openai.com"]|str
|
from docutranslate.agents.provider import ProviderType
|
||||||
|
|
||||||
ModeType: TypeAlias = Literal["ollama", "bigmodel", "aliyun", "volces", "google", "siliconflow", "default"]
|
ModeType: TypeAlias = Literal["ollama", "bigmodel", "aliyun", "volces", "google", "siliconflow", "default"]
|
||||||
ThinkingField: TypeAlias = str
|
ThinkingField: TypeAlias = str
|
||||||
EnableValueType: TypeAlias = str | dict[str,Any] | bool
|
EnableValueType: TypeAlias = str | dict[str,Any] | bool
|
||||||
DisableValueType: TypeAlias = str | dict[str,Any] | bool
|
DisableValueType: TypeAlias = str | dict[str,Any] | bool
|
||||||
ThinkingConfig: TypeAlias= tuple[ThinkingField, EnableValueType, DisableValueType]
|
ThinkingConfig: TypeAlias= tuple[ThinkingField, EnableValueType, DisableValueType]
|
||||||
|
|
||||||
thinking_mode: dict[ModeType,ThinkingConfig] = {
|
thinking_mode: dict[ProviderType,ThinkingConfig] = {
|
||||||
"ollama": ("reasoning_effort", "medium", "none"),
|
"ollama": ("reasoning_effort", "medium", "none"),
|
||||||
"bigmodel": ("thinking", {"type": "enabled"}, {"type": "disabled"}),
|
"bigmodel": ("thinking", {"type": "enabled"}, {"type": "disabled"}),
|
||||||
"aliyun": (
|
"aliyun": (
|
||||||
@@ -53,18 +54,16 @@ def get_thinking_mode_by_model_id(model_id: str) -> ThinkingConfig :
|
|||||||
|
|
||||||
def get_thinking_mode(provider: ProviderType, model_id: str) -> ThinkingConfig :
|
def get_thinking_mode(provider: ProviderType, model_id: str) -> ThinkingConfig :
|
||||||
provider = provider
|
provider = provider
|
||||||
if provider == "open.bigmodel.cn":
|
if provider == "bigmodel":
|
||||||
return thinking_mode["bigmodel"]
|
return thinking_mode["bigmodel"]
|
||||||
elif provider == "dashscope.aliyuncs.com":
|
elif provider == "aliyun":
|
||||||
return thinking_mode["aliyun"]
|
return thinking_mode["aliyun"]
|
||||||
elif provider == "ark.cn-beijing.volces.com":
|
elif provider == "volces":
|
||||||
return thinking_mode["volces"]
|
return thinking_mode["volces"]
|
||||||
elif provider == "generativelanguage.googleapis.com":
|
elif provider == "google":
|
||||||
return thinking_mode["google"]
|
return thinking_mode["google"]
|
||||||
elif provider == "api.siliconflow.cn":
|
elif provider == "siliconflow":
|
||||||
return thinking_mode["siliconflow"]
|
return thinking_mode["siliconflow"]
|
||||||
elif provider == "api.302.ai":
|
|
||||||
return get_thinking_mode_by_model_id(model_id)
|
|
||||||
elif provider == "ollama":
|
elif provider == "ollama":
|
||||||
return thinking_mode["ollama"]
|
return thinking_mode["ollama"]
|
||||||
return thinking_mode["default"]
|
return get_thinking_mode_by_model_id(model_id)
|
||||||
+1
-12
@@ -317,18 +317,7 @@ app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
|
|||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# --- Pydantic Models for Service API ---
|
# --- Pydantic Models for Service API ---
|
||||||
# ===================================================================
|
# =================================================================
|
||||||
|
|
||||||
ProviderType: TypeAlias = Literal[
|
|
||||||
"ollama",
|
|
||||||
"open.bigmodel.cn",
|
|
||||||
"dashscope.aliyuncs.com",
|
|
||||||
"ark.cn-beijing.volces.com",
|
|
||||||
"generativelanguage.googleapis.com",
|
|
||||||
"api.siliconflow.cn",
|
|
||||||
"api.302.ai"
|
|
||||||
] | str
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# 4. 创建最终的请求体模型
|
# 4. 创建最终的请求体模型
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
<!DOCTYPE html>
<html lang="zh-CN" data-bs-theme="auto">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DocuTranslate - 交互式文档翻译</title>
<link rel="icon" href="/static/favicon.ico" type="image/x-icon">
<!-- Bootstrap CSS -->
<link href="/static/bootstrap.css" rel="stylesheet" crossorigin="anonymous">
<!-- Bootstrap Icons -->
<link rel="stylesheet" href="/static/bootstrap-icons.css">
<style>
/* 复用原版 CSS */
body {
background-color: var(--bs-body-bg);
}
button:focus {
outline: none !important;
box-shadow: none !important;
}
.main-container {
display: flex;
flex-direction: column;
height: 100vh;
padding-top: 1rem;
padding-bottom: 1rem;
}
.settings-panel {
height: calc(100vh - 2rem);
overflow-y: auto;
padding-right: 15px;
}
.task-area {
height: calc(100vh - 2rem);
overflow-y: auto;
}
.task-card {
transition: all 0.3s ease-in-out;
}
.log-area {
height: 150px;
background-color: var(--bs-tertiary-bg);
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
font-family: monospace;
font-size: 0.8rem;
padding: 10px;
overflow-y: auto;
white-space: pre-wrap;
word-break: break-all;
}
.log-area-wrapper {
position: relative;
}
.copy-log-btn {
position: absolute;
bottom: 5px;
right: 5px;
z-index: 10;
opacity: 0.5;
transition: all 0.2s ease-in-out;
padding: 0.1rem 0.4rem;
line-height: 1;
}
.copy-log-btn:hover {
opacity: 1;
}
.file-drop-area {
border: 2px dashed var(--bs-secondary-bg);
border-radius: .375rem;
padding: 2rem;
text-align: center;
cursor: pointer;
transition: all 0.2s ease-in-out;
background-color: var(--bs-body-bg);
}
.file-drop-area.drag-over {
border-color: var(--bs-primary);
background-color: var(--bs-secondary-bg);
}
.file-drop-area.file-selected {
border-style: solid;
border-color: var(--bs-success);
background-color: var(--bs-success-bg-subtle);
}
.file-drop-area.input-error {
border-color: var(--bs-danger);
}
#previewOffcanvas {
--bs-offcanvas-width: 95vw;
max-width: 1600px;
}
.preview-split-container {
display: flex;
flex-direction: row;
height: 90%;
}
.preview-pane-wrapper {
display: flex;
flex-direction: column;
overflow: hidden;
width: 100%;
height: 100%;
}
.preview-pane-wrapper .preview-pane {
flex-grow: 1;
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
overflow: auto;
position: relative;
}
.gutter {
background-color: var(--bs-tertiary-bg);
background-repeat: no-repeat;
background-position: 50%;
}
.gutter.gutter-horizontal {
cursor: col-resize;
border-left: 1px solid var(--bs-border-color);
border-right: 1px solid var(--bs-border-color);
}
.gutter.gutter-vertical {
cursor: row-resize;
border-top: 1px solid var(--bs-border-color);
border-bottom: 1px solid var(--bs-border-color);
}
.preview-pane iframe {
width: 100%;
height: 100%;
border: none;
}
.preview-pane pre {
margin: 0;
padding: 1rem;
background-color: var(--bs-body-bg);
white-space: pre;
}
.bottom-left-controls {
position: fixed;
bottom: 1rem;
left: 1rem;
z-index: 1050;
display: flex;
gap: 0.5rem;
}
.step-number {
margin-right: 0.25rem;
}
#translatedPreviewContainer .preview-pane {
overflow: hidden;
}
#translatedPreviewContainer .preview-pane iframe {
display: block;
width: 100%;
height: 100%;
}
.lang-list-container {
max-height: 200px;
overflow-y: auto;
border: 1px solid var(--bs-border-color);
border-radius: 0.375rem;
paddinLine truncated
|
<!DOCTYPE html>
<html lang="zh-CN" data-bs-theme="auto">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DocuTranslate - 交互式文档翻译</title>
<link rel="icon" href="/static/favicon.ico" type="image/x-icon">
<!-- Bootstrap CSS -->
<link href="/static/bootstrap.css" rel="stylesheet" crossorigin="anonymous">
<!-- Bootstrap Icons -->
<link rel="stylesheet" href="/static/bootstrap-icons.css">
<style>
/* 复用原版 CSS */
body {
background-color: var(--bs-body-bg);
}
button:focus {
outline: none !important;
box-shadow: none !important;
}
.main-container {
display: flex;
flex-direction: column;
height: 100vh;
padding-top: 1rem;
padding-bottom: 1rem;
}
.settings-panel {
height: calc(100vh - 2rem);
overflow-y: auto;
padding-right: 15px;
}
.task-area {
height: calc(100vh - 2rem);
overflow-y: auto;
}
.task-card {
transition: all 0.3s ease-in-out;
}
.log-area {
height: 150px;
background-color: var(--bs-tertiary-bg);
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
font-family: monospace;
font-size: 0.8rem;
padding: 10px;
overflow-y: auto;
white-space: pre-wrap;
word-break: break-all;
}
.log-area-wrapper {
position: relative;
}
.copy-log-btn {
position: absolute;
bottom: 5px;
right: 5px;
z-index: 10;
opacity: 0.5;
transition: all 0.2s ease-in-out;
padding: 0.1rem 0.4rem;
line-height: 1;
}
.copy-log-btn:hover {
opacity: 1;
}
.file-drop-area {
border: 2px dashed var(--bs-secondary-bg);
border-radius: .375rem;
padding: 2rem;
text-align: center;
cursor: pointer;
transition: all 0.2s ease-in-out;
background-color: var(--bs-body-bg);
}
.file-drop-area.drag-over {
border-color: var(--bs-primary);
background-color: var(--bs-secondary-bg);
}
.file-drop-area.file-selected {
border-style: solid;
border-color: var(--bs-success);
background-color: var(--bs-success-bg-subtle);
}
.file-drop-area.input-error {
border-color: var(--bs-danger);
}
#previewOffcanvas {
--bs-offcanvas-width: 95vw;
max-width: 1600px;
}
.preview-split-container {
display: flex;
flex-direction: row;
height: 90%;
}
.preview-pane-wrapper {
display: flex;
flex-direction: column;
overflow: hidden;
width: 100%;
height: 100%;
}
.preview-pane-wrapper .preview-pane {
flex-grow: 1;
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
overflow: auto;
position: relative;
}
.gutter {
background-color: var(--bs-tertiary-bg);
background-repeat: no-repeat;
background-position: 50%;
}
.gutter.gutter-horizontal {
cursor: col-resize;
border-left: 1px solid var(--bs-border-color);
border-right: 1px solid var(--bs-border-color);
}
.gutter.gutter-vertical {
cursor: row-resize;
border-top: 1px solid var(--bs-border-color);
border-bottom: 1px solid var(--bs-border-color);
}
.preview-pane iframe {
width: 100%;
height: 100%;
border: none;
}
.preview-pane pre {
margin: 0;
padding: 1rem;
background-color: var(--bs-body-bg);
white-space: pre;
}
.bottom-left-controls {
position: fixed;
bottom: 1rem;
left: 1rem;
z-index: 1050;
display: flex;
gap: 0.5rem;
}
.step-number {
margin-right: 0.25rem;
}
#translatedPreviewContainer .preview-pane {
overflow: hidden;
}
#translatedPreviewContainer .preview-pane iframe {
display: block;
width: 100%;
height: 100%;
}
.lang-list-container {
max-height: 200px;
overflow-y: auto;
border: 1px solid var(--bs-border-color);
border-radius: 0.375rem;
paddinLine truncated
|
||||||
Reference in new issue
Block a user