pinexq-client 0.9.2.20250515.43__py3-none-any.whl → 0.9.2.20250728.45__py3-none-any.whl

pinexq_client/job_management/__init__.py

@@ -22,4 +22,4 @@ from .model import JobSortPropertiesSortParameter, ProcessingView
 from .tool import Job, JobGroup, ProcessingStep, WorkData
 
 # Protocol version the JMA is using
-__jma_version__ = [7, 6, 0]
+__jma_version__ = [8, 0, 0]

pinexq_client/job_management/hcos/user_hco.py

@@ -16,7 +16,7 @@ class UserLink(LinkHco):
 
 class UserHco(Hco[UserEntity]):
     user_id: UUID = Property()
-    user_groups: list[str] = Property()
+    user_grants: list[str] = Property()
 
     self_link: UserLink
 

pinexq_client/job_management/model/open_api_generated.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.json
-#   timestamp: 2025-05-14T12:10:18+00:00
+#   timestamp: 2025-07-28T08:17:01+00:00
 
 from __future__ import annotations
 
@@ -132,6 +132,7 @@ class InfoHtoOpenApiProperties(BaseModel):
         extra='allow',
         populate_by_name=True,
     )
+    organization_id: str | None = Field(None, alias='OrganizationId')
     api_version: str | None = Field(None, alias='ApiVersion')
     build_version: str | None = Field(None, alias='BuildVersion')
     used_storage_in_bytes: int | None = Field(None, alias='UsedStorageInBytes')
@@ -252,6 +253,9 @@ class ProcessingStepHtoOpenApiProperties(BaseModel):
     owner_id: str | None = Field(
         None, alias='OwnerId', description='The owner of this resource'
     )
+    created_by: str | None = Field(
+        None, alias='CreatedBy', description='The creator of this resource'
+    )
     version: str | None = Field(
         None, alias='Version', description='Version of the algorithm. Default = "0"'
     )
@@ -444,7 +448,7 @@ class UserHtoOpenApiProperties(BaseModel):
         populate_by_name=True,
     )
     user_id: str | None = Field(None, alias='UserId')
-    user_groups: List[str] | None = Field(None, alias='UserGroups')
+    user_grants: List[str] | None = Field(None, alias='UserGrants')
 
 
 class WorkDataKind(Enum):
@@ -682,6 +686,7 @@ class JobHtoOpenApiProperties(BaseModel):
     owner_id: str | None = Field(
         None, alias='OwnerId', description='The owner of this resource'
     )
+    created_by: str | None = Field(None, alias='CreatedBy')
     state: JobStates | None = Field(None, alias='State')
     tags: List[str] | None = Field(None, alias='Tags')
     hidden: bool | None = Field(None, alias='Hidden')
@@ -847,6 +852,9 @@ class WorkDataHtoOpenApiProperties(BaseModel):
     owner_id: str | None = Field(
         None, alias='OwnerId', description='The owner of this resource'
     )
+    created_by: str | None = Field(
+        None, alias='CreatedBy', description='The creator of this resource'
+    )
     name: str | None = Field(None, alias='Name')
     created_at: AwareDatetime | None = Field(None, alias='CreatedAt')
     size_in_bytes: int | None = Field(None, alias='SizeInBytes')

pinexq_client/job_management/tool/job.py

@@ -1,9 +1,10 @@
 import json as json_
 import warnings
-from typing import Any, Self
+from typing import Any, Self, List
 
 import httpx
 from httpx import URL
+from pydantic import BaseModel, ConfigDict
 
 from pinexq_client.core import Link, MediaTypes, ClientException, ApiException
 from pinexq_client.core.polling import wait_until, PollingException
@@ -35,12 +36,51 @@ from pinexq_client.job_management.model import (
     SelectProcessingParameters,
     SelectWorkDataCollectionForDataSlotParameters,
     SelectWorkDataForDataSlotParameters,
-    SetJobTagsParameters, RapidJobSetupParameters,
+    SetJobTagsParameters, RapidJobSetupParameters, InputDataSlotParameter,
 )
 from pinexq_client.job_management.tool.processing_step import ProcessingStep
 from pinexq_client.job_management.tool.workdata import WorkData
 
 
+class InputDataSlotParameterFlexible(BaseModel):
+    model_config = ConfigDict(
+        extra='allow',
+        arbitrary_types_allowed=True
+    )
+    index: int
+    work_data_urls: List[str] | None = None
+    work_data_instances: List[WorkData] | None = None
+
+    @classmethod
+    def create(cls, *,
+        index: int,
+        work_data_urls: List[WorkDataLink] | None = None,
+        work_data_instances: List[WorkData] | None = None
+    ) -> "InputDataSlotParameterFlexible":
+        """Creates an instance of InputDataSlotParameterFlexible that can be used to assign work data to a job.
+
+        Args:
+            index: The index of the input data slot.
+            work_data_urls: A list of URLs pointing to the work data.
+            work_data_instances: A list of WorkData instances.
+
+        Returns:
+            An instance of InputDataSlotParameterFlexible.
+        """
+        if sum(p is not None for p in [work_data_urls, work_data_instances]) != 1:
+            raise ValueError("Exactly one parameter must be provided")
+
+        if work_data_instances is not None:
+            if not isinstance(work_data_instances, list) or any(
+                    not isinstance(i, WorkData) for i in work_data_instances):
+                raise Exception('Instance passed to "work_data_instances" is not of type "list[WorkData]"')
+            work_data_urls = [work_data_instance.self_link() for work_data_instance in work_data_instances]
+        return InputDataSlotParameterFlexible(
+            index=index,
+            work_data_urls=[str(wd.get_url()) for wd in work_data_urls] if work_data_urls else None,
+            work_data_instances=None
+        )
+
 class Job:
     """Convenience wrapper for handling JobHcos in the JobManagement-Api.
 
@@ -61,7 +101,7 @@ class Job:
     _entrypoint: EntryPointHco
     _jobs_root: JobsRootHco
     _processing_step_root: ProcessingStepsRootHco
-    job_hco: JobHco | None = None # Internal hco of the wrapper. This is updated by this class. You should not take a reference to this object.
+    job_hco: JobHco | None = None  # Internal hco of the wrapper. This is updated by this class. You should not take a reference to this object.
 
     def __init__(self, client: httpx.Client):
         """
@@ -313,6 +353,19 @@ class Job:
 
         return self
 
+    def wait_for_completion(self, timeout_ms: int = 60000, polling_interval_ms: int = 500) -> Self:
+        """Wait for this job to reach the state 'completed'.
+
+        Args:
+            timeout_ms: Timeout to wait for the job to reach the next state.
+            polling_interval_ms: will determine how fast the API is polled for updates.
+            Note that low values will produce unnecessary load.
+
+        Returns:
+            This `Job` object
+        """
+        return self.wait_for_state(JobStates.completed, timeout_ms, polling_interval_ms)
+
     def assign_input_dataslot(
             self,
             index: int,
@@ -564,7 +617,7 @@ class Job:
 
         job_was_deleted = False
         try:
-            if  self.job_hco.delete_action.is_available():
+            if self.job_hco.delete_action.is_available():
                 self.job_hco.delete_action.execute()
                 # do not delete the hco here since we want to access its data slots just below
                 job_was_deleted = True
@@ -663,7 +716,17 @@ class Job:
 
     def create_and_configure_rapidly(
             self,
-            parameters: RapidJobSetupParameters
+            *,
+            name: str,
+            parent_job_url: JobLink | None = None,
+            parent_job_instance: Self | None = None,
+            tags: list[str] | None = None,
+            processing_step_url: ProcessingStepLink | None = None,
+            processing_step_instance: ProcessingStep | None = None,
+            start: bool = True,
+            parameters: str | None = None,
+            allow_output_data_slots: bool | None = None,
+            input_data_slots: List[InputDataSlotParameterFlexible] | None = None,
     ) -> Self:
         """
         Creates a new job and configures it rapidly with RapidJobSetupParameters.
@@ -674,7 +737,54 @@ class Job:
         Returns:
             The newly created job as `Job` object
         """
-        job_link = self._jobs_root.rapid_job_setup_action.execute(parameters)
+
+        # handle parent job
+        if sum(p is not None for p in [parent_job_url, parent_job_instance]) > 1:
+            raise ValueError("Either none or at most 1 one of parent_job_url or parent_job_instance must be provided")
+        parent_job = None
+        if parent_job_instance is not None:
+            if not isinstance(parent_job_instance, Job):
+                raise Exception('Instance passed to "parent_job_instance" is not of type "Job"')
+            parent_job = parent_job_instance.self_link().get_url()
+        elif parent_job_url is not None:
+            if not isinstance(parent_job_url, JobLink):
+                raise Exception('Instance passed to "parent_job_url" is not of type "JobLink"')
+            parent_job = parent_job_url.get_url()
+
+        # handle processing step
+        if sum(p is not None for p in [processing_step_url, processing_step_instance]) != 1:
+            raise ValueError("Exactly one of processing_step_url or processing_step_instance must be provided")
+        if processing_step_instance is not None:
+            if not isinstance(processing_step_instance, ProcessingStep):
+                raise Exception('Instance passed to "processing_step_instance" is not of type "ProcessingStep"')
+            processing_step = processing_step_instance.self_link().get_url()
+        else:
+            if not isinstance(processing_step_url, ProcessingStepLink):
+                raise Exception('Instance passed to "processing_step_url" is not of type "ProcessingStepLink"')
+            processing_step = processing_step_url.get_url()
+
+        # handle input data slots
+        if input_data_slots is not None:
+            input_data_slots = [
+                InputDataSlotParameter(
+                    Index=slot.index,
+                    WorkDataUrls=slot.work_data_urls
+                ) for slot in input_data_slots
+            ]
+
+        # build RapidJobSetupParameters
+        params = RapidJobSetupParameters(
+            Name=name,
+            ParentJobUrl=None if parent_job is None else str(parent_job),
+            ProcessingStepUrl=str(processing_step),
+            Tags=tags,
+            Start=start,
+            Parameters=parameters,
+            AllowOutputDataDeletion=allow_output_data_slots,
+            InputDataSlots=input_data_slots
+        )
+
+        job_link = self._jobs_root.rapid_job_setup_action.execute(params)
         self._get_by_link(job_link)
         return self
 

{pinexq_client-0.9.2.20250515.43.dist-info → pinexq_client-0.9.2.20250728.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pinexq-client
-Version: 0.9.2.20250515.43
+Version: 0.9.2.20250728.45
 Summary: A hypermedia-based client for the DataCybernetics PinexQ platform.
 Author-Email: =?utf-8?q?Sebastian_H=C3=B6fer?= <hoefer@data-cybernetics.com>, Mathias Reichardt <reichardt@data-cybernetics.com>, Jasim Ahmed <ahmed@data-cybernetics.com>, Pratik Poudel <poudel@data-cybernetics.com>
 Maintainer-Email: Mathias Reichardt <reichardt@data-cybernetics.com>, =?utf-8?q?Sebastian_H=C3=B6fer?= <hoefer@data-cybernetics.com>, Carsten Blank <blank@data-cybernetics.com>

{pinexq_client-0.9.2.20250515.43.dist-info → pinexq_client-0.9.2.20250728.45.dist-info}/RECORD

@@ -1,7 +1,7 @@
-pinexq_client-0.9.2.20250515.43.dist-info/METADATA,sha256=0WwpBhk9GA6PUPIi3nDnyX9fvaaRIb9nloEjn2OVsBk,3279
-pinexq_client-0.9.2.20250515.43.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-pinexq_client-0.9.2.20250515.43.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-pinexq_client-0.9.2.20250515.43.dist-info/licenses/LICENSE,sha256=3oz3tAhM7kOgRukkRe7wmh5T_HihZY77ZtJDJm91ZN8,1072
+pinexq_client-0.9.2.20250728.45.dist-info/METADATA,sha256=rpYp7wXC3mkwpuPzLGmEjObrX6rnq74CYCvOrhnCq6A,3279
+pinexq_client-0.9.2.20250728.45.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+pinexq_client-0.9.2.20250728.45.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+pinexq_client-0.9.2.20250728.45.dist-info/licenses/LICENSE,sha256=3oz3tAhM7kOgRukkRe7wmh5T_HihZY77ZtJDJm91ZN8,1072
 pinexq_client/core/__init__.py,sha256=zO9vUuAl6AEokL-SqQO3Jl1qrxFBZPA2kH99VNZugEU,598
 pinexq_client/core/base_relations.py,sha256=oIUS58pkbMDdqm-3YOdsenhL1smtzeAk4fp7-U595MY,162
 pinexq_client/core/enterapi.py,sha256=eB4F2_t3lCbMgKhy-M-Sf_u9MhuJMO7OGh-GB-4Cc-8,731
@@ -21,7 +21,7 @@ pinexq_client/core/model/error.py,sha256=ZDbUlwsj7d8XPMolSSLTFwgs3RBLvOvgmlEtoBu
 pinexq_client/core/model/sirenmodels.py,sha256=vGRQlhM2cSa2caxQel91Jr48KWqM-vMYX32iaQCzIds,5547
 pinexq_client/core/polling.py,sha256=Z6VXn-PCGk4XX-4tQWZG59qJyCIS0eIrpPUORQDIGrs,1077
 pinexq_client/core/sirenaccess.py,sha256=F7eZI5Pz79el0D30SYNGsiS2qWaAZF_jrCrUy-q2GgY,6992
-pinexq_client/job_management/__init__.py,sha256=jaOkYyOSur8EMcz4fgEFlENQFwagHKjLwlR67E9FIhs,598
+pinexq_client/job_management/__init__.py,sha256=tpmrNGVVfoH6kfcU_-w1vN4kpBUxO2_zmtdt-ddgT5w,598
 pinexq_client/job_management/enterjma.py,sha256=Ivl_jVPw_gaLyU5nKbywM-bbVGpn0MoCrZ0DMbJYf3s,1411
 pinexq_client/job_management/hcos/__init__.py,sha256=TZgs5kuBk3lSBxPfn5ehgbdUgzPy2jn1PC3Ea6VQY-k,584
 pinexq_client/job_management/hcos/entrypoint_hco.py,sha256=qodjAwO_MtawUuhmaYjhGXHV-uW1k94V9gKRYZRkhn4,2234
@@ -36,18 +36,18 @@ pinexq_client/job_management/hcos/processing_step_hco.py,sha256=JH9s3ifchYvpwzPG
 pinexq_client/job_management/hcos/processing_step_used_tags_hco.py,sha256=90-2IWlYTcYX62NzmAPnmcUCwMDhmMZyBrNs_G3yigs,1067
 pinexq_client/job_management/hcos/processingstep_query_result_hco.py,sha256=YcCgigKvOIggILixgaEbmnM23FlkjCgxnhZC2Eh98dY,3817
 pinexq_client/job_management/hcos/processingsteproot_hco.py,sha256=gQBGMWEKX5kq_HwC7-eEjjfAm6oYTuIxGX5kKw_GKUM,3684
-pinexq_client/job_management/hcos/user_hco.py,sha256=z6USe-4nYzBfOoEx3n9_UbgomMTimg4EIa_XeVBj01A,1095
+pinexq_client/job_management/hcos/user_hco.py,sha256=6GZrNeUZSZxwOiyCylkfl-pqDa1RL7Lc9Lg3vf0EuYc,1095
 pinexq_client/job_management/hcos/workdata_hco.py,sha256=utKgdvwJdtR5oFSdM0PQpjpFmH39X1RAvfF-2a1g3U8,5707
 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=qB1iQpwD63579dq3tUF4DBB_rZRMqJ80y1ysf-41aOo,1087
 pinexq_client/job_management/hcos/workdataroot_hco.py,sha256=LdEPW2JJTqAWi-6zj-40lfREhthcDL6nPXQk_nfMtCA,3936
 pinexq_client/job_management/known_relations.py,sha256=f3-7RagAfeSFv9b54l5zxnLKbVQjQQHzYsM4W2QHf0Y,708
 pinexq_client/job_management/model/__init__.py,sha256=iuAKRXdW_Mxo0i3HsBfEzhJJZUKkNe3qs4gLW-ge1PU,63
-pinexq_client/job_management/model/open_api_generated.py,sha256=s-XtnhuK5YmBhbOqKsy09iRKrQMtZL6-N2be-g5d8QU,33211
+pinexq_client/job_management/model/open_api_generated.py,sha256=0zRqgTQWp2imTfIaAwQxun9XT1xLW9BMIr6yZ_5Wkes,33577
 pinexq_client/job_management/model/sirenentities.py,sha256=MUjgByEwzQcrduCEJuNK85uAj8SLTdyaiKmnlB44h3E,3430
 pinexq_client/job_management/tool/__init__.py,sha256=zPobd-hQyANHzC0-TjJG91z9XrewvE54ZJ6VViymW5M,128
-pinexq_client/job_management/tool/job.py,sha256=p9WDfJiIcQMZyLfNajpxK9kSd0DqF2H9hoS7lvDIFC0,25496
+pinexq_client/job_management/tool/job.py,sha256=yVEVE3RRalQy8abA2G1X-a1Tj3v32YCsDeN52LDMSp8,30572
 pinexq_client/job_management/tool/job_group.py,sha256=TNWw46UDyP2gmArhbzMAqpHa6lS2hzwarLIrxxpOMnk,4822
 pinexq_client/job_management/tool/processing_step.py,sha256=LLesEbS7vaAiCoGs7MV8bnaD8bWnkK-2YTxAsyPiJFM,10796
 pinexq_client/job_management/tool/workdata.py,sha256=wRy_yfFZUJDh-hoGUuAbQaRGtPysDmEOhLwD84Fgz04,5510
-pinexq_client-0.9.2.20250515.43.dist-info/RECORD,,
+pinexq_client-0.9.2.20250728.45.dist-info/RECORD,,

{pinexq_client-0.9.2.20250515.43.dist-info → pinexq_client-0.9.2.20250728.45.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.4)
+Generator: pdm-backend (2.4.5)
 Root-Is-Purelib: true
 Tag: py3-none-any