ethanrom commited on
Commit
eb28cbb
1 Parent(s): d23c4d7

Update server.py

Browse files
Files changed (1) hide show
  1. server.py +38 -3
server.py CHANGED
@@ -119,11 +119,46 @@ class OCRData(BaseModel):
119
  class ResponseData(BaseModel):
120
  documentName: str
121
  errorCode: int
122
- mrz: MRZData
123
- ocr: OCRData
124
  status: str
125
 
126
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
127
  def create_response_data(mrz, ocr_data):
128
  return ResponseData(
129
  documentName="Passport",
@@ -166,7 +201,7 @@ async def recognize_passport(image: UploadFile = File(...)):
166
 
167
  ocr_data = json.loads(response_str)
168
 
169
- return create_response_data(mrz.to_dict(), ocr_data)
170
 
171
  except HTTPException as e:
172
  raise e
 
119
  class ResponseData(BaseModel):
120
  documentName: str
121
  errorCode: int
122
+ mrz: Optional[MRZData]
123
+ ocr: Optional[OCRData]
124
  status: str
125
 
126
 
127
+ def create_response_data(mrz, ocr_data):
128
+ if not mrz and not ocr_data:
129
+ return ResponseData(
130
+ documentName="Passport",
131
+ errorCode=1,
132
+ mrz=None,
133
+ ocr=None,
134
+ status="No MRZ or OCR data available"
135
+ )
136
+ elif not mrz:
137
+ return ResponseData(
138
+ documentName="Passport",
139
+ errorCode=2,
140
+ mrz=None,
141
+ ocr=OCRData(**ocr_data),
142
+ status="PassportEYE did not find an MRZ"
143
+ )
144
+ elif not ocr_data:
145
+ return ResponseData(
146
+ documentName="Passport",
147
+ errorCode=3,
148
+ mrz=MRZData(**mrz),
149
+ ocr=None,
150
+ status="OCR result not available"
151
+ )
152
+ else:
153
+ return ResponseData(
154
+ documentName="Passport",
155
+ errorCode=0,
156
+ mrz=MRZData(**mrz),
157
+ ocr=OCRData(**ocr_data),
158
+ status="ok"
159
+ )
160
+
161
+
162
  def create_response_data(mrz, ocr_data):
163
  return ResponseData(
164
  documentName="Passport",
 
201
 
202
  ocr_data = json.loads(response_str)
203
 
204
+ return create_response_data(mrz.to_dict() if mrz else None, ocr_data)
205
 
206
  except HTTPException as e:
207
  raise e