From c66ac84d2095a36fb9349bb8adfc68d3632edc14 Mon Sep 17 00:00:00 2001
From: xunbu <xunbu3@qq.com>
Date: Thu, 8 May 2025 19:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=9B=9E=E5=A4=8D=E5=BC=80=E5=A4=B4=E7=9A=84=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                | 14 +++++++++++---
 docutranslate/translater.py        |  2 +-
 docutranslate/utils/agent_utils.py | 15 +++++++++++----
 pyproject.toml                     |  3 +--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1dcb91a..43bf8dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6b18b44a-df57-4212-a857-9e291ebe5dd2" name="更改" comment="" />
+    <list default="true" id="6b18b44a-df57-4212-a857-9e291ebe5dd2" name="更改" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docutranslate/translater.py" beforeDir="false" afterPath="$PROJECT_DIR$/docutranslate/translater.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docutranslate/utils/agent_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/docutranslate/utils/agent_utils.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -301,7 +306,10 @@
       <workItem from="1746626070703" duration="7931000" />
       <workItem from="1746669839816" duration="20657000" />
       <workItem from="1746693297445" duration="915000" />
-      <workItem from="1746694671369" duration="2275000" />
+      <workItem from="1746694671369" duration="2403000" />
+      <workItem from="1746697418777" duration="120000" />
+      <workItem from="1746699070198" duration="51000" />
+      <workItem from="1746700998566" duration="3875000" />
     </task>
     <servers />
   </component>
@@ -311,7 +319,7 @@
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/filetranslate$test.coverage" NAME="test 覆盖结果" MODIFIED="1746677277745" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/PDFtranslate$translater.coverage" NAME="translater 覆盖结果" MODIFIED="1746600434803" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pdftranslate_packages" />
-    <SUITE FILE_PATH="coverage/filetranslate$test1.coverage" NAME="test1 覆盖结果" MODIFIED="1746694693445" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/filetranslate$test1.coverage" NAME="test1 覆盖结果" MODIFIED="1746704682491" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/PDFtranslate$PDFtranslater__1_.coverage" NAME="PDFtranslater (1) 覆盖结果" MODIFIED="1746633258205" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pdftranslate_packages" />
     <SUITE FILE_PATH="coverage/PDFtranslate$convert.coverage" NAME="convert 覆盖结果" MODIFIED="1746596984213" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pdftranslate_packages/utils" />
     <SUITE FILE_PATH="coverage/PDFtranslate$agent_utils.coverage" NAME="agent_utils 覆盖结果" MODIFIED="1746617703678" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pdftranslate_packages/utils" />
diff --git a/docutranslate/translater.py b/docutranslate/translater.py
index 1176195..bcc420f 100644
--- a/docutranslate/translater.py
+++ b/docutranslate/translater.py
@@ -62,7 +62,7 @@ class FileTranslater:
 applications and scenarios becoming more and more extensive.
 Blockchain's origination was Bitcoin, the most successful of the digital currencies (cryptocurrencies). Since 1983, when digital currency was first proposed, the Internet has continued to burgeon, with its 
 输出：
-Blockchain's origination was Bitcoin, the most successful of the digital currencies (cryptocurrencies). Since 1983, when digital currency was first proposed, the Internet has continued to burgeon, with its applications and scenarios becoming more and more extensive.
+Blockchain's origination was Bitcoin, the most successful of the digital currencies (cryptocurrencies). Since 1983, when digital currency was first proposed, the Internet has continued to burgeon, with its applications and scenarios becoming more and more extensive.【answer-end】
 ## 去掉异常字词
 输入：
 你@好,你叫什么\名#字
diff --git a/docutranslate/utils/agent_utils.py b/docutranslate/utils/agent_utils.py
index 8cfcab1..d86d19d 100644
--- a/docutranslate/utils/agent_utils.py
+++ b/docutranslate/utils/agent_utils.py
@@ -1,4 +1,5 @@
 import asyncio
+import re
 
 import httpx
 
@@ -15,7 +16,7 @@ class Agent:
         self.client_async = httpx.AsyncClient()
         self.max_concurrent = max_concurrent
 
-    def _prepare_request_data(self, prompt, system_prompt, temperature=None, top_p=0.9):
+    def _prepare_request_data(self, prompt:str, system_prompt:str, temperature=None, top_p=0.9):
         if temperature is None:
             temperature = self.temperature
         headers = {"Content-Type": "application/json",
@@ -23,7 +24,7 @@ class Agent:
         data = {
             "model": self.model_id,
             "messages": [
-                {"role": "system", "content": system_prompt},
+                {"role": "system", "content": "所有回复必须严格以<<AAA>>开头，包括简短回答。示例：\n<<AAA>>这是示例回答\n"+system_prompt},
                 {"role": "user", "content": prompt}
             ],
             "temperature": temperature,
@@ -52,8 +53,14 @@ class Agent:
                 timeout=timeout
             )
             response.raise_for_status()
-            result: str = response.json()["choices"][0]["message"]["content"]
-            return result.lstrip()
+            result=response.json()["choices"][0]["message"]["content"]
+            pattern=r"<<AAA>>(.*)"
+            match= re.search(pattern,result, re.DOTALL)
+            if match is None:
+                print("检测开头<<AAA>失败")
+            else:
+                result=match.group(1)
+            return result
         except httpx.HTTPStatusError as e:
             raise Exception(f"AI请求错误 (async): {e.response.status_code} - {e.response.text}") from e
         except httpx.RequestError as e:
diff --git a/pyproject.toml b/pyproject.toml
index 3a754c9..488f1c8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "docutranslate"
-version = "0.0.3"
+version = "0.0.4"
 description = "能翻译pdf和markdown的软件"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -10,4 +10,3 @@ dependencies = [
     "markdown2>=2.5.3",
     "transformers>=4.42.4",
 ]
-