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

Jump to bottom

[Freeze][Resume After Silver SQL] Plot user revenues using Streamlit #829

Draft
wants to merge 88 commits into
base: issue610-create-silver-predictions-table
Choose a base branch
from
Draft

[Freeze][Resume After Silver SQL] Plot user revenues using Streamlit #829

wants to merge 88 commits into from

Conversation

KatunaNorbert
Copy link
Member

Fixes #612.

calina-c and others added 30 commits February 29, 2024 15:20
@calina-c
Currency special types (#676)
b03a816
@trizin
#695 - Claim rewards for second private key (#700)
d17fc36
@trizin
#692 - Implement cutoff seconds to stop predictions (#696)
9b96af6
@trentmc
Fix #683: [Bug, sim] Contour plots missing x-value ticks
ddbd8cd
@calina-c
Remove asCurrency function (unused). (#706)
2d25106
@trentmc
Fix #684: [Sim] Change 1d profit scatterplots to 2d (#705)
c9fc5c3 
Fixes #684. New scatterplots are:
- 2d scatterplot of (a) model's prob_up vs (b) predictoor profit.
- 2d scatterplot of (a) model's prob_up vs (b) trader profit.

Also:
- Fix [#707](#707) [Linter bug] Pylint failures in safe_fetch_ohlcv_dydx. Why here: it was causing my CI to fail, and easy to fix
- For [#547](#547) Eth/Weth currency_types: (a) Move tests from test_mathutil.py to new dedicated test module test_currency_types.py. (b) Add support for unary +/- operators (c) Add tests for math operators +, -, *, /, and unary +/-. Why here: because sim_engine uses it
@trentmc
Fix #709: unwanted print() in aimodel.py
cb336fc
@trentmc
Fix #708: When prob(up) < 0.5, trader profit is always zero (PR #712)
48cb4d1 
Fixes #708. The key fix is when the trader exits the trading position in the case of `not pred_up`. 

Related change made: removed Eth stuff from sim_engine. Why: this is _sim_ and doesn't deal with blockchain; the Eth stuff was hurting understandability, including my work to solve this ticket
@calina-c
Add dependency numbers. (#711)
8ff9a6c 
* Add dependency numbers.
* Add dependabot config.
@trentmc
Fix #719: [Bug, Aimodel] constant classifier (PR #720)
fe6043b 
Fix #719
@trentmc
Fix #704: Calibrate model probabilities w CalibratedClassifierCV (PR #…
8ab21d7 
…721)

Fix #704
@trentmc
Fix #722 #725 #723 classifier: balance T/F, weight newest by 10x, cal…
8886433 
…c var importances (PR #727)

- #722 Improve AI model: In training, balance True vs False classes
- #725 Improve AI model: In training X, weight newest sample 10x. Also, weight youngest n samples lots too
- #723 Improve AI model: calc rel importances of vars #723
@trentmc
Fix #729: [Aimodel] ppss for weight_recent, balance_classes, calibrat…
591787e 
…e_probs (#730)

Fix #729
@trizin
#697 - Automatically claim payouts for previous epochs (#698)
22a20fd
@dependabot @calina-c
Bump pylint from 3.0.3 to 3.1.0 (#716)
bb74a90 
* Bump pylint from 3.0.3 to 3.1.0

Bumps [pylint](https://github.com/pylint-dev/pylint) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/pylint-dev/pylint/releases)
- [Commits](pylint-dev/pylint@v3.0.3...v3.1.0)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update pytest.yml

* Update pytest.yml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Călina Cenan <calina@cenan.net>
@dependabot @calina-c
Bump pytest-asyncio from 0.21.1 to 0.23.5 (#714)
f1b65ca 
Bumps [pytest-asyncio](https://github.com/pytest-dev/pytest-asyncio) from 0.21.1 to 0.23.5.
- [Release notes](https://github.com/pytest-dev/pytest-asyncio/releases)
- [Commits](pytest-dev/pytest-asyncio@v0.21.1...v0.23.5)

---
updated-dependencies:
- dependency-name: pytest-asyncio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Călina Cenan <calina@cenan.net>
@dependabot @calina-c
Bump numpy from 1.24.4 to 1.26.4, upgrade CIs to Python 3.11 (#715)
86e7476 
* Bump numpy from 1.24.4 to 1.26.4

Bumps [numpy](https://github.com/numpy/numpy) from 1.24.4 to 1.26.4.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst)
- [Commits](numpy/numpy@v1.24.4...v1.26.4)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Trial run for Python 3.9.

* Update dockerfile.

* Change to Python 3.11.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Calina Cenan <calina@cenan.net>
@dependabot @calina-c
Bump scikit-learn from 1.3.2 to 1.4.1.post1 (#717)
7e8c8be 
Bumps [scikit-learn](https://github.com/scikit-learn/scikit-learn) from 1.3.2 to 1.4.1.post1.
- [Release notes](https://github.com/scikit-learn/scikit-learn/releases)
- [Commits](scikit-learn/scikit-learn@1.3.2...1.4.1.post1)

---
updated-dependencies:
- dependency-name: scikit-learn
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Călina Cenan <calina@cenan.net>
@dependabot @calina-c
Bump pandas from 2.0.3 to 2.2.1 (#718)
50399e8 
Bumps [pandas](https://github.com/pandas-dev/pandas) from 2.0.3 to 2.2.1.
- [Release notes](https://github.com/pandas-dev/pandas/releases)
- [Commits](pandas-dev/pandas@v2.0.3...v2.2.1)

---
updated-dependencies:
- dependency-name: pandas
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Călina Cenan <calina@cenan.net>
@trizin
Fix #678 - Deployer update for two sided prediction bots (#690)
7978832
@trentmc
For #731, turn off balancing classes, until 731 is resolved
356abc8
@trentmc
Merge branch 'main' of https://github.com/oceanprotocol/pdr-backend
4fe5944
@trentmc
Fix #752 [Bug] ccxt FileNotFoundError in initialize_network_objects (#…
9284b60 
…753)
@trentmc
Fix #750: [Sim] Refactor plot code in sim_engine (PR #755)
45bdf2e 
* split sim_engine.py into 3 modules: sim_engine.py, sim_plotter.py, sim_state.py. 
* each plot is modularized into its own method
@trentmc
Extend work from #750: [Sim] Refactor plot code in sim_engine (PR #760)
47b9249 
Even cleaner! What I did here: rename axes to the names of the plots themselves. This in turn allowed me to reference axes within the plot, rather than passing it in.
@Pfed-prog
Fix # 743: [DX] VisualStudio linter complains about README formatting (…
3919ac2 
…#745)

Fixes #743.
- Fixed warnings in https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint
- And the relative links in readme in particular
@trizin
Fix #732 - Refactor currency classes to reduce duplication (#733)
d0849d9 
* Refactor currency classes to reduce duplication and enable direct comparisons between Eth and Wei

* Add pos and neg

* Add __float__

* Remove init method

* Formatting

* Fix typo

* amt_wei and amt_eth for compatibility

* Fix return types

* Bug fixes

* Simplify things

* Formatting

* Fix type

* Fix type error

* Revert

* Support numbers

* Fix

* Ensure same type

* Make EthUnit abstract

* Update tests

* Add test_math_with_wei_and_eth test

* Update exception type

* Linter fixes

* Type fixes

* Add test_allowance_update test

* Update test

* Mypy ignore type error

* Formatting

* Fix types

* Fix type

* Fix do_transfer type

* Payout function add types

* Allow comparison with 0

* Add test_compare_to_zero

* Fix types

* Add type

* Fix types and add return type

* Fix type issues in tests

* Fix types

* Fixes

* Remove debug print

* .to_eth().amt_eth

* Reserve order

* More to_eth
@trentmc
Fix #657: [Bug, lake] pl.Dataframe constructor error (#762)
8fc3002 
Fix #657: [Bug, lake] pl.Dataframe constructor - 'float' object cannot be interpreted as an integer

* Write unit tests that capture the base issue
* Update unit tests to expose orient=infer/col/row behavior. They show: infer can fail sometimes, col always fails, row always passes
* Update DataFrame() constructor calls to always explicitly set orient="row"
@trentmc
Fix #724 #674: [Sim] Plot rel importances of vars; plot contours for …
728398a 
…2 most impt vars (#761)

- Plot rel importances of vars #724
- Plot contour if >2 vars, by using 2 most important vars #674
- And refactoring as needed to make ^ clean
@graceful-coder
For #493 step 2/4 add a new method safe_fetch_ohlcv_dydx() (#736)
344df7e 
* Added several unit tests for the new safe_fetch_ohlcv_dydx() function to make its testing comprehensive
* Fixed a bug in the safe_fetch_ohlcv_dydx() function that was returning an incorrect data structure
dependabot bot and others added 23 commits March 25, 2024 15:10
@dependabot
Bump pyarrow from 15.0.1 to 15.0.2 (#834)
37dc79a 
Bumps [pyarrow](https://github.com/apache/arrow) from 15.0.1 to 15.0.2.
- [Commits](apache/arrow@go/v15.0.1...go/v15.0.2)

---
updated-dependencies:
- dependency-name: pyarrow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump pytest-asyncio from 0.23.5.post1 to 0.23.6 (#835)
698594c 
Bumps [pytest-asyncio](https://github.com/pytest-dev/pytest-asyncio) from 0.23.5.post1 to 0.23.6.
- [Release notes](https://github.com/pytest-dev/pytest-asyncio/releases)
- [Commits](pytest-dev/pytest-asyncio@v0.23.5.post1...v0.23.6)

---
updated-dependencies:
- dependency-name: pytest-asyncio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@KatunaNorbert
add tests for predictoor income plotter
2bfea55
@dependabot
Bump polars from 0.20.15 to 0.20.16 (#833)
9f321b8 
Bumps [polars](https://github.com/pola-rs/polars) from 0.20.15 to 0.20.16.
- [Release notes](https://github.com/pola-rs/polars/releases)
- [Commits](pola-rs/polars@py-0.20.15...py-0.20.16)

---
updated-dependencies:
- dependency-name: polars
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@KatunaNorbert
plot using plotly instead of matplot
c180b41
@KatunaNorbert
update tests and fix mypy issue
6b91eee
@KatunaNorbert
add new libraries to install requirements
46de4e5
@KatunaNorbert
update silver table tests
0b1ba1a
@KatunaNorbert
added plots for revenue and costs
f783ae2
@calina-c
Issue #749 - Use streamlit to display graphs in sim plotter (#793)
29cf281 
Sim engine now save states as pickles. A streamlit process picks them up and displays real-time and final-state plots based on the data. Instructions have been added to the readme on how to run and display.
@calina-c
Fix asyncio version by downgrading to 21.1 again for CI warnings. (#837)
3b5bfba
@KatunaNorbert
add new values to silver table and reflect them in new revenue and costs
5c885fa
@KatunaNorbert
update plot income page tests
290e336
@dependabot
Bump polars from 0.20.16 to 0.20.17 (#843)
abbf786 
Bumps [polars](https://github.com/pola-rs/polars) from 0.20.16 to 0.20.17.
- [Release notes](https://github.com/pola-rs/polars/releases)
- [Commits](pola-rs/polars@py-0.20.16...py-0.20.17)

---
updated-dependencies:
- dependency-name: polars
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @calina-c
Bump streamlit from 1.32.1 to 1.32.2 (#844)
767b92f 
Bumps [streamlit](https://github.com/streamlit/streamlit) from 1.32.1 to 1.32.2.
- [Release notes](https://github.com/streamlit/streamlit/releases)
- [Commits](streamlit/streamlit@1.32.1...1.32.2)

---
updated-dependencies:
- dependency-name: streamlit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Călina Cenan <calina@cenan.net>
@dependabot
Bump web3 from 6.15.1 to 6.16.0 (#845)
2f02341 
Bumps [web3](https://github.com/ethereum/web3.py) from 6.15.1 to 6.16.0.
- [Changelog](https://github.com/ethereum/web3.py/blob/v6.16.0/docs/releases.rst)
- [Commits](ethereum/web3.py@v6.15.1...v6.16.0)

---
updated-dependencies:
- dependency-name: web3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @calina-c
Bump requests-mock from 1.11.0 to 1.12.1 (#847)
d177ef5 
Bumps [requests-mock](https://github.com/jamielennox/requests-mock) from 1.11.0 to 1.12.1.
- [Release notes](https://github.com/jamielennox/requests-mock/releases)
- [Commits](jamielennox/requests-mock@1.11.0...1.12.1)

---
updated-dependencies:
- dependency-name: requests-mock
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Călina Cenan <calina@cenan.net>
@dependabot @calina-c
Bump ccxt from 4.2.82 to 4.2.87 (#846)
1916f38 
Bumps [ccxt](https://github.com/ccxt/ccxt) from 4.2.82 to 4.2.87.
- [Release notes](https://github.com/ccxt/ccxt/releases)
- [Changelog](https://github.com/ccxt/ccxt/blob/master/CHANGELOG.md)
- [Commits](ccxt/ccxt@4.2.82...4.2.87)

---
updated-dependencies:
- dependency-name: ccxt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Călina Cenan <calina@cenan.net>
@KatunaNorbert
Fix accuracy calculation for predictions and predictoors info (#840)
266a6f6 
* Fix accuracy calculation for predictions and predictoors info

* fromat new code code
@calina-c
Issue #842 - convert plots to plotly (#853)
05387e7 
* Readd varimps code and convert to plotly.
* Convert profit and accuracy graphs to plotly.
* Convert profits scatters to plotly.
* Convert f1 recall.
@calina-c
Adds snapshots slider for sim engine plots (#851)
9331825 
* Adds snapshots slider.
@calina-c
Adds multisim ids to enable multiple streamlit runs/comparisons. (#857)
cc039b6
@calina-c
Merge branch 'main' into issue612-plot-predictoor-income
1022fe9
This was referenced Apr 9, 2024
Closed
Closed
@idiom-bytes idiom-bytes changed the title Plot user revenues using Streamlit [Freeze][Do Not Merge] Plot user revenues using Streamlit Apr 12, 2024
@idiom-bytes idiom-bytes changed the title [Freeze][Do Not Merge] Plot user revenues using Streamlit [Freeze][Rebase After Silver Table] Plot user revenues using Streamlit Apr 12, 2024
@idiom-bytes idiom-bytes changed the title [Freeze][Rebase After Silver Table] Plot user revenues using Streamlit [Freeze][Resume After Silver SQL] Plot user revenues using Streamlit Apr 12, 2024
@idiom-bytes idiom-bytes changed the title [Freeze][Resume After Silver SQL] Plot user revenues using Streamlit [Freeze][Post Silver SQL] Plot user revenues using Streamlit May 6, 2024
@idiom-bytes idiom-bytes changed the title [Freeze][Post Silver SQL] Plot user revenues using Streamlit [Freeze][Resume After Silver SQL] Plot user revenues using Streamlit May 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@KatunaNorbert @calina-c @trizin @trentmc @Pfed-prog @graceful-coder