Py4HEAppE 3.0.0__tar.gz → 3.2.0__tar.gz

{py4heappe-3.0.0 → py4heappe-3.2.0}/CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 3.2.0
+
+### Added
+- Extended `py4heappe FileTransfer Stream` with alternate upload sources: `--stdin` for raw piped bytes and `--base64` for inline base64 content.
+- Added `--upload-filename` for naming uploaded content when using `--stdin` or `--base64`.
+- Added dedicated in-memory upload implementation in `src/py4heappe/heappe_v6/core/api/file_transfer_api_ext.py` via `FileTransferApiExt.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post`, supporting byte-like and file-like objects.
+- Added live CLI examples for `Stream --stdin` and `Stream --base64` in `tests/test_cli_file_transfer.py`.
+
+### Changed
+- Updated `README.md` File Transfer examples to include concrete `Stream` upload commands for disk files, stdin bytes, and base64 payloads.
+- Updated `docs/examples/example.py` with an optional in-memory upload example using `FileTransferApiExt` and `InMemoryUploadFile`.
+
+## 3.1.0
+
+### Added
+- CLI integration tests (live CLI examples) under `tests/` with helper `tests/live_cli_support.py` and a `tests/.env` template to simplify running live examples.
+- Updated README with instructions for running CLI tests and environment setup.
+
+### Changed
+- Documented test-runner defaults (use Python's `unittest`) and optional `pytest` support.
+
+
 ## 3.0.0
 
 ### Compatible with HEAppE V6.5.X, V6.4.X, V6.3.X, V6.2.X, V6.2.1, V5.0.X, V4.3.X and V4.2.X

{py4heappe-3.0.0 → py4heappe-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Py4HEAppE
-Version: 3.0.0
+Version: 3.2.0
 Summary: Py4HEAppE is client library for easy access to HEAppE Middleware
 Author-email: IT4Innovations <support.heappe@it4i.cz>
 License-Expression: MIT
@@ -22,11 +22,14 @@ Requires-Dist: click>=8.1.0
 Requires-Dist: typer>=0.15.0
 Requires-Dist: python-dotenv>=0.21.1
 Requires-Dist: validators==0.35.0
+Requires-Dist: typing-extensions==4.16.0
 Dynamic: license-file
 
 <img align="right" width="35%" src="https://raw.githubusercontent.com/It4innovations/Py4HEAppE/refs/heads/master/docs/imgs/logo.png">
 
 # Py4HEAppE (Python for HEAppE Middleware)
+Release: 3.2.0
+
 Py4HEAppE provides both a command-line interface and versioned Python wrappers for the [HEAppE](https://heappe.eu) middleware API.
 
 You can use it in two ways:
@@ -36,7 +39,8 @@ You can use it in two ways:
 ## Supported HEAppE Versions
 | Py4HEAppE | HEAppE Version                                         | Notes |
 |:---------:|:-------------------------------------------------------| :---- |
-|   3.0.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
+|   3.2.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
+|   3.1.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
 |   2.9.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
 |   2.8.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
 |   2.7.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
@@ -208,7 +212,14 @@ py4heappe FileTransfer Download --help
 Upload files directly into the job execution directory:
 
 ```shell
-py4heappe FileTransfer Stream --help
+# Upload one or more local files from disk
+py4heappe FileTransfer Stream --id 12345 --files ./input_a.dat --files ./input_b.dat
+
+# Upload a single file from stdin bytes
+Get-Content -Path .\input.dat -AsByteStream | py4heappe FileTransfer Stream --id 12345 --stdin --upload-filename input.dat
+
+# Upload a single file from base64 content
+py4heappe FileTransfer Stream --id 12345 --base64 aGVsbG8gd29ybGQ= --upload-filename hello.txt
 ```
 
 ## Python API Wrapper
@@ -226,6 +237,40 @@ import py4heappe.heappe_v6.core as hp
 
 There is no single unversioned `py4heappe.core` module. Use the versioned wrapper explicitly.
 
+### Dedicated In-Memory Upload API (`file_transfer_api_ext.py`)
+
+For uploads that should not touch local disk files, use the dedicated implementation in
+`src/py4heappe/heappe_v6/core/api/file_transfer_api_ext.py`.
+
+It provides `FileTransferApiExt.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post`,
+which accepts byte-like payloads or file-like objects.
+
+```python
+import io
+
+import py4heappe.heappe_v6.core as hp
+from py4heappe.heappe_v6.core.api.file_transfer_api_ext import (
+    FileTransferApiExt,
+    InMemoryUploadFile,
+)
+
+configuration = hp.Configuration()
+configuration.host = "https://heappe.example.org"
+api_client = hp.ApiClient(configuration)
+
+stream_api = FileTransferApiExt(api_client)
+stream_api.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post(
+    files=[
+        InMemoryUploadFile("bytes-input.txt", b"hello from bytes"),
+        ("stream-input.bin", io.BytesIO(b"\\x00\\x01\\x02"), "application/octet-stream"),
+    ],
+    session_code="your-session-code",
+    job_id=12345,
+    task_id=1,
+    _preload_content=False,
+)
+```
+
 ### Minimal Python Example
 
 ```python
@@ -330,6 +375,26 @@ finally:
     api_client.pool.join()
 ```
 
+## Running CLI tests
+
+The repository includes live CLI integration tests under `tests/` that require a reachable HEAppE instance and several environment variables.
+
+Quick steps:
+
+- Create a `tests/.env` from the example and edit it:
+  - Unix: `cp tests/.env.example tests/.env`
+  - Windows (PowerShell): `Copy-Item tests\.env.example tests\.env`
+- Populate required values in `tests/.env` (or export the variables). At minimum set `PY4HEAPPE_RUN_LIVE_CLI_TESTS=1` and `PY4HEAPPE_TEST_URL` and `PY4HEAPPE_TEST_PROJECT`. To allow tests that change remote state also set `PY4HEAPPE_TEST_RUN_MUTATING_COMMANDS=1`.
+- Run the CLI tests (default, using the standard library's unittest):
+  - Run all CLI tests: `python -m unittest discover -s tests -p "test_cli_*.py" -v`
+  - Run a single test module: `python -m unittest tests.test_cli_auth -v`
+
+- Optional: run with pytest (pytest can run unittest-style tests and offers improved output):
+  - Install pytest: `python -m pip install -U pytest`
+  - Run with pytest: `python -m pytest -q tests/test_cli_*.py`
+
+Do NOT commit `tests/.env` with real credentials or session tokens.
+
 ## Notes
 
 - CLI configuration is stored locally after `py4heappe Conf Init`.

{py4heappe-3.0.0 → py4heappe-3.2.0}/README.md

@@ -1,6 +1,8 @@
 <img align="right" width="35%" src="https://raw.githubusercontent.com/It4innovations/Py4HEAppE/refs/heads/master/docs/imgs/logo.png">
 
 # Py4HEAppE (Python for HEAppE Middleware)
+Release: 3.2.0
+
 Py4HEAppE provides both a command-line interface and versioned Python wrappers for the [HEAppE](https://heappe.eu) middleware API.
 
 You can use it in two ways:
@@ -10,7 +12,8 @@ You can use it in two ways:
 ## Supported HEAppE Versions
 | Py4HEAppE | HEAppE Version                                         | Notes |
 |:---------:|:-------------------------------------------------------| :---- |
-|   3.0.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
+|   3.2.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
+|   3.1.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
 |   2.9.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
 |   2.8.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
 |   2.7.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
@@ -182,7 +185,14 @@ py4heappe FileTransfer Download --help
 Upload files directly into the job execution directory:
 
 ```shell
-py4heappe FileTransfer Stream --help
+# Upload one or more local files from disk
+py4heappe FileTransfer Stream --id 12345 --files ./input_a.dat --files ./input_b.dat
+
+# Upload a single file from stdin bytes
+Get-Content -Path .\input.dat -AsByteStream | py4heappe FileTransfer Stream --id 12345 --stdin --upload-filename input.dat
+
+# Upload a single file from base64 content
+py4heappe FileTransfer Stream --id 12345 --base64 aGVsbG8gd29ybGQ= --upload-filename hello.txt
 ```
 
 ## Python API Wrapper
@@ -200,6 +210,40 @@ import py4heappe.heappe_v6.core as hp
 
 There is no single unversioned `py4heappe.core` module. Use the versioned wrapper explicitly.
 
+### Dedicated In-Memory Upload API (`file_transfer_api_ext.py`)
+
+For uploads that should not touch local disk files, use the dedicated implementation in
+`src/py4heappe/heappe_v6/core/api/file_transfer_api_ext.py`.
+
+It provides `FileTransferApiExt.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post`,
+which accepts byte-like payloads or file-like objects.
+
+```python
+import io
+
+import py4heappe.heappe_v6.core as hp
+from py4heappe.heappe_v6.core.api.file_transfer_api_ext import (
+    FileTransferApiExt,
+    InMemoryUploadFile,
+)
+
+configuration = hp.Configuration()
+configuration.host = "https://heappe.example.org"
+api_client = hp.ApiClient(configuration)
+
+stream_api = FileTransferApiExt(api_client)
+stream_api.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post(
+    files=[
+        InMemoryUploadFile("bytes-input.txt", b"hello from bytes"),
+        ("stream-input.bin", io.BytesIO(b"\\x00\\x01\\x02"), "application/octet-stream"),
+    ],
+    session_code="your-session-code",
+    job_id=12345,
+    task_id=1,
+    _preload_content=False,
+)
+```
+
 ### Minimal Python Example
 
 ```python
@@ -304,6 +348,26 @@ finally:
     api_client.pool.join()
 ```
 
+## Running CLI tests
+
+The repository includes live CLI integration tests under `tests/` that require a reachable HEAppE instance and several environment variables.
+
+Quick steps:
+
+- Create a `tests/.env` from the example and edit it:
+  - Unix: `cp tests/.env.example tests/.env`
+  - Windows (PowerShell): `Copy-Item tests\.env.example tests\.env`
+- Populate required values in `tests/.env` (or export the variables). At minimum set `PY4HEAPPE_RUN_LIVE_CLI_TESTS=1` and `PY4HEAPPE_TEST_URL` and `PY4HEAPPE_TEST_PROJECT`. To allow tests that change remote state also set `PY4HEAPPE_TEST_RUN_MUTATING_COMMANDS=1`.
+- Run the CLI tests (default, using the standard library's unittest):
+  - Run all CLI tests: `python -m unittest discover -s tests -p "test_cli_*.py" -v`
+  - Run a single test module: `python -m unittest tests.test_cli_auth -v`
+
+- Optional: run with pytest (pytest can run unittest-style tests and offers improved output):
+  - Install pytest: `python -m pip install -U pytest`
+  - Run with pytest: `python -m pytest -q tests/test_cli_*.py`
+
+Do NOT commit `tests/.env` with real credentials or session tokens.
+
 ## Notes
 
 - CLI configuration is stored locally after `py4heappe Conf Init`.

{py4heappe-3.0.0 → py4heappe-3.2.0}/docs/examples/example.py

@@ -1,6 +1,8 @@
 import json
 import os
 import time
+import base64
+import binascii
 from io import StringIO
 from pathlib import Path
 
@@ -9,6 +11,10 @@ from paramiko import SSHClient
 from scp import SCPClient
 
 import py4heappe.heappe_v6.core as hp
+from py4heappe.heappe_v6.core.api.file_transfer_api_ext import (
+    FileTransferApiExt,
+    InMemoryUploadFile,
+)
 
 POLL_INTERVAL_SECONDS = 30
 OUTPUT_DIRECTORY = Path("data_transfer/output")
@@ -62,6 +68,44 @@ def wait_for_job_completion(
         time.sleep(POLL_INTERVAL_SECONDS)
 
 
+def upload_job_input_from_memory(
+    api_client: hp.ApiClient,
+    session_code: str,
+    job_id: int,
+) -> None:
+    """Optional example: upload one file from base64 env content via Stream API extension."""
+    encoded_content = os.environ.get("HEAPPE_STREAM_UPLOAD_BASE64", "").strip()
+    if not encoded_content:
+        print(
+            "Skipping in-memory stream upload (set HEAPPE_STREAM_UPLOAD_BASE64 to enable this example)."
+        )
+        return
+
+    try:
+        file_bytes = base64.b64decode(encoded_content, validate=True)
+    except (binascii.Error, ValueError) as exception:
+        raise RuntimeError(
+            "HEAPPE_STREAM_UPLOAD_BASE64 contains invalid base64 content"
+        ) from exception
+
+    filename = os.environ.get("HEAPPE_STREAM_UPLOAD_FILENAME", "input.dat").strip()
+    if not filename:
+        filename = "input.dat"
+
+    task_id_raw = os.environ.get("HEAPPE_STREAM_UPLOAD_TASK_ID", "").strip()
+    task_id = int(task_id_raw) if task_id_raw else None
+
+    stream_api = FileTransferApiExt(api_client)
+    stream_api.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post(
+        files=[InMemoryUploadFile(filename=filename, content=file_bytes)],
+        session_code=session_code,
+        job_id=job_id,
+        task_id=task_id,
+        _preload_content=False,
+    )
+    print(f"Uploaded in-memory file '{filename}' to job {job_id}.")
+
+
 def download_job_outputs(
     file_transfer_api: hp.FileTransferApi,
     session_code: str,
@@ -234,6 +278,8 @@ def main() -> None:
         job_id = created_job["Id"]
         print(f"Job ID: {job_id}")
 
+        upload_job_input_from_memory(api_client, session_code, job_id)
+
         print(f"\nSubmitting job {job_id}...")
         job_api.heappe_job_management_submit_job_put(
             _preload_content=False,

{py4heappe-3.0.0 → py4heappe-3.2.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "Py4HEAppE"
 authors = [{name = "IT4Innovations", email = "support.heappe@it4i.cz"}]
 description = "Py4HEAppE is client library for easy access to HEAppE Middleware"
-version = "3.0.0"
+version = "3.2.0"
 license = "MIT"
 readme = "README.md"
 requires-python = ">=3.11"

py4heappe-3.0.0/src/Py4HEAppE.egg-info/requires.txt → py4heappe-3.2.0/requirements.txt

@@ -7,3 +7,4 @@ click>=8.1.0
 typer>=0.15.0
 python-dotenv>=0.21.1
 validators==0.35.0
+typing-extensions==4.16.0

{py4heappe-3.0.0 → py4heappe-3.2.0}/src/Py4HEAppE.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Py4HEAppE
-Version: 3.0.0
+Version: 3.2.0
 Summary: Py4HEAppE is client library for easy access to HEAppE Middleware
 Author-email: IT4Innovations <support.heappe@it4i.cz>
 License-Expression: MIT
@@ -22,11 +22,14 @@ Requires-Dist: click>=8.1.0
 Requires-Dist: typer>=0.15.0
 Requires-Dist: python-dotenv>=0.21.1
 Requires-Dist: validators==0.35.0
+Requires-Dist: typing-extensions==4.16.0
 Dynamic: license-file
 
 <img align="right" width="35%" src="https://raw.githubusercontent.com/It4innovations/Py4HEAppE/refs/heads/master/docs/imgs/logo.png">
 
 # Py4HEAppE (Python for HEAppE Middleware)
+Release: 3.2.0
+
 Py4HEAppE provides both a command-line interface and versioned Python wrappers for the [HEAppE](https://heappe.eu) middleware API.
 
 You can use it in two ways:
@@ -36,7 +39,8 @@ You can use it in two ways:
 ## Supported HEAppE Versions
 | Py4HEAppE | HEAppE Version                                         | Notes |
 |:---------:|:-------------------------------------------------------| :---- |
-|   3.0.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
+|   3.2.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
+|   3.1.X   | 6.5.X, 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X | Without Admin CLI section |
 |   2.9.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
 |   2.8.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
 |   2.7.X   | 6.4.X, 6.3.X, 6.2.X, 6.2.1, 5.0.X, 4.3.X, 4.2.X        | Without Admin CLI section |
@@ -208,7 +212,14 @@ py4heappe FileTransfer Download --help
 Upload files directly into the job execution directory:
 
 ```shell
-py4heappe FileTransfer Stream --help
+# Upload one or more local files from disk
+py4heappe FileTransfer Stream --id 12345 --files ./input_a.dat --files ./input_b.dat
+
+# Upload a single file from stdin bytes
+Get-Content -Path .\input.dat -AsByteStream | py4heappe FileTransfer Stream --id 12345 --stdin --upload-filename input.dat
+
+# Upload a single file from base64 content
+py4heappe FileTransfer Stream --id 12345 --base64 aGVsbG8gd29ybGQ= --upload-filename hello.txt
 ```
 
 ## Python API Wrapper
@@ -226,6 +237,40 @@ import py4heappe.heappe_v6.core as hp
 
 There is no single unversioned `py4heappe.core` module. Use the versioned wrapper explicitly.
 
+### Dedicated In-Memory Upload API (`file_transfer_api_ext.py`)
+
+For uploads that should not touch local disk files, use the dedicated implementation in
+`src/py4heappe/heappe_v6/core/api/file_transfer_api_ext.py`.
+
+It provides `FileTransferApiExt.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post`,
+which accepts byte-like payloads or file-like objects.
+
+```python
+import io
+
+import py4heappe.heappe_v6.core as hp
+from py4heappe.heappe_v6.core.api.file_transfer_api_ext import (
+    FileTransferApiExt,
+    InMemoryUploadFile,
+)
+
+configuration = hp.Configuration()
+configuration.host = "https://heappe.example.org"
+api_client = hp.ApiClient(configuration)
+
+stream_api = FileTransferApiExt(api_client)
+stream_api.heappe_file_transfer_upload_file_objects_to_job_execution_dir_post(
+    files=[
+        InMemoryUploadFile("bytes-input.txt", b"hello from bytes"),
+        ("stream-input.bin", io.BytesIO(b"\\x00\\x01\\x02"), "application/octet-stream"),
+    ],
+    session_code="your-session-code",
+    job_id=12345,
+    task_id=1,
+    _preload_content=False,
+)
+```
+
 ### Minimal Python Example
 
 ```python
@@ -330,6 +375,26 @@ finally:
     api_client.pool.join()
 ```
 
+## Running CLI tests
+
+The repository includes live CLI integration tests under `tests/` that require a reachable HEAppE instance and several environment variables.
+
+Quick steps:
+
+- Create a `tests/.env` from the example and edit it:
+  - Unix: `cp tests/.env.example tests/.env`
+  - Windows (PowerShell): `Copy-Item tests\.env.example tests\.env`
+- Populate required values in `tests/.env` (or export the variables). At minimum set `PY4HEAPPE_RUN_LIVE_CLI_TESTS=1` and `PY4HEAPPE_TEST_URL` and `PY4HEAPPE_TEST_PROJECT`. To allow tests that change remote state also set `PY4HEAPPE_TEST_RUN_MUTATING_COMMANDS=1`.
+- Run the CLI tests (default, using the standard library's unittest):
+  - Run all CLI tests: `python -m unittest discover -s tests -p "test_cli_*.py" -v`
+  - Run a single test module: `python -m unittest tests.test_cli_auth -v`
+
+- Optional: run with pytest (pytest can run unittest-style tests and offers improved output):
+  - Install pytest: `python -m pip install -U pytest`
+  - Run with pytest: `python -m pytest -q tests/test_cli_*.py`
+
+Do NOT commit `tests/.env` with real credentials or session tokens.
+
 ## Notes
 
 - CLI configuration is stored locally after `py4heappe Conf Init`.

{py4heappe-3.0.0 → py4heappe-3.2.0}/src/Py4HEAppE.egg-info/SOURCES.txt

@@ -438,6 +438,7 @@ src/py4heappe/heappe_v6/core/api/data_transfer_api.py
 src/py4heappe/heappe_v6/core/api/dictionary_api.py
 src/py4heappe/heappe_v6/core/api/events_api.py
 src/py4heappe/heappe_v6/core/api/file_transfer_api.py
+src/py4heappe/heappe_v6/core/api/file_transfer_api_ext.py
 src/py4heappe/heappe_v6/core/api/health_api.py
 src/py4heappe/heappe_v6/core/api/job_management_api.py
 src/py4heappe/heappe_v6/core/api/job_reporting_api.py
@@ -681,4 +682,13 @@ src/py4heappe/heappe_v6/core/models/vault_.py
 src/py4heappe/heappe_v6/core/models/vault_credential_counts_ext_.py
 src/py4heappe/heappe_v6/core/models/vault_info_.py
 src/py4heappe/heappe_v6/core/models/version_information_ext.py
-tests/__init__.py
+tests/.env.example
+tests/__init__.py
+tests/live_cli_support.py
+tests/test_cli_auth.py
+tests/test_cli_command_template.py
+tests/test_cli_configuration.py
+tests/test_cli_file_transfer.py
+tests/test_cli_information.py
+tests/test_cli_job_management.py
+tests/test_cli_report.py

py4heappe-3.0.0/requirements.txt → py4heappe-3.2.0/src/Py4HEAppE.egg-info/requires.txt

@@ -6,4 +6,5 @@ six>=1.16.0
 click>=8.1.0
 typer>=0.15.0
 python-dotenv>=0.21.1
-validators==0.35.0
+validators==0.35.0
+typing-extensions==4.16.0

{py4heappe-3.0.0 → py4heappe-3.2.0}/src/py4heappe/heappe_v6/cli/auth.py

@@ -7,9 +7,8 @@ import py4heappe.heappe_v6.core.base.utils as utils
 import py4heappe.heappe_v6.core as heappeCore
 
 from py4heappe.heappe_v6.core.base import exceptions
-from py4heappe.heappe_v6.core  import rest 
-# from py4lexis.session import LexisSession
-
+from py4heappe.heappe_v6.core  import rest
+#from py4lexis import LexisSession
 
 app = typer.Typer(name="HEAppEAuthCLI", no_args_is_help=True, pretty_exceptions_short=True)
 
@@ -45,9 +44,6 @@ def authentication_credentials():
         if "CREDENTIALS_PASSWORD" in os.environ:
             print(session_code)
 
-        utils.print_and_log("User was authenticated.")
-        utils.store_session(session_code)
-
     except rest.ApiException as exception:
         try:
             response_data = json.loads(exception.body)
@@ -64,6 +60,11 @@ def authentication_credentials():
     except Exception as exception:
         raise exceptions.Py4HEAppEInternalException(f"Other exception: {str(exception)}") from None
 
+    else:
+        utils.print_and_log("User was authenticated.")
+        utils.store_session(session_code)
+
+
 @app.command(name="OpenId")
 def authentication_openid():
     """OpenID authentication"""

{py4heappe-3.0.0 → py4heappe-3.2.0}/src/py4heappe/heappe_v6/cli/configuration.py

@@ -2,12 +2,15 @@ import dotenv
 import os
 import typer
 import validators
+from pathlib import Path
 
 import py4heappe.heappe_v6.core as hp
 import py4heappe.heappe_v6.core.base.utils as utils
 from py4heappe.heappe_v6.core.base import exceptions
 from urllib.parse import urlparse
 
+ENV_FILE_PATH = Path(__file__).with_name(".env")
+
 app = typer.Typer(
     name="HEAppEConfigurationCLI",
     no_args_is_help=True,
@@ -16,8 +19,8 @@ app = typer.Typer(
 
 
 def get_api_instance():
-    dotenv.load_dotenv(os.path.join(os.path.dirname(__file__), ".env"))
-    url: str = os.environ.get("url")
+    dotenv.load_dotenv(ENV_FILE_PATH)
+    url = os.environ.get("url")
 
     if url is None:
         raise exceptions.Py4HEAppEInternalException(
@@ -31,9 +34,9 @@ def get_api_instance():
 
 
 def get_project_from_configuration():
-    dotenv.load_dotenv(os.path.join(os.path.dirname(__file__), ".env"))
+    dotenv.load_dotenv(ENV_FILE_PATH)
 
-    computationalProject: str = os.environ.get("project")
+    computationalProject = os.environ.get("project")
     if computationalProject is None:
         raise exceptions.Py4HEAppEInternalException(
             "Py4HEappE is not configured. Please check Conf option."
@@ -46,10 +49,10 @@ def get_project_from_configuration():
 def environment_preparation():
     """Initialization"""
     utils.print_and_log("Preparation of Py4HEAppE Environment ...")
-    dotenv.load_dotenv()
+    dotenv.load_dotenv(ENV_FILE_PATH)
 
-    url: str = os.environ.get("url")
-    computationalProject: str = os.environ.get("project")
+    url = os.environ.get("url")
+    computationalProject = os.environ.get("project")
 
     if url is not None or computationalProject is not None:
         reconfigure = typer.confirm(
@@ -82,9 +85,9 @@ def environment_preparation():
         "Enter HEAppE accounting string", confirmation_prompt=True
     )
 
-    dotenv.set_key(os.path.join(os.path.dirname(__file__), ".env"), "url", normalized)
+    dotenv.set_key(ENV_FILE_PATH, "url", normalized)
     dotenv.set_key(
-        os.path.join(os.path.dirname(__file__), ".env"),
+        ENV_FILE_PATH,
         "project",
         computationalProject.upper(),
     )