feat: people add new filed 'contact'
This commit is contained in:
@@ -25,7 +25,6 @@ class ExtractPeopleAgent(BaseAgent):
|
|||||||
"性别 gender\n"
|
"性别 gender\n"
|
||||||
"年龄 age\n"
|
"年龄 age\n"
|
||||||
"身高(cm) height\n"
|
"身高(cm) height\n"
|
||||||
# "体重(kg) weight\n"
|
|
||||||
"婚姻状况 marital_status\n"
|
"婚姻状况 marital_status\n"
|
||||||
"择偶要求 match_requirement\n"
|
"择偶要求 match_requirement\n"
|
||||||
"以上信息需要严格按照 JSON 格式输出 字段名与条目中英文保持一致。\n"
|
"以上信息需要严格按照 JSON 格式输出 字段名与条目中英文保持一致。\n"
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ class People:
|
|||||||
id: str
|
id: str
|
||||||
# 姓名
|
# 姓名
|
||||||
name: str
|
name: str
|
||||||
|
# 联系人
|
||||||
|
contact: str
|
||||||
# 性别
|
# 性别
|
||||||
gender: str
|
gender: str
|
||||||
# 年龄
|
# 年龄
|
||||||
@@ -38,10 +40,10 @@ class People:
|
|||||||
# 初始化所有属性,从kwargs中获取值,如果不存在则设置默认值
|
# 初始化所有属性,从kwargs中获取值,如果不存在则设置默认值
|
||||||
self.id = kwargs.get('id', '') if kwargs.get('id', '') is not None else ''
|
self.id = kwargs.get('id', '') if kwargs.get('id', '') is not None else ''
|
||||||
self.name = kwargs.get('name', '') if kwargs.get('name', '') is not None else ''
|
self.name = kwargs.get('name', '') if kwargs.get('name', '') is not None else ''
|
||||||
|
self.contact = kwargs.get('contact', '') if kwargs.get('contact', '') is not None else ''
|
||||||
self.gender = kwargs.get('gender', '') if kwargs.get('gender', '') is not None else ''
|
self.gender = kwargs.get('gender', '') if kwargs.get('gender', '') is not None else ''
|
||||||
self.age = kwargs.get('age', 0) if kwargs.get('age', 0) is not None else 0
|
self.age = kwargs.get('age', 0) if kwargs.get('age', 0) is not None else 0
|
||||||
self.height = kwargs.get('height', 0) if kwargs.get('height', 0) is not None else 0
|
self.height = kwargs.get('height', 0) if kwargs.get('height', 0) is not None else 0
|
||||||
# self.weight = kwargs.get('weight', 0) if kwargs.get('weight', 0) is not None else 0
|
|
||||||
self.marital_status = kwargs.get('marital_status', '') if kwargs.get('marital_status', '') is not None else ''
|
self.marital_status = kwargs.get('marital_status', '') if kwargs.get('marital_status', '') is not None else ''
|
||||||
self.match_requirement = kwargs.get('match_requirement', '') if kwargs.get('match_requirement', '') is not None else ''
|
self.match_requirement = kwargs.get('match_requirement', '') if kwargs.get('match_requirement', '') is not None else ''
|
||||||
self.introduction = kwargs.get('introduction', {}) if kwargs.get('introduction', {}) is not None else {}
|
self.introduction = kwargs.get('introduction', {}) if kwargs.get('introduction', {}) is not None else {}
|
||||||
@@ -68,10 +70,10 @@ class People:
|
|||||||
return {
|
return {
|
||||||
'id': self.id,
|
'id': self.id,
|
||||||
'name': self.name,
|
'name': self.name,
|
||||||
|
'contact': self.contact,
|
||||||
'gender': self.gender,
|
'gender': self.gender,
|
||||||
'age': self.age,
|
'age': self.age,
|
||||||
'height': self.height,
|
'height': self.height,
|
||||||
# 'weight': self.weight,
|
|
||||||
'marital_status': self.marital_status,
|
'marital_status': self.marital_status,
|
||||||
'match_requirement': self.match_requirement,
|
'match_requirement': self.match_requirement,
|
||||||
'introduction': self.introduction,
|
'introduction': self.introduction,
|
||||||
@@ -86,9 +88,7 @@ class People:
|
|||||||
'gender': self.gender,
|
'gender': self.gender,
|
||||||
'age': self.age,
|
'age': self.age,
|
||||||
'height': self.height,
|
'height': self.height,
|
||||||
# 'weight': self.weight,
|
|
||||||
'marital_status': self.marital_status,
|
'marital_status': self.marital_status,
|
||||||
# 'match_requirement': self.match_requirement,
|
|
||||||
}
|
}
|
||||||
logging.info(f"people meta: {meta}")
|
logging.info(f"people meta: {meta}")
|
||||||
return meta
|
return meta
|
||||||
@@ -102,8 +102,6 @@ class People:
|
|||||||
doc.append(f"年龄: {self.age}")
|
doc.append(f"年龄: {self.age}")
|
||||||
if self.height:
|
if self.height:
|
||||||
doc.append(f"身高: {self.height}cm")
|
doc.append(f"身高: {self.height}cm")
|
||||||
# if self.weight:
|
|
||||||
# doc.append(f"体重: {self.weight}kg")
|
|
||||||
if self.marital_status:
|
if self.marital_status:
|
||||||
doc.append(f"婚姻状况: {self.marital_status}")
|
doc.append(f"婚姻状况: {self.marital_status}")
|
||||||
if self.match_requirement:
|
if self.match_requirement:
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ class PeopleORM(Base):
|
|||||||
__tablename__ = 'peoples'
|
__tablename__ = 'peoples'
|
||||||
id = Column(String(36), primary_key=True)
|
id = Column(String(36), primary_key=True)
|
||||||
name = Column(String(255), index=True)
|
name = Column(String(255), index=True)
|
||||||
|
contact = Column(String(255), index=True)
|
||||||
gender = Column(String(10))
|
gender = Column(String(10))
|
||||||
age = Column(Integer)
|
age = Column(Integer)
|
||||||
height = Column(Integer)
|
height = Column(Integer)
|
||||||
@@ -33,6 +34,7 @@ class PeopleORM(Base):
|
|||||||
import json
|
import json
|
||||||
self.id = people.id
|
self.id = people.id
|
||||||
self.name = people.name
|
self.name = people.name
|
||||||
|
self.contact = people.contact
|
||||||
self.gender = people.gender
|
self.gender = people.gender
|
||||||
self.age = people.age
|
self.age = people.age
|
||||||
self.height = people.height
|
self.height = people.height
|
||||||
@@ -47,6 +49,7 @@ class PeopleORM(Base):
|
|||||||
people = People()
|
people = People()
|
||||||
people.id = self.id
|
people.id = self.id
|
||||||
people.name = self.name
|
people.name = self.name
|
||||||
|
people.contact = self.contact
|
||||||
people.gender = self.gender
|
people.gender = self.gender
|
||||||
people.age = self.age
|
people.age = self.age
|
||||||
people.height = self.height
|
people.height = self.height
|
||||||
|
|||||||
Reference in New Issue
Block a user