From 670c702ddee9f649da2c7dc084d03b2060e346a9 Mon Sep 17 00:00:00 2001
From: "majiahui@haimaqingfan.com" <majiahui@haimaqingfan.com>
Date: Fri, 14 Feb 2025 15:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E8=A1=A8=E6=A0=BC=E5=85=AC=E5=BC=8F=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=8D=A2=E6=96=B0=E7=9B=AE=E5=BD=95=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                                   |   8 -
 .idea/deployment.xml                               | 301 +--------------------
 .idea/generate_articles_directory.iml              |   2 +-
 .idea/inspectionProfiles/Project_Default.xml       |   5 +-
 .idea/misc.xml                                     |   2 +-
 ...directory_predict_word_table_formula_kongzhi.py |   9 +-
 gunicorn_config_word_table_formula_kongzhi.py      |  21 ++
 run_api_gunicorn_word_table_formula_kongzhi.sh     |   1 +
 8 files changed, 39 insertions(+), 310 deletions(-)
 delete mode 100644 .idea/.gitignore
 create mode 100644 gunicorn_config_word_table_formula_kongzhi.py
 create mode 100644 run_api_gunicorn_word_table_formula_kongzhi.sh

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 35410ca..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 94f98bd..558914d 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,161 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="majiahui@192.168.31.149:22 (3)" remoteFilesAllowedToDisappearOnAutoupload="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="majiahui@192.168.31.74:22 (83)" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false">
+    <option name="confirmBeforeUploading" value="false" />
     <serverData>
-      <paths name="majiahui@104.244.90.248:28385">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@114.116.25.228:8006">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@114.116.25.228:8006 (2)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@114.116.25.228:8006 (3)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@114.116.25.228:8006 (4)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@114.116.25.228:8006 (5)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@114.116.25.228:8006 (6)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@118.31.114.216:4000">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (10)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (11)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (12)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (13)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (14)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (2)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (3)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (4)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (5)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (6)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (7)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (8)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.145:22 (9)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="majiahui@192.168.31.149:22">
         <serverdata>
           <mappings>
@@ -163,20 +10,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="majiahui@192.168.31.149:22 (2)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.149:22 (3)">
-        <serverdata>
-          <mappings>
-            <mapping deploy="/home/majiahui/project/generate_articles_directory" local="$PROJECT_DIR$" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="majiahui@192.168.31.74:22">
         <serverdata>
           <mappings>
@@ -191,13 +24,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="majiahui@192.168.31.74:22 (100)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="majiahui@192.168.31.74:22 (11)">
         <serverdata>
           <mappings>
@@ -558,7 +384,7 @@
       <paths name="majiahui@192.168.31.74:22 (58)">
         <serverdata>
           <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/home/majiahui/project/generate_articles_directory" local="$PROJECT_DIR$" />
           </mappings>
         </serverdata>
       </paths>
@@ -754,49 +580,7 @@
       <paths name="majiahui@192.168.31.74:22 (83)">
         <serverdata>
           <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (84)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (85)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (86)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (87)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (88)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (89)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
+            <mapping deploy="/home/majiahui/project/generate_articles_directory" local="$PROJECT_DIR$" />
           </mappings>
         </serverdata>
       </paths>
@@ -807,83 +591,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="majiahui@192.168.31.74:22 (90)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (91)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (92)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (93)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (94)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (95)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (96)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (97)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (98)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 (99)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="majiahui@192.168.31.74:22 password">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
     </serverData>
     <option name="myAutoUpload" value="ALWAYS" />
   </component>
diff --git a/.idea/generate_articles_directory.iml b/.idea/generate_articles_directory.iml
index 12ca792..9a47304 100644
--- a/.idea/generate_articles_directory.iml
+++ b/.idea/generate_articles_directory.iml
@@ -5,7 +5,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.8 (ldm)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Remote Python 3.8.18 (sftp://majiahui@192.168.31.74:22/home/majiahui/miniconda3/envs/llama_paper/bin/python)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 50c8dac..d9a1ea7 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,16 +1,19 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoredPackages">
         <value>
-          <list size="6">
+          <list size="8">
             <item index="0" class="java.lang.String" itemvalue="transformers" />
             <item index="1" class="java.lang.String" itemvalue="deepspeed" />
             <item index="2" class="java.lang.String" itemvalue="sentencepiece" />
             <item index="3" class="java.lang.String" itemvalue="xformers" />
             <item index="4" class="java.lang.String" itemvalue="torch" />
             <item index="5" class="java.lang.String" itemvalue="numpy" />
+            <item index="6" class="java.lang.String" itemvalue="datasets" />
+            <item index="7" class="java.lang.String" itemvalue="sse-starlette" />
           </list>
         </value>
       </option>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5cf0187..4577e59 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (ldm)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Remote Python 3.8.18 (sftp://majiahui@192.168.31.74:22/home/majiahui/miniconda3/envs/llama_paper/bin/python)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/articles_directory_predict_word_table_formula_kongzhi.py b/articles_directory_predict_word_table_formula_kongzhi.py
index 70ebe8a..be5c3b8 100644
--- a/articles_directory_predict_word_table_formula_kongzhi.py
+++ b/articles_directory_predict_word_table_formula_kongzhi.py
@@ -326,6 +326,7 @@ def panduankongzhi(content):
 
 def mulu_kongzhi(data):
     data_new = []
+    mulu_kongzhi_dict_list = []
     for dan_data_index in range(len(data)):
         is_continue = False
         # mulu = re.findall(pattern_mulu, data[dan_data_index]['input'], re.DOTALL)[0]
@@ -393,16 +394,19 @@ def mulu_kongzhi(data):
         for i, j in mulu_xiaobiaoti_tuple:
             mulu_xiaobiaoti_dict[i] = j
 
+        mulu_kongzhi_dict = {}
         for i in mulu_xiaobiaoti_dict:
             # print(mulu_list_quan)
             # print(i)
             try:
                 index_title = mulu_list_quan.index(i)
                 mulu_list_quan[index_title] = [i, mulu_xiaobiaoti_dict[i], panduankongzhi(mulu_xiaobiaoti_dict[i])]
+                mulu_kongzhi_dict[i] = panduankongzhi(mulu_xiaobiaoti_dict[i])
             except:
                 continue
         data_new.append(mulu_list_quan)
-    return data_new
+        mulu_kongzhi_dict_list.append(mulu_kongzhi_dict)
+    return mulu_kongzhi_dict_list
 
 
 def biaogegongshi_kongzhi_prompt(title, mulu_list, table_and_formulas_list):
@@ -478,7 +482,8 @@ def articles_directory():
     results = mulu_kongzhi(data)
     data = {
         "code": 200,
-        "data": results
+        "catalog_list": mulu_list,
+        "catalog_dict": results
     }
     # log.log('text:{},'.format(prompt))
     return jsonify(data)  # 返回结果
diff --git a/gunicorn_config_word_table_formula_kongzhi.py b/gunicorn_config_word_table_formula_kongzhi.py
new file mode 100644
index 0000000..464aebc
--- /dev/null
+++ b/gunicorn_config_word_table_formula_kongzhi.py
@@ -0,0 +1,21 @@
+# 并行工作线程数
+workers = 2
+# 监听内网端口5000【按需要更改】
+bind = '0.0.0.0:18003'
+
+loglevel = 'debug'
+
+worker_class = "gevent"
+# 设置守护进程【关闭连接时，程序仍在运行】
+daemon = True
+# 设置超时时间120s，默认为30s。按自己的需求进行设置
+timeout = 120
+# 设置访问日志和错误信息日志路径
+accesslog = './logs/acess_word_table_formula_kongzhi.log'
+errorlog = './logs/error_word_table_formula_kongzhi.log'
+# access_log_format = '%(h) -  %(t)s - %(u)s - %(s)s %(H)s'
+# errorlog = '-' # 记录到标准输出
+
+
+# 设置最大并发量
+worker_connections = 20000
diff --git a/run_api_gunicorn_word_table_formula_kongzhi.sh b/run_api_gunicorn_word_table_formula_kongzhi.sh
new file mode 100644
index 0000000..dd6cdb3
--- /dev/null
+++ b/run_api_gunicorn_word_table_formula_kongzhi.sh
@@ -0,0 +1 @@
+gunicorn articles_directory_predict_word_table_formula_kongzhi:app -c gunicorn_config_word_table_formula_kongzhi.py
\ No newline at end of file