pinexq-client 0.10.3rc1__py3-none-any.whl → 0.10.5rc1__py3-none-any.whl

pinexq_client/job_management/tool/job.py

@@ -629,29 +629,47 @@ class Job:
             delete_subjobs_with_data: bool = True
     ) -> Self:
         """Delete this job after deleting output workdata and subjobs (recursive call) depending on the flag.
-        Afterward, also deletes input workdata depending on the flag. This is a best effort operation,
-        if an operation can not be executed a warning will be printed but the process continues.
+                Afterward, also deletes input workdata depending on the flag. This is a best effort operation,
+                if an operation can not be executed a warning will be printed but the process continues.
 
-        Args:
-            delete_output_workdata: boolean flag to specify if output WorkData should be attempted for deletion. Default: True
-            delete_input_workdata: boolean flag to specify if input WorkData should be attempted for deletion. Default: False
-            delete_subjobs_with_data: boolean flag tp specify if Sub jobs should be attempted for deletion. Default: True
+                Args:
+                    delete_output_workdata: boolean flag to specify if output WorkData should be attempted for deletion. Default: True
+                    delete_input_workdata: boolean flag to specify if input WorkData should be attempted for deletion. Default: False
+                    delete_subjobs_with_data: boolean flag tp specify if Sub jobs should be attempted for deletion. Default: True
 
-        Returns:
-            This `Job` object
+                Returns:
+                    This `Job` object
         """
+        self._delete_with_associated_internal(
+            delete_output_workdata=delete_output_workdata,
+            delete_input_workdata=delete_input_workdata,
+            delete_subjobs_with_data=delete_subjobs_with_data,
+            recursion_depth = 0)
+
+    def _delete_with_associated_internal(
+            self,
+            *,
+            delete_output_workdata: bool = True,
+            delete_input_workdata: bool = False,
+            delete_subjobs_with_data: bool = True,
+            recursion_depth: int = 0
+    ) -> Self:
         self._raise_if_no_hco()
 
         # delete subjobs
-        if delete_subjobs_with_data is True:
+        if delete_subjobs_with_data:
+            if recursion_depth > 20:
+                raise Exception("Recursion limit of subjob deletion exceeded.")
+
             for subjob in self._get_sub_jobs().iter_flat():
                 try:
                     # recursion
                     subjob_wrapper = Job.from_hco(subjob)
-                    subjob_wrapper.delete_with_associated(
+                    subjob_wrapper._delete_with_associated_internal(
                         delete_output_workdata=delete_output_workdata,
                         delete_input_workdata=delete_input_workdata,
-                        delete_subjobs_with_data=delete_subjobs_with_data)
+                        delete_subjobs_with_data=delete_subjobs_with_data,
+                        recursion_depth = recursion_depth + 1)
                     if subjob.self_link.exists():
                         warnings.warn(f"Could not delete subjob: {subjob.self_link.get_url()}")
                 except (ClientException, ApiException) as e:
@@ -660,7 +678,7 @@ class Job:
         self.refresh()
 
         # delete output workdatas
-        if delete_output_workdata is True:
+        if delete_output_workdata:
             for slot in self.job_hco.output_dataslots:
                 for wd in slot.assigned_workdatas:
                     try:

pinexq_client/job_management/tool/processing_step.py

@@ -11,11 +11,11 @@ from pinexq_client.job_management.hcos.job_hco import GenericProcessingConfigure
 from pinexq_client.job_management.hcos.processingsteproot_hco import ProcessingStepsRootHco
 from pinexq_client.job_management.known_relations import Relations
 from pinexq_client.job_management.model import (
-    CreateProcessingStepParameters,
     SetProcessingStepTagsParameters, ProcessingStepQueryParameters, ProcessingStepFilterParameter,
-    FunctionNameMatchTypes, EditProcessingStepParameters, CopyPsFromUserToOrgActionParameters,
-    CopyPsFromOrgToUserActionParameters, DeprecatePsActionParameters, ConfigureDeploymentParameters,
-    DeploymentResourcePresets, ScalingConfiguration, DeploymentStates, AssignCodeHashParameters
+    FunctionNameMatchTypes, CopyPsFromUserToOrgActionParameters,
+    DeprecatePsActionParameters, ConfigureDeploymentParameters,
+    DeploymentResourcePresets, ScalingConfiguration, DeploymentStates, AssignCodeHashParameters,
+    SetProcessingStepTitleParameters
 )
 
 
@@ -39,24 +39,22 @@ class ProcessingStep:
         self._entrypoint = enter_jma(client)
         self._processing_steps_root = self._entrypoint.processing_step_root_link.navigate()
 
-    def create(self, title: str, function_name: str, version: str = "0") -> Self:
-        """
-        Creates a new ProcessingStep by name.
+    def create(self, json_data: Any) -> Self:
+        """Create a new processing step.
 
         Args:
-            title: Title of the ProcessingStep to be created
-            function_name: Function name of the ProcessingStep to be created
-            version: Version of the ProcessingStep to be created
+            json_data: The JSON data representing the configuration of the processing step to be created.
 
         Returns:
-            The newly created ProcessingStep as `ProcessingStep` object
+            The newly created processing step as `ProcessingStep` object.
         """
-        processing_step_hco = self._processing_steps_root.register_new_action.execute(CreateProcessingStepParameters(
-            title=title,
-            function_name=function_name,
-            version=version
-        ))
-        self.processing_step_hco = processing_step_hco
+        upload_parameters = UploadParameters(
+            filename="processing_step.json",  # placeholder, jma does not care about filename
+            mediatype=MediaTypes.APPLICATION_JSON,
+            json=json_data
+        )
+        processing_step_link = self._processing_steps_root.register_new_action.execute(upload_parameters)
+        self._get_by_link(processing_step_link)
         return self
 
     def _get_by_link(self, processing_step_link: ProcessingStepLink):
@@ -141,10 +139,10 @@ class ProcessingStep:
             Query result object containing the matching processing steps.
         """
         query_param = ProcessingStepQueryParameters(
-            filter=ProcessingStepFilterParameter(
-                function_name=step_name,
-                function_name_match_type=FunctionNameMatchTypes.match_exact,
-                version=version
+            Filter=ProcessingStepFilterParameter(
+                FunctionName=step_name,
+                FunctionNameMatchType=FunctionNameMatchTypes.match_exact,
+                Version=version
             )
         )
         instance = ProcessingStep(client)
@@ -190,29 +188,7 @@ class ProcessingStep:
             This `ProcessingStep` object"""
         self._raise_if_no_hco()
         self.processing_step_hco.edit_tags_action.execute(SetProcessingStepTagsParameters(
-            tags=tags
-        ))
-        self.refresh()
-        return self
-
-    def edit_properties(
-            self,
-            *,
-            new_title: str | None = None,
-            is_public: bool | None = None,
-            new_function_name: str | None = None,
-            new_version: str | None = None,
-    ) -> Self:
-        """Edit processing step properties.
-
-        Returns:
-            This `ProcessingStep` object"""
-        self._raise_if_no_hco()
-        self.processing_step_hco.edit_properties_action.execute(EditProcessingStepParameters(
-            title=new_title,
-            is_public=is_public,
-            function_name=new_function_name,
-            version=new_version
+            Tags=tags
         ))
         self.refresh()
         return self
@@ -284,7 +260,7 @@ class ProcessingStep:
             This `ProcessingStep` object"""
         self._raise_if_no_hco()
         self.processing_step_hco.deprecate_ps_action.execute(
-            DeprecatePsActionParameters(reason=reason)
+            DeprecatePsActionParameters(Reason=reason)
         )
         self.refresh()
         return self
@@ -319,7 +295,7 @@ class ProcessingStep:
         """
         self._raise_if_no_hco()
         self.processing_step_hco.assign_code_hash_action.execute(
-            AssignCodeHashParameters(code_hash=code_hash)
+            AssignCodeHashParameters(CodeHash=code_hash)
         )
         self.refresh()
         return self
@@ -339,9 +315,9 @@ class ProcessingStep:
         self._raise_if_no_hco()
         self.processing_step_hco.configure_deployment_action.execute(
             ConfigureDeploymentParameters(
-                resource_preset = resource_preset,
-                entrypoint = entrypoint,
-                scaling = scaling
+                ResourcePreset = resource_preset,
+                Entrypoint = entrypoint,
+                Scaling = scaling
             )
         )
         self.refresh()
@@ -411,28 +387,20 @@ class ProcessingStep:
         self._raise_if_no_hco()
         return self.processing_step_hco.deployment_state
 
-    def upload_configuration(self, json_data: Any) -> Self:
-        """Upload processing configuration.
+    def copy_from_org_to_user(self) -> ProcessingStepLink:
+        """Copy ProcessingStep from organization to user.
 
         Returns:
-            This `ProcessingStep` object
+            The URL of the copied ProcessingStep
         """
         self._raise_if_no_hco()
-        self.processing_step_hco.upload_configuration_action.execute(
-            UploadParameters(
-                filename="config.json",  # placeholder, jma does not care about filename
-                mediatype=MediaTypes.APPLICATION_JSON,
-                json=json_data
-            )
-        )
-        self.refresh()
-
-        return self
+        return self.processing_step_hco.copy_from_org_to_user_action.execute()
 
-    def copy_from_org_to_user(self, *, title: str, function_name: str, version: str) -> ProcessingStepLink:
-        """Copy ProcessingStep from organization to user.
+    def copy_from_user_to_org(self, *, org_id: str) -> ProcessingStepLink:
+        """Copy ProcessingStep from user to organization.
 
         Args:
+            org_id: The ID of the organization to copy the processing step to.
             title: New title for the copied ProcessingStep
             function_name: New function for the copied ProcessingStep
             version: New version for the copied ProcessingStep
@@ -441,35 +409,47 @@ class ProcessingStep:
             The URL of the copied ProcessingStep
         """
         self._raise_if_no_hco()
-        return self.processing_step_hco.copy_from_org_to_user_action.execute(
-            CopyPsFromOrgToUserActionParameters(
-                title=title,
-                function_name=function_name,
-                version=version
-            )
+        return self.processing_step_hco.copy_from_user_to_org_action.execute(
+            CopyPsFromUserToOrgActionParameters(OrgId=org_id)
         )
 
-    def copy_from_user_to_org(self, *, title: str, function_name: str, version: str, org_id: str) -> ProcessingStepLink:
-        """Copy ProcessingStep from user to organization.
+    def make_public(self) -> Self:
+        """Make the ProcessingStep public.
+
+        Returns:
+            This `ProcessingStep` object
+        """
+        self._raise_if_no_hco()
+        self.processing_step_hco.make_public_action.execute()
+        self.refresh()
+        return self
+
+    def make_private(self) -> Self:
+        """Make the ProcessingStep private.
+
+        Returns:
+            This `ProcessingStep` object
+        """
+        self._raise_if_no_hco()
+        self.processing_step_hco.make_private_action.execute()
+        self.refresh()
+        return self
+
+    def set_title(self, title: str) -> Self:
+        """Set the title of the ProcessingStep.
 
         Args:
-            org_id: The ID of the organization to copy the processing step to.
-            title: New title for the copied ProcessingStep
-            function_name: New function for the copied ProcessingStep
-            version: New version for the copied ProcessingStep
+            title: The new title for the ProcessingStep.
 
         Returns:
-            The URL of the copied ProcessingStep
+            This `ProcessingStep` object
         """
         self._raise_if_no_hco()
-        return self.processing_step_hco.copy_from_user_to_org_action.execute(
-            CopyPsFromUserToOrgActionParameters(
-                org_id=org_id,
-                title=title,
-                function_name=function_name,
-                version=version
-            )
+        self.processing_step_hco.set_title_action.execute(
+            SetProcessingStepTitleParameters(Title=title)
         )
+        self.refresh()
+        return self
 
     def self_link(self) -> ProcessingStepLink:
         self._raise_if_no_hco()

{pinexq_client-0.10.3rc1.dist-info → pinexq_client-0.10.5rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pinexq-client
-Version: 0.10.3rc1
+Version: 0.10.5rc1
 Summary: A hypermedia-based client for the DataCybernetics PinexQ platform.
 Author: Sebastian Höfer, Mathias Reichardt, Jasim Ahmed, Pratik Poudel
 Author-email: Sebastian Höfer <hoefer@data-cybernetics.com>, Mathias Reichardt <reichardt@data-cybernetics.com>, Jasim Ahmed <ahmed@data-cybernetics.com>, Pratik Poudel <poudel@data-cybernetics.com>
@@ -14,9 +14,9 @@ Maintainer-email: Mathias Reichardt <reichardt@data-cybernetics.com>, Sebastian
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 
-# Pine-x-Q Python Client
+# PineXQ Python Client
 
-A hypermedia-based client for the DataCybernetics PinexQ platform.
+A hypermedia-based client for the DataCybernetics PineXQ platform.
 
 This module contains the submodules:
 

{pinexq_client-0.10.3rc1.dist-info → pinexq_client-0.10.5rc1.dist-info}/RECORD

@@ -4,7 +4,7 @@ pinexq_client/core/base_relations.py,sha256=oIUS58pkbMDdqm-3YOdsenhL1smtzeAk4fp7
 pinexq_client/core/enterapi.py,sha256=eB4F2_t3lCbMgKhy-M-Sf_u9MhuJMO7OGh-GB-4Cc-8,731
 pinexq_client/core/exceptions.py,sha256=NqB3y1ufjOfG3kv7Rz4ppXqJRAugt2zlgxkto2nIVQU,2228
 pinexq_client/core/hco/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pinexq_client/core/hco/action_hco.py,sha256=6bWea-SkFjn52m5sYywkZeNOe74Nxmsvj338jSB6RZo,2338
+pinexq_client/core/hco/action_hco.py,sha256=byPFuO3cQlc2MY20FMfJ4RvPUKrsVPtonmcT5CZU1A4,2542
 pinexq_client/core/hco/action_with_parameters_hco.py,sha256=qvtoqTfDHddxB0ALanWXNDobSpazCmK2_ulTuvax2A4,3280
 pinexq_client/core/hco/download_link_hco.py,sha256=_ijLtRfzy0qKG_QXpsWBZ8FJfp60o5Lw7QVv4_EpgPY,1335
 pinexq_client/core/hco/hco_base.py,sha256=u37c9bmjX_Ug49XgCHWdtrj7jrYIVQHkYllQQoijLGw,3534
@@ -18,35 +18,35 @@ pinexq_client/core/model/error.py,sha256=ZDbUlwsj7d8XPMolSSLTFwgs3RBLvOvgmlEtoBu
 pinexq_client/core/model/sirenmodels.py,sha256=vGRQlhM2cSa2caxQel91Jr48KWqM-vMYX32iaQCzIds,5547
 pinexq_client/core/polling.py,sha256=nNEDONEkB3Gu5WUMm2u9RFG1OIclnixaiy7l_U2Z4No,1146
 pinexq_client/core/sirenaccess.py,sha256=F7eZI5Pz79el0D30SYNGsiS2qWaAZF_jrCrUy-q2GgY,6992
-pinexq_client/job_management/__init__.py,sha256=of3nrM8wMG-rvSDV4cTN6CyDaxdtBw1h7P4odkgF7CA,598
+pinexq_client/job_management/__init__.py,sha256=mZOGFYzI4mvKc4I11nHuPPoaPhz0QkJC8eAVyZoiNes,598
 pinexq_client/job_management/enterjma.py,sha256=A9Uo9QSJAuAm9oHAhs0BIpEat77cRuWZvJ5zEOijhPs,3386
 pinexq_client/job_management/hcos/__init__.py,sha256=TZgs5kuBk3lSBxPfn5ehgbdUgzPy2jn1PC3Ea6VQY-k,584
 pinexq_client/job_management/hcos/entrypoint_hco.py,sha256=yeGw-tirgJf4MYziGnFQFfYaOOovrUf3kkb1U_wgN4k,2423
-pinexq_client/job_management/hcos/info_hco.py,sha256=Y2nqDZRvqm3087-EzSGfV4QShe9Hy-eu0s-M953ggyw,1899
-pinexq_client/job_management/hcos/input_dataslot_hco.py,sha256=SDflhyW8kjpcTUfKAXnJxNR-etPzAHfoTqlYUcJZrxs,3442
+pinexq_client/job_management/hcos/info_hco.py,sha256=9PZfx3SCuZiAvXsCsRR7XMfae18kd0Z1C_FLUyxiN_M,2122
+pinexq_client/job_management/hcos/input_dataslot_hco.py,sha256=QTTn0L1czLfu3HNMsCUCYihHDQBSUMicL-lFV9wtLD4,3474
 pinexq_client/job_management/hcos/job_hco.py,sha256=8Lq5RABq7XUp3Z6jhYegPgVPfm591-38eC8CCLes0KQ,8934
 pinexq_client/job_management/hcos/job_query_result_hco.py,sha256=I0G8YIlYDhTahLz8n06L8BywlcsMGNWUEsmEr4Sk0GU,3315
 pinexq_client/job_management/hcos/job_used_tags_hco.py,sha256=JKbZerZRway_HU6ujXiBjgP9TlLho1WD0syTmivsZpk,1706
 pinexq_client/job_management/hcos/jobsroot_hco.py,sha256=8ba2vFmTeVcW0GZrtUfyrxWt-OCTtKeGOc-NeCq1Rrg,4971
-pinexq_client/job_management/hcos/output_dataslot_hco.py,sha256=zxpo-fI9eHcp_pMKcf2l-gRoPHX1RzQO53auHMRB_T8,1549
-pinexq_client/job_management/hcos/processing_step_hco.py,sha256=9WkAzoRCrQw_og8Y7fTio3TRTI8EowOJPxq9MNCQKX8,12657
+pinexq_client/job_management/hcos/output_dataslot_hco.py,sha256=xIU5AsJT6zPqaR39gKOi_9N_VwdiUUPjvaXXMyA7HUU,1583
+pinexq_client/job_management/hcos/processing_step_hco.py,sha256=SyFDSvM7nmkvoA3oEdrRVFFcUPvZm5zY0YoanYOLrCg,12407
 pinexq_client/job_management/hcos/processing_step_used_tags_hco.py,sha256=K4Ub5FVK5ge8CtUeit9D23MPjQTMTC-X75dS9561oyw,1947
 pinexq_client/job_management/hcos/processingstep_query_result_hco.py,sha256=YcCgigKvOIggILixgaEbmnM23FlkjCgxnhZC2Eh98dY,3817
-pinexq_client/job_management/hcos/processingsteproot_hco.py,sha256=MC7qxNMXwoKtMReSVzYiNqI_2MUdT3gbxoxULyYXU6c,4172
+pinexq_client/job_management/hcos/processingsteproot_hco.py,sha256=u2iXoDmujuXL3z-zL-u7MRht4czdiNwG9rWS0uj3diY,4295
 pinexq_client/job_management/hcos/user_hco.py,sha256=6GZrNeUZSZxwOiyCylkfl-pqDa1RL7Lc9Lg3vf0EuYc,1095
 pinexq_client/job_management/hcos/workdata_hco.py,sha256=QI1m_IUWVBesCft9UR1svCRsWDz16moY7XMhWvfFGcE,7206
 pinexq_client/job_management/hcos/workdata_query_result_hco.py,sha256=yxEnu_COMxP3mt553JZD13jjPyqSp3DJjgd8es5Nq_E,3520
 pinexq_client/job_management/hcos/workdata_used_tags_query_result_hco.py,sha256=oMHyG4NLOOPljzIE5324vVfo4zoGiNsQnT_HEuRi-nY,1991
 pinexq_client/job_management/hcos/workdataroot_hco.py,sha256=92Q3J8q28XRL7cw1Ac5F_hl_Y5ZNaZ2gThYLbTIrka0,4441
-pinexq_client/job_management/known_relations.py,sha256=Xe5QhDZY_0bH6Bdqb-DJdh8Mu8Uhcas3kF2v1UJe56A,874
+pinexq_client/job_management/known_relations.py,sha256=do-u2wjb6u_HK2-y604f2gs3rk9O19MTIZpvbkfTSpA,905
 pinexq_client/job_management/model/__init__.py,sha256=iuAKRXdW_Mxo0i3HsBfEzhJJZUKkNe3qs4gLW-ge1PU,63
-pinexq_client/job_management/model/open_api_generated.py,sha256=l5TroQbIM1ho0-CpwseorQ2nehDx4LwdrCmSeeLIsMc,39658
+pinexq_client/job_management/model/open_api_generated.py,sha256=nXIX64VwGTZQxDmlB4YNYSfMNTFsmW3anAmR2sMWhYA,40601
 pinexq_client/job_management/model/sirenentities.py,sha256=75ivnSU5OSuocITfluJ5o4o0CZldgtaP5PZqj4LhjJc,3950
 pinexq_client/job_management/tool/__init__.py,sha256=zPobd-hQyANHzC0-TjJG91z9XrewvE54ZJ6VViymW5M,128
-pinexq_client/job_management/tool/job.py,sha256=pD8O47N5okIOflVADy-9MSSDll1aSoV3CCyfzJxejG4,34262
+pinexq_client/job_management/tool/job.py,sha256=YOnNXk_tUSTjmHPcTwn_jYskjoqDg183tRHqG63HCuI,35037
 pinexq_client/job_management/tool/job_group.py,sha256=olwnPNqfT32XtLKJOzoq7j_Hb6NovUxy6YRJtQgLsW0,11221
-pinexq_client/job_management/tool/processing_step.py,sha256=3_KIk5IPqKXuJw4Gn3S6t2TYPf_EBCxZhBpHZqEHfUQ,16797
+pinexq_client/job_management/tool/processing_step.py,sha256=AI290f0zXHu381PJr9CS0VXo-PsSk2m5ri7WXV3scE8,15851
 pinexq_client/job_management/tool/workdata.py,sha256=E1Qt945tocXiSZuQo2IbTnlgW2VRnq2ODEFQ96lXTDI,6270
-pinexq_client-0.10.3rc1.dist-info/WHEEL,sha256=ePp19eyRASTHUPCpRsqjeFjsybXoCLYnd2O6QHdRRAY,79
-pinexq_client-0.10.3rc1.dist-info/METADATA,sha256=M9QJ3veg77CzUMA0Am6ksoVQg0wNuJddFXpwt4idTv4,3520
-pinexq_client-0.10.3rc1.dist-info/RECORD,,
+pinexq_client-0.10.5rc1.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
+pinexq_client-0.10.5rc1.dist-info/METADATA,sha256=cILJKlfrGB8hHBcu3_YBINKV2icOzVnz75xWRPG2cKI,3518
+pinexq_client-0.10.5rc1.dist-info/RECORD,,

{pinexq_client-0.10.3rc1.dist-info → pinexq_client-0.10.5rc1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.14
+Generator: uv 0.9.22
 Root-Is-Purelib: true
 Tag: py3-none-any