Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: don't require Form JSON to have 'parameters' #1245

Merged
merged 1 commit into from
Jul 7, 2024
Merged

fix: don't require Form JSON to have 'parameters' #1245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/uproot/interpretation/library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,10 @@ def _object_to_awkward_json(form, obj):
return out

elif form["class"][:15] == "ListOffsetArray":
if form["parameters"].get("__array__") == "string":
if form.get("parameters", {}).get("__array__") == "string":
return obj

elif form["content"]["parameters"].get("__array__") == "sorted_map":
elif form["content"].get("parameters", {}).get("__array__") == "sorted_map":
key_form = form["content"]["contents"][0]
value_form = form["content"]["contents"][1]
return [
Expand Down Expand Up @@ -385,30 +385,30 @@ def _awkward_json_to_array(awkward, form, array):
names.append(name)
length = len(array) if len(contents) == 0 else None
return awkward.contents.RecordArray(
contents, names, length, parameters=form["parameters"]
contents, names, length, parameters=form.get("parameters", {})
)

elif form["class"][:15] == "ListOffsetArray":
if form["parameters"].get("__array__") == "string":
if form.get("parameters", {}).get("__array__") == "string":
if isinstance(array, awkward.contents.EmptyArray):
content = awkward.contents.NumpyArray(
numpy.empty(0, dtype=numpy.uint8),
parameters=form["content"]["parameters"],
parameters=form["content"].get("parameters", {}),
)
return awkward.contents.ListOffsetArray(
awkward.index.Index64(numpy.array([0], dtype=numpy.uint8)),
content,
parameters=form["parameters"],
parameters=form.get("parameters", {}),
)
else:
content = _awkward_json_to_array(
awkward, form["content"], array.content
)
return type(array)(
array.offsets, content, parameters=form["parameters"]
array.offsets, content, parameters=form.get("parameters", {})
)

elif form["content"]["parameters"].get("__array__") == "sorted_map":
elif form["content"].get("parameters", {}).get("__array__") == "sorted_map":
offsets = _awkward_offsets(awkward, form, array)
key_form = form["content"]["contents"][0]
value_form = form["content"]["contents"][1]
Expand All @@ -419,7 +419,7 @@ def _awkward_json_to_array(awkward, form, array):
(keys, values),
None,
0,
parameters=form["content"]["parameters"],
parameters=form["content"].get("parameters", {}),
)
else:
keys = _awkward_json_to_array(awkward, key_form, array.content["0"])
Expand All @@ -429,10 +429,10 @@ def _awkward_json_to_array(awkward, form, array):
(keys, values),
None,
length,
parameters=form["content"]["parameters"],
parameters=form["content"].get("parameters", {}),
)
cls = uproot._util._content_cls_from_name(awkward, form["class"])
return cls(offsets, content, parameters=form["parameters"])
return cls(offsets, content, parameters=form.get("parameters", {}))

else:
offsets = _awkward_offsets(awkward, form, array)
Expand All @@ -443,15 +443,15 @@ def _awkward_json_to_array(awkward, form, array):
awkward, form["content"], array.content
)
cls = uproot._util._content_cls_from_name(awkward, form["class"])
return cls(offsets, content, parameters=form["parameters"])
return cls(offsets, content, parameters=form.get("parameters", {}))

elif form["class"] == "RegularArray":
if isinstance(array, awkward.contents.EmptyArray):
content = _awkward_json_to_array(awkward, form["content"], array)
else:
content = _awkward_json_to_array(awkward, form["content"], array.content)
return awkward.contents.RegularArray(
content, form["size"], parameters=form["parameters"]
content, form["size"], parameters=form.get("parameters", {})
)

else:
Expand Down