Skip to content

Commit 9697963

Browse files
committed
[r p] Rename files.url to files.azul_file_url for AnVIL (#6549)
1 parent e993592 commit 9697963

File tree

4 files changed

+235
-154
lines changed

4 files changed

+235
-154
lines changed

src/azul/plugins/metadata/anvil/indexer/transform.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,6 @@ def _file_types(cls) -> FieldTypes:
316316
# FIXME: Redundant file fields for AnVIL are no longer needed
317317
# https://github.com/DataBiosphere/azul/issues/7005
318318
'uuid': null_str,
319-
'size': null_int,
320-
'name': null_str,
321319
'crc32': null_str,
322320
'sha256': null_str,
323321
'drs_uri': null_str
@@ -407,11 +405,8 @@ def _donor(self, donor: EntityReference) -> MutableJSON:
407405
return self._entity(donor, self._donor_types())
408406

409407
def _file(self, file: EntityReference) -> MutableJSON:
410-
metadata = self.bundle.entities[file]
411408
return self._entity(file,
412409
self._file_types(),
413-
size=metadata['file_size'],
414-
name=metadata['file_name'],
415410
uuid=file.entity_id)
416411

417412
def _only_dataset(self) -> EntityReference:

src/azul/plugins/metadata/anvil/service/response.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -203,34 +203,31 @@ def _non_pivotal_fields_by_entity_type(self) -> dict[str, set[str]]:
203203
},
204204
'biosamples': {
205205
'anatomical_site',
206+
'apriori_cell_type',
206207
'biosample_type',
207208
'disease',
208209
'donor_age_at_collection_unit',
209210
'donor_age_at_collection',
210211
},
211212
'datasets': {
213+
'consent_group',
214+
'data_modality',
215+
'data_use_permission',
212216
'dataset_id',
213217
'duos_id',
218+
'owner',
219+
'principal_investigator',
220+
'registered_identifier',
214221
'title'
215222
},
216223
'diagnoses': {
217224
'disease',
218225
'phenotype',
219226
'phenopacket',
227+
'onset_age',
220228
'onset_age_unit',
229+
'diagnosis_age',
221230
'diagnosis_age_unit',
222-
*(
223-
# These fields are of high cardinality, but the number of
224-
# aggregated inner entities per donor should be low. Since
225-
# diagnoses do not appear in the index as outer entities,
226-
# this is our only opportunity to display these fields.
227-
[
228-
'diagnosis_age',
229-
'onset_age'
230-
]
231-
if self.entity_type == 'donors' else
232-
[]
233-
)
234231
},
235232
'donors': {
236233
'organism_type',

test/indexer/data/826dea02-e274-affe-aabc-eb3db63ad068.results.json

Lines changed: 0 additions & 132 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)