Skip to content

Changes for new pricing system #199

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

Merged
merged 16 commits into from
Feb 18, 2025
Merged

Changes for new pricing system #199

merged 16 commits into from
Feb 18, 2025

Conversation

philogicae
Copy link
Member

@philogicae philogicae commented Jan 31, 2025

Jira: ALEPH-393, ALEPH-397, ALEPH-400

Needed for this PR on SDK

Self proofreading checklist

  • The new code clear, easy to read and well commented.
  • New code does not duplicate the functions of builtin or popular libraries.
  • An LLM was used to review the new code and look for simplifications.
  • New classes and functions contain docstrings explaining what they provide.
  • All new code is covered by relevant tests.
  • Update TODO lines for PROD

Changes

  • Move/improve flow code parts from CLI to SDK
  • Add utils functions
  • Add make_instance_content and make_program_content
  • Refactor create_instance and create_program
  • Add get_estimated_price
  • Fixes for mypy/ruff/pytest
  • Minor improvements
  • Remove firecracker rootfs hashes for instances

@philogicae philogicae requested a review from nesitor January 31, 2025 14:46
@github-actions github-actions bot added the RED This PR is complex and may require more time to review. label Jan 31, 2025
@philogicae philogicae self-assigned this Jan 31, 2025
@philogicae philogicae force-pushed the add-manage-flow-superfluid branch from f3cc2ba to fa60a8a Compare January 31, 2025 17:23
@philogicae philogicae force-pushed the add-manage-flow-superfluid branch from 813cf75 to a401698 Compare February 3, 2025 09:33
nesitor
nesitor previously approved these changes Feb 4, 2025
@philogicae philogicae force-pushed the add-manage-flow-superfluid branch 2 times, most recently from 8e891e1 to 13be020 Compare February 6, 2025 16:22
@philogicae philogicae force-pushed the add-manage-flow-superfluid branch from 13be020 to 30190e6 Compare February 6, 2025 17:26
@philogicae philogicae changed the title Add manage_flow to superfluid.py Changes for new pricing system Feb 6, 2025
@philogicae philogicae force-pushed the add-manage-flow-superfluid branch from 9e7f24d to 9139e20 Compare February 6, 2025 17:36
@philogicae philogicae force-pushed the add-manage-flow-superfluid branch 5 times, most recently from 904c4c6 to d310a69 Compare February 13, 2025 12:17
@philogicae philogicae force-pushed the add-manage-flow-superfluid branch from d310a69 to 97ac509 Compare February 13, 2025 12:48
@aleph-im aleph-im deleted a comment from github-actions bot Feb 18, 2025
@philogicae philogicae merged commit e4ce90e into main Feb 18, 2025
22 checks passed
@philogicae philogicae deleted the add-manage-flow-superfluid branch February 18, 2025 17:15
Antonyjin pushed a commit that referenced this pull request Feb 25, 2025
- Move/improve flow code parts from CLI to SDK
- Add utils functions
- Add `make_instance_content` and `make_program_content`
- Refactor `create_instance` and `create_program`
- Add `get_estimated_price`
- Fixes for mypy/ruff/pytest
- Minor improvements
- Remove firecracker rootfs hashes for instances
nesitor added a commit that referenced this pull request Apr 10, 2025
* Migrate to Pydantic v2, update model validation and fix async issues

- Migrated to Pydantic v2:
  - Replaced deprecated `parse_obj()` and `parse_raw()` with
`model_validate()` and `model_validate_json()`.
  - Replaced `.dict()` with `.model_dump()` for serializing models to dictionaries.
  - Updated `validator` to `field_validator` and `root_validator` to
`model_validator` to comply with Pydantic v2 syntax changes.

- Fixed asyncio issues:
  - Added `await` for asynchronous methods like `raise_for_status()`
in `RemoteAccount` and other HTTP operations to avoid `RuntimeWarning`.

- Updated config handling:
  - Used `ClassVar` for constants in `Settings` and other configuration classes.
  - Replaced `Config` with `ConfigDict` in Pydantic models
to follow v2 conventions.
  - Added default values for missing fields in chain configurations
(`CHAINS_SEPOLIA_ACTIVE`, etc.).

- Adjusted signature handling:
  - Updated the signing logic to prepend `0x` in the `BaseAccount` signature
generation to ensure correct Ethereum address formatting.

- Minor fixes:
  - Resolved issue with extra fields not being allowed by default
by specifying `extra="allow"` or `extra="forbid"` where necessary.
  - Fixed tests to account for changes in model validation and
serialization behavior.
  - Added `pydantic-settings` as a new dependency for configuration management.

* fix: lint tests were failing

- Updated all instances of **extra_fields to ensure proper handling of
Optional dictionaries using `(extra_fields or {})` pattern.
- Added proper return statements in `AlephHttpClient.get_message_status`
to return parsed JSON data as a `MessageStatus` object.
- Updated `Settings` class in `conf.py` to correct DNS resolvers type
and simplify the `model_config` definition.
- Refactored `parse_volume` to ensure correct handling of Mapping types
and MachineVolume types, avoiding TypeErrors.
- Improved field validation and model validation in `SignedPubKeyHeader` by
using correct Pydantic v2 validation decorators and ensuring compatibility with the new model behavior.
- Applied formatting and consistency fixes for `model_dump` usage and indentation improvements in test files.

* feat: add pyproject-fmt

* fix: run pyproject-fmt

* Post-SOL fixes (#178)

* Missing chain field on auth

* Fix Signature of Solana operation for CRN

* Add export_private_key func for accounts

* Improve _load_account

* Add chain arg to _load_account

* Increase default HTTP_REQUEST_TIMEOUT

* Typing

---------

Co-authored-by: Olivier Le Thanh Duong <olivier@lethanh.be>

* Migrate to Pydantic v2, update model validation and fix async issues

- Migrated to Pydantic v2:
  - Replaced deprecated `parse_obj()` and `parse_raw()` with
`model_validate()` and `model_validate_json()`.
  - Replaced `.dict()` with `.model_dump()` for serializing models to dictionaries.
  - Updated `validator` to `field_validator` and `root_validator` to
`model_validator` to comply with Pydantic v2 syntax changes.

- Fixed asyncio issues:
  - Added `await` for asynchronous methods like `raise_for_status()`
in `RemoteAccount` and other HTTP operations to avoid `RuntimeWarning`.

- Updated config handling:
  - Used `ClassVar` for constants in `Settings` and other configuration classes.
  - Replaced `Config` with `ConfigDict` in Pydantic models
to follow v2 conventions.
  - Added default values for missing fields in chain configurations
(`CHAINS_SEPOLIA_ACTIVE`, etc.).

- Adjusted signature handling:
  - Updated the signing logic to prepend `0x` in the `BaseAccount` signature
generation to ensure correct Ethereum address formatting.

- Minor fixes:
  - Resolved issue with extra fields not being allowed by default
by specifying `extra="allow"` or `extra="forbid"` where necessary.
  - Fixed tests to account for changes in model validation and
serialization behavior.
  - Added `pydantic-settings` as a new dependency for configuration management.

* fix: add explicit float type for HTTP_REQUEST_TIMEOUT to comply with Pydantic v2 requirements

Pydantic v2 requires explicit type annotations for fields, so added `float`
to ensure proper validation of HTTP_REQUEST_TIMEOUT.

* Fix: Linting tests did not pass:

* Fix: Project don't use the good version of aleph-message

There were changes made on aleph-message on the main branch about
pydantic version. Using the version by the url and then change it
later after the release.

* fix: Wrong aleph-message version

* Fix: list[str] rise an error in ubuntu 20.04

Using List from typing instead to assure the compatibility between python3.8 and above

* style: isort

* fix: Hugo comments

* Add pydantic for better mypy tests + Fixes

* fix: Changing version of aleph-message

* style: Missing type for URL

* style: Missing type for URL

* fix: Changing version of aleph-message and fix mypy

Changing the version from the branch to the main of aleph-message
mypy rose some errors about missing name argument, so setting the as None because
they are optional

* fix: Changing version of aleph-message

* fix: Changing version of pytezos

* Changes for new pricing system (#199)

- Move/improve flow code parts from CLI to SDK
- Add utils functions
- Add `make_instance_content` and `make_program_content`
- Refactor `create_instance` and `create_program`
- Add `get_estimated_price`
- Fixes for mypy/ruff/pytest
- Minor improvements
- Remove firecracker rootfs hashes for instances

* Migrate to Pydantic v2, update model validation and fix async issues

- Migrated to Pydantic v2:
  - Replaced deprecated `parse_obj()` and `parse_raw()` with
`model_validate()` and `model_validate_json()`.
  - Replaced `.dict()` with `.model_dump()` for serializing models to dictionaries.
  - Updated `validator` to `field_validator` and `root_validator` to
`model_validator` to comply with Pydantic v2 syntax changes.

- Fixed asyncio issues:
  - Added `await` for asynchronous methods like `raise_for_status()`
in `RemoteAccount` and other HTTP operations to avoid `RuntimeWarning`.

- Updated config handling:
  - Used `ClassVar` for constants in `Settings` and other configuration classes.
  - Replaced `Config` with `ConfigDict` in Pydantic models
to follow v2 conventions.
  - Added default values for missing fields in chain configurations
(`CHAINS_SEPOLIA_ACTIVE`, etc.).

- Adjusted signature handling:
  - Updated the signing logic to prepend `0x` in the `BaseAccount` signature
generation to ensure correct Ethereum address formatting.

- Minor fixes:
  - Resolved issue with extra fields not being allowed by default
by specifying `extra="allow"` or `extra="forbid"` where necessary.
  - Fixed tests to account for changes in model validation and
serialization behavior.
  - Added `pydantic-settings` as a new dependency for configuration management.

* fix: lint tests were failing

- Updated all instances of **extra_fields to ensure proper handling of
Optional dictionaries using `(extra_fields or {})` pattern.
- Added proper return statements in `AlephHttpClient.get_message_status`
to return parsed JSON data as a `MessageStatus` object.
- Updated `Settings` class in `conf.py` to correct DNS resolvers type
and simplify the `model_config` definition.
- Refactored `parse_volume` to ensure correct handling of Mapping types
and MachineVolume types, avoiding TypeErrors.
- Improved field validation and model validation in `SignedPubKeyHeader` by
using correct Pydantic v2 validation decorators and ensuring compatibility with the new model behavior.
- Applied formatting and consistency fixes for `model_dump` usage and indentation improvements in test files.

* Migrate to Pydantic v2, update model validation and fix async issues

- Migrated to Pydantic v2:
  - Replaced deprecated `parse_obj()` and `parse_raw()` with
`model_validate()` and `model_validate_json()`.
  - Replaced `.dict()` with `.model_dump()` for serializing models to dictionaries.
  - Updated `validator` to `field_validator` and `root_validator` to
`model_validator` to comply with Pydantic v2 syntax changes.

- Fixed asyncio issues:
  - Added `await` for asynchronous methods like `raise_for_status()`
in `RemoteAccount` and other HTTP operations to avoid `RuntimeWarning`.

- Updated config handling:
  - Used `ClassVar` for constants in `Settings` and other configuration classes.
  - Replaced `Config` with `ConfigDict` in Pydantic models
to follow v2 conventions.
  - Added default values for missing fields in chain configurations
(`CHAINS_SEPOLIA_ACTIVE`, etc.).

- Adjusted signature handling:
  - Updated the signing logic to prepend `0x` in the `BaseAccount` signature
generation to ensure correct Ethereum address formatting.

- Minor fixes:
  - Resolved issue with extra fields not being allowed by default
by specifying `extra="allow"` or `extra="forbid"` where necessary.
  - Fixed tests to account for changes in model validation and
serialization behavior.
  - Added `pydantic-settings` as a new dependency for configuration management.

* Fix: Linting tests did not pass:

* fix: Wrong aleph-message version

* fix: Hugo comments

* Add pydantic for better mypy tests + Fixes

* fix: Changing version of aleph-message

* style: Missing type for URL

* fix: Changing version of aleph-message and fix mypy

Changing the version from the branch to the main of aleph-message
mypy rose some errors about missing name argument, so setting the as None because
they are optional

* fix: Changing version of aleph-message

* Fix: Missing pydantic_core and wrong version of tezos

* Fix: Access to PersistentVolumeSizeMib is incompatible after migrating to Pydantic2

Using model_validate to access it

* Fix: Wrong name given to the variable

* Style: isort

* Fix: PersistentVolumeSizeMib no longer exist

This class has been deleted from aleph_message and the size is now inside
the PersistentVolume class

* Fix: Update last `aleph-message` version and use again `PersistentVolumeSizeMib` class

* fix: invalid signature cause by `0x` + signature.hex()

* fix: add '0x' to the signature if not here (error happenings only on unit test)

* Refactor: Apply the `.hex()` quick fix on the ETHAccount class instead on the base one as other chains can be affected.

* fix: pydantic model should use `.model_dump()` instead of `dict()`

* fix: add dummy signature for unauthenticated price estimates

When estimating prices without authentication, there's no valid signature available.
This fix uses a dummy signature so that message validation passes in these cases.

---------

Co-authored-by: Laurent Peuch <cortex@worlddomination.be>
Co-authored-by: philogicae <philogicae+github@gmail.com>
Co-authored-by: Olivier Le Thanh Duong <olivier@lethanh.be>
Co-authored-by: philogicae <38438271+philogicae@users.noreply.github.com>
Co-authored-by: Andres D. Molins <amolinsdiaz@yahoo.es>
Co-authored-by: 1yam <lyam.gomes@epitech.eu>
Co-authored-by: Andres D. Molins <nesitor@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RED This PR is complex and may require more time to review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants