|
@@ -2,8 +2,9 @@ import shutil
|
|
import tempfile
|
|
import tempfile
|
|
import time
|
|
import time
|
|
import sys
|
|
import sys
|
|
|
|
+from typing import List
|
|
from zipfile import ZipFile
|
|
from zipfile import ZipFile
|
|
-
|
|
|
|
|
|
+import json
|
|
import fiona
|
|
import fiona
|
|
from shapely.geometry import shape
|
|
from shapely.geometry import shape
|
|
from sse_starlette.sse import EventSourceResponse
|
|
from sse_starlette.sse import EventSourceResponse
|
|
@@ -24,14 +25,14 @@ from qwen_agent.planning.plan_continue_executor import PlanContinueExecutor
|
|
from qwen_agent.llm.llm_client import LLMClient, LLMAsyncClient
|
|
from qwen_agent.llm.llm_client import LLMClient, LLMAsyncClient
|
|
from agent_config import LLMDict_Qwen_72B_1211, LLMDict_GPT4_TURBO
|
|
from agent_config import LLMDict_Qwen_72B_1211, LLMDict_GPT4_TURBO
|
|
from agent_messages import BaseRequest
|
|
from agent_messages import BaseRequest
|
|
-
|
|
|
|
|
|
+from qwen_agent.tools.tools import async_xzdb
|
|
prompt_lan = "CN"
|
|
prompt_lan = "CN"
|
|
llm_name = "qwen-plus"
|
|
llm_name = "qwen-plus"
|
|
llm_turbo_name = "gpt-4-turbo"
|
|
llm_turbo_name = "gpt-4-turbo"
|
|
max_ref_token = 4000
|
|
max_ref_token = 4000
|
|
# model_server = "http://10.10.0.10:7907/v1"
|
|
# model_server = "http://10.10.0.10:7907/v1"
|
|
# model_server = "http://lq.lianqiai.cn:7905/v1"
|
|
# model_server = "http://lq.lianqiai.cn:7905/v1"
|
|
-# model_server = "http://10.36.162.54:20331/v1"
|
|
|
|
|
|
+# model_server = "http://172.20.28.16:20331/v1"
|
|
model_server = "http://ac.zjugis.com:8511/v1"
|
|
model_server = "http://ac.zjugis.com:8511/v1"
|
|
api_key = ""
|
|
api_key = ""
|
|
server_host = "0.0.0.0"
|
|
server_host = "0.0.0.0"
|
|
@@ -172,6 +173,23 @@ async def clarificationByTurbo(request: BaseRequest):
|
|
)
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
+@app.get("/queryGeometry")
|
|
|
|
+async def queryGeometry(id: int):
|
|
|
|
+ sql = f'select objectid, xzqmc, xzqdm, dymc, yddm, ydxz, ydmj, rjlsx, rjlxx, jzmdsx, jzmdxx, jzgdsx, jzgdxx, ldlsx, ldlxx, pfwh, pfsj, shape, st_area(shape::geography) as pfmarea,st_astext(shape) as geom, st_astext(st_centroid(shape)) as center_wkt from dlgis.gcs330000g2007_kzxxxgh_kgdk_kgy_dsgj where objectid = {id}'
|
|
|
|
+ res_tuples = await async_xzdb.run(sql)
|
|
|
|
+ result, success = res_tuples
|
|
|
|
+ print(success, result)
|
|
|
|
+ return json.loads(result)
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+@app.get("/queryGeometryList")
|
|
|
|
+async def queryGeometryList(items):
|
|
|
|
+ sql = f'select st_asgeojson(shape) as geom from dlgis.gcs330000g2007_kzxxxgh_kgdk_kgy_dsgj where objectid in {items}'
|
|
|
|
+ res_tuples = await async_xzdb.run(sql)
|
|
|
|
+ result, success = res_tuples
|
|
|
|
+ print(success, result)
|
|
|
|
+ return json.loads(result)
|
|
|
|
+
|
|
llm_client = LLMClient(model=llm_name, model_server=model_server)
|
|
llm_client = LLMClient(model=llm_name, model_server=model_server)
|
|
llm_client_async = LLMAsyncClient(model=llm_name, model_server=model_server)
|
|
llm_client_async = LLMAsyncClient(model=llm_name, model_server=model_server)
|
|
|
|
|
|
@@ -217,4 +235,5 @@ async def call_with_stream(
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
if __name__ == "__main__":
|
|
|
|
+ # uvicorn.run("run_server_async:app", host=server_host, port=server_port, workers=5)
|
|
uvicorn.run(app, host=server_host, port=server_port, workers=1)
|
|
uvicorn.run(app, host=server_host, port=server_port, workers=1)
|