新增工程数据
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
@@ -555,7 +556,7 @@ def upload_file(request: ChatFileUploadRequest):
|
||||
logger.error(f"Error processing file: {e}", exc_info=True)
|
||||
raise HTTPException(status_code=500, detail="Error processing file")
|
||||
|
||||
@v.post("/applications")
|
||||
@v.post("/project")
|
||||
def upload_file(request: ChatFileUploadRequest):
|
||||
try:
|
||||
logger.info("Processing file")
|
||||
|
||||
@@ -161,11 +161,13 @@ class ProjectInfo:
|
||||
dbManage.createTable(self._tableName)
|
||||
|
||||
def add(self,name:str,flag:str):
|
||||
record = {
|
||||
'prjectName': name,
|
||||
'prjFlag': flag
|
||||
}
|
||||
dbManage.addRecord(self._tableName,record)
|
||||
info = dbManage.query(self._tableName,prjFlag = flag)
|
||||
if len(info) == 0:
|
||||
record = {
|
||||
'prjectName': name,
|
||||
'prjFlag': flag
|
||||
}
|
||||
dbManage.addRecord(self._tableName,record)
|
||||
|
||||
def projectNames(self)->List[str]:
|
||||
records = dbManage.query(self._tableName)
|
||||
|
||||
@@ -39,7 +39,7 @@ class BaseConfig(BaseModel):
|
||||
"type": "select",
|
||||
"max_length": 48,
|
||||
"required": True,
|
||||
"options": [projectInfo]
|
||||
"options": projectInfo
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
@@ -13,9 +13,7 @@ from app.api.routers.request.base import ProjectInfo
|
||||
def getPrjFalg(params:dict=None)->str:
|
||||
prjFlag = ''
|
||||
if params is not None:
|
||||
inputs:dict = params.get('inputs')
|
||||
if inputs is not None:
|
||||
prjFlag = ProjectInfo.prjFalg(inputs.get('projectname'))
|
||||
prjFlag = ProjectInfo().prjFalg(params.get('projectname'))
|
||||
return prjFlag
|
||||
|
||||
|
||||
@@ -33,13 +31,7 @@ def get_chat_engine(filters=None, params:dict=None):
|
||||
#tools.append(sql_query_tool)
|
||||
|
||||
# Add query tool if index exists
|
||||
prjFlag = ''
|
||||
if params is not None:
|
||||
inputs:dict = params.get('inputs')
|
||||
if inputs is not None:
|
||||
prjFlag = inputs.get('projectname')
|
||||
|
||||
index = get_index(prjFlag = getPrjFalg(params))
|
||||
index = get_index(getPrjFalg(params))
|
||||
if index is not None:
|
||||
summary_query_engine = create_summary_query_engine(index,top_k,use_reranker,filters)
|
||||
summary_query_tool = QueryEngineTool.from_defaults( query_engine=summary_query_engine, name="summary_query_tool",
|
||||
|
||||
@@ -5,17 +5,11 @@ from app.engine.loaders import get_document_Types
|
||||
from typing import Dict,Any
|
||||
logger = logging.getLogger("uvicorn")
|
||||
|
||||
def get_index(**args):
|
||||
def get_index(prjFlag:str):
|
||||
if prjFlag is None or prjFlag == '':
|
||||
raise ValueError('无效的工程标识')
|
||||
logger.info("Connecting vector store...")
|
||||
if 'prjFlag' in args:
|
||||
prjFlags = get_document_Types()
|
||||
if len(prjFlags)<=0:
|
||||
return None
|
||||
prjFlag = args.get('prjFlag','')
|
||||
flag = prjFlags[0] if prjFlag not in prjFlags else prjFlag
|
||||
else:
|
||||
flag = ''
|
||||
store = get_vector_store(flag)
|
||||
store = get_vector_store(prjFlag)
|
||||
index = VectorStoreIndex.from_vector_store(store)
|
||||
logger.info("Finished load index from vector store.")
|
||||
return index
|
||||
|
||||
@@ -3,8 +3,10 @@ import yaml
|
||||
from app.engine.loaders.db import DBLoaderConfig, get_db_documents
|
||||
from app.engine.loaders.file import FileLoaderConfig, get_file_documents
|
||||
from app.engine.loaders.web import WebLoaderConfig, get_web_documents
|
||||
from app.engine.loaders.projectJson import getProjectName
|
||||
import os
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def load_configs():
|
||||
@@ -55,6 +57,31 @@ def get_document_Types():
|
||||
types.append(path_difference(rootPath,curDir))
|
||||
return types
|
||||
|
||||
def getProjectInfos():
|
||||
config = load_configs()
|
||||
if config is None or len(config.items()) == 0:
|
||||
return None
|
||||
|
||||
prjDir = None
|
||||
for loader_type, loader_config in config.items():
|
||||
if loader_config.get('enable', True):
|
||||
loader_config = loader_config or []
|
||||
config = FileLoaderConfig(**loader_config)
|
||||
prjDir = config.data_dir
|
||||
break
|
||||
if prjDir is None:
|
||||
return None
|
||||
|
||||
prjInfos = []
|
||||
prjFlags = get_document_Types()
|
||||
for prjFlag in prjFlags:
|
||||
fileDir = os.path.join(config.data_dir,prjFlag.replace('_','\\'))
|
||||
prjInfo = {}
|
||||
prjInfo['flag'] = prjFlag
|
||||
prjInfo['name'] = getProjectName(fileDir)
|
||||
prjInfos.append(prjInfo)
|
||||
return prjInfos
|
||||
|
||||
def get_documents(docType:str):
|
||||
documents = []
|
||||
config = load_configs()
|
||||
@@ -80,4 +107,4 @@ def get_documents(docType:str):
|
||||
raise ValueError(f"Invalid loader type: {loader_type}")
|
||||
documents.extend(document)
|
||||
|
||||
return documents
|
||||
return documents
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
from typing import Dict,List,Any
|
||||
import json,os
|
||||
|
||||
class Record:
|
||||
def __init__(self,datas:Dict[str,Any]) -> None:
|
||||
self._datas:Dict[str,Any] = datas
|
||||
|
||||
def value(self,key:str):
|
||||
if key in self._datas:
|
||||
return self._datas.get(key)
|
||||
return ''
|
||||
|
||||
class Field:
|
||||
def __init__(self,datas:Dict[str,Any]) -> None:
|
||||
self._datas:Dict[str,Any] = datas
|
||||
|
||||
def value(self,key:str):
|
||||
if key in self._datas:
|
||||
return self._datas.get(key)
|
||||
return ''
|
||||
|
||||
class JsonTable:
|
||||
def __init__(self,filePth:str) -> None:
|
||||
self._filePth = filePth
|
||||
self._fields:Dict[str,Field] = {}
|
||||
self._records:List[Record] = []
|
||||
self._name = ''
|
||||
|
||||
def parse(self):
|
||||
with open(self._filePth, 'r',encoding='utf-8') as file:
|
||||
jsObj = json.load(file)
|
||||
data:dict = jsObj.get('table')
|
||||
self._name = data.get('name')
|
||||
Jsfields = data.get('fields')
|
||||
for jsfiled in Jsfields:
|
||||
field = Field(jsfiled)
|
||||
self._fields[field.value('name')] =field
|
||||
|
||||
JsRecords = data.get('records')
|
||||
for jsRecord in JsRecords:
|
||||
self._records.append(Record(jsRecord))
|
||||
|
||||
def records(self):
|
||||
return self._records
|
||||
|
||||
class ProjectJson:
|
||||
def __init__(self,dir:str) -> None:
|
||||
self._dir = dir
|
||||
self._tables:Dict[str,JsonTable] = {}
|
||||
|
||||
def parse(self):
|
||||
json_files = [f for f in os.listdir(self._dir) if f.endswith('.json')]
|
||||
for json_file in json_files:
|
||||
prjPath = os.path.join(self._dir, json_file)
|
||||
tb = JsonTable(prjPath)
|
||||
tb.parse()
|
||||
basename = os.path.splitext(json_file)[0]
|
||||
self._tables[basename] = tb
|
||||
|
||||
def table(self,tableName:str):
|
||||
return self._tables[tableName]
|
||||
|
||||
def getProjectName(dir:str):
|
||||
prjJson = ProjectJson(dir)
|
||||
prjJson.parse()
|
||||
tb:JsonTable = prjJson.table('工程属性')
|
||||
records = tb.records()
|
||||
for record in records:
|
||||
name = record.value('名称')
|
||||
if name == '工程名称':
|
||||
return record.value('值')
|
||||
return ''
|
||||
|
||||
+10
-4
@@ -7,6 +7,8 @@ from llama_index.llms.xinference import Xinference
|
||||
from llama_index.llms.xinference.base import DEFAULT_XINFERENCE_TEMP
|
||||
|
||||
from app.xinference.base import XinferenceEmbedding, XinferenceRerank
|
||||
from app.engine.loaders import getProjectInfos
|
||||
from app.api.routers.request.base import ProjectInfo
|
||||
|
||||
|
||||
def get_node_postprocessors():
|
||||
@@ -53,7 +55,6 @@ def init_settings():
|
||||
Settings.chunk_size = int(os.getenv("CHUNK_SIZE", "1024"))
|
||||
Settings.chunk_overlap = int(os.getenv("CHUNK_OVERLAP", "20"))
|
||||
|
||||
|
||||
def init_ollama():
|
||||
# from llama_index.embeddings.ollama import OllamaEmbedding
|
||||
# from llama_index.llms.ollama.base import DEFAULT_REQUEST_TIMEOUT, Ollama
|
||||
@@ -127,7 +128,6 @@ def init_dashscope():
|
||||
Settings.embed_model = DashScopeEmbedding(model_name=DashScopeTextEmbeddingModels.TEXT_EMBEDDING_V2,
|
||||
text_type=DashScopeTextEmbeddingType.TEXT_TYPE_QUERY)
|
||||
|
||||
|
||||
def init_azure_openai():
|
||||
# from llama_index.core.constants import DEFAULT_TEMPERATURE
|
||||
# from llama_index.embeddings.azure_openai import AzureOpenAIEmbedding
|
||||
@@ -162,7 +162,6 @@ def init_azure_openai():
|
||||
# )
|
||||
pass
|
||||
|
||||
|
||||
def init_fastembed():
|
||||
"""
|
||||
Use Qdrant Fastembed as the local embedding provider.
|
||||
@@ -232,4 +231,11 @@ def init_mistral():
|
||||
#
|
||||
# Settings.llm = MistralAI(model=os.getenv("MODEL"))
|
||||
# Settings.embed_model = MistralAIEmbedding(model_name=os.getenv("EMBEDDING_MODEL"))
|
||||
pass
|
||||
pass
|
||||
|
||||
def init_ProjectInfo():
|
||||
prjObj = ProjectInfo()
|
||||
prjInfos:list[tuple] = getProjectInfos()
|
||||
for prjInfo in prjInfos:
|
||||
prjObj.add(prjInfo['name'],prjInfo['flag'])
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
{"table":{"alias":"","comment":"取费表是取费设置中各取费表明细。查询示例: SELECT Rate FROM FeeCollectionTable WHERE Name = 'findname'。","fields":[{"alias":"","comment":"","name":"_id","type":"VARCHAR"},{"alias":"编号,代码,代号","comment":"费用代码","name":"Code","type":"VARCHAR"},{"alias":"公式,计算式,表达式","comment":"取费基数","name":"CalculationFormula","type":"VARCHAR"},{"alias":"备注,说明","comment":"费用项备注说明","name":"Remarks","type":"VARCHAR"},{"alias":"费用序号,序号,序列号","comment":"费用表序号","name":"SerialNumber","type":"VARCHAR"},{"alias":"","comment":"","name":"是否隐藏","type":"VARCHAR"},{"alias":"费用利率,费率","comment":"取费费率","name":"Rate","type":"REAL"},{"alias":"项目名,费用名,名称","comment":"费用名称,项目名称","name":"Name","type":"VARCHAR"},{"alias":"","comment":"","name":"nodeType","type":"VARCHAR"},{"alias":"","comment":"","name":"parentId","type":"VARCHAR"},{"alias":"","comment":"","name":"relTbId","type":"VARCHAR"}],"name":"FeeCollectionTable","records":[{"_id":"{AC732533-7DF2-4AE5-B7E5-F44567D78364}","nodeType":"取费表","parentId":"","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"FFZ","取费基数":"","备注":"","序号":"一","是否隐藏":"否","费率":"100","费用名称":"直接费"},{"_id":"{634B13BE-3DD0-451B-A6C9-0C9A317CEDA8}","nodeType":"取费表","parentId":"{AC732533-7DF2-4AE5-B7E5-F44567D78364}","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"FFZ1","取费基数":"","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"直接工程费"},{"_id":"{A5043C5F-A326-42D0-8EA7-D8ED1D64495E}","nodeType":"取费表","parentId":"{634B13BE-3DD0-451B-A6C9-0C9A317CEDA8}","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"DZF","取费基数":"","备注":"","序号":"1.1","是否隐藏":"否","费率":"100","费用名称":"定额直接费"},{"_id":"{6CE02AA1-5AF2-415C-8120-87B69633E7A6}","nodeType":"取费表","parentId":"{A5043C5F-A326-42D0-8EA7-D8ED1D64495E}","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"RGF","取费基数":"取费定额人工费","备注":"","序号":"1.1.1","是否隐藏":"否","费率":"100","费用名称":"人工费"},{"_id":"{D06FC2F6-D089-430F-9898-F222D85FF87C}","nodeType":"取费表","parentId":"{A5043C5F-A326-42D0-8EA7-D8ED1D64495E}","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"CLF","取费基数":"取费定额乙供材料费不含税+取费定额甲供材料费含税","备注":"","序号":"1.1.2","是否隐藏":"否","费率":"100","费用名称":"材料费"},{"_id":"{A5BAAA84-B337-43F1-BD8B-4C13F1B15A04}","nodeType":"取费表","parentId":"{A5043C5F-A326-42D0-8EA7-D8ED1D64495E}","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"JXF","取费基数":"取费定额机械费","备注":"","序号":"1.1.3","是否隐藏":"否","费率":"100","费用名称":"施工机械使用费"},{"_id":"{3A5715D5-42FB-41A5-937A-D231277D9916}","nodeType":"取费表","parentId":"{AC732533-7DF2-4AE5-B7E5-F44567D78364}","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"FFZ2","取费基数":"","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"措施费"},{"_id":"{AB35557D-593C-4D66-AD1B-17359227B6B5}","nodeType":"取费表","parentId":"{3A5715D5-42FB-41A5-937A-D231277D9916}","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"BZF","取费基数":"FFZ1-甲供消材进项税额","备注":"","序号":"2.1","是否隐藏":"否","费率":"2.93","费用名称":"安全文明施工费"},{"_id":"{15CC6A96-C81A-4AAE-A212-B3DCF573443D}","nodeType":"取费表","parentId":"","relTbId":"{6C5274C1-2091-440D-8E3F-94FA30CE65A2}","代码":"HJ","取费基数":"FFZ+一笔性费用","备注":"","序号":"二","是否隐藏":"否","费率":"100","费用名称":"合计"}]}}
|
||||
@@ -0,0 +1 @@
|
||||
{"table":{"alias":"","comment":"取费表是取费设置中各取费表明细。查询示例: SELECT Rate FROM FeeCollectionTable WHERE Name = 'findname'。","fields":[{"alias":"","comment":"","name":"_id","type":"VARCHAR"},{"alias":"编号,代码,代号","comment":"费用代码","name":"Code","type":"VARCHAR"},{"alias":"公式,计算式,表达式","comment":"取费基数","name":"CalculationFormula","type":"VARCHAR"},{"alias":"备注,说明","comment":"费用项备注说明","name":"Remarks","type":"VARCHAR"},{"alias":"费用序号,序号,序列号","comment":"费用表序号","name":"SerialNumber","type":"VARCHAR"},{"alias":"","comment":"","name":"是否隐藏","type":"VARCHAR"},{"alias":"费用利率,费率","comment":"取费费率","name":"Rate","type":"REAL"},{"alias":"项目名,费用名,名称","comment":"费用名称,项目名称","name":"Name","type":"VARCHAR"},{"alias":"","comment":"","name":"nodeType","type":"VARCHAR"},{"alias":"","comment":"","name":"parentId","type":"VARCHAR"},{"alias":"","comment":"","name":"relTbId","type":"VARCHAR"}],"name":"FeeCollectionTable","records":[{"_id":"{1C15B4B2-3B33-40F9-8C1A-F16A585894B4}","nodeType":"取费表","parentId":"","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"FFZ","取费基数":"","备注":"","序号":"一","是否隐藏":"否","费率":"100","费用名称":"直接费"},{"_id":"{5E7ADB7A-9C41-4813-89D3-8915182FD91E}","nodeType":"取费表","parentId":"{1C15B4B2-3B33-40F9-8C1A-F16A585894B4}","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"FFZ1","取费基数":"","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"直接工程费"},{"_id":"{80745DAE-6C80-497B-B46A-9B0AD665847A}","nodeType":"取费表","parentId":"{5E7ADB7A-9C41-4813-89D3-8915182FD91E}","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"RGF","取费基数":"取费定额人工费","备注":"","序号":"1.1","是否隐藏":"否","费率":"100","费用名称":"人工费"},{"_id":"{A7D785CA-D360-4D17-9740-436534F84150}","nodeType":"取费表","parentId":"{5E7ADB7A-9C41-4813-89D3-8915182FD91E}","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"CLF","取费基数":"取费定额乙供材料费不含税+取费定额甲供材料费含税","备注":"","序号":"1.2","是否隐藏":"否","费率":"100","费用名称":"材料费"},{"_id":"{2680555F-1FC1-4AFE-BC80-12A16587675B}","nodeType":"取费表","parentId":"{5E7ADB7A-9C41-4813-89D3-8915182FD91E}","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"JXF","取费基数":"取费定额机械费","备注":"","序号":"1.3","是否隐藏":"否","费率":"100","费用名称":"施工机械使用费"},{"_id":"{1CDC9898-AD38-4B46-BDAC-870F4AC6BE52}","nodeType":"取费表","parentId":"{1C15B4B2-3B33-40F9-8C1A-F16A585894B4}","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"FFZ2","取费基数":"","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"措施费"},{"_id":"{B3C816DB-A50E-49B9-B861-98F358A8AD11}","nodeType":"取费表","parentId":"{1CDC9898-AD38-4B46-BDAC-870F4AC6BE52}","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"BZF","取费基数":"FFZ1-甲供消材进项税额","备注":"","序号":"2.1","是否隐藏":"否","费率":"2.93","费用名称":"安全文明施工费"},{"_id":"{A74D1DBF-FA60-4C00-9F2C-659CAB97AD3C}","nodeType":"取费表","parentId":"","relTbId":"{96A61AA6-7110-477F-BD0B-CC0F56658DFE}","代码":"HJ","取费基数":"FFZ+一笔性费用","备注":"","序号":"二","是否隐藏":"否","费率":"100","费用名称":"合计"}]}}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
{"table":{"alias":"","comment":"取费表是取费设置中各取费表明细。查询示例: SELECT Rate FROM FeeCollectionTable WHERE Name = 'findname'。","fields":[{"alias":"","comment":"","name":"_id","type":"VARCHAR"},{"alias":"编号,代码,代号","comment":"费用代码","name":"Code","type":"VARCHAR"},{"alias":"公式,计算式,表达式","comment":"取费基数","name":"CalculationFormula","type":"VARCHAR"},{"alias":"备注,说明","comment":"费用项备注说明","name":"Remarks","type":"VARCHAR"},{"alias":"费用序号,序号,序列号","comment":"费用表序号","name":"SerialNumber","type":"VARCHAR"},{"alias":"","comment":"","name":"是否隐藏","type":"VARCHAR"},{"alias":"费用利率,费率","comment":"取费费率","name":"Rate","type":"REAL"},{"alias":"项目名,费用名,名称","comment":"费用名称,项目名称","name":"Name","type":"VARCHAR"},{"alias":"","comment":"","name":"nodeType","type":"VARCHAR"},{"alias":"","comment":"","name":"parentId","type":"VARCHAR"},{"alias":"","comment":"","name":"relTbId","type":"VARCHAR"}],"name":"FeeCollectionTable","records":[{"_id":"{F68A4F69-59D3-4184-96BE-7B6F662BC60E}","nodeType":"取费表","parentId":"","relTbId":"{D8E27F1A-75C4-4005-B49F-BD3402874FB4}","代码":"FFZ1","取费基数":"","备注":"","序号":"一","是否隐藏":"否","费率":"100","费用名称":"直接工程费"},{"_id":"{12EB546B-D14C-4FFA-9029-54ACEE399D6E}","nodeType":"取费表","parentId":"{F68A4F69-59D3-4184-96BE-7B6F662BC60E}","relTbId":"{D8E27F1A-75C4-4005-B49F-BD3402874FB4}","代码":"RGF","取费基数":"取费定额人工费","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"人工费"},{"_id":"{19E92F99-E1E9-4745-8EA2-F525AF331FB0}","nodeType":"取费表","parentId":"{F68A4F69-59D3-4184-96BE-7B6F662BC60E}","relTbId":"{D8E27F1A-75C4-4005-B49F-BD3402874FB4}","代码":"CLF","取费基数":"取费定额乙供材料费不含税+取费定额甲供材料费含税+乙供取费主材费不含税+甲供取费主材费含税","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"材料费"},{"_id":"{05F2241D-8919-4A1C-96D0-1091DD079E3B}","nodeType":"取费表","parentId":"{F68A4F69-59D3-4184-96BE-7B6F662BC60E}","relTbId":"{D8E27F1A-75C4-4005-B49F-BD3402874FB4}","代码":"JXF","取费基数":"取费定额机械费","备注":"","序号":"3","是否隐藏":"否","费率":"100","费用名称":"施工机械使用费"},{"_id":"{EB338420-823E-47B7-B8DE-640935812A5B}","nodeType":"取费表","parentId":"","relTbId":"{D8E27F1A-75C4-4005-B49F-BD3402874FB4}","代码":"TZHQF","取费基数":"FFZ1-甲供消材进项税额-甲供主材进项税额","备注":"综合取费费用额(包含措施费、间接费、利润)","序号":"二","是否隐藏":"否","费率":"16.59","费用名称":"综合取费费用额"},{"_id":"{C5834D3B-A4FB-4AEC-812E-B2069F136041}","nodeType":"取费表","parentId":"","relTbId":"{D8E27F1A-75C4-4005-B49F-BD3402874FB4}","代码":"TFFS","取费基数":"FFZ1+TZHQF-取费定额甲供材料费含税-甲供取费主材费含税+不取费定额费不含税-不取费甲供材料费不含税+不取费乙供主材费不含税","备注":"","序号":"三","是否隐藏":"否","费率":"9","费用名称":"税金"},{"_id":"{71DECC0F-AB3D-4230-9A30-7FC4096BF99C}","nodeType":"取费表","parentId":"","relTbId":"{D8E27F1A-75C4-4005-B49F-BD3402874FB4}","代码":"THJ","取费基数":"FFZ1+TZHQF+TFFS+一笔性费用+不取费定额费不含税+不取费乙供主材费不含税+不取费甲供材料进项税额+不取费甲供主材费含税","备注":"","序号":"四","是否隐藏":"否","费率":"100","费用名称":"合计"}]}}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
{"table":{"alias":"","comment":"取费表是取费设置中各取费表明细。查询示例: SELECT Rate FROM FeeCollectionTable WHERE Name = 'findname'。","fields":[{"alias":"","comment":"","name":"_id","type":"VARCHAR"},{"alias":"编号,代码,代号","comment":"费用代码","name":"Code","type":"VARCHAR"},{"alias":"公式,计算式,表达式","comment":"取费基数","name":"CalculationFormula","type":"VARCHAR"},{"alias":"备注,说明","comment":"费用项备注说明","name":"Remarks","type":"VARCHAR"},{"alias":"费用序号,序号,序列号","comment":"费用表序号","name":"SerialNumber","type":"VARCHAR"},{"alias":"","comment":"","name":"是否隐藏","type":"VARCHAR"},{"alias":"费用利率,费率","comment":"取费费率","name":"Rate","type":"REAL"},{"alias":"项目名,费用名,名称","comment":"费用名称,项目名称","name":"Name","type":"VARCHAR"},{"alias":"","comment":"","name":"nodeType","type":"VARCHAR"},{"alias":"","comment":"","name":"parentId","type":"VARCHAR"},{"alias":"","comment":"","name":"relTbId","type":"VARCHAR"}],"name":"FeeCollectionTable","records":[{"_id":"{42DAB3FC-51DF-47E9-8991-7642C6EE885C}","nodeType":"取费表","parentId":"","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"FFZ","取费基数":"","备注":"","序号":"一","是否隐藏":"否","费率":"100","费用名称":"直接费"},{"_id":"{80FF74E3-2DA7-46FE-8298-B7A6EE2D0703}","nodeType":"取费表","parentId":"{42DAB3FC-51DF-47E9-8991-7642C6EE885C}","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"FFZ1","取费基数":"","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"直接工程费"},{"_id":"{6ABF558C-0DB4-47C3-9BB6-7ABCBEA910C2}","nodeType":"取费表","parentId":"{80FF74E3-2DA7-46FE-8298-B7A6EE2D0703}","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"DZF","取费基数":"","备注":"","序号":"1.1","是否隐藏":"否","费率":"100","费用名称":"定额直接费"},{"_id":"{DDC61D9C-A38B-4D90-90C4-3266EBDE4D77}","nodeType":"取费表","parentId":"{6ABF558C-0DB4-47C3-9BB6-7ABCBEA910C2}","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"RGF","取费基数":"取费定额人工费","备注":"","序号":"1.1.1","是否隐藏":"否","费率":"100","费用名称":"人工费"},{"_id":"{51CF5ACE-E686-4522-9879-32595AE23830}","nodeType":"取费表","parentId":"{6ABF558C-0DB4-47C3-9BB6-7ABCBEA910C2}","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"CLF","取费基数":"取费定额乙供材料费不含税","备注":"","序号":"1.1.2","是否隐藏":"否","费率":"100","费用名称":"材料费"},{"_id":"{A2B54828-4789-4C20-AD42-4DE7F6176747}","nodeType":"取费表","parentId":"{6ABF558C-0DB4-47C3-9BB6-7ABCBEA910C2}","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"JXF","取费基数":"取费定额机械费","备注":"","序号":"1.1.3","是否隐藏":"否","费率":"100","费用名称":"施工机械使用费"},{"_id":"{02AC3342-44E9-4B16-A718-67A56F6619FF}","nodeType":"取费表","parentId":"{42DAB3FC-51DF-47E9-8991-7642C6EE885C}","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"FFZ2","取费基数":"","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"措施费"},{"_id":"{30CFC3DF-FF64-4870-9A93-9EA9F344213A}","nodeType":"取费表","parentId":"{02AC3342-44E9-4B16-A718-67A56F6619FF}","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"BZF","取费基数":"FFZ1","备注":"","序号":"2.1","是否隐藏":"否","费率":"3.25","费用名称":"安全文明施工费"},{"_id":"{E78003F1-AA06-4BF1-BA05-23CBBB4367A0}","nodeType":"取费表","parentId":"","relTbId":"{02A4F179-28A3-476E-9697-CD560E240F7A}","代码":"HJ","取费基数":"FFZ+一笔性费用","备注":"","序号":"二","是否隐藏":"否","费率":"100","费用名称":"合计"}]}}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
{"table":{"alias":"","comment":"取费表是取费设置中各取费表明细。查询示例: SELECT Rate FROM FeeCollectionTable WHERE Name = 'findname'。","fields":[{"alias":"","comment":"","name":"_id","type":"VARCHAR"},{"alias":"编号,代码,代号","comment":"费用代码","name":"Code","type":"VARCHAR"},{"alias":"公式,计算式,表达式","comment":"取费基数","name":"CalculationFormula","type":"VARCHAR"},{"alias":"备注,说明","comment":"费用项备注说明","name":"Remarks","type":"VARCHAR"},{"alias":"费用序号,序号,序列号","comment":"费用表序号","name":"SerialNumber","type":"VARCHAR"},{"alias":"","comment":"","name":"是否隐藏","type":"VARCHAR"},{"alias":"费用利率,费率","comment":"取费费率","name":"Rate","type":"REAL"},{"alias":"项目名,费用名,名称","comment":"费用名称,项目名称","name":"Name","type":"VARCHAR"},{"alias":"","comment":"","name":"nodeType","type":"VARCHAR"},{"alias":"","comment":"","name":"parentId","type":"VARCHAR"},{"alias":"","comment":"","name":"relTbId","type":"VARCHAR"}],"name":"FeeCollectionTable","records":[{"_id":"{D762E40C-F7C1-4A8E-B091-B4BD26454476}","nodeType":"取费表","parentId":"","relTbId":"{DCBA7CA2-95BA-458A-BF34-7163010FFEAA}","代码":"FFZ1","取费基数":"","备注":"","序号":"一","是否隐藏":"否","费率":"100","费用名称":"直接工程费"},{"_id":"{82C58340-54B2-4EDB-A62F-A7F786D59B78}","nodeType":"取费表","parentId":"{D762E40C-F7C1-4A8E-B091-B4BD26454476}","relTbId":"{DCBA7CA2-95BA-458A-BF34-7163010FFEAA}","代码":"RGF","取费基数":"取费定额人工费","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"人工费"},{"_id":"{DE1DDC41-13C3-416B-AD08-253EFAF7FF40}","nodeType":"取费表","parentId":"{D762E40C-F7C1-4A8E-B091-B4BD26454476}","relTbId":"{DCBA7CA2-95BA-458A-BF34-7163010FFEAA}","代码":"CLF","取费基数":"取费定额乙供材料费不含税+乙供取费主材费不含税+甲供取费主材费含税","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"材料费"},{"_id":"{28A95C2F-5516-429E-BAB3-36B6DD9390FC}","nodeType":"取费表","parentId":"{D762E40C-F7C1-4A8E-B091-B4BD26454476}","relTbId":"{DCBA7CA2-95BA-458A-BF34-7163010FFEAA}","代码":"JXF","取费基数":"取费定额机械费","备注":"","序号":"3","是否隐藏":"否","费率":"100","费用名称":"施工机械使用费"},{"_id":"{D27F3977-1185-4DAD-A041-186036503DAF}","nodeType":"取费表","parentId":"","relTbId":"{DCBA7CA2-95BA-458A-BF34-7163010FFEAA}","代码":"TZHQF","取费基数":"FFZ1-甲供主材进项税额","备注":"综合取费费用额(包含措施费、间接费、利润)","序号":"二","是否隐藏":"否","费率":"17.79","费用名称":"综合取费费用额"},{"_id":"{695C2D0E-F688-489C-BA71-EABF73E98E41}","nodeType":"取费表","parentId":"","relTbId":"{DCBA7CA2-95BA-458A-BF34-7163010FFEAA}","代码":"TFFS","取费基数":"FFZ1+TZHQF-甲供取费主材费含税+不取费定额费不含税+不取费乙供主材费不含税","备注":"","序号":"三","是否隐藏":"否","费率":"9","费用名称":"税金"},{"_id":"{C91A22B6-896A-4040-948D-DFC25A8D0C77}","nodeType":"取费表","parentId":"","relTbId":"{DCBA7CA2-95BA-458A-BF34-7163010FFEAA}","代码":"THJ","取费基数":"FFZ1+TZHQF+TFFS+一笔性费用+不取费定额费不含税+不取费乙供主材费不含税+不取费甲供主材费含税","备注":"","序号":"四","是否隐藏":"否","费率":"100","费用名称":"合计"}]}}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
{"table":{"alias":"","comment":"取费表是取费设置中各取费表明细。查询示例: SELECT Rate FROM FeeCollectionTable WHERE Name = 'findname'。","fields":[{"alias":"","comment":"","name":"_id","type":"VARCHAR"},{"alias":"编号,代码,代号","comment":"费用代码","name":"Code","type":"VARCHAR"},{"alias":"公式,计算式,表达式","comment":"取费基数","name":"CalculationFormula","type":"VARCHAR"},{"alias":"备注,说明","comment":"费用项备注说明","name":"Remarks","type":"VARCHAR"},{"alias":"费用序号,序号,序列号","comment":"费用表序号","name":"SerialNumber","type":"VARCHAR"},{"alias":"","comment":"","name":"是否隐藏","type":"VARCHAR"},{"alias":"费用利率,费率","comment":"取费费率","name":"Rate","type":"REAL"},{"alias":"项目名,费用名,名称","comment":"费用名称,项目名称","name":"Name","type":"VARCHAR"},{"alias":"","comment":"","name":"nodeType","type":"VARCHAR"},{"alias":"","comment":"","name":"parentId","type":"VARCHAR"},{"alias":"","comment":"","name":"relTbId","type":"VARCHAR"}],"name":"FeeCollectionTable","records":[{"_id":"{AE260A6F-EF67-4F66-9AA2-742A11A39C78}","nodeType":"取费表","parentId":"","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"FFZ","取费基数":"","备注":"","序号":"一","是否隐藏":"否","费率":"100","费用名称":"直接费"},{"_id":"{2EA0D884-AB7F-478B-BCCE-212BF1A5AC87}","nodeType":"取费表","parentId":"{AE260A6F-EF67-4F66-9AA2-742A11A39C78}","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"FFZ1","取费基数":"","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"直接工程费"},{"_id":"{62F8641B-D629-40CD-AB49-34B7FB702E98}","nodeType":"取费表","parentId":"{2EA0D884-AB7F-478B-BCCE-212BF1A5AC87}","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"DZF","取费基数":"","备注":"","序号":"1.1","是否隐藏":"否","费率":"100","费用名称":"定额直接费"},{"_id":"{B9DB9995-8BF9-4769-AB7B-E989B4907A08}","nodeType":"取费表","parentId":"{62F8641B-D629-40CD-AB49-34B7FB702E98}","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"RGF","取费基数":"取费定额人工费","备注":"","序号":"1.1.1","是否隐藏":"否","费率":"100","费用名称":"人工费"},{"_id":"{6F2D0FFB-CAF5-43CD-90EB-2C64A21E6127}","nodeType":"取费表","parentId":"{62F8641B-D629-40CD-AB49-34B7FB702E98}","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"CLF","取费基数":"取费定额乙供材料费不含税","备注":"","序号":"1.1.2","是否隐藏":"否","费率":"100","费用名称":"材料费"},{"_id":"{4C54B793-5D91-4762-8813-115218DC72F8}","nodeType":"取费表","parentId":"{62F8641B-D629-40CD-AB49-34B7FB702E98}","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"JXF","取费基数":"取费定额机械费","备注":"","序号":"1.1.3","是否隐藏":"否","费率":"100","费用名称":"施工机械使用费"},{"_id":"{DBF98998-59F5-4BD6-8575-51CDD2F3EF65}","nodeType":"取费表","parentId":"{AE260A6F-EF67-4F66-9AA2-742A11A39C78}","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"FFZ2","取费基数":"","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"措施费"},{"_id":"{1A6B97A1-F64F-4062-9344-92F9DBFEA27C}","nodeType":"取费表","parentId":"{DBF98998-59F5-4BD6-8575-51CDD2F3EF65}","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"BZF","取费基数":"FFZ1","备注":"","序号":"2.1","是否隐藏":"否","费率":"3.55","费用名称":"安全文明施工费"},{"_id":"{61FE5B00-8DA5-4FA5-A6B5-67A506CABBAC}","nodeType":"取费表","parentId":"","relTbId":"{DE579B44-20F0-4A84-A620-3C8D211C8F16}","代码":"HJ","取费基数":"FFZ+一笔性费用","备注":"","序号":"二","是否隐藏":"否","费率":"100","费用名称":"合计"}]}}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
{"table":{"alias":"","comment":"取费表是取费设置中各取费表明细。查询示例: SELECT Rate FROM FeeCollectionTable WHERE Name = 'findname'。","fields":[{"alias":"","comment":"","name":"_id","type":"VARCHAR"},{"alias":"编号,代码,代号","comment":"费用代码","name":"Code","type":"VARCHAR"},{"alias":"公式,计算式,表达式","comment":"取费基数","name":"CalculationFormula","type":"VARCHAR"},{"alias":"备注,说明","comment":"费用项备注说明","name":"Remarks","type":"VARCHAR"},{"alias":"费用序号,序号,序列号","comment":"费用表序号","name":"SerialNumber","type":"VARCHAR"},{"alias":"","comment":"","name":"是否隐藏","type":"VARCHAR"},{"alias":"费用利率,费率","comment":"取费费率","name":"Rate","type":"REAL"},{"alias":"项目名,费用名,名称","comment":"费用名称,项目名称","name":"Name","type":"VARCHAR"},{"alias":"","comment":"","name":"nodeType","type":"VARCHAR"},{"alias":"","comment":"","name":"parentId","type":"VARCHAR"},{"alias":"","comment":"","name":"relTbId","type":"VARCHAR"}],"name":"FeeCollectionTable","records":[{"_id":"{ECA21A14-0907-4136-8DCC-B517973334C2}","nodeType":"取费表","parentId":"","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"FFZ1","取费基数":"","备注":"","序号":"一","是否隐藏":"否","费率":"100","费用名称":"直接工程费"},{"_id":"{740AA893-1750-4ECB-B39F-281A67A1E535}","nodeType":"取费表","parentId":"{ECA21A14-0907-4136-8DCC-B517973334C2}","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"RGF","取费基数":"取费定额人工费","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"人工费"},{"_id":"{D5ED3338-0D3C-40C6-9578-7664DF58DFE0}","nodeType":"取费表","parentId":"{ECA21A14-0907-4136-8DCC-B517973334C2}","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"CLF","取费基数":"取费定额乙供材料费不含税+乙供取费主材费不含税+甲供取费主材费含税","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"材料费"},{"_id":"{EF4424BB-6DA4-4C71-AA3F-0B3A32C2F57D}","nodeType":"取费表","parentId":"{ECA21A14-0907-4136-8DCC-B517973334C2}","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"JXF","取费基数":"取费定额机械费","备注":"","序号":"3","是否隐藏":"否","费率":"100","费用名称":"施工机械使用费"},{"_id":"{9BEB4BE3-56A4-4E59-B0F9-912856B078A5}","nodeType":"取费表","parentId":"","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"TZHQF","取费基数":"FFZ1-甲供主材进项税额","备注":"综合取费费用额(包含措施费、间接费、利润)","序号":"二","是否隐藏":"否","费率":"17.79","费用名称":"综合取费费用额"},{"_id":"{463D4D32-D1F0-4A43-B912-5C9B83B4083E}","nodeType":"取费表","parentId":"","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"JC","取费基数":"","备注":"","序号":"三","是否隐藏":"否","费率":"100","费用名称":"编制基准期价差"},{"_id":"{26405AAE-BE51-42E1-8A3A-8E0162C48364}","nodeType":"取费表","parentId":"{463D4D32-D1F0-4A43-B912-5C9B83B4083E}","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"RJC","取费基数":"人工价差","备注":"","序号":"1","是否隐藏":"否","费率":"100","费用名称":"人工价差"},{"_id":"{E65ED1F7-384E-4047-891E-79B7A668B42C}","nodeType":"取费表","parentId":"{463D4D32-D1F0-4A43-B912-5C9B83B4083E}","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"CJC","取费基数":"乙供材料价差不含税+乙供主材价差不含税+甲供主材价差含税","备注":"","序号":"2","是否隐藏":"否","费率":"100","费用名称":"材料价差"},{"_id":"{A0CD4285-8D60-435A-9CD7-AAF3E249347D}","nodeType":"取费表","parentId":"{463D4D32-D1F0-4A43-B912-5C9B83B4083E}","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"JJC","取费基数":"机械价差","备注":"","序号":"3","是否隐藏":"否","费率":"100","费用名称":"机械价差"},{"_id":"{8AF46722-7815-4A79-A6AA-2AA7D37848CD}","nodeType":"取费表","parentId":"","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"TFFS","取费基数":"FFZ1+TZHQF+JC-甲供取费主材费含税-甲供主材价差含税+不取费定额费不含税+不取费乙供主材费不含税","备注":"","序号":"四","是否隐藏":"否","费率":"9","费用名称":"税金"},{"_id":"{881D2F8E-691E-4D29-88C3-C19AD425AECB}","nodeType":"取费表","parentId":"","relTbId":"{0256D22B-7007-4520-B09E-928BB6A8D16A}","代码":"THJ","取费基数":"FFZ1+TZHQF+TFFS+JC+一笔性费用+不取费定额费不含税+不取费乙供主材费不含税+不取费甲供主材费含税","备注":"","序号":"五","是否隐藏":"否","费率":"100","费用名称":"合计"}]}}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2
-3
@@ -13,12 +13,11 @@ from fastapi.responses import RedirectResponse
|
||||
from app.api.routers.chat import chat_router
|
||||
from app.api.routers.upload import file_upload_router
|
||||
from app.api.routers.app import v1_router
|
||||
from app.settings import init_settings
|
||||
from app.settings import init_settings,init_ProjectInfo
|
||||
from app.observability import init_observability
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from phoenix.trace import using_project
|
||||
|
||||
|
||||
logger = logging.getLogger("uvicorn")
|
||||
|
||||
|
||||
@@ -28,7 +27,7 @@ usPrj.__enter__()
|
||||
|
||||
init_settings()
|
||||
init_observability()
|
||||
|
||||
init_ProjectInfo()
|
||||
app = FastAPI()
|
||||
|
||||
environment = os.getenv("ENVIRONMENT", "dev") # Default to 'development' if not set
|
||||
|
||||
Reference in New Issue
Block a user