Skip to content

Commit 1b39573

Browse files
committed
Merge remote-tracking branch 'origin/main' into adamtheturtle/fix-vumark-db-fixture
# Conflicts: # src/mock_vws/_flask_server/target_manager.py # src/mock_vws/_flask_server/vwq.py # src/mock_vws/_flask_server/vws.py # src/mock_vws/_requests_mock_server/mock_web_query_api.py # src/mock_vws/target_manager.py
2 parents c00b1c2 + 703a1e3 commit 1b39573

2 files changed

Lines changed: 13 additions & 17 deletions

File tree

src/mock_vws/_flask_server/vwq.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,8 @@ class VWQSettings(BaseSettings):
6363

6464

6565
@beartype
66-
def get_all_databases() -> set[CloudDatabase]:
67-
"""Get all cloud database objects from the target manager back-end.
68-
69-
Only cloud databases are returned because the query API uses client
70-
keys for authentication, which VuMark databases do not have.
71-
"""
66+
def get_all_cloud_databases() -> set[CloudDatabase]:
67+
"""Get all cloud database objects from the target manager back-end."""
7268
settings = VWQSettings.model_validate(obj={})
7369
response = requests.get(
7470
url=f"{settings.target_manager_base_url}/databases",
@@ -136,7 +132,7 @@ def query() -> Response:
136132
settings = VWQSettings.model_validate(obj={})
137133
query_match_checker = settings.query_image_matcher.to_image_matcher()
138134

139-
databases = get_all_databases()
135+
databases = get_all_cloud_databases()
140136
request_body = request.stream.read()
141137
run_query_validators(
142138
request_headers=dict(request.headers),

src/mock_vws/_flask_server/vws.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class VWSSettings(BaseSettings):
8686

8787

8888
@beartype
89-
def get_all_databases() -> set[CloudDatabase]:
89+
def get_all_cloud_databases() -> set[CloudDatabase]:
9090
"""Get all cloud database objects from the target manager back-end."""
9191
settings = VWSSettings.model_validate(obj={})
9292
response = requests.get(
@@ -129,7 +129,7 @@ def set_terminate_wsgi_input() -> None:
129129
@beartype
130130
def validate_request() -> None:
131131
"""Run validators on the request."""
132-
databases = get_all_databases()
132+
databases = get_all_cloud_databases()
133133
run_services_validators(
134134
request_headers=dict(request.headers),
135135
request_body=request.data,
@@ -171,7 +171,7 @@ def add_target() -> Response:
171171
https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api#add
172172
"""
173173
settings = VWSSettings.model_validate(obj={})
174-
databases = get_all_databases()
174+
databases = get_all_cloud_databases()
175175
database = get_database_matching_server_keys(
176176
request_headers=dict(request.headers),
177177
request_body=request.data,
@@ -244,7 +244,7 @@ def get_target(target_id: str) -> Response:
244244
Fake implementation of
245245
https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api#target-record
246246
"""
247-
databases = get_all_databases()
247+
databases = get_all_cloud_databases()
248248
database = get_database_matching_server_keys(
249249
request_headers=dict(request.headers),
250250
request_body=request.data,
@@ -301,7 +301,7 @@ def delete_target(target_id: str) -> Response:
301301
https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api#delete
302302
"""
303303
settings = VWSSettings.model_validate(obj={})
304-
databases = get_all_databases()
304+
databases = get_all_cloud_databases()
305305
database = get_database_matching_server_keys(
306306
request_headers=dict(request.headers),
307307
request_body=request.data,
@@ -401,7 +401,7 @@ def database_summary() -> Response:
401401
Fake implementation of
402402
https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api#summary-report
403403
"""
404-
databases = get_all_databases()
404+
databases = get_all_cloud_databases()
405405
database = get_database_matching_server_keys(
406406
request_headers=dict(request.headers),
407407
request_body=request.data,
@@ -456,7 +456,7 @@ def target_summary(target_id: str) -> Response:
456456
Fake implementation of
457457
https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api#retrieve-report
458458
"""
459-
databases = get_all_databases()
459+
databases = get_all_cloud_databases()
460460
database = get_database_matching_server_keys(
461461
request_headers=dict(request.headers),
462462
request_body=request.data,
@@ -510,7 +510,7 @@ def get_duplicates(target_id: str) -> Response:
510510
Fake implementation of
511511
https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api#check
512512
"""
513-
databases = get_all_databases()
513+
databases = get_all_cloud_databases()
514514
settings = VWSSettings.model_validate(obj={})
515515
database = get_database_matching_server_keys(
516516
request_headers=dict(request.headers),
@@ -569,7 +569,7 @@ def target_list() -> Response:
569569
Fake implementation of
570570
https://developer.vuforia.com/library/web-api/cloud-targets-web-services-api#details-list
571571
"""
572-
databases = get_all_databases()
572+
databases = get_all_cloud_databases()
573573
database = get_database_matching_server_keys(
574574
request_headers=dict(request.headers),
575575
request_body=request.data,
@@ -615,7 +615,7 @@ def update_target(target_id: str) -> Response:
615615
# We do not use ``request.get_json(force=True)`` because this only works
616616
# when the content type is given as ``application/json``.
617617
request_json = json.loads(s=request.data)
618-
databases = get_all_databases()
618+
databases = get_all_cloud_databases()
619619
database = get_database_matching_server_keys(
620620
request_headers=dict(request.headers),
621621
request_body=request.data,

0 commit comments

Comments
 (0)