Skip to content

Commit 4583f53

Browse files
committed
fix: fix return type
1 parent 300b005 commit 4583f53

1 file changed

Lines changed: 7 additions & 26 deletions

File tree

src/query_farm_server_base/flight_inventory.py

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def upload_and_generate_schema_list(
8585
) -> bytes:
8686
serialized_schema_data: list[dict[str, Any]] = []
8787
s3_client = boto3.client("s3")
88-
all_schema_flights_with_length_serialized: list[Any] = []
88+
all_schema_flights_serialized: list[Any] = []
8989

9090
external_details: dict[str, Any] = {}
9191

@@ -110,36 +110,26 @@ def upload_and_generate_schema_list(
110110

111111
assert uploaded_schema_contents.compressed_data
112112

113-
all_schema_flights_with_length_serialized.append(
113+
all_schema_flights_serialized.append(
114114
[
115115
uploaded_schema_contents.sha256_hash,
116116
uploaded_schema_contents.compressed_data,
117117
]
118118
)
119119

120-
external_details = {}
121-
if not serialize_inline:
122-
external_details = {
123-
"external": {
124-
"url": schema_path,
125-
}
126-
}
127-
if enable_sha256_caching:
128-
external_details["external"]["sha256"] = uploaded_schema_contents.sha256_hash
129-
130120
serialized_schema_data.append(
131121
{
132122
"schema": schema_name,
133123
"description": schema_details[schema_name].description if schema_name in schema_details else "",
134124
"contents": {
135-
**external_details,
136-
"serialized": None,
125+
"url": schema_path if not serialize_inline else None,
126+
"sha256": uploaded_schema_contents.sha256_hash,
137127
},
138128
"tags": schema_details[schema_name].tags if schema_name in schema_details else {},
139129
}
140130
)
141131

142-
all_packed = msgpack.packb(all_schema_flights_with_length_serialized)
132+
all_packed = msgpack.packb(all_schema_flights_serialized)
143133
all_schema_contents_upload = schema_uploader.upload(
144134
s3_client=s3_client,
145135
data=all_packed,
@@ -150,21 +140,12 @@ def upload_and_generate_schema_list(
150140
)
151141
all_schema_path = f"{SCHEMA_BASE_URL}/{all_schema_contents_upload.s3_path}"
152142

153-
external_details = {}
154-
if not serialize_inline:
155-
external_details = {
156-
"external": {
157-
"url": all_schema_path,
158-
}
159-
}
160-
if enable_sha256_caching:
161-
external_details["external"]["sha256"] = all_schema_contents_upload.sha256_hash
162-
163143
schemas_list_data = {
164144
"schemas": serialized_schema_data,
165145
# This encodes the contents of all schemas in one file.
166146
"contents": {
167-
**external_details,
147+
"sha256": all_schema_contents_upload.sha256_hash,
148+
"url": all_schema_path if not serialize_inline else None,
168149
"serialized": all_schema_contents_upload.compressed_data if serialize_inline else None,
169150
},
170151
}

0 commit comments

Comments
 (0)