js7-client-python 2.0.1.0__tar.gz → 2.0.9__tar.gz

{js7_client_python-2.0.1.0/src/js7_client_python.egg-info → js7_client_python-2.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: js7-client-python
-Version: 2.0.1.0
+Version: 2.0.9
 Summary: Python client for the JS7 JOC REST API
 Author: Marcel Kerth
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -686,18 +686,21 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pydantic<3.0.0,>=2.10.6
-Requires-Dist: cryptography; platform_system != "Windows" or platform_machine not in "arm64,ARM64"
+Requires-Dist: cryptography
 
 # JS7 Python Client
 
+[![PyPI version](https://img.shields.io/pypi/v/js7-client-python.svg)](https://pypi.org/project/js7-client-python/)
+[![Python versions](https://img.shields.io/pypi/pyversions/js7-client-python)](https://pypi.org/project/js7-client-python/)
+
 The JS7 Python Client provides methods for accessing the JS7 JOC REST API.
-Its functionality is based on the JS7 UNIX CLI: [JS7 UNIX CLI](https://github.com/sos-berlin/js7-cli-unix)
+It offers functionality similar to the JS7 Unix CLI: [JS7 Unix CLI](https://github.com/sos-berlin/js7-cli-unix).
 
 ## Requirements
 
 - Python version 3.8 or later
-- A JS7 installation with version 2.6.5 to 2.8.3
-- A Java JVM version 17 or later for (en/de)cryption functionality
+- A JS7 installation with version 2.6.5–2.8.3
+- A Java JVM version 17 or later for encryption and decryption functionality
 
 ## Installation
 
@@ -707,7 +710,9 @@ pip install js7-client-python
 
 ## Quick Start
 
-The following example shows how to create a client instance and execute the first operation.
+The following example shows how to create a client instance and perform an operation.
+
+**Note**: Additional examples showing how the client can be used can be found in the `./example` directory of this repository.
 
 ### Client Initialization
 
@@ -718,8 +723,8 @@ import js7
 
 client = js7.Client(
     http_config=js7.model.HTTPConfiguration(
-        host="192.168.1.1",
-        port=4446
+        host="192.168.1.14",
+        port=4443
     ),
     auth_config=js7.model.AuthConfiguration(
         basic_auth=js7.model.BasicAuth(
@@ -732,32 +737,49 @@ client = js7.Client(
 
 #### SSL and Certificate-Based Authentication
 
->The code snippet shows authentication using Basic Auth.
->However, the JS7 Python Client also supports certificate-based authentication, provided that a corresponding identity provider and account exist in JS7 JOC.
->
->If an HTTPS certificate is required for a secure SSL connection, it can be specified in the `http_config`.
+The code snippet above shows authentication using Basic Auth.
+However, the JS7 Python Client also supports certificate-based authentication and client certificates for HTTPS connections.
 
-### Import Configurations
+```python
+client = js7.Client(
+    http_config=js7.model.HTTPConfiguration(
+        host="192.168.1.14",
+        port=4446,
+        ssl=True,
+        cafile_path="./certificate.crt"
+    ),
+    auth_config=js7.model.AuthConfiguration(
+        cert_auth=js7.model.CertAuth(
+            certfile_path="./client.crt",
+            keyfile_path="./client.key"
+        )
+    )
+)
+```
+
+### Import Inventory Configurations
 
-A common use case is the import of inventory configurations into JS7 JOC.
+A common use case is importing inventory configurations into JS7 JOC.
 We use the previously created client instance to import configurations.
 
 ```python
-client.inventory.manage.import_configurations(
+ok = client.inventory.manage.import_configurations(
     file_path="/path/to/file/or/folder",
     inventory_target_folder="/test-folder"
 )
+
+print(f"Operation successful: {ok}")
 ```
 
 ## Namespaces
 
-The Client class follows the domains of the JS7 JOC API, but groups its methods into three different namespaces:
+The Client class follows the domains of the JS7 JOC API, but groups its methods into three namespaces:
 
-- **Manage**: Used to manage existing configurations and resources or to import new ones.
-- **Operate**: Used to change the state of the system, for example to resume a workflow or cancel an order.
-- **Deploy**: Used to deploy configurations such as workflows.
+- **Manage**: Used to manage configurations and resources, such as importing, updating, or removing them.
+- **Operate**: Used to control runtime behavior, such as resuming a workflow or canceling an order.
+- **Deploy**: Used to deploy configurations, such as workflows.
 
-## Help
+## Resources
 
 - **Docs**: [JS7 Python Client](https://kb.sos-berlin.com/display/JS7/JS7+-+Python+Client)
 - **Issues**: [JOC-2175 - Python Client for JS7 REST API](https://change.sos-berlin.com/browse/JOC-2175)

js7_client_python-2.0.9/README.md

@@ -0,0 +1,95 @@
+# JS7 Python Client
+
+[![PyPI version](https://img.shields.io/pypi/v/js7-client-python.svg)](https://pypi.org/project/js7-client-python/)
+[![Python versions](https://img.shields.io/pypi/pyversions/js7-client-python)](https://pypi.org/project/js7-client-python/)
+
+The JS7 Python Client provides methods for accessing the JS7 JOC REST API.
+It offers functionality similar to the JS7 Unix CLI: [JS7 Unix CLI](https://github.com/sos-berlin/js7-cli-unix).
+
+## Requirements
+
+- Python version 3.8 or later
+- A JS7 installation with version 2.6.5–2.8.3
+- A Java JVM version 17 or later for encryption and decryption functionality
+
+## Installation
+
+```sh
+pip install js7-client-python
+```
+
+## Quick Start
+
+The following example shows how to create a client instance and perform an operation.
+
+**Note**: Additional examples showing how the client can be used can be found in the `./example` directory of this repository.
+
+### Client Initialization
+
+Client initialization begins with configuring the JOC API endpoint and the user’s credentials.
+
+```python
+import js7
+
+client = js7.Client(
+    http_config=js7.model.HTTPConfiguration(
+        host="192.168.1.14",
+        port=4443
+    ),
+    auth_config=js7.model.AuthConfiguration(
+        basic_auth=js7.model.BasicAuth(
+            username="root",
+            password="changeit"
+        )
+    )
+)
+```
+
+#### SSL and Certificate-Based Authentication
+
+The code snippet above shows authentication using Basic Auth.
+However, the JS7 Python Client also supports certificate-based authentication and client certificates for HTTPS connections.
+
+```python
+client = js7.Client(
+    http_config=js7.model.HTTPConfiguration(
+        host="192.168.1.14",
+        port=4446,
+        ssl=True,
+        cafile_path="./certificate.crt"
+    ),
+    auth_config=js7.model.AuthConfiguration(
+        cert_auth=js7.model.CertAuth(
+            certfile_path="./client.crt",
+            keyfile_path="./client.key"
+        )
+    )
+)
+```
+
+### Import Inventory Configurations
+
+A common use case is importing inventory configurations into JS7 JOC.
+We use the previously created client instance to import configurations.
+
+```python
+ok = client.inventory.manage.import_configurations(
+    file_path="/path/to/file/or/folder",
+    inventory_target_folder="/test-folder"
+)
+
+print(f"Operation successful: {ok}")
+```
+
+## Namespaces
+
+The Client class follows the domains of the JS7 JOC API, but groups its methods into three namespaces:
+
+- **Manage**: Used to manage configurations and resources, such as importing, updating, or removing them.
+- **Operate**: Used to control runtime behavior, such as resuming a workflow or canceling an order.
+- **Deploy**: Used to deploy configurations, such as workflows.
+
+## Resources
+
+- **Docs**: [JS7 Python Client](https://kb.sos-berlin.com/display/JS7/JS7+-+Python+Client)
+- **Issues**: [JOC-2175 - Python Client for JS7 REST API](https://change.sos-berlin.com/browse/JOC-2175)

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 description = "Python client for the JS7 JOC REST API"
 readme = "README.md"
-version = "2.0.1.0"
+version = "2.0.9"
 requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -18,7 +18,7 @@ classifiers = [
 license = { file = "LICENSE" }
 dependencies = [
     "pydantic>=2.10.6,<3.0.0",
-    "cryptography; platform_system != 'Windows' or platform_machine not in 'arm64,ARM64'"
+    "cryptography"
 ]
 
 [project.urls]

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/api/joc/http/v_2_8_2/agents/export.py

@@ -19,8 +19,7 @@ def export(call: EndpointCall) -> bytes:
             path="/joc/api/agents/export",
             body=body,
             headers={
-                "X-Access-Token": call.access_token, 
-                "Accept": "application/octet-stream"
+                "X-Access-Token": call.access_token
             }
         )
         

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/agent/export_agents_action.py

@@ -1,11 +1,9 @@
 from pathlib import Path
-from typing import List, Literal, Optional, Union
+from typing import List, Literal, Union
 
 from ...context import Context
-from ....model.public.client.common.audit_log import AuditLog
 from ....model.private.api.endpoint import EndpointCall
 from ....model.private.http.joc.joc_v_2_8_2 import (
-    AuditParams as AuditParams_V_2_8_2,
     AgentExportFilter as AgentExportFilter_V_2_8_2,
     ExportFile as ExportFile_V_2_8_2,
     ArchiveFormat as ArchiveFormat_V_2_8_2
@@ -20,8 +18,7 @@ def export_agents_action(
     context: Context, 
     out_path: Union[Path, str],
     archive_format: Literal["ZIP", "TAR_GZ"],
-    agent_ids: List[str],
-    audit_log: Optional[AuditLog]
+    agent_ids: List[str]
 ) -> bool:
     
     # Normalize out_path
@@ -38,8 +35,7 @@ def export_agents_action(
         request_data = _build_v_2_8_2_request(
             out_path=out_path,
             archive_format=archive_format,
-            agent_ids=agent_ids,
-            audit_log=audit_log
+            agent_ids=agent_ids
         )
     else:
         raise RuntimeError(f"Version {context.version} is not compatible with building the request.")
@@ -53,7 +49,7 @@ def export_agents_action(
     ))
     
     if isinstance(result, bytes):
-        return bytes_to_file(data=result, out_path=Path(out_path))
+        return bytes_to_file(data=result, out_path=out_path)
     
     raise RuntimeError(f"Unexpected response type: {type(result).__name__}")
 
@@ -64,8 +60,7 @@ def _build_v_2_8_2_request(
     *,
     out_path: Union[Path, str],
     archive_format: Literal["ZIP", "TAR_GZ"],
-    agent_ids: List[str],
-    audit_log: Optional[AuditLog]
+    agent_ids: List[str]
 ) -> AgentExportFilter_V_2_8_2:
     
     # Validate: out_path
@@ -85,17 +80,9 @@ def _build_v_2_8_2_request(
         filename=Path(out_path).name,
         format=(ArchiveFormat_V_2_8_2(archive_format)) # Raises ValueError() if invalid.
     )
-    
-    # Build: Audit Log
-    res_audit_log = AuditParams_V_2_8_2(
-        ticket_link=audit_log.ticket_link,
-        comment=audit_log.comment,
-        time_spent=audit_log.time_spent
-    ) if audit_log else None
 
     # Result
     return AgentExportFilter_V_2_8_2(
         agent_ids=agent_ids,
-        export_file=res_export_file,
-        audit_log=res_audit_log
+        export_file=res_export_file
     )

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/controller/register_controller_action.py

@@ -1,7 +1,8 @@
-from typing import Literal, Optional
+from typing import List, Optional
 
 from ...context import Context
 from ....model.public.client.common.audit_log import AuditLog
+from ....model.public.client.common.controller import Controller
 from ....model.private.api.endpoint import EndpointCall
 from ....model.private.http.joc.joc_v_2_8_2 import (
     AuditParams as AuditParams_V_2_8_2,
@@ -16,22 +17,16 @@ from ....util.check_matching_version import check_matching_version
 
 def register_controller_action(
     *, 
-    context: Context, 
+    context: Context,
     controller_id: Optional[str],
-    url: str,
-    cluster_url: Optional[str],
-    role: Literal["STANDALONE", "PRIMARY", "BACKUP"],
-    title: Optional[str],
+    controllers: List[Controller],
     audit_log: Optional[AuditLog]
 ) -> bool:
 
     if check_matching_version(min="2.6.5", max="2.8.3", check=context.version):
         request_data = _build_v_2_8_2_request(
             controller_id=controller_id,
-            url=url,
-            cluster_url=cluster_url,
-            role=role,
-            title=title,
+            controllers=controllers,
             audit_log=audit_log
         )
     else:
@@ -56,20 +51,16 @@ def register_controller_action(
 def _build_v_2_8_2_request(
     *, 
     controller_id: Optional[str],
-    url: str,
-    cluster_url: Optional[str],
-    role: Literal["STANDALONE", "PRIMARY", "BACKUP"],
-    title: Optional[str],
+    controllers: List[Controller],
     audit_log: Optional[AuditLog]
 ) -> RegisterParameters_V_2_8_2:
 
-    # Validate: url
-    if not url:
-        raise ValueError("'url' is required.")
-    
-    # Validate: role
-    if role not in ["STANDALONE", "PRIMARY", "BACKUP"]:
-        raise ValueError(f"Invalid 'role': {role}.")
+    # Validate: controllers
+    for c in controllers:
+        if not c.url:
+            raise ValueError("Each controller must define a 'url'.")
+        if c.role not in ["STANDALONE", "PRIMARY", "BACKUP"]:
+            raise ValueError(f"Invalid controller role '{c.role}'. Expected one of: STANDALONE, PRIMARY, BACKUP.")
     
     # Build: Audit Log
     res_audit_log = AuditParams_V_2_8_2(
@@ -83,11 +74,12 @@ def _build_v_2_8_2_request(
         controller_id=controller_id,
         controllers=[
             RegisterParameter_V_2_8_2(
-                url=url,
-                cluster_url=cluster_url,
-                role=ControllerRole_V_2_8_2(role), # Raises ValueError() if invalid.
-                title=title,
+                url=c.url,
+                cluster_url=c.cluster_url,
+                role=ControllerRole_V_2_8_2(c.role), # Raises ValueError() if invalid.
+                title=c.title,
             )
+            for c in controllers
         ],
         audit_log=res_audit_log
     )

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/controller/test_controller_instance_action.py

@@ -4,7 +4,8 @@ from ...context import Context
 from ....model.private.api.endpoint import EndpointCall
 from ....model.private.http.joc.joc_v_2_8_2 import (
     TestConnect as TestConnect_V_2_8_2,
-    JobScheduler200 as JobScheduler200_V_2_8_2
+    JobScheduler200 as JobScheduler200_V_2_8_2,
+    ConnectionStateText as ConnectionStateText_V_2_8_2
 )
 
 from ....util.check_matching_version import check_matching_version
@@ -34,14 +35,14 @@ def test_controller_instance_action(
     ))
 
     if isinstance(result, JobScheduler200_V_2_8_2):
-        if not (
+        if (
             result.controller
-            and result.controller.connection_state 
-            and result.controller.connection_state.severity != 0
+            and result.controller.connection_state
+            and result.controller.connection_state.text == ConnectionStateText_V_2_8_2.ESTABLISHED
         ):
-            return False
-        
-        return True
+            return True
+
+        return False
                 
     raise RuntimeError(f"Unexpected response type: {type(result).__name__}")
 

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/daily_plan/generate_orders_action.py

@@ -1,4 +1,4 @@
-from datetime import date, datetime
+from datetime import date
 from typing import List, Optional
 
 from ...context import Context
@@ -97,8 +97,7 @@ def _build_v_2_8_2_request(
     return GenerateRequest_V_2_8_2(
         controller_id=controller_id,
         daily_plan_dates=[
-            datetime.combine(d, datetime.min.time())
-            for d in daily_plan_dates
+            d for d in daily_plan_dates
         ],
         schedule_paths=PathItem_V_2_8_2(
             folders=[

js7_client_python-2.0.1.0/src/js7/client/action/daily_plan/create_projections_action.py → js7_client_python-2.0.9/src/js7/client/action/daily_plan/recreate_projections_action.py

@@ -5,7 +5,7 @@ from ....model.private.http.joc.joc_v_2_8_2 import (
 )
 
 
-def create_projections_action(
+def recreate_projections_action(
     *,
     context: Context
 ) -> bool:

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/iam/get_account_permissions_action.py

@@ -5,8 +5,8 @@ from ....model.public.client.common.audit_log import AuditLog
 from ....model.private.api.endpoint import EndpointCall
 from ....model.private.http.joc.joc_v_2_8_2 import (
     AccountFilter as AccountFilter_V_2_8_2,
-    Accounts as Accounts_V_2_8_2,
     AuditParams as AuditParams_V_2_8_2,
+    ConfigurationPermissions as ConfigurationPermissions_V_2_8_2
 )
 
 from ....util.check_matching_version import check_matching_version
@@ -37,7 +37,7 @@ def get_account_permissions_action(
         options=None,
     ))
     
-    if isinstance(result, Accounts_V_2_8_2):
+    if isinstance(result, ConfigurationPermissions_V_2_8_2):
         return result.model_dump(mode="json")
     
     raise RuntimeError(f"Unexpected response type: {type(result).__name__}")

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/iam/get_roles_action.py

@@ -32,10 +32,13 @@ def get_roles_action(
     ))
     
     if isinstance(result, Roles_V_2_8_2):
-        return [
-            r.role_name
-            for r in result.roles
-        ] if result.roles else []
+        result_list: List[str] = []
+        if result.roles:
+            for r in result.roles:
+                if not r.role_name:
+                    continue
+                result_list.append(r.role_name)
+        return result_list
     
     raise RuntimeError(f"Unexpected response type: {type(result).__name__}")
 

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/inventory/get_change_dependencies_action.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Set
+from typing import List, Optional, Set, Tuple
 
 from ...context import Context
 from ....model.public.client.common.changes import Change, ChangeDependencies, ChangeStatus
@@ -20,7 +20,7 @@ def get_change_dependencies_action(
     *,
     context: Context,
     operation_type: OperationType,
-    changes: List[Change],
+    changes: List[Tuple[str, ObjectType]],
     filter_paths: Optional[List[str]],
     filter_no_references: bool,
     filter_no_referencing: bool
@@ -51,22 +51,25 @@ def get_change_dependencies_action(
 #---------------------#
 # Build 2.8.2 request #
 #---------------------#
-def _build_v_2_8_2_request(*, operation_type: OperationType, changes: List[Change]) -> GetDependenciesRequest_V_2_8_2:    
+def _build_v_2_8_2_request(*, operation_type: OperationType, changes: List[Tuple[str, ObjectType]]) -> GetDependenciesRequest_V_2_8_2:    
     # Validate: changes
     if not changes:
         raise ValueError("At least one change in 'changes' is required.")
     
     # Validate: changes
-    for c in changes:
-        if not (c.name and c.object_type):
+    for name, object_type in changes:
+        if not name or not object_type:
             raise ValueError("'name' and 'object_type' are required in every change.")
-    
+
+        # Validate: Object Types
+        if object_type in {"FOLDER", "JOBRESOURCE", "INCLUDESCRIPT", "REPORT", "DEPLOYMENTDESCRIPTOR", "DESCRIPTORFOLDER"}:
+            raise ValueError(f"Object type '{object_type.value}' is not supported for dependency resolution.")
+            
     return GetDependenciesRequest_V_2_8_2(
         operation_type=OperationType_V_2_8_2(operation_type.value), # Raises ValueError() if invalid.
         configurations=[
-            RequestItem_V_2_8_2(name=c.name, type=c.object_type)
-            for c in changes
-            if c.name and c.object_type # Process only valid changes
+            RequestItem_V_2_8_2(name=name, type=object_type.value)
+            for name, object_type in changes
         ]
     )
 
@@ -137,7 +140,7 @@ def _build_v_2_8_2_response(
                 
                 if skip:
                     continue
-                
+            
             if in_references or in_referenced_by or in_enforced_references or in_enforced_referenced_by:
                 if not config.object_type:
                     raise RuntimeError("'object_type' is required in response.")

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/inventory/get_git_credentials_action.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from ...context import Context
 from ....model.public.client.common.git_credentials import GitCredentials
 from ....model.private.api.endpoint import EndpointCall
@@ -6,7 +8,7 @@ from ....model.private.http.joc.joc_v_2_8_2 import (
 )
 
 
-def get_git_credentials_action(*, context: Context) -> GitCredentials:
+def get_git_credentials_action(*, context: Context) -> List[GitCredentials]:
     # Calls the dispatcher for the matching JOC version
     result = context.joc_api.dispatch(endpoint_id="inventory/repository/git/credentials", call=EndpointCall(
         http_service=context.http_service,
@@ -16,14 +18,17 @@ def get_git_credentials_action(*, context: Context) -> GitCredentials:
     ))
     
     if isinstance(result, GitCredentials_V_2_8_2):
-        return GitCredentials(
-            email=result.email,
-            git_account=result.git_account,
-            git_server=result.git_server,
-            keyfile_path=result.keyfile_path,
-            password=result.password,
-            personal_access_token=result.personal_access_token,
-            username=result.username
-        )
+        return [
+            GitCredentials(
+                email=c.email,
+                git_account=c.git_account,
+                git_server=c.git_server,
+                keyfile_path=c.keyfile_path,
+                password=c.password,
+                personal_access_token=c.personal_access_token,
+                username=c.username
+            )
+            for c in result.credentials
+        ] if result.credentials else []
 
     raise RuntimeError(f"Unexpected response type: {type(result).__name__}")

{js7_client_python-2.0.1.0 → js7_client_python-2.0.9}/src/js7/client/action/inventory/import_configurations_action.py

@@ -19,7 +19,7 @@ def import_configurations_action(
     file_path: Union[Path, str],
     archive_format: Literal["ZIP", "TAR_GZ"],
     overwrite: bool,
-    target_folder: Optional[str],
+    inventory_target_folder: Optional[str],
     suffix: Optional[str],
     prefix: Optional[str],
     overwrite_tags: bool,
@@ -31,7 +31,7 @@ def import_configurations_action(
             file_path=Path(file_path),
             archive_format=archive_format,
             overwrite=overwrite,
-            target_folder=target_folder,
+            inventory_target_folder=inventory_target_folder,
             suffix=suffix,
             prefix=prefix,
             overwrite_tags=overwrite_tags,
@@ -62,7 +62,7 @@ def _build_v_2_8_2_request(
     file_path: Path,
     archive_format: Literal["ZIP", "TAR_GZ"],
     overwrite: bool,
-    target_folder: Optional[str],
+    inventory_target_folder: Optional[str],
     suffix: Optional[str],
     prefix: Optional[str],
     overwrite_tags: bool,
@@ -77,6 +77,10 @@ def _build_v_2_8_2_request(
     if archive_format not in ("ZIP", "TAR_GZ"):
         raise ValueError("'archive_format' must be 'ZIP' or 'TAR_GZ'.")
     
+    # Validate: inventory_target_folder
+    if inventory_target_folder and not inventory_target_folder.startswith("/"):
+        inventory_target_folder = "/" + inventory_target_folder
+    
     # Build: files_as_bytes
     files_as_bytes = files_to_bytes(
         file_path=file_path,
@@ -96,7 +100,9 @@ def _build_v_2_8_2_request(
         # Skips invalid filenames
         if path.rsplit("/", 1)[-1].startswith((".", "_", "-")):
             continue
-                
+        
+        path = "/" + path
+          
         archive_type = detect_archive_type(file)
         
         if not archive_type and path.endswith(".json"):
@@ -110,14 +116,14 @@ def _build_v_2_8_2_request(
             if not arch_files:
                 continue
             
+            # Removes the archive name from path
+            path = "/".join(path.split("/")[:-1])
+            
             for arch_path, arch_file in arch_files:
                 # Skips invalid filenames
                 if arch_path.rsplit("/", 1)[-1].startswith((".", "_", "-")):
                     continue
                 
-                # Removes archive suffix
-                path = path.split(".")[0]
-                
                 new_path = path + "/" + arch_path
                 files.append((new_path, arch_file))
     
@@ -131,12 +137,12 @@ def _build_v_2_8_2_request(
         "overwrite_tags": overwrite_tags    
     }
     
-    if target_folder:
-        res_options["target_folder"] = target_folder
+    if inventory_target_folder:
+        res_options["target_folder"] = inventory_target_folder
     
     if suffix:
         res_options["suffix"] = suffix
-        
+    
     if prefix:
         res_options["prefix"] = prefix