Merge pull request #22 from algorandfoundation/tweaks

neilcampbell · web-flow · commit e0acc13f2d45 · 2024-05-07T10:32:06.000+08:00
chore: tweak client generator imports
diff --git a/examples/generators/production_python_smart_contract_python/smart_contracts/helpers/build.py b/examples/generators/production_python_smart_contract_python/smart_contracts/helpers/build.py
@@ -53,7 +53,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:
     if generate_result.returncode:
         if "No such command" in generate_result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.1 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:
diff --git a/examples/generators/production_python_smart_contract_typescript/package.json b/examples/generators/production_python_smart_contract_typescript/package.json
@@ -14,10 +14,11 @@
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^5.1.0",
-    "algosdk": "^2.5.0"
+    "@algorandfoundation/algokit-utils": "^6.0.2",
+    "algosdk": "^2.7.0"
   },
   "devDependencies": {
+    "@algorandfoundation/algokit-client-generator": "^3.0.3",
     "@types/jest": "^29.5.11",
     "dotenv": "^16.0.3",
     "prettier": "^2.8.4",
diff --git a/examples/generators/production_python_smart_contract_typescript/pyproject.toml b/examples/generators/production_python_smart_contract_typescript/pyproject.toml
@@ -12,7 +12,6 @@ python-dotenv = "^1.0.0"
 algorand-python = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
-algokit-client-generator = "^1.1.3"
 black = {extras = ["d"], version = "*"}
 ruff = "^0.1.6"
 mypy = "*"
diff --git a/examples/generators/production_python_smart_contract_typescript/smart_contracts/helpers/build.py b/examples/generators/production_python_smart_contract_typescript/smart_contracts/helpers/build.py
@@ -53,7 +53,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:
     if generate_result.returncode:
         if "No such command" in generate_result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.1 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:
diff --git a/examples/generators/starter_python_smart_contract_python/smart_contracts/helpers/build.py b/examples/generators/starter_python_smart_contract_python/smart_contracts/helpers/build.py
@@ -53,7 +53,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:
     if generate_result.returncode:
         if "No such command" in generate_result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.1 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:
diff --git a/examples/generators/starter_python_smart_contract_typescript/package.json b/examples/generators/starter_python_smart_contract_typescript/package.json
@@ -13,10 +13,11 @@
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^5.1.0",
-    "algosdk": "^2.5.0"
+    "@algorandfoundation/algokit-utils": "^6.0.2",
+    "algosdk": "^2.7.0"
   },
   "devDependencies": {
+    "@algorandfoundation/algokit-client-generator": "^3.0.3",
     "dotenv": "^16.0.3",
     "prettier": "^2.8.4",
     "ts-node-dev": "^2.0.0",
diff --git a/examples/generators/starter_python_smart_contract_typescript/pyproject.toml b/examples/generators/starter_python_smart_contract_typescript/pyproject.toml
@@ -12,7 +12,6 @@ python-dotenv = "^1.0.0"
 algorand-python = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
-algokit-client-generator = "^1.1.3"
 puyapy = "*"
 
 [build-system]
diff --git a/examples/generators/starter_python_smart_contract_typescript/smart_contracts/helpers/build.py b/examples/generators/starter_python_smart_contract_typescript/smart_contracts/helpers/build.py
@@ -53,7 +53,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:
     if generate_result.returncode:
         if "No such command" in generate_result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.1 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:
diff --git a/examples/production_python/smart_contracts/helpers/build.py b/examples/production_python/smart_contracts/helpers/build.py
@@ -53,7 +53,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:
     if generate_result.returncode:
         if "No such command" in generate_result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.1 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:
diff --git a/examples/starter_python/smart_contracts/helpers/build.py b/examples/starter_python/smart_contracts/helpers/build.py
@@ -53,7 +53,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:
     if generate_result.returncode:
         if "No such command" in generate_result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.1 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:
diff --git a/template_content/pyproject.toml.jinja b/template_content/pyproject.toml.jinja
@@ -12,7 +12,9 @@ python-dotenv = "^1.0.0"
 algorand-python = "^1.0.0"
 
 [tool.poetry.group.dev.dependencies]
+{% if deployment_language == 'python' -%}
 algokit-client-generator = "^1.1.3"
+{% endif -%}
 {% if use_python_black -%}
 black = {extras = ["d"], version = "*"}
 {% endif -%}
diff --git a/template_content/smart_contracts/helpers/build.py.jinja b/template_content/smart_contracts/helpers/build.py.jinja
@@ -56,7 +56,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:
     if generate_result.returncode:
         if "No such command" in generate_result.stdout:
             raise Exception(
-                "Could not generate typed client, requires AlgoKit 1.1 or "
+                "Could not generate typed client, requires AlgoKit 2.0.0 or "
                 "later. Please update AlgoKit"
             )
         else:
diff --git a/template_content/{% if deployment_language == 'typescript' or use_typescript_jest %}package.json{% endif %}.jinja b/template_content/{% if deployment_language == 'typescript' or use_typescript_jest %}package.json{% endif %}.jinja
@@ -16,10 +16,11 @@
     "npm": ">=9.0"
   },
   "dependencies": {
-    "@algorandfoundation/algokit-utils": "^5.1.0",
-    "algosdk": "^2.5.0"
+    "@algorandfoundation/algokit-utils": "^6.0.2",
+    "algosdk": "^2.7.0"
   },
   "devDependencies": {
+    "@algorandfoundation/algokit-client-generator": "^3.0.3",
     {%- if use_typescript_jest  %}
     "@types/jest": "^29.5.11",
     {%- endif %}

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ def build(output_dir: Path, contract_path: Path) -> Path:`
`53`	`53`	`if generate_result.returncode:`
`54`	`54`	`if "No such command" in generate_result.stdout:`
`55`	`55`	`raise Exception(`
`56`		`- "Could not generate typed client, requires AlgoKit 1.1 or "`
	`56`	`+ "Could not generate typed client, requires AlgoKit 2.0.0 or "`
`57`	`57`	`"later. Please update AlgoKit"`
`58`	`58`	`)`
`59`	`59`	`else:`