fix: patching algopy import syntax in hello world (#30)

algorandfoundation · Jun 27, 2024 · 3880851 · 3880851
1 parent 550eaff
commit 3880851
Show file tree

Hide file tree

Showing 20 changed files with 68 additions and 52 deletions.
diff --git a/examples/generators/production_python_smart_contract_python/.algokit.toml b/examples/generators/production_python_smart_contract_python/.algokit.toml
@@ -33,7 +33,7 @@ audit = { commands = [
   'poetry run pip-audit -r requirements.txt',
 ], description = 'Audit with pip-audit' }
 lint = { commands = [
-  'poetry run black --check .',
+  'poetry run black --check --diff .',
   'poetry run ruff check .',
   'poetry run mypy',
 ], description = 'Perform linting' }

diff --git a/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...erators/production_python_smart_contract_python/smart_contracts/cool_contract/contract.py b/...erators/production_python_smart_contract_python/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class CoolContract(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...enerators/production_python_smart_contract_python/smart_contracts/hello_world/contract.py b/...enerators/production_python_smart_contract_python/smart_contracts/hello_world/contract.py
@@ -1,7 +1,8 @@
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class HelloWorld(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit.toml b/examples/generators/production_python_smart_contract_typescript/.algokit.toml
@@ -33,7 +33,7 @@ audit = { commands = [
   'poetry run pip-audit -r requirements.txt',
 ], description = 'Audit with pip-audit' }
 lint = { commands = [
-  'poetry run black --check .',
+  'poetry run black --check --diff .',
   'poetry run ruff check .',
   'poetry run mypy',
 ], description = 'Perform linting' }

diff --git a/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...ors/production_python_smart_contract_typescript/smart_contracts/cool_contract/contract.py b/...ors/production_python_smart_contract_typescript/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class CoolContract(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...ators/production_python_smart_contract_typescript/smart_contracts/hello_world/contract.py b/...ators/production_python_smart_contract_typescript/smart_contracts/hello_world/contract.py
@@ -1,7 +1,8 @@
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class HelloWorld(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...on/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...generators/starter_python_smart_contract_python/smart_contracts/cool_contract/contract.py b/...generators/starter_python_smart_contract_python/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class CoolContract(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...s/generators/starter_python_smart_contract_python/smart_contracts/hello_world/contract.py b/...s/generators/starter_python_smart_contract_python/smart_contracts/hello_world/contract.py
@@ -1,7 +1,8 @@
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class HelloWorld(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2 b/...pt/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/contract.py.j2
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...rators/starter_python_smart_contract_typescript/smart_contracts/cool_contract/contract.py b/...rators/starter_python_smart_contract_typescript/smart_contracts/cool_contract/contract.py
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class CoolContract(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/...nerators/starter_python_smart_contract_typescript/smart_contracts/hello_world/contract.py b/...nerators/starter_python_smart_contract_typescript/smart_contracts/hello_world/contract.py
@@ -1,7 +1,8 @@
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class HelloWorld(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/examples/production_python/.algokit.toml b/examples/production_python/.algokit.toml
@@ -33,7 +33,7 @@ audit = { commands = [
   'poetry run pip-audit -r requirements.txt',
 ], description = 'Audit with pip-audit' }
 lint = { commands = [
-  'poetry run black --check .',
+  'poetry run black --check --diff .',
   'poetry run ruff check .',
   'poetry run mypy',
 ], description = 'Perform linting' }

diff --git a/examples/production_python/smart_contracts/hello_world/contract.py b/examples/production_python/smart_contracts/hello_world/contract.py
@@ -1,7 +1,8 @@
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class HelloWorld(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/examples/starter_python/smart_contracts/hello_world/contract.py b/examples/starter_python/smart_contracts/hello_world/contract.py
@@ -1,7 +1,8 @@
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class HelloWorld(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/template_content/.algokit.toml.jinja b/template_content/.algokit.toml.jinja
@@ -48,7 +48,7 @@ audit = { commands = [
 {%- endif %}
 lint = { commands = [
 {%- if use_python_black %}
-  'poetry run black --check .',
+  'poetry run black --check --diff .',
 {%- endif %}
 {%- if python_linter == 'ruff' %}
   'poetry run ruff check .',

diff --git a/...s/create_contract/smart_contracts/{% raw %}{{ contract_name }}{% endraw %}/contract.py.j2 b/...s/create_contract/smart_contracts/{% raw %}{{ contract_name }}{% endraw %}/contract.py.j2
@@ -1,8 +1,9 @@
 # pyright: reportMissingModuleSource=false
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name
diff --git a/template_content/smart_contracts/{{ contract_name }}/contract.py.jinja b/template_content/smart_contracts/{{ contract_name }}/contract.py.jinja
@@ -1,7 +1,8 @@
-from algopy import ARC4Contract, arc4
+from algopy import ARC4Contract, String
+from algopy.arc4 import abimethod
 
 
 class {{ contract_name.split('_')|map('capitalize')|join }}(ARC4Contract):
-    @arc4.abimethod()
-    def hello(self, name: arc4.String) -> arc4.String:
+    @abimethod()
+    def hello(self, name: String) -> String:
         return "Hello, " + name