From 35b908e045c0a7b3bbbfacd2a8b135bf34fa699b Mon Sep 17 00:00:00 2001
From: juanboy <2980526980@qq.com>
Date: Thu, 4 Jul 2024 12:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=86=E6=83=85=E5=87=BD=E6=95=B0=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/topicdefine.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/model/topicdefine.py b/model/topicdefine.py
index 66ad8db..5034436 100644
--- a/model/topicdefine.py
+++ b/model/topicdefine.py
@@ -1,5 +1,6 @@
 from utils.query import query
 from utils.getPublicData import *
+from model2.model_use import *
 articleList = getAllArticleData()
 commentList = getAllCommentsData()
 
@@ -31,22 +32,14 @@ def drop_label1():# 删除标注列
     params = []
     query(sql, params)
 
-
 # 处理数据并添加标注
-def process_data(data):
-    processed_data =testmodel(data)
-    return processed_data
-
-def testmodel(test):
-    return "wicao"
-
 def topicdefine():
     label_article=[]
     label_comments=[]
     for x in articleList:
-        label_article.append((x[0],process_data(x[5])))
+        label_article.append((x[0],predict_topic(x[5])))
     for x in commentList:
-        label_comments.append((x[5],process_data(x[4])))
+        label_comments.append((x[5],predict_topic(x[4])))
     return label_article,label_comments
 
 # 更新数据库