fix: PAN-1832 include config on wheel (#10)

* fix: PAN-1832 include config on wheel

.dockerignore

@@ -0,0 +1,17 @@
+**/__pycache__/
+*.egg-info/
+*.key*
+*.keystore*
+*.swp
+.coverage
+.DS_store
+.venv/
+.vscode/
+build/
+dist/
+find.sh
+local/
+.pytest_cache
+.mypy_cache
+Dockerfile
+*.

.github/workflows/ci.yaml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Test image
         run: |
-            docker run --rm ghcr.io/pantos-io/client-cli:latest --help
+          docker run --rm ghcr.io/pantos-io/client-cli:latest --help
 
   build-and-run:
     runs-on: ubuntu-latest

.gitignore

@@ -11,3 +11,5 @@ build/
 dist/
 find.sh
 local/
+.pytest_cache
+.mypy_cache

Dockerfile

@@ -1,27 +1,26 @@
-FROM python:3.12-alpine
-
-ARG environment=testnet
-ARG version=1.1.0
-
-ENV PANTOS_CLIENT_VERSION=${version}
+FROM python:3.12-alpine AS build
 
 RUN apk update && apk add gcc libc-dev libffi-dev \
   && apk cache clean
 
+RUN python3 -m pip install poetry
+
 WORKDIR /pantos-cli
 
-COPY pyproject.toml poetry.lock ./
+COPY . .
 
-RUN python3 -m pip install poetry
+RUN poetry build
+
+FROM python:3.12-alpine AS production
+
+WORKDIR /pantos-cli
+
+COPY --from=build /pantos-cli/dist/*.whl .
 
-RUN poetry install --only main --no-interaction --no-cache --no-root
+RUN python3 -m pip install *.whl
 
-RUN mkdir -p ./pantos/cli
+RUN pip cache purge && rm -rf ~/.cache/pip
 
-COPY pantos/cli ./pantos/cli
-COPY client-cli.yml .
-COPY client-library.yml .
-COPY client-cli.env .
-COPY client-library.env .
+RUN rm *.whl
 
-ENTRYPOINT ["poetry", "run", "python3", "-m", "pantos.cli"]
+ENTRYPOINT ["pantos-cli"]

Makefile

@@ -70,12 +70,8 @@ wheel:
 	poetry build
 
 .PHONY: docker
-docker: dist/pantos_client_cli-$(PANTOS_CLIENT_CLI_VERSION).docker
-
-dist/pantos_client_cli-$(PANTOS_CLIENT_CLI_VERSION).docker: Dockerfile pantos/ client-cli.yml client-library.yml client-library.publish.env submodules/client-library/pantos/client/library/ pyproject.toml submodules/common/pantos/common/
+docker:
 	docker build -t pantosio/pantos-client .
-	mkdir -p dist
-	docker save pantosio/pantos-client > dist/pantos_client_cli-$(PANTOS_CLIENT_CLI_VERSION).docker
 
 .PHONY: install
 install: dist/pantos_client_cli-$(PANTOS_CLIENT_CLI_VERSION)-py3-none-any.whl

pantos/cli/__main__.py

@@ -4,7 +4,9 @@
 import argparse
 import decimal
 import getpass
+import importlib.resources
 import pathlib
+import shutil
 import sys
 import typing
 import uuid
@@ -31,6 +33,8 @@ def main() -> None:
             _execute_command_transfer(arguments)
         elif arguments.command == 'status':
             _execute_command_status(arguments)
+        elif arguments.command == 'create-config':
+            _execute_command_create_config(arguments)
         else:
             raise NotImplementedError
     except Exception as error:
@@ -125,6 +129,12 @@ def _create_argument_parser() -> argparse.ArgumentParser:
         help='The number of blocks to query for the transfer on the '
         'destination blockchain. If not specified, the query will '
         'include all blocks from the latest to the genesis block.')
+    parser_config = subparsers.add_parser('create-config',
+                                          help='Create a new empty env file')
+    parser_config.add_argument(
+        '-p', '--path', type=pathlib.Path, default=None,
+        help='Path where to create the env file, defaults to the '
+        'current working directory')
     return parser
 
 
@@ -199,6 +209,22 @@ def _execute_command_status(arguments: argparse.Namespace) -> None:
                   transfer_status)
 
 
+def _execute_command_create_config(arguments: argparse.Namespace) -> None:
+    path = arguments.path
+    if path is None:
+        path = pathlib.Path.cwd()
+
+    path.mkdir(parents=True, exist_ok=True)
+
+    # List and copy all .env files from the pantos resource directory
+    resource_path = importlib.resources.files('pantos')
+    for env_file in resource_path.iterdir():
+        env_file_path = pathlib.Path(env_file.name)
+        if env_file_path.suffix == '.env':
+            shutil.copy(env_file_path, path / env_file_path.name)
+    print(f'Created .env files in {path}')
+
+
 def _load_private_key(
         blockchain: api.Blockchain,
         keystore_path: typing.Optional[pathlib.Path] = None) -> api.PrivateKey:

pyproject.toml

@@ -8,6 +8,12 @@ readme = "README.md"
 packages = [
     { include = "pantos"}
 ]
+include = [
+    "pantos/client-library.yml",
+    "pantos/client-library.env",
+    "pantos/client-cli.yml",
+    "pantos/client-cli.env",
+]
 
 [tool.setuptools.packages.find]
 where = ["."]
@@ -44,3 +50,6 @@ python-dotenv = "1.0.1"
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.scripts]
+pantos-cli = "pantos.cli.__main__:main"