Skip to content

Commit 746cead

Browse files
JWittmeyerJWittmeyer
andauthored
Fast Api JSONResponst change (#20)
* Changes response * Replace pandas depricate iteritems with items --------- Co-authored-by: JWittmeyer <jens.wittmeyer@onetask.ai>
1 parent ee0b40f commit 746cead

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

app.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from fastapi import FastAPI, HTTPException, responses
1+
from fastapi import FastAPI, HTTPException, responses, status
22
from pydantic import BaseModel
33

44
from controller import stats
@@ -34,7 +34,9 @@ class ExportWsStatsRequest(BaseModel):
3434

3535

3636
@app.post("/fit_predict")
37-
async def weakly_supervise(request: WeakSupervisionRequest) -> int:
37+
async def weakly_supervise(
38+
request: WeakSupervisionRequest,
39+
) -> responses.PlainTextResponse:
3840
session_token = general.get_ctx_token()
3941
integration.fit_predict(
4042
request.project_id,
@@ -43,21 +45,25 @@ async def weakly_supervise(request: WeakSupervisionRequest) -> int:
4345
request.weak_supervision_task_id,
4446
)
4547
general.remove_and_refresh_session(session_token)
46-
return None, 200
48+
return responses.PlainTextResponse(status_code=status.HTTP_200_OK)
4749

4850

4951
@app.post("/labeling_task_statistics")
50-
async def calculate_task_stats(request: TaskStatsRequest):
52+
async def calculate_task_stats(
53+
request: TaskStatsRequest,
54+
) -> responses.PlainTextResponse:
5155
session_token = general.get_ctx_token()
5256
stats.calculate_quality_statistics_for_labeling_task(
5357
request.project_id, request.labeling_task_id, request.user_id
5458
)
5559
general.remove_and_refresh_session(session_token)
56-
return None, 200
60+
return responses.PlainTextResponse(status_code=status.HTTP_200_OK)
5761

5862

5963
@app.post("/source_statistics")
60-
async def calculate_source_stats(request: SourceStatsRequest):
64+
async def calculate_source_stats(
65+
request: SourceStatsRequest,
66+
) -> responses.PlainTextResponse:
6167
session_token = general.get_ctx_token()
6268
has_coverage = stats.calculate_quantity_statistics_for_labeling_task_from_source(
6369
request.project_id, request.source_id, request.user_id
@@ -67,11 +73,11 @@ async def calculate_source_stats(request: SourceStatsRequest):
6773
request.project_id, request.source_id, request.user_id
6874
)
6975
general.remove_and_refresh_session(session_token)
70-
return None, 200
76+
return responses.PlainTextResponse(status_code=status.HTTP_200_OK)
7177

7278

7379
@app.post("/export_ws_stats")
74-
async def export_ws_stats(request: ExportWsStatsRequest) -> responses.HTMLResponse:
80+
async def export_ws_stats(request: ExportWsStatsRequest) -> responses.PlainTextResponse:
7581
session_token = general.get_ctx_token()
7682
status_code, message = integration.export_weak_supervision_stats(
7783
request.project_id, request.labeling_task_id
@@ -80,4 +86,4 @@ async def export_ws_stats(request: ExportWsStatsRequest) -> responses.HTMLRespon
8086

8187
if status_code != 200:
8288
raise HTTPException(status_code=status_code, detail=message)
83-
return responses.HTMLResponse(status_code=status_code)
89+
return responses.PlainTextResponse(status_code=status_code)

controller/integration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def integrate_classification(df: pd.DataFrame):
9696
for record_id, (
9797
label_id,
9898
confidence,
99-
) in weak_supervision_results.dropna().iteritems():
99+
) in weak_supervision_results.dropna().items():
100100
return_values[record_id].append(
101101
{"label_id": label_id, "confidence": confidence}
102102
)
@@ -107,7 +107,7 @@ def integrate_extraction(df: pd.DataFrame):
107107
enlm = util.get_enlm_from_df(df)
108108
weak_supervision_results = enlm.weakly_supervise()
109109
return_values = defaultdict(list)
110-
for record_id, preds in weak_supervision_results.iteritems():
110+
for record_id, preds in weak_supervision_results.items():
111111
for pred in preds:
112112
label, confidence, token_min, token_max = pred
113113
return_values[record_id].append(

0 commit comments

Comments
 (0)