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

feat!: update experimentalists grid_pool, random_pool, random_sample to use the new State mechanism #33

Merged
merged 132 commits into from
Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from 130 commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
230dc29
refactor: update docstrings and file ordering
hollandjg Jul 10, 2023
ba57826
refactor: reorder random_pooler file
hollandjg Jul 10, 2023
af49e59
refactor: reorganize random_pool to use pd.DataFrame as default and h…
hollandjg Jul 10, 2023
c206cc2
refactor: remake random sampler to use a result object to be used in …
hollandjg Jul 10, 2023
b735ce4
test: update doctests to support windows
hollandjg Jul 10, 2023
96533ed
revert: changes to grid_pool function
hollandjg Jul 10, 2023
e1b2c54
docs: update docstrings and tests to work
hollandjg Jul 10, 2023
8b91e48
revert: changes to random_sample function
hollandjg Jul 10, 2023
3d08b87
docs: add explanation on wrapper.
hollandjg Jul 10, 2023
00d15d8
rename: update executors to use a new naming convention
hollandjg Jul 12, 2023
46975ef
Merge branch 'feat/default-state-from-main' into feat/default-state-f…
hollandjg Jul 12, 2023
6a57124
Revert "docs: remove notebook which doesn't yet work"
hollandjg Jul 12, 2023
38a5577
fix: if there is no model available, return None
hollandjg Jul 12, 2023
4824af9
docs: update notebook to use new format
hollandjg Jul 12, 2023
ceccc68
Merge branch 'feat/default-state-from-main' into feat/default-state-f…
hollandjg Jul 12, 2023
fac91cb
refactor: change to using singledispatch for random_pool
hollandjg Jul 12, 2023
38eebaa
revert: undo name change in tests
hollandjg Jul 12, 2023
790164e
docs: update signatures
hollandjg Jul 12, 2023
03f639a
refactor: update random_sampler to use singledispatch
hollandjg Jul 12, 2023
a5b659c
docs: update random_pool docs
hollandjg Jul 12, 2023
4dc67cc
Revert "docs: update random_pool docs"
hollandjg Jul 12, 2023
88cc5dd
docs: update random_sample docs
hollandjg Jul 12, 2023
686145e
refactor: move random_pool, random_sample to experimentalist.random_
hollandjg Jul 12, 2023
09fdaed
refactor: move grid_pool to experimentalist.grid_
hollandjg Jul 12, 2023
451bad8
test: revert tests to old behavior
hollandjg Jul 12, 2023
9942180
docs: update standard example for grid pool
hollandjg Jul 12, 2023
c2dcce9
docs: update docstring for random_ module
hollandjg Jul 12, 2023
4911177
docs: add deprecation warning to old pooler and sampler files
hollandjg Jul 12, 2023
31dd73b
docs: add introductory documentation
hollandjg Jul 12, 2023
edd634b
docs: update introductory notebooks
hollandjg Jul 12, 2023
eba68b0
docs: update docs to use new locations
hollandjg Jul 12, 2023
a12c425
Merge branch 'feat/default-state-from-main' into feat/default-state-f…
hollandjg Jul 12, 2023
221302d
Merge branch 'feat/default-state-from-main' into feat/default-state-f…
hollandjg Jul 12, 2023
e210975
docs: update docstring for n-->num_samples
benwandrew Jul 14, 2023
b9ed3f3
docs: update docstring
benwandrew Jul 14, 2023
3aba5bf
docs: remove broken bit of example code
hollandjg Jul 17, 2023
d796e42
Merge branch 'feat/default-state-from-main' into feat/default-state-f…
hollandjg Jul 17, 2023
dc83b55
docs: update execution of notebook
hollandjg Jul 17, 2023
365adcd
docs: fix argument name
hollandjg Jul 17, 2023
0008515
Apply suggestions from code review
hollandjg Jul 17, 2023
396e5d7
refactor: return dataframe from grid_pool_from_ivs – use in other fun…
hollandjg Jul 17, 2023
331698d
Apply suggestions from code review
hollandjg Jul 17, 2023
4b5bb14
docs: update docstring for grid_pool
hollandjg Jul 17, 2023
7875985
test: add doctests fr grid_pool_on_state
hollandjg Jul 17, 2023
3e11268
test: update doctests fr grid_pool_on_ivs
hollandjg Jul 17, 2023
4a535cb
test: update docstrings for grid_pool_from_variables
hollandjg Jul 17, 2023
d4a5987
refactor: rename functions to _on
hollandjg Jul 17, 2023
00a3122
Update src/autora/experimentalist/grid_.py
hollandjg Jul 17, 2023
000c66f
test: update doctest formatting
hollandjg Jul 17, 2023
da6b550
test: update doctest formatting
hollandjg Jul 17, 2023
ad199f2
docs: update docstring formatting
hollandjg Jul 17, 2023
30be1fa
Update src/autora/experimentalist/random_.py
hollandjg Jul 17, 2023
ad8cf30
chore: remove unecessary random_sample_on_list – just use random.choices
hollandjg Jul 17, 2023
ca5d175
docs: update docstrings
hollandjg Jul 17, 2023
9c4fd2e
Merge remote-tracking branch 'origin/feat/default-state-from-main-exp…
hollandjg Jul 17, 2023
cb4b26f
docs: update grid docstrings
hollandjg Jul 17, 2023
a278b04
docs: update random_ docstrings
hollandjg Jul 17, 2023
f866d6d
docs: update random_ docstrings
hollandjg Jul 17, 2023
228cced
docs: remove extra spaces
hollandjg Jul 17, 2023
dfa5484
fix: support **kwargs on state function call
hollandjg Jul 18, 2023
5e70c7b
refactor: simplify grid_pool to make fundamental function the one wit…
hollandjg Jul 18, 2023
6730ca6
refactor: simplify random_pool and random_sample to make fundamental …
hollandjg Jul 18, 2023
848a8d9
refactor: rename state_fn_from_estimator
hollandjg Jul 18, 2023
27bd42a
refactor: rename state_fn_from_x_to_y_fn
hollandjg Jul 18, 2023
0caf091
refactor: rename state_fn_from_x_to_xy_fn
hollandjg Jul 18, 2023
c329501
refactor: rename state_fn_from_experimentalist_pipeline
hollandjg Jul 18, 2023
6df547e
refactor: rename state_fn_from_pipeline
hollandjg Jul 18, 2023
b1a9178
test: add a doctest for the estimator wrapper
hollandjg Jul 18, 2023
4ecfd14
test: add doctests for dataframe version of experiment_runner wrapper
hollandjg Jul 19, 2023
498bfd6
test: add doctests for dataframe version of experiment_runner wrapper…
hollandjg Jul 19, 2023
65cce2c
chore: remove wrapper for pipeline – no longer compatible with Standa…
hollandjg Jul 19, 2023
807f4e8
docs: rename example functions to drop _df where unnecessary.
hollandjg Jul 19, 2023
463c390
docs: rename experimentalist functions in preparation for aliasing
hollandjg Jul 21, 2023
6035eea
exploration: add some function naming options
hollandjg Jul 24, 2023
942bfaa
exploration: add more function naming options examples
hollandjg Jul 24, 2023
1f72cc1
docs: clear output from notebook
hollandjg Jul 24, 2023
bdb7aa8
refactor: update more examples
hollandjg Jul 26, 2023
ec53bad
refactor: add basic wrapper function to return deltas
hollandjg Jul 26, 2023
881a09d
test: update output wrapping function with more doctests
hollandjg Jul 26, 2023
4a84c05
refactor: add more ways to access the `on_state` wrapper – as a decor…
hollandjg Jul 26, 2023
0548e82
Merge branch 'main' into feat/default-state-from-main-experimentalists
benwandrew Aug 3, 2023
982d225
Merge pull request #37 from AutoResearch/feat/rename-special-wrapper-…
hollandjg Aug 15, 2023
f4975bd
feat: add a warning if a Delta field is not available on the State
hollandjg Aug 15, 2023
19c6406
refactor: move random functions back to random_ file
hollandjg Aug 15, 2023
7e24f1f
refactor: move grid functions back to grid_ file
hollandjg Aug 15, 2023
ef2aa35
docs: update Basic Introduction to Functions and States.ipynb
hollandjg Aug 15, 2023
89e9202
docs: remove Function Naming Convention Options.ipynb
hollandjg Aug 15, 2023
6d315e9
docs: update Linear and Cyclical Workflows using Functions and States…
hollandjg Aug 15, 2023
dda49f3
docs: add docstrings
hollandjg Aug 16, 2023
cee9222
feat: add support and tests for dict and UserDict objects alongside D…
hollandjg Aug 16, 2023
0a798a0
feat: add support and tests for dict and UserDict objects alongside D…
hollandjg Aug 16, 2023
351ff06
chore: add docstring
hollandjg Aug 16, 2023
70f4424
docs: rename parameter to avoid shadowing `S`
hollandjg Aug 16, 2023
d29b4e2
docs: rename parameter to avoid replacing `u` or shadowing pd/np
hollandjg Aug 16, 2023
402e233
chore: remove redundant parentheses
hollandjg Aug 16, 2023
d271e26
docs add docstring
hollandjg Aug 16, 2023
d4d39d8
docs: make obvious that first parameter is unused
hollandjg Aug 16, 2023
edfae12
docs: update parameter name to avoid shadowing
hollandjg Aug 16, 2023
4f487d5
docs: update parameter name to avoid shadowing
hollandjg Aug 16, 2023
c5a52d4
docs: update parameter name to avoid shadowing
hollandjg Aug 16, 2023
a44a38f
docs: update parameter name to avoid shadowing
hollandjg Aug 16, 2023
fb8a3e9
docs: update imports to avoid duplication
hollandjg Aug 16, 2023
d3ab865
docs: update random states
hollandjg Aug 16, 2023
c9e17cf
feat: add support for passing the full state as well in the inputs_fr…
hollandjg Aug 17, 2023
327a211
docs: add example of using complex experimentalists which need more i…
hollandjg Aug 17, 2023
b6aa182
feat: always use combined `on_state` function in wrappers
hollandjg Aug 17, 2023
c08b580
feat: split inputs_from_state and delta_to_state
hollandjg Aug 17, 2023
dc27c66
docs: update Combining Experimentalists with State
hollandjg Aug 17, 2023
8147877
docs: update example Notebook
hollandjg Aug 17, 2023
a862fba
docs: update example Notebook
hollandjg Aug 17, 2023
1980d09
docs: add more examples with chainable State-based voting.
hollandjg Aug 17, 2023
bcf3e5b
chore!: remove deprecated pooler and sampler submodules
hollandjg Aug 22, 2023
0ba8082
fix: ensure inputs to sample function are cast to dataFrame
hollandjg Aug 22, 2023
8ea071c
test: update docstrings on aliases to fix test running
hollandjg Aug 22, 2023
bfbaf97
docs: update documentation to drop pooler/sampler split
hollandjg Aug 22, 2023
cc1d180
refactor: move StandardState and standard wrappers into a single file
hollandjg Aug 22, 2023
9bdea5b
chore: remove unused TypeVar
hollandjg Aug 22, 2023
0665a07
chore: update pre-commit hooks
hollandjg Aug 22, 2023
417f760
refactor: rename Executor to StateFunction
hollandjg Aug 22, 2023
c0f88df
Merge branch 'main' into feat/updated-wrappers
hollandjg Aug 22, 2023
e16fcd4
chore: remove extra newlines
hollandjg Aug 22, 2023
c91d2eb
chore: remove extra newlines
hollandjg Aug 22, 2023
d54d904
Merge remote-tracking branch 'origin/feat/updated-wrappers' into feat…
hollandjg Aug 22, 2023
21c54c4
Merge branch 'feat/updated-wrappers' into feat/default-state-from-mai…
hollandjg Aug 22, 2023
7c5783e
refactor: move all standard-state code into a single state.py file
hollandjg Aug 23, 2023
046aae4
refactor: move all standard-state code into a single state.py file
hollandjg Aug 23, 2023
0cab123
refactor: make _extend and _append functions private
hollandjg Aug 23, 2023
495631f
refactor: update imports from autora.state
hollandjg Aug 23, 2023
247511e
refactor: update imports from autora.state
hollandjg Aug 23, 2023
e48b387
refactor: make pytest use `importlib` mode, allowing duplicate filenames
hollandjg Aug 24, 2023
1a1c897
refactor: rename estimator_on_state from state_fn_from_estimator
hollandjg Aug 25, 2023
982a2c2
refactor: rename experiment_runner_on_state from state_fn_from_x_to_x…
hollandjg Aug 25, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/test-pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: "pip"
- run: pip install ".[test]"
- run: pytest --doctest-modules
- run: pytest --doctest-modules --import-mode importlib
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/ambv/black
rev: 22.12.0
rev: 23.7.0
hooks:
- id: black
- repo: https://github.com/pycqa/isort
Expand All @@ -11,15 +11,15 @@ repos:
- "--filter-files"
- "--project=autora"
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
args:
- "--max-line-length=100"
- "--extend-ignore=E203"
- "--per-file-ignores=__init__.py:F401"
- repo: https://github.com/pre-commit/mirrors-mypy
rev: "v0.991"
rev: "v1.5.1"
hooks:
- id: mypy
additional_dependencies: [types-requests,scipy,pytest]
Expand Down
Loading