Skip to content

Commit df3363d

Browse files
toomoretoomore
committed
Migrated by manually
Signed-off-by: Toomore Chiang <[email protected]>
1 parent 7b86617 commit df3363d

27 files changed

+262
-275
lines changed

‎api/routers/members.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ async def members_past(
4444
_user = chiefs_infos[uid]
4545
h_msg = hashlib.md5()
4646
h_msg.update(_user['oauth']['email'].encode('utf-8'))
47-
data_chiefs.append(MembersInfo.parse_obj({
47+
data_chiefs.append(MembersInfo.model_validate({
4848
'name': _user['profile']['badge_name'],
4949
'email_hash': h_msg.hexdigest(),
5050
}))
@@ -60,12 +60,12 @@ async def members_past(
6060
for _user in User.get_info(uids=list(uids)).values():
6161
h_msg = hashlib.md5()
6262
h_msg.update(_user['oauth']['email'].encode('utf-8'))
63-
data_members.append(MembersInfo.parse_obj({
63+
data_members.append(MembersInfo.model_validate({
6464
'name': _user['profile']['badge_name'],
6565
'email_hash': h_msg.hexdigest(),
6666
}))
6767

68-
result.data.append(MembersTeams.parse_obj(
68+
result.data.append(MembersTeams.model_validate(
6969
{'name': team.name, 'tid': team.id,
7070
'chiefs': data_chiefs, 'members': data_members}
7171
))
@@ -103,7 +103,7 @@ async def members(
103103
user = chiefs_infos[uid]
104104
h_msg = hashlib.md5()
105105
h_msg.update(user['oauth']['email'].encode('utf-8'))
106-
data_chiefs.append(MembersInfo.parse_obj({
106+
data_chiefs.append(MembersInfo.model_validate({
107107
'name': user['profile']['badge_name'],
108108
'email_hash': h_msg.hexdigest(),
109109
}))
@@ -119,12 +119,12 @@ async def members(
119119
for user in User.get_info(uids=list(uids)).values():
120120
h_msg = hashlib.md5()
121121
h_msg.update(user['oauth']['email'].encode('utf-8'))
122-
data_members.append(MembersInfo.parse_obj({
122+
data_members.append(MembersInfo.model_validate({
123123
'name': user['profile']['badge_name'],
124124
'email_hash': h_msg.hexdigest(),
125125
}))
126126

127-
result.data.append(MembersTeams.parse_obj(
127+
result.data.append(MembersTeams.model_validate(
128128
{'name': team.name, 'tid': team.id,
129129
'chiefs': data_chiefs, 'members': data_members}
130130
))

‎api/routers/projects.py‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
from fastapi import APIRouter, Depends, HTTPException, Path, status
55

66
from api.apistructs.items import ProjectItem, TeamItem
7-
from api.apistructs.projects import (ProjectAllOut, ProjectCreateInput,
8-
ProjectCreateOutput,
9-
ProjectItemUpdateInput,
10-
ProjectItemUpdateOutput,
7+
from api.apistructs.projects import (ProjectAllOut, ProjectCreateInput, ProjectCreateOutput,
8+
ProjectItemUpdateInput, ProjectItemUpdateOutput,
119
ProjectSettingTrafficSubsidyInput,
1210
ProjectSettingTrafficSubsidyOutput,
13-
ProjectTeamDietaryHabitOutput,
14-
ProjectTeamsOutput)
11+
ProjectTeamDietaryHabitOutput, ProjectTeamsOutput)
1512
from api.apistructs.teams import TeamCreateInput, TeamCreateOutput
1613
from api.dependencies import get_current_user
1714
from module.dietary_habit import DietaryHabitItemsName, DietaryHabitItemsValue
@@ -41,10 +38,10 @@ async def projects_all(current_user: dict[str, Any] = Depends(get_current_user))
4138
datas = []
4239
for data in Project.all():
4340
if current_user['uid'] in data.owners:
44-
datas.append(ProjectItem.parse_obj(data))
41+
datas.append(ProjectItem.model_validate(data))
4542
else:
4643
datas.append(
47-
ProjectItem.parse_obj({
44+
ProjectItem.model_validate({
4845
'id': data.id,
4946
'name': data.name,
5047
'desc': data.desc,
@@ -68,10 +65,10 @@ async def projects_create(
6865
if current_user['uid'] not in API_DEFAULT_OWNERS:
6966
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
7067

71-
data = create_date.dict()
68+
data = create_date.model_dump()
7269
data['owners'] = API_DEFAULT_OWNERS
7370
result = Project.create(**data)
74-
return ProjectCreateOutput.parse_obj(result)
71+
return ProjectCreateOutput.model_validate(result)
7572

7673

7774
@router.patch('/{pid}',
@@ -105,9 +102,9 @@ async def projects_one_update(
105102
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
106103

107104
result = Project.update(pid=pid,
108-
data=ProjectBaseUpdate.parse_obj(update_data))
105+
data=ProjectBaseUpdate.model_validate(update_data))
109106

110-
return ProjectItemUpdateOutput.parse_obj(result)
107+
return ProjectItemUpdateOutput.model_validate(result)
111108

112109

113110
@router.get('/{pid}/teams',
@@ -125,9 +122,9 @@ async def projects_teams(
125122
''' Lists of teams in project '''
126123
teams = []
127124
for team in Team.list_by_pid(pid=pid):
128-
teams.append(TeamItem.parse_obj(team))
125+
teams.append(TeamItem.model_validate(team))
129126

130-
return ProjectTeamsOutput.parse_obj({'teams': teams})
127+
return ProjectTeamsOutput.model_validate({'teams': teams})
131128

132129

133130
@router.post('/{pid}/teams',
@@ -155,7 +152,7 @@ async def projects_teams_create(
155152
result = Team.create(
156153
pid=pid, tid=create_date.id, name=create_date.name, owners=project.owners)
157154

158-
return TeamCreateOutput.parse_obj(result)
155+
return TeamCreateOutput.model_validate(result)
159156

160157

161158
@router.get('/{pid}/teams/dietary_habit',
@@ -199,10 +196,10 @@ async def projects_teams_dietary_habit(
199196
datas = []
200197
for habit, count in habit_count.items():
201198
datas.append(
202-
ProjectTeamDietaryHabitOutput.parse_obj({'name': dietary_habit_info[habit],
203-
'count': count,
204-
'code': habit,
205-
}))
199+
ProjectTeamDietaryHabitOutput.model_validate({'name': dietary_habit_info[habit],
200+
'count': count,
201+
'code': habit,
202+
}))
206203

207204
return datas
208205

@@ -235,7 +232,7 @@ async def projects_traffic(
235232
if current_user['uid'] not in project.owners:
236233
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
237234

238-
return ProjectSettingTrafficSubsidyOutput.parse_obj({
235+
return ProjectSettingTrafficSubsidyOutput.model_validate({
239236
'datas': FormTrafficFeeMapping.get(pid=pid)})
240237

241238

@@ -270,4 +267,4 @@ async def projects_traffic_update(
270267

271268
result = FormTrafficFeeMapping.save(pid=pid, datas=update_data.datas)
272269

273-
return ProjectSettingTrafficSubsidyOutput.parse_obj({'datas': result})
270+
return ProjectSettingTrafficSubsidyOutput.model_validate({'datas': result})

‎api/routers/sender.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import io
44
from typing import Any
55

6-
from fastapi import (APIRouter, Depends, File, HTTPException, Path, UploadFile,
7-
status)
6+
from fastapi import APIRouter, Depends, File, HTTPException, Path, UploadFile, status
87
from pydantic import BaseModel, Field
98

109
from api.apistructs.sender import SenderCampaignLists
@@ -37,15 +36,15 @@ async def sender_all(
3736
if not team:
3837
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
3938

40-
teamusers = TeamUsers.parse_obj(team)
39+
teamusers = TeamUsers.model_validate(team)
4140
if current_user['uid'] not in (teamusers.owners + teamusers.chiefs + teamusers.members):
4241
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
4342

4443
campaigns = []
4544
for campaign in SenderCampaign.get_list(pid=pid, tid=tid):
4645
campaigns.append(campaign)
4746

48-
return SenderCampaignLists.parse_obj({'datas': campaigns})
47+
return SenderCampaignLists.model_validate({'datas': campaigns})
4948

5049

5150
class UploadReceiverOutput(BaseModel):
@@ -98,14 +97,14 @@ async def sender_upload_receiver_lists_replace(
9897
if not team:
9998
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
10099

101-
teamusers = TeamUsers.parse_obj(team)
100+
teamusers = TeamUsers.model_validate(team)
102101
if current_user['uid'] not in (teamusers.owners + teamusers.chiefs + teamusers.members):
103102
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
104103

105104
csv_rows = await sender_upload_receiver(pid=pid, tid=tid, cid=cid,
106105
file=file, upload_type='replace')
107106

108-
return UploadReceiverOutput.parse_obj({'rows': csv_rows})
107+
return UploadReceiverOutput.model_validate({'rows': csv_rows})
109108

110109

111110
@router.patch('/{pid}/{tid}/{cid}/receiver/lists',
@@ -128,14 +127,14 @@ async def sender_upload_receiver_lists_update(
128127
if not team:
129128
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
130129

131-
teamusers = TeamUsers.parse_obj(team)
130+
teamusers = TeamUsers.model_validate(team)
132131
if current_user['uid'] not in (teamusers.owners + teamusers.chiefs + teamusers.members):
133132
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
134133

135134
csv_rows = await sender_upload_receiver(pid=pid, tid=tid, cid=cid,
136135
file=file, upload_type='update')
137136

138-
return UploadReceiverOutput.parse_obj({'rows': csv_rows})
137+
return UploadReceiverOutput.model_validate({'rows': csv_rows})
139138

140139

141140
@router.delete('/{pid}/{tid}/{cid}/receiver/lists',
@@ -156,9 +155,9 @@ async def sender_upload_receiver_lists_delete(
156155
if not team:
157156
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
158157

159-
teamusers = TeamUsers.parse_obj(team)
158+
teamusers = TeamUsers.model_validate(team)
160159
if current_user['uid'] not in (teamusers.owners + teamusers.chiefs + teamusers.members):
161160
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
162161

163-
return UploadReceiverOutput.parse_obj({
162+
return UploadReceiverOutput.model_validate({
164163
'rows': SenderReceiver.remove(pid=pid, cid=cid)})

‎api/routers/tasks.py‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
from fastapi import APIRouter, Depends, HTTPException, Path, Request, status
55

66
from api.apistructs.items import UserItem
7-
from api.apistructs.tasks import (TaskAttendeeInput, TaskCreateInput,
8-
TaskCreateOutput, TaskGetAttendeeOutput,
9-
TaskGetOutput, TaskMeJoinOutput,
7+
from api.apistructs.tasks import (TaskAttendeeInput, TaskCreateInput, TaskCreateOutput,
8+
TaskGetAttendeeOutput, TaskGetOutput, TaskMeJoinOutput,
109
TasksGetAllOutput, TaskUpdateInput)
1110
from api.dependencies import get_current_user
1211
from module.project import Project
@@ -50,13 +49,13 @@ async def tasks_all(
5049

5150
datas = []
5251
for task in Tasks.get_by_pid(pid=pid):
53-
task_data = TaskItem.parse_obj(task)
52+
task_data = TaskItem.model_validate(task)
5453
if not is_in_project:
5554
task_data.people = []
5655

5756
datas.append(task_data)
5857

59-
return TasksGetAllOutput.parse_obj({'datas': datas})
58+
return TasksGetAllOutput.model_validate({'datas': datas})
6059

6160

6261
@router.post('/{pid}',
@@ -90,14 +89,14 @@ async def tasks_create(
9089
if not project:
9190
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
9291

93-
data = update_data.dict()
92+
data = update_data.model_dump()
9493
data['pid'] = pid
9594
data['created_by'] = current_user['uid']
96-
task_item = TaskItem.parse_obj(data)
95+
task_item = TaskItem.model_validate(data)
9796
raw = Tasks.add(pid=pid,
98-
body=task_item.dict(by_alias=True))
97+
body=task_item.model_dump(by_alias=True))
9998

100-
return TaskCreateOutput.parse_obj(raw)
99+
return TaskCreateOutput.model_validate(raw)
101100

102101

103102
@router.get('/{pid}/{task_id}',
@@ -134,7 +133,7 @@ async def tasks_get(
134133
if not is_in_project:
135134
task_data['people'] = []
136135

137-
return TaskGetOutput.parse_obj(task_data)
136+
return TaskGetOutput.model_validate(task_data)
138137

139138

140139
@router.patch('/{pid}/{task_id}',
@@ -172,13 +171,13 @@ async def tasks_update(
172171
if not is_in_project:
173172
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
174173

175-
data = update_data.dict(exclude_none=True)
174+
data = update_data.model_dump(exclude_none=True)
176175
data['_id'] = task_id
177176
data['pid'] = pid
178177

179178
if data:
180179
raw = Tasks.add(pid=pid, body=data)
181-
return TaskGetOutput.parse_obj(raw)
180+
return TaskGetOutput.model_validate(raw)
182181

183182
raise HTTPException(status_code=status.HTTP_406_NOT_ACCEPTABLE)
184183

@@ -292,13 +291,13 @@ async def tasks_users_add(
292291
if user_infos:
293292
for uid in task_data['people']:
294293
if uid in user_infos:
295-
result.append(UserItem.parse_obj({
294+
result.append(UserItem.model_validate({
296295
'id': uid,
297296
'badge_name': user_infos[uid]['profile']['badge_name'],
298297
'avatar': user_infos[uid]['oauth']['picture'],
299298
}))
300299

301-
return TaskGetAttendeeOutput.parse_obj({'datas': result})
300+
return TaskGetAttendeeOutput.model_validate({'datas': result})
302301

303302
if update_data is not None:
304303
if request.method == 'PATCH':

0 commit comments

Comments
 (0)