From 8aca60cf073fff2fb8d9e302d5ff292d6fc6fdfa Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 14 Mar 2025 17:01:24 +0800
Subject: [PATCH] 'commit'

---
 AI/AiService/Start.py                         |   3 +-
 .../MarkdownToJsonConverter.cpython-310.pyc   | Bin 5303 -> 5463 bytes
 AI/Text2Sql/app.py                            |  33 ++++++++++++++----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/AI/AiService/Start.py b/AI/AiService/Start.py
index b0b783bf..f09fcb86 100644
--- a/AI/AiService/Start.py
+++ b/AI/AiService/Start.py
@@ -1,5 +1,6 @@
 import asyncio
 import socket
+import time
 
 import uvicorn
 from fastapi import FastAPI, Body
@@ -24,7 +25,7 @@ def convertMarkdownToJson(markdown_content: str, language: str):
     # 创建转换器实例
     converter = MarkdownToJsonConverter(client, language)
     # 转换 Markdown 为 JSON
-    for item in converter.convert_markdown_to_json(markdown_content,language):  # 使用普通 for 循环
+    for item in converter.convert_markdown_to_json(markdown_content, language):  # 使用普通 for 循环
         yield f"{item}\n"  # 每行数据后添加换行符
     # 添加结束标记
     yield '{"type": "end" }\n'  # 结束标记后也添加换行符
diff --git a/AI/AiService/__pycache__/MarkdownToJsonConverter.cpython-310.pyc b/AI/AiService/__pycache__/MarkdownToJsonConverter.cpython-310.pyc
index 5fae9c805620cb94983f042c3a4738058fa78797..05740c203bbd83d80b31c6d8de261178f593474b 100644
GIT binary patch
delta 1763
zcmZuy-ES0C6u<Y*-8-`%ZMSq0wzROAK->nJmJ$Pkqz#1!1EoSNf{@L+ce?I&nO*Ko
zscmK~XbdLCL~_vwi>7@rv5DwIA22b-_~HZl;FBivW(2_){R4~-o-@1B<zpuI?3sJc
z`JHpmx##Sy{4WEY^^T4Nf#=up+vPv{u66!(*1*r!gFJ(E7?zs`;!~d#h|hphNluYG
zoyfCLlxh{*@j|Osbjq{EvYj_V?%K6!#lc3!fUFW_>QOq8z#TyobRnn5_-6eD{fP>_
z$ohAfs2ULqxG-bC?x|wQE7a^uc5S%eRlJ(rslQ|Yb|q16PFEaRtkqP9{?X_Y0<F9B
z-$wt=M}Rgy1hl6K<ZfCU<}Wd7>Z@Ycrgg7Lw|L2Jx*T~%-xf2X7lE_-fO$OI2W(!b
zrYnpgR;xI+tG4SEvo{%mY(s5Je{XK3+t%)yXXtLU4-;?{$E|pky0gkuw8cG$Yn6rE
zn{U`5mqo7#Zf4@o4evq>M1#z-!J&{>Jo`d3GwXpS4%RBJSE^rV9J2M#@ss<vpdYhT
zcRZ*>-iVy2-3Wz}JXKNji75Io?s{sr<jpEu<#aLed_U@(O-896DOBCM)9z1yo!ClG
z>M$|A*nT-M7|cZpmisx7D{wu=$@$5^kkmIW5w%@1ANVXmzR5|JB?0%zGV!_3R#*`8
zV=akskhJWMO8&s^XiLhoWSk70&jbQM1pprLfqMd&kN|XX*rQc&uK!Fn(nAnidp`6`
z>czumD-(FwLX>^HrfSdsx?xh<Zb?-dShUb`XJ0KmS_l14D!)~Mftv%uE?Yc9Q_-7Y
zX==fn(qkPjJeD+UxTvG<10!i*EKK=KvKgil(g+Mkz!!(Fw2TFYN2+j=s^M`dq$#Z%
zOvZg<iO7Ucm&nHk?v$BK%G7%XB$iiW>I72RktJ18HPwm5_RnQ&g#<A#zMPPqknPxt
z(YDjozT?MELxX!snT{N>w<v}B;vOenYTl(J5R@!*fkwA4Ae09hf}A08Lm=J|r|>rp
z%p9E~`5xWqJU2!{R&r)H!_n`5dF#$M-`>0a*`2R${{G?ByGx(kyLtV$%WsCvb{4Xe
zHM{8AIp~`?xTO^*cf={foqugm|Ik^cd)G#~rl@{5y_DPwP--WVq#o|xa;{m~X2G$h
zp=c=R6Btj*b{loawbdcqrgr-!NBez1-iGBq3xsn96%?>IEZ`Y~dS2_Ee5jsr)Pxl^
z!TZ2mA!QO6(FLa~G~kd@E}1l-Zu|ybcVijTj>#m;%tsv|V^a8{LZ6^vL>eaOa^D19
zXqN%#F*C3tAPa#m?g23XV?Ti`1~O}k!2YOyXT$MhV-S^!hRPstq1BoZZZsGsV4!uQ
z0*(i@3CREw%zzpNl8>(sJQdS@Jv(|&qb!Fc>Xv9IH7ApPrKg{Ms^@!hG_61CDeS}a
zH1VGR9pziSj4JCGEui7dQ+aO1Ez26Qa#l|&r*QP-MQ9e?d8bsVtNmz)e+BA*Ze%v5
KAA|TH^Ynk60*T}R

delta 1726
zcmZuxO>7%Q6rP!#{jp;^Y2$=C5vf&F!9oIUqlz|4Q&mY-Kx#xA8k9)Lay{#?j<a@V
z*ZI?$P>Q&LgoaxSB)8^<ltV9w3xWe&-~?KU0~g@Z14l#!ytm${`C+Yje)HzN@6CMk
z-u(3ZLp#^VX43?|>c#ICz8?HI_vk9aY4V|tV-kjsejyD>i3l=7Y&vbz$f(p^#|vy0
zao?#|B?q4!A`NwmPFon6rW-|dC4WMFLw~S!Fho5|Ww|ICt6r(n@B#>q^rdo8d0QH=
z+7YJuiWO*9{mdTEVb;j3x}GT4>oS8gUU&T<;=-*2kyVwArA24mx4A@knT!2nM8}`c
zwLEvZ<&={7fgB@zfcEdc!f!EZsLzbyr{WEm7~kcWSDaGaS#j#4&#GUIMWcY&C)7>z
z`otipwy`gpUUxmmmqm<(y?M@juF{ecj@E%V*GW5s5T^RY9HK+JkIgwcf}l}4kY&$z
z1GnMrFd3V8;H(8Zz-h4Fbl{-npbWX+OO2g<0Wol&z&LyHOvK&5S=xW97;zj4sx+3G
z6GA;o-Mlz}Rx_d7*5V{`7@=^*rZPTKIzCdA@&nnb1TE>vlWHw}=@k0RcXh}p)%=Ec
zIA1{>OBd)3^=G=exxadFpLiz~82$qgcc6Zz$XnBGCTPf3h%5>gf?gn~cQnBYq^*Ty
zi-g)XZS#;Pc5R#_QBxwZLDW>T$_oULdxzUPK<cnC8G?2MN*4gLd?uhZNUV%Zv*#t)
z*M36O2bmiao!gC4c-m4-|Jgmas7pA0MY>JAu*mXTw@ZibKn-N=p=CUD5d?eJ;(3~(
zX&8CdLoN8FRXO|G0j`iIEcLk4z6E9DT0m;B&6*Z)K?M`qeI~fjLwb*V8qXG(FogM`
z)`p|hbUA@iSOrouYUaV&mbDF>2C1#INQpG?s-a~wF?BsL0rA?K(A+_n$aE6jr4%j=
zZJY#|_1l!RIVBt2;E@eEZe`EIAag|I+WZ|pll-sJRbqFyX7Omn<on}`yT5<(pm^og
z;&1Bv+@yNFyGloQA9l}D77>*_c5ibO+~sK$aqDZqaHKb-3lBx=>RQE#iMRDm|HbWM
zNyl$CJl~O*AS|NJp#qgJgZX_JKGr<r7G>08Fev|*{lj$QuYCGA#h*cQYU23#ft#@)
z2A{RKia!G74p|_;IaVlz3e})0wY~ef&!A%277h6}5=XXJ?4t`^7@_V`!H;-ov4;V^
zJTy8L{~VOE**0S!6M>e`!LlB*ZEPPMR?Jxf*30Ud-s{({!JcINFpPi}SxKM!adS_@
zOVxu8*y6Gug^l7oipwBuD|yM(m%XP4X3%^RMO^Ulix>-2{oVUC{ah9DMc`;GU%G(2
zbfEtSHKts?fi6!l5}+UR{kCSMEXx|TidJuCP-@_38<AP|*S(6{kQXoxZ(ok7p1!`G
KBM|5NPW=b0lY2`5

diff --git a/AI/Text2Sql/app.py b/AI/Text2Sql/app.py
index 28e50597..22e8cfb1 100644
--- a/AI/Text2Sql/app.py
+++ b/AI/Text2Sql/app.py
@@ -1,13 +1,17 @@
 import re
+from typing import io
 
+import pandas as pd
 from fastapi import FastAPI, HTTPException, Depends
 from pydantic import BaseModel
 from sqlalchemy import create_engine, Column, Integer, String, SmallInteger, Date
 from sqlalchemy.orm import declarative_base  # 更新导入路径
 from sqlalchemy.orm import sessionmaker, Session
 import uvicorn  # 导入 uvicorn
-from starlette.staticfiles import StaticFiles
+from starlette.responses import StreamingResponse
 
+from Text2Sql.Util.PostgreSQLUtil import PostgreSQLUtil
+from Text2Sql.Util.SaveToExcel import save_to_excel
 from Text2Sql.Util.VannaUtil import VannaUtil
 
 # 数据库连接配置
@@ -131,8 +135,9 @@ def delete_question(question_id: int, db: Session = Depends(get_db)):
     db.commit()
     return {"message": "Question deleted successfully"}
 
-@app.post("/questions/generate_sql")
-def generate_sql(question: str):
+# 通过语义生成Excel
+@app.post("/questions/getExcel")
+def getExcel(question: str):
     # 指定学段
     question = '''
                     查询:
@@ -146,12 +151,28 @@ def generate_sql(question: str):
         2、目标数据库是Postgresql 16
         '''
     question = question + common_prompt
-    # 开始查询
-    print("开始查询...")
     # 获取完整 SQL
     sql = vn.generate_sql(question)
     print("生成的查询 SQL:\n", sql)
-
+    # 执行SQL查询
+    with PostgreSQLUtil() as db:
+        _data = db.execute_query(sql)
+        # 将数据保存为Excel文件流
+        excel_stream = save_to_excel_stream(_data)
+        # 返回Excel文件流
+        return StreamingResponse(
+            excel_stream,
+            media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            headers={"Content-Disposition": "attachment; filename=导出信息.xlsx"}
+        )
+def save_to_excel_stream(data):
+    # 将数据保存为Excel文件流
+    df = pd.DataFrame(data)
+    output = io.BytesIO()
+    with pd.ExcelWriter(output, engine='openpyxl') as writer:
+        df.to_excel(writer, index=False)
+    output.seek(0)  # 将指针移动到流的开头
+    return output
 # 添加 main 函数
 def main():
     # 开始训练