Beaker & PyTeal deprecation by CiottiGiorgio · Pull Request #34 · algorandfoundation/algokit-client-generator-py

CiottiGiorgio · 2025-01-22T09:07:56Z

This PR consists of replacing the smart contracts in the examples folder with new ones written in Algorand Python.

aorumbayev · 2025-01-22T22:17:35Z

@CiottiGiorgio i'd suggest holding this off until #33 is merged. PR will align examples with examples available on ts generator, the remaining steps on this pr would just imply fixing some merge conflicts (replacing non puya with puya).

CiottiGiorgio · 2025-01-23T11:03:40Z

Thank you for heads up.

# Conflicts: # examples/__main__.py # examples/helloworld/application.json # examples/helloworld/helloworld.py # examples/lifecycle/application.json # examples/lifecycle/lifecycle.py # examples/minimal/application.json # examples/minimal/minimal.py # examples/smart_contracts/artifacts/hello_world/hello_world_client.py # examples/smart_contracts/artifacts/lifecycle/lifecycle_client.py # examples/smart_contracts/artifacts/minimal/minimal_client.py # examples/smart_contracts/artifacts/state/state_client.py # examples/state/application.json # examples/state/state.py # examples/tests/test_hello_world_client.py # examples/tests/test_lifecycle_client.py # examples/tests/test_minimal_client.py # examples/tests/test_state_client.py # examples/tests/test_voting_client.py # examples/voting/application.json # examples/voting/client.py # examples/voting/voting.py # poetry.lock # pyproject.toml # scripts/update_approvals.py # tests/test_generator.py

# Conflicts: # examples/helloworld/test_client.py # examples/lifecycle/test_client.py # examples/smart_contracts/artifacts/hello_world/hello_world_client.py # examples/smart_contracts/artifacts/lifecycle/lifecycle_client.py # examples/smart_contracts/artifacts/minimal/minimal_client.py # examples/smart_contracts/artifacts/state/state_client.py # examples/state/test_client.py # examples/voting/client.py # examples/voting/test_client.py # poetry.lock # pyproject.toml # scripts/update_approvals.py # tests/test_generator.py

# Conflicts: # examples/smart_contracts/artifacts/hello_world/hello_world_client.py # examples/smart_contracts/artifacts/lifecycle/lifecycle_client.py # examples/smart_contracts/artifacts/minimal/minimal_client.py # examples/smart_contracts/artifacts/state/state_client.py # examples/tests/test_lifecycle_client.py # examples/voting/client.py # poetry.lock # pyproject.toml

CiottiGiorgio · 2025-02-06T11:09:35Z

@aorumbayev I noticed how the dev dependency for the latest compiler and algopy language bumped Python to 3.12.
This is even when the client generator is only used and not developed on. Is this problematic?

aorumbayev · 2025-02-06T11:11:22Z

@CiottiGiorgio good point will double check in an hour or so if it's an issue (intent was likely to bump it only on dev dependencies)

CiottiGiorgio · 2025-02-06T11:26:57Z

This happened on my side when I installed puya and algopy on this branch as dev deps. Looking forward to know if this causes issues but I'll look more into having two python version requirements for dev group and main group.

github-actions · 2025-02-06T15:04:14Z

Coverage Report

File	Stmts	Miss	Cover	Missing
src/algokit_client_generator
__main__.py	2	2	0%	1–3
cli.py	48	48	0%	1–87
document.py	82	7	91%	44, 47, 49–50, 55, 74–75
generator.py	31	1	97%	23
spec.py	207	16	92%	86, 116–119, 219–223, 253, 269, 350–351, 395, 410
utils.py	219	48	78%	11, 20, 24, 28, 32, 36, 40, 44, 55, 58, 63–64, 75–76, 82–84, 89–91, 94–96, 99, 102, 105, 108–110, 159–160, 194, 198, 201–202, 218, 220, 231–232, 249, 261–264, 268, 278, 281, 283
src/algokit_client_generator/generators
composer.py	51	1	98%	29
typed_client.py	328	8	98%	59, 188, 287, 590, 680, 690, 729, 840
typed_factory.py	213	3	99%	64, 94, 227
TOTAL	1252	134	89%

Tests	Skipped	Failures	Errors	Time
42	0 💤	0 ❌	0 🔥	20.012s ⏱️

…use it was manually recompiled with a version of puya that contains the bugfix

CiottiGiorgio · 2025-02-07T10:34:22Z

This PR is waiting for this fix (algorandfoundation/puya#389) to make it into a release of puya because at the moment the state contract is manually recompiled using a nightly release.

aorumbayev · 2025-02-07T10:49:28Z

pyproject.toml

+algorand-python = { version = "^2.4.1", python = "^3.12" }
 setuptools = "^75.8.0"
 pytest-sugar = "^1.0.0"
+inflection = "^0.5.1"


@CiottiGiorgio do you really need an whole dependency for a single to camel case use case? Also looks like the dependency is not actively maintained https://github.com/jpvanhal/inflection (no commits since 2020)

@CiottiGiorgio see utils.py file in src, there are various formatters and sanitizers you can reuse, for instance you can make to_camel_case by reusing the to_pascal_case method and making first char lowercase?

def to_camel_case(value: str) -> str: pascal_case = to_pascal_case(value) return pascal_case[0].lower() + pascal_case[1:]

CiottiGiorgio · 2025-02-07T13:41:10Z

Review comments and bugfixes are addressed. Ready for a last pass of review if necessary

CiottiGiorgio added 2 commits January 16, 2025 16:51

chore: remove beaker from the dependencies in favor of algorand python.

f831395

feat: rewrote all contracts other than voting in algopy.

f9ec745

CiottiGiorgio added 2 commits January 24, 2025 16:27

feat: voting contract.

3c40190

feat: linting & rebuilding.

9ae6b9f

CiottiGiorgio requested a review from lempira January 24, 2025 15:45

CiottiGiorgio added 23 commits January 31, 2025 14:51

fix: ran "poetry lock"

0c27d71

fix: rebuilt clients

d1ca02e

fix: rebuilt specs and clients

75a5cab

fix: ran "poetry lock"

cc75486

fix: rebuilt specs and clients

b0a1373

fix: added structs contract

b0192d7

fix: added zero coupon bond contract

0c90833

fix: added reti contract

5fd671a

fix: added arc56_test contract

76ffa72

fix: added nfd contract

51d1d48

fix: added nested contract

a850aaf

fix: added duplicate structs contract

675bab7

fix: fixed most app tests

8ca5efc

fix: formatting and simplifying build pipeline

5509e8f

fix: simplifying update_approvals.py

a8be469

fix: linting and formatting

7cf8527

fix: adding client generation for missed apps

57ce5f9

fix: stability test

b964f76

fix: linting and formatting.

76d1cc0

fix: poetry update.

d76a0b9

fix: state contract testing.

a28601a

CiottiGiorgio marked this pull request as ready for review February 5, 2025 17:57

CiottiGiorgio added 3 commits February 6, 2025 12:02

fix: poetry lock --no-update.

1980e80

fix: rebuilt artifacts.

6845db0

CiottiGiorgio added 5 commits February 6, 2025 12:31

fix: python 3.12 only required when in installed with the dev group.

83d79b2

fix: using external package to convert to camel case.

5802d01

fix: linting.

e5eae6d

fix: capitalize app names.

bc1c8a2

fix: harmonize lifecycle contract names.

d3ecdf4

CiottiGiorgio force-pushed the feature/beaker-deprecation branch from 50415f7 to d3ecdf4 Compare February 6, 2025 14:55

fix: harmonize nfd and arc56Test contract names.

92bfd5c

aorumbayev self-requested a review February 6, 2025 15:17

aorumbayev approved these changes Feb 6, 2025

View reviewed changes

CiottiGiorgio added the task label Feb 6, 2025

CiottiGiorgio added 2 commits February 6, 2025 17:09

fix: update README.md.

c998bfa

fix: state contract correctly hints default arg from local state beca…

3818d10

…use it was manually recompiled with a version of puya that contains the bugfix

aorumbayev reviewed Feb 7, 2025

View reviewed changes

CiottiGiorgio added 4 commits February 7, 2025 12:19

fix: poetry update & rebuild all artifacts

3314d84

fix: remove inflection

f06d346

fix: harmonize contracts that have acronyms in the name

c9b9ba5

fix: import arc56_test client in related test

0718728

CiottiGiorgio merged commit f9ef7a1 into main Feb 7, 2025
6 checks passed

CiottiGiorgio mentioned this pull request Feb 10, 2025

Beaker & PyTeal Deprecation #38

Merged

CiottiGiorgio deleted the feature/beaker-deprecation branch February 10, 2025 13:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Beaker & PyTeal deprecation#34

Beaker & PyTeal deprecation#34
CiottiGiorgio merged 46 commits intomainfrom
feature/beaker-deprecation

CiottiGiorgio commented Jan 22, 2025

Uh oh!

aorumbayev commented Jan 22, 2025

Uh oh!

CiottiGiorgio commented Jan 23, 2025

Uh oh!

CiottiGiorgio commented Feb 6, 2025 •

edited

Loading

Uh oh!

aorumbayev commented Feb 6, 2025 •

edited

Loading

Uh oh!

CiottiGiorgio commented Feb 6, 2025

Uh oh!

github-actions bot commented Feb 6, 2025 •

edited

Loading

Uh oh!

CiottiGiorgio commented Feb 7, 2025

Uh oh!

aorumbayev Feb 7, 2025

Uh oh!

aorumbayev Feb 7, 2025

Uh oh!

aorumbayev Feb 7, 2025

Uh oh!

CiottiGiorgio Feb 7, 2025

Uh oh!

CiottiGiorgio commented Feb 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

CiottiGiorgio commented Jan 22, 2025

Uh oh!

aorumbayev commented Jan 22, 2025

Uh oh!

CiottiGiorgio commented Jan 23, 2025

Uh oh!

CiottiGiorgio commented Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aorumbayev commented Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CiottiGiorgio commented Feb 6, 2025

Uh oh!

github-actions bot commented Feb 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CiottiGiorgio commented Feb 7, 2025

Uh oh!

aorumbayev Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

aorumbayev Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

aorumbayev Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

CiottiGiorgio Feb 7, 2025

Choose a reason for hiding this comment

Uh oh!

CiottiGiorgio commented Feb 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

CiottiGiorgio commented Feb 6, 2025 •

edited

Loading

aorumbayev commented Feb 6, 2025 •

edited

Loading

github-actions bot commented Feb 6, 2025 •

edited

Loading