|
27 | 27 | TargetStatuses, |
28 | 28 | ) |
29 | 29 | from mock_vws._database_matchers import get_database_matching_server_keys |
30 | | -from mock_vws._mock_common import json_dump |
| 30 | +from mock_vws._mock_common import RequestData, json_dump |
| 31 | +from mock_vws._model_target_web_api import ( |
| 32 | + create_model_target_dataset, |
| 33 | + delete_model_target_dataset, |
| 34 | + download_model_target_dataset, |
| 35 | + get_model_target_dataset_status, |
| 36 | +) |
| 37 | +from mock_vws._model_target_web_api import ( |
| 38 | + oauth2_token as model_target_oauth2_token, |
| 39 | +) |
31 | 40 | from mock_vws._services_validators import run_services_validators |
32 | 41 | from mock_vws._services_validators.exceptions import ( |
33 | 42 | FailError, |
|
44 | 53 | ImageMatcher, |
45 | 54 | StructuralSimilarityMatcher, |
46 | 55 | ) |
| 56 | +from mock_vws.model_target import ModelTargetDatasetType |
47 | 57 | from mock_vws.target import ImageTarget |
| 58 | +from mock_vws.target_manager import TargetManager |
48 | 59 | from mock_vws.target_raters import ( |
49 | 60 | HardcodedTargetTrackingRater, |
50 | 61 | ) |
@@ -117,6 +128,36 @@ def get_all_vumark_databases() -> set[VuMarkDatabase]: |
117 | 128 | } |
118 | 129 |
|
119 | 130 |
|
| 131 | +@beartype |
| 132 | +def _flask_request_data() -> RequestData: |
| 133 | + """Return the current Flask request as shared request data.""" |
| 134 | + return RequestData( |
| 135 | + method=request.method, |
| 136 | + path=request.path, |
| 137 | + headers=dict(request.headers), |
| 138 | + body=request.data, |
| 139 | + ) |
| 140 | + |
| 141 | + |
| 142 | +@beartype |
| 143 | +def _model_target_manager() -> TargetManager: |
| 144 | + """Return the target manager backing the Flask app.""" |
| 145 | + from mock_vws._flask_server.target_manager import ( # noqa: PLC0415 |
| 146 | + TARGET_MANAGER, |
| 147 | + ) |
| 148 | + |
| 149 | + return TARGET_MANAGER |
| 150 | + |
| 151 | + |
| 152 | +@beartype |
| 153 | +def _to_flask_response( |
| 154 | + api_response: tuple[int, dict[str, str], str | bytes], |
| 155 | +) -> Response: |
| 156 | + """Convert a shared API response to a Flask response.""" |
| 157 | + status_code, headers, body = api_response |
| 158 | + return Response(response=body, status=status_code, headers=headers) |
| 159 | + |
| 160 | + |
120 | 161 | @VWS_FLASK_APP.before_request |
121 | 162 | @beartype |
122 | 163 | def set_terminate_wsgi_input() -> None: |
@@ -154,6 +195,10 @@ def validate_request() -> None: |
154 | 195 | """ |
155 | 196 | if request.endpoint == "generate_vumark_instance": |
156 | 197 | return |
| 198 | + if request.path == "/oauth2/token" or request.path.startswith( |
| 199 | + "/modeltargets/", |
| 200 | + ): |
| 201 | + return |
157 | 202 | run_services_validators( |
158 | 203 | request_headers=dict(request.headers), |
159 | 204 | request_body=request.data, |
@@ -187,6 +232,157 @@ def handle_exceptions(exc: ValidatorError) -> Response: |
187 | 232 | return response |
188 | 233 |
|
189 | 234 |
|
| 235 | +@VWS_FLASK_APP.route(rule="/oauth2/token", methods=[HTTPMethod.POST]) |
| 236 | +@beartype |
| 237 | +def oauth2_token() -> Response: |
| 238 | + """Obtain an OAuth2 token for the Model Target Web API.""" |
| 239 | + return _to_flask_response( |
| 240 | + api_response=model_target_oauth2_token( |
| 241 | + request=_flask_request_data(), |
| 242 | + ), |
| 243 | + ) |
| 244 | + |
| 245 | + |
| 246 | +@VWS_FLASK_APP.route( |
| 247 | + rule="/modeltargets/datasets", |
| 248 | + methods=[HTTPMethod.POST], |
| 249 | +) |
| 250 | +@beartype |
| 251 | +def create_standard_model_target_dataset() -> Response: |
| 252 | + """Create a standard Model Target dataset.""" |
| 253 | + settings = VWSSettings.model_validate(obj={}) |
| 254 | + return _to_flask_response( |
| 255 | + api_response=create_model_target_dataset( |
| 256 | + request=_flask_request_data(), |
| 257 | + target_manager=_model_target_manager(), |
| 258 | + processing_time_seconds=settings.processing_time_seconds, |
| 259 | + dataset_type=ModelTargetDatasetType.STANDARD, |
| 260 | + ), |
| 261 | + ) |
| 262 | + |
| 263 | + |
| 264 | +@VWS_FLASK_APP.route( |
| 265 | + rule="/modeltargets/advancedDatasets", |
| 266 | + methods=[HTTPMethod.POST], |
| 267 | +) |
| 268 | +@beartype |
| 269 | +def create_advanced_model_target_dataset() -> Response: |
| 270 | + """Create an advanced Model Target dataset.""" |
| 271 | + settings = VWSSettings.model_validate(obj={}) |
| 272 | + return _to_flask_response( |
| 273 | + api_response=create_model_target_dataset( |
| 274 | + request=_flask_request_data(), |
| 275 | + target_manager=_model_target_manager(), |
| 276 | + processing_time_seconds=settings.processing_time_seconds, |
| 277 | + dataset_type=ModelTargetDatasetType.ADVANCED, |
| 278 | + ), |
| 279 | + ) |
| 280 | + |
| 281 | + |
| 282 | +@VWS_FLASK_APP.route( |
| 283 | + rule="/modeltargets/datasets/<string:dataset_uuid>/status", |
| 284 | + methods=[HTTPMethod.GET], |
| 285 | +) |
| 286 | +@beartype |
| 287 | +def get_standard_model_target_dataset_status( |
| 288 | + dataset_uuid: str, |
| 289 | +) -> Response: |
| 290 | + """Return a standard Model Target dataset creation status.""" |
| 291 | + return _to_flask_response( |
| 292 | + api_response=get_model_target_dataset_status( |
| 293 | + request=_flask_request_data(), |
| 294 | + target_manager=_model_target_manager(), |
| 295 | + dataset_uuid=dataset_uuid, |
| 296 | + ), |
| 297 | + ) |
| 298 | + |
| 299 | + |
| 300 | +@VWS_FLASK_APP.route( |
| 301 | + rule="/modeltargets/advancedDatasets/<string:dataset_uuid>/status", |
| 302 | + methods=[HTTPMethod.GET], |
| 303 | +) |
| 304 | +@beartype |
| 305 | +def get_advanced_model_target_dataset_status( |
| 306 | + dataset_uuid: str, |
| 307 | +) -> Response: |
| 308 | + """Return an advanced Model Target dataset creation status.""" |
| 309 | + return _to_flask_response( |
| 310 | + api_response=get_model_target_dataset_status( |
| 311 | + request=_flask_request_data(), |
| 312 | + target_manager=_model_target_manager(), |
| 313 | + dataset_uuid=dataset_uuid, |
| 314 | + ), |
| 315 | + ) |
| 316 | + |
| 317 | + |
| 318 | +@VWS_FLASK_APP.route( |
| 319 | + rule="/modeltargets/datasets/<string:dataset_uuid>/dataset", |
| 320 | + methods=[HTTPMethod.GET], |
| 321 | +) |
| 322 | +@beartype |
| 323 | +def download_standard_model_target_dataset( |
| 324 | + dataset_uuid: str, |
| 325 | +) -> Response: |
| 326 | + """Download a standard Model Target dataset.""" |
| 327 | + return _to_flask_response( |
| 328 | + api_response=download_model_target_dataset( |
| 329 | + request=_flask_request_data(), |
| 330 | + target_manager=_model_target_manager(), |
| 331 | + dataset_uuid=dataset_uuid, |
| 332 | + ), |
| 333 | + ) |
| 334 | + |
| 335 | + |
| 336 | +@VWS_FLASK_APP.route( |
| 337 | + rule="/modeltargets/advancedDatasets/<string:dataset_uuid>/dataset", |
| 338 | + methods=[HTTPMethod.GET], |
| 339 | +) |
| 340 | +@beartype |
| 341 | +def download_advanced_model_target_dataset( |
| 342 | + dataset_uuid: str, |
| 343 | +) -> Response: |
| 344 | + """Download an advanced Model Target dataset.""" |
| 345 | + return _to_flask_response( |
| 346 | + api_response=download_model_target_dataset( |
| 347 | + request=_flask_request_data(), |
| 348 | + target_manager=_model_target_manager(), |
| 349 | + dataset_uuid=dataset_uuid, |
| 350 | + ), |
| 351 | + ) |
| 352 | + |
| 353 | + |
| 354 | +@VWS_FLASK_APP.route( |
| 355 | + rule="/modeltargets/datasets/<string:dataset_uuid>", |
| 356 | + methods=[HTTPMethod.DELETE], |
| 357 | +) |
| 358 | +@beartype |
| 359 | +def delete_standard_model_target_dataset(dataset_uuid: str) -> Response: |
| 360 | + """Delete a standard Model Target dataset.""" |
| 361 | + return _to_flask_response( |
| 362 | + api_response=delete_model_target_dataset( |
| 363 | + request=_flask_request_data(), |
| 364 | + target_manager=_model_target_manager(), |
| 365 | + dataset_uuid=dataset_uuid, |
| 366 | + ), |
| 367 | + ) |
| 368 | + |
| 369 | + |
| 370 | +@VWS_FLASK_APP.route( |
| 371 | + rule="/modeltargets/advancedDatasets/<string:dataset_uuid>", |
| 372 | + methods=[HTTPMethod.DELETE], |
| 373 | +) |
| 374 | +@beartype |
| 375 | +def delete_advanced_model_target_dataset(dataset_uuid: str) -> Response: |
| 376 | + """Delete an advanced Model Target dataset.""" |
| 377 | + return _to_flask_response( |
| 378 | + api_response=delete_model_target_dataset( |
| 379 | + request=_flask_request_data(), |
| 380 | + target_manager=_model_target_manager(), |
| 381 | + dataset_uuid=dataset_uuid, |
| 382 | + ), |
| 383 | + ) |
| 384 | + |
| 385 | + |
190 | 386 | @VWS_FLASK_APP.route(rule="/targets", methods=[HTTPMethod.POST]) |
191 | 387 | @beartype |
192 | 388 | def add_target() -> Response: |
|
0 commit comments