js7-client-python 2.0.2__py3-none-any.whl → 2.0.9.0__py3-none-any.whl

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/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/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/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/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/action/daily_plan/{create_projections_action.py → 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/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/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/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/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/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
     

js7/client/action/inventory/import_deploy_configurations_action.py

@@ -127,28 +127,30 @@ 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"):
             files.append((path, file))
         else:
             arch_files = read_bytes_archive_files_to_bytes(
-                file=file, 
+                file=file,
                 filter_suffixes=[".json"]
             )
             
             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))
     

js7/client/action/inventory/recall_folder_action.py

@@ -1,13 +1,11 @@
 from typing import List, Optional
 
-from ....model.public.client.common.audit_log import AuditLog
 from ....model.public.client.enum.object_types import ReleaseObjectType
 from ...context import Context
 from ....model.private.api.endpoint import EndpointCall
 from ....model.private.http.joc.joc_v_2_8_2 import (
     CommonConfigurationType as ConfigurationType_V_2_8_2,
-    RequestFolder as RequestFolder_V_2_8_2,
-    AuditParams as AuditParams_V_2_8_2,
+    CommonRequestFolder as CommonRequestFolder_V_2_8_2,
     OK as OK_V_2_8_2,
 )
 
@@ -19,18 +17,14 @@ def recall_folder_action(
     context: Context,
     folder_path: str, 
     filter_object_types: Optional[List[ReleaseObjectType]],
-    filter_no_invalid_objects: bool,
-    recursive: bool,
-    audit_log: Optional[AuditLog]
+    recursive: bool
 ) -> bool:
     
     if check_matching_version(min="2.6.5", max="2.8.3", check=context.version):
         request_data = _build_v_2_8_2_request(
             folder_path=folder_path,
             filter_object_types=filter_object_types,
-            filter_no_invalid_objects=filter_no_invalid_objects,
-            recursive=recursive,
-            audit_log=audit_log,
+            recursive=recursive
         )
     else:
         raise RuntimeError(f"Version {context.version} is not compatible with building the request.")
@@ -55,21 +49,12 @@ def _build_v_2_8_2_request(
     *,
     folder_path: str, 
     filter_object_types: Optional[List[ReleaseObjectType]],
-    filter_no_invalid_objects: bool,
     recursive: bool,
-    audit_log: Optional[AuditLog],
-) -> RequestFolder_V_2_8_2:
+) -> CommonRequestFolder_V_2_8_2:
     
     # Validate: folder_path
     if not folder_path:
         raise ValueError("'folder_path' must not be empty.")
-
-    # Build: res_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
      
     # Build: res_object_types
     res_object_types = [
@@ -78,12 +63,8 @@ def _build_v_2_8_2_request(
     ] if filter_object_types else None
 
     # Result
-    return RequestFolder_V_2_8_2(
-        controller_id=None,
+    return CommonRequestFolder_V_2_8_2(
         path=folder_path,
-        recursive=recursive,
         object_types=res_object_types,
-        audit_log=res_audit_log,
-        only_valid_objects=filter_no_invalid_objects,
-        cancel_orders_date_from=None,
+        recursive=recursive,
     )

js7/client/action/inventory/remove_configurations_from_trash_action.py

@@ -9,7 +9,7 @@ from ....model.private.http.joc.joc_v_2_8_2 import (
     CommonRequestFilter as CommonRequestFilter_V_2_8_2,
     OK as OK_V_2_8_2,
     CommonConfigurationType as ConfigurationType_V_2_8_2,
-    RequestFilters as RequestFilters_V_2_8_2
+    CommonRequestFilters as CommonRequestFilters_V_2_8_2
 )
 
 from ....util.check_matching_version import check_matching_version
@@ -49,7 +49,7 @@ def _build_v_2_8_2_request(
     *, 
     configurations: List[Configuration],
     audit_log: Optional[AuditLog]
-) -> RequestFilters_V_2_8_2:
+) -> CommonRequestFilters_V_2_8_2:
     
     # Validate: configurations
     if not configurations:
@@ -72,9 +72,7 @@ def _build_v_2_8_2_request(
     ) if audit_log else None
     
     # Result
-    return RequestFilters_V_2_8_2(
+    return CommonRequestFilters_V_2_8_2(
         objects=res_objects,
-        audit_log=res_audit_log,
-        
-        cancel_orders_date_from=None, # Wrong domain
+        audit_log=res_audit_log
     )

js7/client/action/inventory/remove_repository_configuration_action.py

@@ -10,7 +10,8 @@ from ....model.private.http.joc.joc_v_2_8_2 import (
     CommonConfigurationType as ConfigurationType_V_2_8_2,
     DeleteFromFilter as DeleteFromFilter_V_2_8_2,
     Category as Category_V_2_8_2,
-    PublishConfiguration as Configuration_V_2_8_2,
+    PublishConfiguration as PublishConfiguration_V_2_8_2,
+    PublishConfig as PublishConfig_V_2_8_2
 )
 
 from ....util.check_matching_version import check_matching_version
@@ -61,8 +62,8 @@ def _build_v_2_8_2_request(
         raise ValueError("'category' must be one of 'LOCAL' or 'ROLLOUT'.")
     
     # Build: Configurations
-    res_configurations: List[Configuration_V_2_8_2] = [
-        Configuration_V_2_8_2(
+    res_configurations: List[PublishConfiguration_V_2_8_2] = [
+        PublishConfiguration_V_2_8_2(
             object_type=ConfigurationType_V_2_8_2(c.object_type.value), # Raises ValueError() if invalid.
             path=c.path,
         )
@@ -78,7 +79,10 @@ def _build_v_2_8_2_request(
 
     # Result
     return DeleteFromFilter_V_2_8_2(
-        configurations=res_configurations,
+        configurations=[
+            PublishConfig_V_2_8_2(configuration=c)
+            for c in res_configurations
+        ],
         category=Category_V_2_8_2(category), # Raises ValueError() if invalid.
         audit_log=res_audit_log,
     )

js7/client/action/inventory/restore_configuration_from_trash_action.py

@@ -6,7 +6,7 @@ from ....model.private.api.endpoint import EndpointCall
 from ....model.public.client.common.configurations import Configuration
 from ....model.private.http.joc.joc_v_2_8_2 import (
     AuditParams as AuditParams_V_2_8_2,
-    RequestFilter as RequestFilter_V_2_8_2,
+    RestoreRequestFilter as RestoreRequestFilter_V_2_8_2,
     CommonConfigurationType as ConfigurationType_V_2_8_2,
     ResponseNewPath as ResponseNewPath_V_2_8_2
 )
@@ -60,7 +60,7 @@ def _build_v_2_8_2_request(
     add_prefix: Optional[str],
     add_suffix: Optional[str],
     audit_log: Optional[AuditLog]
-) -> RequestFilter_V_2_8_2:
+) -> RestoreRequestFilter_V_2_8_2:
 
     # Validate: new_path
     if not new_path:
@@ -74,7 +74,7 @@ def _build_v_2_8_2_request(
     ) if audit_log else None
 
     # Result
-    return RequestFilter_V_2_8_2(
+    return RestoreRequestFilter_V_2_8_2(
         path=configuration.path,
         object_type=ConfigurationType_V_2_8_2(configuration.object_type.value), # Raises ValueError() if invalid.
         new_path=new_path,

js7/client/action/joc/get_components_versions_action.py

@@ -47,7 +47,7 @@ def _build_v_2_8_2_request(
 ) -> VersionsFilter_V_2_8_2:
     
     # Validate: Any of controller_ids or agent_ids
-    if not (controller_ids and agent_ids):
+    if not (controller_ids or agent_ids):
         raise ValueError("At least one of 'controller_ids' or 'agent_ids' is required.")
     
     # Result