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.

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

Improve Entity Set Serialization #361

Merged
merged 96 commits into from Feb 25, 2019
Merged
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
f5b4dee
serialization: save entity
jeff-hernandez Dec 23, 2018
3887391
serialization: save entity set
jeff-hernandez Dec 24, 2018
a7bfdbc
serialization: load entity set
jeff-hernandez Dec 25, 2018
7b7ef43
serialization: integration
jeff-hernandez Dec 25, 2018
0e96b5b
serialization: variable schema implementation
jeff-hernandez Dec 28, 2018
6dda984
serialization: undo format
jeff-hernandez Jan 8, 2019
ccd0622
serialization: post-review modifications
jeff-hernandez Jan 11, 2019
30b379a
serialization: renamed read_data
jeff-hernandez Jan 11, 2019
2d6d685
serialization: rename and document function read
jeff-hernandez Jan 11, 2019
1c1d6a0
explicitly list out the variable arguments
jeff-hernandez Jan 14, 2019
f05054e
undo format
jeff-hernandez Jan 15, 2019
a479180
update doc string for entity set metadata
jeff-hernandez Jan 15, 2019
4b1909d
improved serialization docstrings
jeff-hernandez Jan 16, 2019
aa2f1b2
serialization: save entity
jeff-hernandez Dec 23, 2018
87c7756
serialization: save entity set
jeff-hernandez Dec 24, 2018
b0b821f
serialization: load entity set
jeff-hernandez Dec 25, 2018
3cc04c0
serialization: integration
jeff-hernandez Dec 25, 2018
5c5bfce
serialization: variable schema implementation
jeff-hernandez Dec 28, 2018
0047bb7
serialization: undo format
jeff-hernandez Jan 8, 2019
12db252
serialization: post-review modifications
jeff-hernandez Jan 11, 2019
f30df11
serialization: renamed read_data
jeff-hernandez Jan 11, 2019
3fe538f
serialization: rename and document function read
jeff-hernandez Jan 11, 2019
9307c4c
explicitly list out the variable arguments
jeff-hernandez Jan 14, 2019
6aebd93
undo format
jeff-hernandez Jan 15, 2019
c7bbbc4
update doc string for entity set metadata
jeff-hernandez Jan 15, 2019
7bd4067
improved serialization docstrings
jeff-hernandez Jan 16, 2019
d1ec95a
serialization tests
jeff-hernandez Jan 17, 2019
3a980b7
merge
jeff-hernandez Jan 17, 2019
274fa03
fixed lint errors
jeff-hernandez Jan 17, 2019
6ab2d4b
Merge branch 'master' into serialization
kmax12 Jan 21, 2019
925875c
move serialization tests
jeff-hernandez Jan 22, 2019
1896a8f
move serialization tests
jeff-hernandez Jan 22, 2019
3489750
Merge branch 'serialization' of github.com:jeff-hernandez/featuretool…
jeff-hernandez Jan 23, 2019
8faf93f
move serialization tests
jeff-hernandez Jan 23, 2019
f46dda9
remove EntitySet.read, update api ref
jeff-hernandez Jan 23, 2019
63e8022
improve readability, expand function abbreviations
jeff-hernandez Jan 25, 2019
c33ad4a
replace dictionary constructor
jeff-hernandez Jan 25, 2019
8da9fcc
refactor underlying serialization explicitly
jeff-hernandez Jan 25, 2019
50b58fd
expand variable abbreviations
jeff-hernandez Jan 25, 2019
687c26c
update read_entity_data
jeff-hernandez Jan 25, 2019
f99fab5
rename _dtype_repr to type_string
jeff-hernandez Jan 25, 2019
cc3992a
comment on unicode cast
jeff-hernandez Jan 25, 2019
e5ef6ad
expand variable abbreviation
jeff-hernandez Jan 25, 2019
d25b0a2
Merge remote-tracking branch 'upstream/master' into serialization
jeff-hernandez Jan 25, 2019
03de4bc
rename _dtype_repr to type_string
jeff-hernandez Jan 25, 2019
6d17529
update tests
jeff-hernandez Jan 25, 2019
da0f3e4
move serialization tests
jeff-hernandez Jan 25, 2019
003dcd9
preserve dtypes
jeff-hernandez Jan 29, 2019
926757f
Merge remote-tracking branch 'upstream/master' into serialization
jeff-hernandez Jan 29, 2019
3a397d7
update parquet format
jeff-hernandez Jan 29, 2019
0ab987f
Merge branch 'master' into serialization
kmax12 Jan 30, 2019
699e739
Merge branch 'master' into serialization
kmax12 Feb 1, 2019
793b941
Merge branch 'master' of https://github.com/Featuretools/featuretools…
jeff-hernandez Feb 8, 2019
6591d06
merged master
kmax12 Feb 8, 2019
97fd9d4
formatting and doc strings
kmax12 Feb 8, 2019
c843492
update metadata
jeff-hernandez Feb 11, 2019
8b3afa6
update docstring for create_data_description
jeff-hernandez Feb 11, 2019
b23325f
add comments in from_data_description
jeff-hernandez Feb 11, 2019
a9a6a4a
update read_entity_data
jeff-hernandez Feb 11, 2019
a642a4d
update serialization
jeff-hernandez Feb 11, 2019
2b1b4fb
update from_relationship_description
jeff-hernandez Feb 11, 2019
bbfb55b
update variable description
jeff-hernandez Feb 12, 2019
e82f5cb
update variable serialization
jeff-hernandez Feb 12, 2019
675e0d5
arrange arguments
jeff-hernandez Feb 12, 2019
97038d6
update docstring
jeff-hernandez Feb 12, 2019
6335919
subset parameters in underlying serialization methods
jeff-hernandez Feb 12, 2019
5cc70aa
rename create_data_description
jeff-hernandez Feb 12, 2019
c7437e5
split serialization file
jeff-hernandez Feb 12, 2019
7cbb5f0
rename _dtype_repr
jeff-hernandez Feb 12, 2019
14c81bc
Merge branch 'master' of https://github.com/Featuretools/featuretools…
jeff-hernandez Feb 12, 2019
5a505cb
update serialization tests
jeff-hernandez Feb 13, 2019
4b13286
Merge branch 'master' of https://github.com/Featuretools/featuretools…
jeff-hernandez Feb 13, 2019
433cc21
rename _dtype_repr
jeff-hernandez Feb 13, 2019
84d166d
update serialization test
jeff-hernandez Feb 13, 2019
88f107b
formatting and doc strings
jeff-hernandez Feb 13, 2019
9024222
sort imports
jeff-hernandez Feb 13, 2019
9b3812b
update test_write_data_description
jeff-hernandez Feb 13, 2019
20a91b9
Merge branch 'master' of https://github.com/Featuretools/featuretools…
jeff-hernandez Feb 15, 2019
7e5a28d
rename _dtype_repr
jeff-hernandez Feb 15, 2019
4e82159
rename serialization methods
jeff-hernandez Feb 15, 2019
82929d7
Merge branch 'master' of https://github.com/Featuretools/featuretools…
jeff-hernandez Feb 15, 2019
7e31f9a
Merge branch 'master' into pr/361
kmax12 Feb 17, 2019
73da51e
add param
jeff-hernandez Feb 18, 2019
6d08df3
refactor oneliners
jeff-hernandez Feb 18, 2019
9435eb7
update entityset serialization
jeff-hernandez Feb 18, 2019
63daf2a
refactor kwargs subsetting
jeff-hernandez Feb 18, 2019
6c37e6a
v0.6.1 (#436)
rwedge Feb 15, 2019
df93429
update tests
jeff-hernandez Feb 19, 2019
dd96018
update docstring
jeff-hernandez Feb 19, 2019
4ae0737
update tests
jeff-hernandez Feb 19, 2019
dfda9a9
Merge branch 'master' of https://github.com/Featuretools/featuretools…
jeff-hernandez Feb 19, 2019
c209bdc
Merge branch 'serialization' of github.com:jeff-hernandez/featuretool…
jeff-hernandez Feb 19, 2019
c63c11b
update deserialize
jeff-hernandez Feb 19, 2019
60005ac
remove infer from docstrings
jeff-hernandez Feb 20, 2019
c561a09
refactor kwargs
jeff-hernandez Feb 21, 2019
39ab514
Merge branch 'master' into pr/361
kmax12 Feb 25, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+6 −3
Diff settings

Always

Just for now

refactor oneliners

  • Loading branch information...
jeff-hernandez committed Feb 18, 2019
commit 6d08df367f468758a3efbc2001cf7094c02f30a7
@@ -35,8 +35,10 @@ def description_to_entity(description, entityset, path=None):
entityset (EntitySet) : Instance of :class:`.EntitySet` to add :class:`.Entity`.
path (str) : Root directory to serialized entityset.
'''
from_disk = path is not None
dataframe = read_entity_data(description, path=path) if from_disk else empty_dataframe(description)
if path:
dataframe = read_entity_data(description, path=path)
else:
dataframe = empty_dataframe(description)
variable_types = {variable['id']: description_to_variable(variable) for variable in description['variables']}
entityset.entity_from_dataframe(
description['id'],
@@ -1257,4 +1257,5 @@ def read_entityset(path, **kwargs):
path (str): Directory on disk to read `data_description.json`.
kwargs (keywords): Additional keyword arguments to pass as keyword arguments to the underlying deserialization method.
'''
return EntitySet.from_data_description(deserialize.read_data_description(path), **kwargs)
data_description = deserialize.read_data_description(path)
return EntitySet.from_data_description(data_description, **kwargs)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.