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

Added multiple cycle upload argument #27

Merged
merged 4 commits into from
Nov 15, 2023
Merged

Conversation

anchapin
Copy link
Contributor

@anchapin anchapin commented Aug 3, 2023

Added an optional boolean argument to the seed_client.upload_and_match_datafile function. You can use the attached sample jupyter notebook to test it. The data file comes from seed repo in folder "seed/tests/data" and is called "Sample_MultipleCycles.xlsx". I've also attached the mapping profile file.

upload_example_data.ipynb.zip

Multiple Cycle_mapping_profile.csv

@anchapin anchapin requested review from nllong and kflemin August 3, 2023 15:13
@anchapin anchapin self-assigned this Aug 3, 2023
pyseed/seed_client.py Outdated Show resolved Hide resolved
pyseed/seed_client.py Outdated Show resolved Hide resolved
@nllong
Copy link
Member

nllong commented Aug 3, 2023

I suggest adding the multiple year upload arg into this method too: https://github.com/SEED-platform/py-seed/blob/develop/pyseed/seed_client.py#L1066. This method is the best one to call when uploading the data--it does everything at once.

Can you do it as a **kwargs through so that it doesn't break existing uploading?

@nllong nllong merged commit b3e2ba5 into develop Nov 15, 2023
7 checks passed
@nllong nllong deleted the multiple_cycle_upload branch November 15, 2023 17:57
axelstudios pushed a commit that referenced this pull request Nov 27, 2023
* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit
axelstudios added a commit that referenced this pull request Nov 27, 2023
* Merge main into develop after release (#21)

* Release 0.3.0 (#20)

* precommit

* Fix delete cycle progress key and race condition (#24)

* Release 0.3.0 (#20)

* precommit

* add progress key to delete cycles

* Remove deprecated APIs, fix typos (#23)

* Update README.rst

* update license (#26)

* Updates to support 179d, includes creating property, downloading property reports from ESPM, and updating building search(#22)

* adding create_building and update_building methods
* modify search_buildings to provide appropriate cycle id
* adding client methods for creating extra data columns
* add pass throughs for file downloads
* updates for audit template workflow
* method to download property xlsx
---------

Co-authored-by: Alex Swindler <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>

* prep release

* increase timeout for server start

* increase timeout for server start (#31)

* cleanup before release (#32)

* configure seed to load small EEEJ dataset for integration test (#33)

* add analysis retrieve methods (#34)

* Added multiple cycle upload argument (#27)

* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit

* Cleanup README.rst  (#35)

* cleanup readme

* populate description in pypi

* precommit fix

* Endpoint to download an Audit Template Report Submission and store in SEED (#36)

* start of AT report download method

* adding endpoint to download AT report submission and store in SEED

* prep 0.4.1 (#37)

* Update CHANGELOG.rst

---------

Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Katherine Fleming <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Alex Chapin <[email protected]>
nllong added a commit that referenced this pull request Jan 18, 2024
* Merge main into develop after release (#21)

* Release 0.3.0 (#20)

* precommit

* Fix delete cycle progress key and race condition (#24)

* Release 0.3.0 (#20)

* precommit

* add progress key to delete cycles

* Remove deprecated APIs, fix typos (#23)

* Update README.rst

* update license (#26)

* Updates to support 179d, includes creating property, downloading property reports from ESPM, and updating building search(#22)

* adding create_building and update_building methods
* modify search_buildings to provide appropriate cycle id
* adding client methods for creating extra data columns
* add pass throughs for file downloads
* updates for audit template workflow
* method to download property xlsx
---------

Co-authored-by: Alex Swindler <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>

* prep release

* increase timeout for server start

* increase timeout for server start (#31)

* cleanup before release (#32)

* configure seed to load small EEEJ dataset for integration test (#33)

* add analysis retrieve methods (#34)

* Added multiple cycle upload argument (#27)

* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit

* Cleanup README.rst  (#35)

* cleanup readme

* populate description in pypi

* precommit fix

* Endpoint to download an Audit Template Report Submission and store in SEED (#36)

* start of AT report download method

* adding endpoint to download AT report submission and store in SEED

* add analysis retrieve methods (#34)

* Added multiple cycle upload argument (#27)

* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit

* Cleanup README.rst  (#35)

* cleanup readme

* populate description in pypi

* precommit fix

* Endpoint to download an Audit Template Report Submission and store in SEED (#36)

* start of AT report download method

* adding endpoint to download AT report submission and store in SEED

* prep 0.4.1 (#37)

* Update CHANGELOG.rst

* update release instruction

* Update README.rst

* Update README.rst

* add new method to get AT submission metadata (#39)

* Update CHANGELOG.rst

* Update setup.cfg

---------

Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Alex Swindler <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Alex Chapin <[email protected]>
nllong added a commit that referenced this pull request Jun 12, 2024
* Merge main into develop after release (#21)

* Release 0.3.0 (#20)

* precommit

* Fix delete cycle progress key and race condition (#24)

* Release 0.3.0 (#20)

* precommit

* add progress key to delete cycles

* Remove deprecated APIs, fix typos (#23)

* Update README.rst

* update license (#26)

* Updates to support 179d, includes creating property, downloading property reports from ESPM, and updating building search(#22)

* adding create_building and update_building methods
* modify search_buildings to provide appropriate cycle id
* adding client methods for creating extra data columns
* add pass throughs for file downloads
* updates for audit template workflow
* method to download property xlsx
---------

Co-authored-by: Alex Swindler <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>

* prep release

* increase timeout for server start

* increase timeout for server start (#31)

* cleanup before release (#32)

* configure seed to load small EEEJ dataset for integration test (#33)

* add analysis retrieve methods (#34)

* Added multiple cycle upload argument (#27)

* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit

* Cleanup README.rst  (#35)

* cleanup readme

* populate description in pypi

* precommit fix

* Endpoint to download an Audit Template Report Submission and store in SEED (#36)

* start of AT report download method

* adding endpoint to download AT report submission and store in SEED

* add analysis retrieve methods (#34)

* Added multiple cycle upload argument (#27)

* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit

* Cleanup README.rst  (#35)

* cleanup readme

* populate description in pypi

* precommit fix

* Endpoint to download an Audit Template Report Submission and store in SEED (#36)

* start of AT report download method

* adding endpoint to download AT report submission and store in SEED

* prep 0.4.1 (#37)

* Update CHANGELOG.rst

* update release instruction

* Update README.rst

* Update README.rst

* add new method to get AT submission metadata (#39)

* Update CHANGELOG.rst

* Update setup.cfg

* Added ESPM functions to py-seed client (#28)

* Added ESPM functions to py-seed client

* Cleaned up the code and put the downloads into its own
folder called "reports"

* Added openpyxl to requirements

* Fixing tests

* First pass at adding test

* First draft of finishing the test

* Finished get report template names test

* Started troubleshooting mypy errors

* Fixed remaining conflict

* Fixed integration test errors

* Fix mypy errors

* Fixed mypy for Python 3.10

* Precommit

* Fix unnecessary typing

* Fixed integration tests

---------

Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Alex Swindler <[email protected]>

* prep version 0.4.3 (#41)

* Add PyPi release action (#42)

* add python 3.12

* update test versions

* add release connection and update instructions

---------

Co-authored-by: Alex Swindler <[email protected]>
Co-authored-by: Katherine Fleming <[email protected]>
Co-authored-by: Alex Chapin <[email protected]>
nllong added a commit that referenced this pull request Sep 30, 2024
* Merge main into develop after release (#21)

* Release 0.3.0 (#20)

* precommit

* Fix delete cycle progress key and race condition (#24)

* Release 0.3.0 (#20)

* precommit

* add progress key to delete cycles

* Remove deprecated APIs, fix typos (#23)

* Update README.rst

* update license (#26)

* Updates to support 179d, includes creating property, downloading property reports from ESPM, and updating building search(#22)

* adding create_building and update_building methods
* modify search_buildings to provide appropriate cycle id
* adding client methods for creating extra data columns
* add pass throughs for file downloads
* updates for audit template workflow
* method to download property xlsx
---------

Co-authored-by: Alex Swindler <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Nicholas Long <[email protected]>

* prep release

* increase timeout for server start

* increase timeout for server start (#31)

* cleanup before release (#32)

* configure seed to load small EEEJ dataset for integration test (#33)

* add analysis retrieve methods (#34)

* Added multiple cycle upload argument (#27)

* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit

* Cleanup README.rst  (#35)

* cleanup readme

* populate description in pypi

* precommit fix

* Endpoint to download an Audit Template Report Submission and store in SEED (#36)

* start of AT report download method

* adding endpoint to download AT report submission and store in SEED

* add analysis retrieve methods (#34)

* Added multiple cycle upload argument (#27)

* Added multiple cycle upload argument

* Responded to comments and fixed failing tests

* Converted to using kwargs

* Pre-commit

* Cleanup README.rst  (#35)

* cleanup readme

* populate description in pypi

* precommit fix

* Endpoint to download an Audit Template Report Submission and store in SEED (#36)

* start of AT report download method

* adding endpoint to download AT report submission and store in SEED

* prep 0.4.1 (#37)

* Update CHANGELOG.rst

* update release instruction

* Update README.rst

* Update README.rst

* add new method to get AT submission metadata (#39)

* Update CHANGELOG.rst

* Update setup.cfg

* Added ESPM functions to py-seed client (#28)

* Added ESPM functions to py-seed client

* Cleaned up the code and put the downloads into its own
folder called "reports"

* Added openpyxl to requirements

* Fixing tests

* First pass at adding test

* First draft of finishing the test

* Finished get report template names test

* Started troubleshooting mypy errors

* Fixed remaining conflict

* Fixed integration test errors

* Fix mypy errors

* Fixed mypy for Python 3.10

* Precommit

* Fix unnecessary typing

* Fixed integration tests

---------

Co-authored-by: Nicholas Long <[email protected]>
Co-authored-by: Alex Swindler <[email protected]>

* prep version 0.4.3 (#41)

* Add PyPi release action (#42)

* add python 3.12

* update test versions

* add release connection and update instructions

* update precommit versions (#44)

* Add create organization and retrieve property cross cycle data (#45)

* add methods to support cross cycle property api

* cleanup

* cleanup

* remove prints

* fix mypy

* comment cleanup

* Add is_omitted column to column mapping profiles (#46)

* add code to enable client to read the isOmitted field in the CSV file, if present, and to pass it to the backend

* isOmitted -> is_omitted

* linter

* prep version 0.5.0 and added compatibility matrix to readme (#47)

* prep version 0.4.4 and added compatibility matrix to readme

* fix compatibility table

* fix title

* Update README.rst

* Update setup.cfg

---------

Co-authored-by: Nicholas Long <[email protected]>

* Update CHANGELOG.rst

---------

Co-authored-by: Alex Swindler <[email protected]>
Co-authored-by: Katherine Fleming <[email protected]>
Co-authored-by: Alex Chapin <[email protected]>
Co-authored-by: Caleb Rutan <[email protected]>
@nllong nllong mentioned this pull request Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants