Skip to content

Commit aaa0fd2

Browse files
committed
fix: use build in exceptions class
1 parent 1e4386b commit aaa0fd2

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

requirements-dev.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ python-levenshtein==0.27.1
8686
# via query-farm-flight-server
8787
query-farm-duckdb-json-serialization==0.1.2
8888
# via query-farm-airport-test-server
89-
query-farm-flight-server==0.1.10
89+
query-farm-flight-server==0.1.12
9090
# via query-farm-airport-test-server
9191
rapidfuzz==3.13.0
9292
# via levenshtein

requirements.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ python-levenshtein==0.27.1
5454
# via query-farm-flight-server
5555
query-farm-duckdb-json-serialization==0.1.2
5656
# via query-farm-airport-test-server
57-
query-farm-flight-server==0.1.8
57+
query-farm-flight-server==0.1.11
5858
# via query-farm-airport-test-server
5959
rapidfuzz==3.13.0
6060
# via levenshtein

src/query_farm_airport_test_server/server.py

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import query_farm_flight_server.auth as auth
1515
import query_farm_flight_server.auth_manager as auth_manager
1616
import query_farm_flight_server.auth_manager_naive as auth_manager_naive
17+
import query_farm_flight_server.exceptions as exceptions
1718
import query_farm_flight_server.flight_handling as flight_handling
1819
import query_farm_flight_server.flight_inventory as flight_inventory
1920
import query_farm_flight_server.middleware as base_middleware
@@ -669,28 +670,12 @@ def exchange_insert(
669670
duplicates_struct = pc.filter(value_counts, pc.greater(value_counts.field("counts"), 1))
670671
duplicates = duplicates_struct.field("values")
671672
if len(duplicates) > 0:
672-
raise flight.FlightServerError(
673-
f"Cannot insert rows with duplicate values in primary key column {column_name}: {duplicates}",
674-
extra_info=msgpack.packb(
675-
{
676-
"exception_type": "ConstraintException",
677-
"message": f"""Duplicate key "{column_name}: {duplicates[0]}" violates primary key constraint.""",
678-
}
679-
),
680-
)
673+
raise exceptions.ConstraintException(column_name, duplicates)
681674

682675
already_exists = pc.is_in(insert_values, value_set=existing_table.column(column_name))
683676
existing_rows = pc.filter(insert_values, already_exists)
684677
if len(existing_rows) > 0:
685-
raise flight.FlightServerError(
686-
f"Cannot insert rows with duplicate values in primary key column {column_name}: {duplicates}",
687-
extra_info=msgpack.packb(
688-
{
689-
"exception_type": "ConstraintException",
690-
"message": f"""Duplicate key "{column_name}: {existing_rows[0]}" violates primary key constraint.""",
691-
}
692-
),
693-
)
678+
raise exceptions.ConstraintException(column_name, existing_rows[0])
694679

695680
assert new_rows.num_rows > 0
696681

0 commit comments

Comments
 (0)