pinexq-client 0.9.0.20241203.1__py3-none-any.whl → 0.9.2.20250317.3__py3-none-any.whl

pinexq_client/core/__init__.py

@@ -1,8 +1,22 @@
 # ruff: noqa: F403, F401
-from .sirenaccess import *
-from .model.sirenmodels import *
-from .model.error import *
-from .media_types import *
-from .http_headers import *
-from .exceptions import *
 from .base_relations import BaseRelations
+from .exceptions import *
+from .http_headers import Headers
+from .media_types import MediaTypes, SirenClasses
+from .model.error import ProblemDetails
+from .model.sirenmodels import ActionField, Action, EmbeddedLinkEntity, Link, Entity
+from .sirenaccess import (
+    ensure_siren_response,
+    execute_action,
+    execute_action_on_entity,
+    get_resource,
+    handle_action_result,
+    handle_error_response,
+    navigate,
+    navigate_self,
+    upload_binary,
+    upload_file,
+    upload_json,
+)
+from .enterapi import enter_api
+

pinexq_client/core/enterapi.py

@@ -1,7 +1,8 @@
 import httpx
 
 from typing import TypeVar, Type
-from pinexq_client.core import Entity, get_resource, raise_exception_on_error
+from pinexq_client.core.sirenaccess import get_resource, raise_exception_on_error
+from pinexq_client.core.model.sirenmodels import Entity
 from pinexq_client.core.hco.hco_base import Hco
 
 THco = TypeVar('THco', bound=Hco)

pinexq_client/core/sirenaccess.py

@@ -87,7 +87,7 @@ def upload_file(client: httpx.Client, action: Action, file: BinaryIO, filename:
     return handle_action_result(response)
 
 
-def execute_action_on_entity(client: httpx.Client, entity: Entity, name: str, parameters: BaseModel | None = None):
+def execute_action_on_entity(client: httpx.Client, entity: Entity, name: str, parameters: BaseModel | None = None) -> None | URL | ProblemDetails | Response:
     action = entity.find_first_action_with_name(name)
     if action is None:
         raise ClientException(f"Entity does not contain expected action: {name}")

pinexq_client/job_management/__init__.py

@@ -1,6 +1,25 @@
 # ruff: noqa: F401
 from .enterjma import enter_jma
-from .tool import Job, ProcessingStep, WorkData
+from .hcos import (
+    EntryPointHco,
+    InfoHco,
+    InputDataSlotHco,
+    JobHco,
+    JobLink,
+    JobQueryResultHco,
+    JobStates,
+    OutputDataSlotHco,
+    ProcessingStepsRootHco,
+    ProcessingStepHco,
+    ProcessingStepLink,
+    ProcessingStepQueryResultHco,
+    UserHco,
+    WorkDataHco,
+    WorkDataLink,
+)
+from .known_relations import Relations
+from .model import JobSortPropertiesSortParameter, ProcessingView
+from .tool import Job, JobGroup, ProcessingStep, WorkData
 
 # Protocol version the JMA is using
-__jma_version__ = [7, 3, 0]
+__jma_version__ = [7, 3, 1]

pinexq_client/job_management/hcos/__init__.py

@@ -1,13 +1,17 @@
-from .input_dataslot_hco import *
-from .output_dataslot_hco import *
 from .entrypoint_hco import *
 from .info_hco import *
+from .input_dataslot_hco import *
 from .job_hco import *
 from .job_query_result_hco import *
+from .job_used_tags_hco import *
 from .jobsroot_hco import *
+from .output_dataslot_hco import *
 from .processing_step_hco import *
+from .processing_step_used_tags_hco import *
 from .processingstep_query_result_hco import *
 from .processingsteproot_hco import *
+from .user_hco import *
 from .workdata_hco import *
 from .workdata_query_result_hco import *
+from .workdata_used_tags_query_result_hco import *
 from .workdataroot_hco import *

pinexq_client/job_management/model/__init__.py

@@ -1 +1,2 @@
 from .open_api_generated import *
+from .sirenentities import *

pinexq_client/job_management/model/open_api_generated.py

@@ -1,13 +1,14 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.json
-#   timestamp: 2024-11-27T15:40:27+00:00
+#   timestamp: 2024-12-12T14:18:14+00:00
 
 from __future__ import annotations
 
+from datetime import datetime
 from enum import Enum
 from typing import Any, List
 
-from pydantic import AwareDatetime, BaseModel, ConfigDict, Field, constr
+from pydantic import BaseModel, ConfigDict, Field, constr
 
 
 class AdminJobQueryResultHtoOpenApiProperties(BaseModel):
@@ -256,8 +257,8 @@ class ProcessingStepHtoOpenApiProperties(BaseModel):
     is_public: bool | None = Field(None, alias='IsPublic')
     tags: List[str] | None = Field(None, alias='Tags')
     is_configured: bool | None = Field(None, alias='IsConfigured')
-    created_at: AwareDatetime | None = Field(None, alias='CreatedAt')
-    last_modified_at: AwareDatetime | None = Field(None, alias='LastModifiedAt')
+    created_at: datetime | None = Field(None, alias='CreatedAt')
+    last_modified_at: datetime | None = Field(None, alias='LastModifiedAt')
     parameter_schema: str | None = Field(None, alias='ParameterSchema')
     default_parameters: str | None = Field(None, alias='DefaultParameters')
     return_schema: str | None = Field(None, alias='ReturnSchema')
@@ -311,6 +312,7 @@ class ProcessingView(BaseModel):
     title: str | None = Field(None, alias='Title')
     description: str | None = Field(None, alias='Description')
     function_name: str | None = Field(None, alias='FunctionName')
+    version: str | None = Field(None, alias='Version')
     number_of_input_data_slots: int | None = Field(None, alias='NumberOfInputDataSlots')
     number_of_output_data_slots: int | None = Field(
         None, alias='NumberOfOutputDataSlots'
@@ -322,7 +324,7 @@ class RenameJobParameters(BaseModel):
         extra='allow',
         populate_by_name=True,
     )
-    new_name: constr(min_length=1) = Field(..., alias='NewName')
+    new_name: constr(min_length=0) = Field("", alias='NewName')
 
 
 class SelectProcessingParameters(BaseModel):
@@ -495,8 +497,8 @@ class AdminJobFilterParameter(BaseModel):
     state: JobStates | None = Field(None, alias='State')
     show_hidden: bool | None = Field(None, alias='ShowHidden')
     processing_step_url: str | None = Field(None, alias='ProcessingStepUrl')
-    created_before: AwareDatetime | None = Field(None, alias='CreatedBefore')
-    created_after: AwareDatetime | None = Field(None, alias='CreatedAfter')
+    created_before: datetime | None = Field(None, alias='CreatedBefore')
+    created_after: datetime | None = Field(None, alias='CreatedAfter')
     tags_by_and: List[str] | None = Field(None, alias='TagsByAnd')
     tags_by_or: List[str] | None = Field(None, alias='TagsByOr')
     parent_job_url: str | None = Field(None, alias='ParentJobUrl')
@@ -562,8 +564,8 @@ class AdminWorkDataFilterParameter(BaseModel):
     tags_by_and: List[str] | None = Field(None, alias='TagsByAnd')
     tags_by_or: List[str] | None = Field(None, alias='TagsByOr')
     is_kind: WorkDataKind | None = Field(None, alias='IsKind')
-    created_before: AwareDatetime | None = Field(None, alias='CreatedBefore')
-    created_after: AwareDatetime | None = Field(None, alias='CreatedAfter')
+    created_before: datetime | None = Field(None, alias='CreatedBefore')
+    created_after: datetime | None = Field(None, alias='CreatedAfter')
     is_deletable: bool | None = Field(None, alias='IsDeletable')
     is_used: bool | None = Field(None, alias='IsUsed')
 
@@ -627,8 +629,8 @@ class JobFilterParameter(BaseModel):
     name: str | None = Field(None, alias='Name')
     show_hidden: bool | None = Field(None, alias='ShowHidden')
     work_data_url: str | None = Field(None, alias='WorkDataUrl')
-    created_before: AwareDatetime | None = Field(None, alias='CreatedBefore')
-    created_after: AwareDatetime | None = Field(None, alias='CreatedAfter')
+    created_before: datetime | None = Field(None, alias='CreatedBefore')
+    created_after: datetime | None = Field(None, alias='CreatedAfter')
     tags_by_and: List[str] | None = Field(None, alias='TagsByAnd')
     tags_by_or: List[str] | None = Field(None, alias='TagsByOr')
     processing_step_url: str | None = Field(None, alias='ProcessingStepUrl')
@@ -646,8 +648,8 @@ class JobHtoOpenApiProperties(BaseModel):
     tags: List[str] | None = Field(None, alias='Tags')
     hidden: bool | None = Field(None, alias='Hidden')
     output_is_deletable: bool | None = Field(None, alias='OutputIsDeletable')
-    created_at: AwareDatetime | None = Field(None, alias='CreatedAt')
-    completed_at: AwareDatetime | None = Field(None, alias='CompletedAt')
+    created_at: datetime | None = Field(None, alias='CreatedAt')
+    completed_at: datetime | None = Field(None, alias='CompletedAt')
     error_description: str | None = Field(None, alias='ErrorDescription')
     processing: ProcessingView | None = Field(None, alias='Processing')
     result: str | None = Field(None, alias='Result')
@@ -792,8 +794,8 @@ class WorkDataFilterParameter(BaseModel):
     tags_by_and: List[str] | None = Field(None, alias='TagsByAnd')
     tags_by_or: List[str] | None = Field(None, alias='TagsByOr')
     is_kind: WorkDataKind | None = Field(None, alias='IsKind')
-    created_before: AwareDatetime | None = Field(None, alias='CreatedBefore')
-    created_after: AwareDatetime | None = Field(None, alias='CreatedAfter')
+    created_before: datetime | None = Field(None, alias='CreatedBefore')
+    created_after: datetime | None = Field(None, alias='CreatedAfter')
     is_deletable: bool | None = Field(None, alias='IsDeletable')
     is_used: bool | None = Field(None, alias='IsUsed')
 
@@ -804,7 +806,7 @@ class WorkDataHtoOpenApiProperties(BaseModel):
         populate_by_name=True,
     )
     name: str | None = Field(None, alias='Name')
-    created_at: AwareDatetime | None = Field(None, alias='CreatedAt')
+    created_at: datetime | None = Field(None, alias='CreatedAt')
     size_in_bytes: int | None = Field(None, alias='SizeInBytes')
     tags: List[str] | None = Field(None, alias='Tags')
     media_type: str | None = Field(None, alias='MediaType')

pinexq_client/job_management/model/sirenentities.py

@@ -79,12 +79,14 @@ class JobUsedTagsEntity(Entity):
     properties: JobUsedTagsHtoOpenApiProperties | None = None
 
 
+# this needs to be added since the openapi.spec does not have this object.
 class InputDataSlotHtoProperties(BaseModel):
     model_config = ConfigDict(
-        extra="forbid",
+        extra="allow",
         populate_by_name=True,
     )
     is_configured: bool | None = Field(None, alias="IsConfigured")
+    name: str = Field("", alias="Name")
     title: str | None = Field(None, alias="Title")
     description: str | None = Field(None, alias="Description")
     media_type: str | None = Field(None, alias="MediaType")
@@ -94,11 +96,13 @@ class InputDataSlotEntity(Entity):
     properties: InputDataSlotHtoProperties | None = None
 
 
+# this needs to be added since the openapi.spec does not have this object.
 class OutputDataSlotHtoProperties(BaseModel):
     model_config = ConfigDict(
-        extra="forbid",
+        extra="allow",
         populate_by_name=True,
     )
+    name: str = Field("", alias="Name")
     title: str | None = Field(None, alias="Title")
     description: str | None = Field(None, alias="Description")
     media_type: str | None = Field(None, alias="MediaType")

pinexq_client/job_management/tool/__init__.py

@@ -1,3 +1,4 @@
 from .job import Job
+from .job_group import JobGroup
 from .processing_step import ProcessingStep
 from .workdata import WorkData

pinexq_client/job_management/tool/job.py

@@ -179,6 +179,7 @@ class Job:
     def select_processing(
             self,
             function_name: str | None = None,
+            function_version: str | None = None,
             *,
             processing_step_link: ProcessingStepLink | None = None,
             processing_step_instance: ProcessingStep | None = None
@@ -188,6 +189,7 @@ class Job:
 
         Args:
             function_name: Name of the processing step as string
+            function_version: Version of the processing step as string
             processing_step_link: A ProcessingStepLink instance pointing to the resource
             processing_step_instance: A ProcessingStep (not the Hco) instance
 
@@ -213,7 +215,8 @@ class Job:
             query_param = ProcessingStepQueryParameters(
                 filter=ProcessingStepFilterParameter(
                     function_name=function_name,
-                    function_name_match_type=FunctionNameMatchTypes.match_exact
+                    function_name_match_type=FunctionNameMatchTypes.match_exact,
+                    function_version=function_version,
                 )
             )
             query_result = self._processing_step_root.query_action.execute(query_param)

pinexq_client/job_management/tool/job_group.py

@@ -3,7 +3,7 @@ from typing import Union, Self
 
 import httpx
 
-from pinexq_client.job_management import Job
+from pinexq_client.job_management.tool import Job
 from pinexq_client.job_management.hcos import JobQueryResultHco
 from pinexq_client.job_management.model import JobStates
 

{pinexq_client-0.9.0.20241203.1.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pinexq-client
-Version: 0.9.0.20241203.1
+Version: 0.9.2.20250317.3
 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.0.20241203.1.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pinexq_client-0.9.0.20241203.1.dist-info/METADATA,sha256=YJLPPrztDSpMg_ewegmfvz1wfB_WAfuSxJ6EM4TPGyo,3278
-pinexq_client-0.9.0.20241203.1.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-pinexq_client-0.9.0.20241203.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-pinexq_client-0.9.0.20241203.1.dist-info/licenses/LICENSE,sha256=3oz3tAhM7kOgRukkRe7wmh5T_HihZY77ZtJDJm91ZN8,1072
-pinexq_client/core/__init__.py,sha256=8SVD_PRgJtpUCOtVjdR6fRrv6KPNk7HD6UQrn0FKR04,235
+pinexq_client-0.9.2.20250317.3.dist-info/METADATA,sha256=5NfTjM2ZTozjLvus0zcPMkXPZBDqss7G_fOzQ1IeyRA,3278
+pinexq_client-0.9.2.20250317.3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+pinexq_client-0.9.2.20250317.3.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+pinexq_client-0.9.2.20250317.3.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=sL9TmF1L5LaDJnre1l_tiHDUo9vTbZ8cvPSov3Q1UTs,671
+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
@@ -20,10 +20,10 @@ pinexq_client/core/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 pinexq_client/core/model/error.py,sha256=ZDbUlwsj7d8XPMolSSLTFwgs3RBLvOvgmlEtoBuon5Y,418
 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=qopQKDfL1enJFb0Ja8UgsLMVOa0oBGy7PonhlV7YVBY,6950
-pinexq_client/job_management/__init__.py,sha256=r-Hgjon5a7uvuj1x3rSf3btMjG28xcQqnvaVEsEksw8,164
+pinexq_client/core/sirenaccess.py,sha256=F7eZI5Pz79el0D30SYNGsiS2qWaAZF_jrCrUy-q2GgY,6992
+pinexq_client/job_management/__init__.py,sha256=iv5oNaGoBlgSEZbUZxIRqtYrPsQce2Mm28sv98EwQiM,598
 pinexq_client/job_management/enterjma.py,sha256=Ivl_jVPw_gaLyU5nKbywM-bbVGpn0MoCrZ0DMbJYf3s,1411
-pinexq_client/job_management/hcos/__init__.py,sha256=sjRsC3FDCfTLtfUM7j-6wic26ELlYdPNDjrOPLFiKjE,431
+pinexq_client/job_management/hcos/__init__.py,sha256=TZgs5kuBk3lSBxPfn5ehgbdUgzPy2jn1PC3Ea6VQY-k,584
 pinexq_client/job_management/hcos/entrypoint_hco.py,sha256=qodjAwO_MtawUuhmaYjhGXHV-uW1k94V9gKRYZRkhn4,2234
 pinexq_client/job_management/hcos/info_hco.py,sha256=zWjR63SCEO_sUcZ9ha_aIoC_qUzAWLf50Xu4AHddAn8,1328
 pinexq_client/job_management/hcos/input_dataslot_hco.py,sha256=SDflhyW8kjpcTUfKAXnJxNR-etPzAHfoTqlYUcJZrxs,3442
@@ -42,12 +42,12 @@ pinexq_client/job_management/hcos/workdata_query_result_hco.py,sha256=yxEnu_COMx
 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=ApHhNfjx4bPuz10sQnyBA2zajYbU7loDTZSKC5H_jBY,34
-pinexq_client/job_management/model/open_api_generated.py,sha256=BxSGNyJDbr6x-LKCELGg3Mctn0TZasKYEQ2aOHLFqjo,31458
-pinexq_client/job_management/model/sirenentities.py,sha256=OInvxHpC6mnnYQjOMM2xAw7uLtvWwj9E2EQSRJe2jDo,3202
-pinexq_client/job_management/tool/__init__.py,sha256=58CRDcP8ifSx9eA2uyTLEg0_fX3FUuNUogY_lirx9AY,96
-pinexq_client/job_management/tool/job.py,sha256=_4HKeOAXsVx9f3DR-2E2Oyr3RqGqEb3Am4D1HwFh9JI,24795
-pinexq_client/job_management/tool/job_group.py,sha256=JyBKqtKAMpVXwdGaGKzh5IJOHgMk8zhK9b54jfvEHkk,4817
+pinexq_client/job_management/model/__init__.py,sha256=iuAKRXdW_Mxo0i3HsBfEzhJJZUKkNe3qs4gLW-ge1PU,63
+pinexq_client/job_management/model/open_api_generated.py,sha256=FP1dLyt53QjQySa42Cx3Db81xb1f07jNCGnDY9Ppu9Y,31462
+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=EQl98STgyjxdDoy9n2dC16rFG2EZYA2PX4rfmebT3qw,24971
+pinexq_client/job_management/tool/job_group.py,sha256=TNWw46UDyP2gmArhbzMAqpHa6lS2hzwarLIrxxpOMnk,4822
 pinexq_client/job_management/tool/processing_step.py,sha256=OOm36tV_N9RnJKh9WBZo_Xbmg1kb5JKh0NtNfECrNpM,10286
 pinexq_client/job_management/tool/workdata.py,sha256=wRy_yfFZUJDh-hoGUuAbQaRGtPysDmEOhLwD84Fgz04,5510
-pinexq_client-0.9.0.20241203.1.dist-info/RECORD,,
+pinexq_client-0.9.2.20250317.3.dist-info/RECORD,,