pinexq-client 0.9.1.20241213.2__py3-none-any.whl → 0.9.2.20250317.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- pinexq_client/core/__init__.py +20 -6
- pinexq_client/core/enterapi.py +2 -1
- pinexq_client/core/sirenaccess.py +1 -1
- pinexq_client/job_management/__init__.py +20 -1
- pinexq_client/job_management/hcos/__init__.py +6 -2
- pinexq_client/job_management/model/__init__.py +1 -0
- pinexq_client/job_management/model/open_api_generated.py +1 -1
- pinexq_client/job_management/model/sirenentities.py +2 -0
- pinexq_client/job_management/tool/__init__.py +1 -0
- pinexq_client/job_management/tool/job.py +4 -1
- pinexq_client/job_management/tool/job_group.py +1 -1
- {pinexq_client-0.9.1.20241213.2.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/METADATA +1 -1
- {pinexq_client-0.9.1.20241213.2.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/RECORD +16 -16
- {pinexq_client-0.9.1.20241213.2.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/WHEEL +0 -0
- {pinexq_client-0.9.1.20241213.2.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/entry_points.txt +0 -0
- {pinexq_client-0.9.1.20241213.2.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/licenses/LICENSE +0 -0
pinexq_client/core/__init__.py
CHANGED
|
@@ -1,8 +1,22 @@
|
|
|
1
1
|
# ruff: noqa: F403, F401
|
|
2
|
-
from .sirenaccess import *
|
|
3
|
-
from .model.sirenmodels import *
|
|
4
|
-
from .model.error import *
|
|
5
|
-
from .media_types import *
|
|
6
|
-
from .http_headers import *
|
|
7
|
-
from .exceptions import *
|
|
8
2
|
from .base_relations import BaseRelations
|
|
3
|
+
from .exceptions import *
|
|
4
|
+
from .http_headers import Headers
|
|
5
|
+
from .media_types import MediaTypes, SirenClasses
|
|
6
|
+
from .model.error import ProblemDetails
|
|
7
|
+
from .model.sirenmodels import ActionField, Action, EmbeddedLinkEntity, Link, Entity
|
|
8
|
+
from .sirenaccess import (
|
|
9
|
+
ensure_siren_response,
|
|
10
|
+
execute_action,
|
|
11
|
+
execute_action_on_entity,
|
|
12
|
+
get_resource,
|
|
13
|
+
handle_action_result,
|
|
14
|
+
handle_error_response,
|
|
15
|
+
navigate,
|
|
16
|
+
navigate_self,
|
|
17
|
+
upload_binary,
|
|
18
|
+
upload_file,
|
|
19
|
+
upload_json,
|
|
20
|
+
)
|
|
21
|
+
from .enterapi import enter_api
|
|
22
|
+
|
pinexq_client/core/enterapi.py
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import httpx
|
|
2
2
|
|
|
3
3
|
from typing import TypeVar, Type
|
|
4
|
-
from pinexq_client.core import
|
|
4
|
+
from pinexq_client.core.sirenaccess import get_resource, raise_exception_on_error
|
|
5
|
+
from pinexq_client.core.model.sirenmodels import Entity
|
|
5
6
|
from pinexq_client.core.hco.hco_base import Hco
|
|
6
7
|
|
|
7
8
|
THco = TypeVar('THco', bound=Hco)
|
|
@@ -87,7 +87,7 @@ def upload_file(client: httpx.Client, action: Action, file: BinaryIO, filename:
|
|
|
87
87
|
return handle_action_result(response)
|
|
88
88
|
|
|
89
89
|
|
|
90
|
-
def execute_action_on_entity(client: httpx.Client, entity: Entity, name: str, parameters: BaseModel | None = None):
|
|
90
|
+
def execute_action_on_entity(client: httpx.Client, entity: Entity, name: str, parameters: BaseModel | None = None) -> None | URL | ProblemDetails | Response:
|
|
91
91
|
action = entity.find_first_action_with_name(name)
|
|
92
92
|
if action is None:
|
|
93
93
|
raise ClientException(f"Entity does not contain expected action: {name}")
|
|
@@ -1,6 +1,25 @@
|
|
|
1
1
|
# ruff: noqa: F401
|
|
2
2
|
from .enterjma import enter_jma
|
|
3
|
-
from .
|
|
3
|
+
from .hcos import (
|
|
4
|
+
EntryPointHco,
|
|
5
|
+
InfoHco,
|
|
6
|
+
InputDataSlotHco,
|
|
7
|
+
JobHco,
|
|
8
|
+
JobLink,
|
|
9
|
+
JobQueryResultHco,
|
|
10
|
+
JobStates,
|
|
11
|
+
OutputDataSlotHco,
|
|
12
|
+
ProcessingStepsRootHco,
|
|
13
|
+
ProcessingStepHco,
|
|
14
|
+
ProcessingStepLink,
|
|
15
|
+
ProcessingStepQueryResultHco,
|
|
16
|
+
UserHco,
|
|
17
|
+
WorkDataHco,
|
|
18
|
+
WorkDataLink,
|
|
19
|
+
)
|
|
20
|
+
from .known_relations import Relations
|
|
21
|
+
from .model import JobSortPropertiesSortParameter, ProcessingView
|
|
22
|
+
from .tool import Job, JobGroup, ProcessingStep, WorkData
|
|
4
23
|
|
|
5
24
|
# Protocol version the JMA is using
|
|
6
25
|
__jma_version__ = [7, 3, 1]
|
|
@@ -1,13 +1,17 @@
|
|
|
1
|
-
from .input_dataslot_hco import *
|
|
2
|
-
from .output_dataslot_hco import *
|
|
3
1
|
from .entrypoint_hco import *
|
|
4
2
|
from .info_hco import *
|
|
3
|
+
from .input_dataslot_hco import *
|
|
5
4
|
from .job_hco import *
|
|
6
5
|
from .job_query_result_hco import *
|
|
6
|
+
from .job_used_tags_hco import *
|
|
7
7
|
from .jobsroot_hco import *
|
|
8
|
+
from .output_dataslot_hco import *
|
|
8
9
|
from .processing_step_hco import *
|
|
10
|
+
from .processing_step_used_tags_hco import *
|
|
9
11
|
from .processingstep_query_result_hco import *
|
|
10
12
|
from .processingsteproot_hco import *
|
|
13
|
+
from .user_hco import *
|
|
11
14
|
from .workdata_hco import *
|
|
12
15
|
from .workdata_query_result_hco import *
|
|
16
|
+
from .workdata_used_tags_query_result_hco import *
|
|
13
17
|
from .workdataroot_hco import *
|
|
@@ -324,7 +324,7 @@ class RenameJobParameters(BaseModel):
|
|
|
324
324
|
extra='allow',
|
|
325
325
|
populate_by_name=True,
|
|
326
326
|
)
|
|
327
|
-
new_name: constr(min_length=
|
|
327
|
+
new_name: constr(min_length=0) = Field("", alias='NewName')
|
|
328
328
|
|
|
329
329
|
|
|
330
330
|
class SelectProcessingParameters(BaseModel):
|
|
@@ -78,6 +78,7 @@ class ProcessingStepUsedTagsEntity(Entity):
|
|
|
78
78
|
class JobUsedTagsEntity(Entity):
|
|
79
79
|
properties: JobUsedTagsHtoOpenApiProperties | None = None
|
|
80
80
|
|
|
81
|
+
|
|
81
82
|
# this needs to be added since the openapi.spec does not have this object.
|
|
82
83
|
class InputDataSlotHtoProperties(BaseModel):
|
|
83
84
|
model_config = ConfigDict(
|
|
@@ -94,6 +95,7 @@ class InputDataSlotHtoProperties(BaseModel):
|
|
|
94
95
|
class InputDataSlotEntity(Entity):
|
|
95
96
|
properties: InputDataSlotHtoProperties | None = None
|
|
96
97
|
|
|
98
|
+
|
|
97
99
|
# this needs to be added since the openapi.spec does not have this object.
|
|
98
100
|
class OutputDataSlotHtoProperties(BaseModel):
|
|
99
101
|
model_config = ConfigDict(
|
|
@@ -179,6 +179,7 @@ class Job:
|
|
|
179
179
|
def select_processing(
|
|
180
180
|
self,
|
|
181
181
|
function_name: str | None = None,
|
|
182
|
+
function_version: str | None = None,
|
|
182
183
|
*,
|
|
183
184
|
processing_step_link: ProcessingStepLink | None = None,
|
|
184
185
|
processing_step_instance: ProcessingStep | None = None
|
|
@@ -188,6 +189,7 @@ class Job:
|
|
|
188
189
|
|
|
189
190
|
Args:
|
|
190
191
|
function_name: Name of the processing step as string
|
|
192
|
+
function_version: Version of the processing step as string
|
|
191
193
|
processing_step_link: A ProcessingStepLink instance pointing to the resource
|
|
192
194
|
processing_step_instance: A ProcessingStep (not the Hco) instance
|
|
193
195
|
|
|
@@ -213,7 +215,8 @@ class Job:
|
|
|
213
215
|
query_param = ProcessingStepQueryParameters(
|
|
214
216
|
filter=ProcessingStepFilterParameter(
|
|
215
217
|
function_name=function_name,
|
|
216
|
-
function_name_match_type=FunctionNameMatchTypes.match_exact
|
|
218
|
+
function_name_match_type=FunctionNameMatchTypes.match_exact,
|
|
219
|
+
function_version=function_version,
|
|
217
220
|
)
|
|
218
221
|
)
|
|
219
222
|
query_result = self._processing_step_root.query_action.execute(query_param)
|
|
@@ -3,7 +3,7 @@ from typing import Union, Self
|
|
|
3
3
|
|
|
4
4
|
import httpx
|
|
5
5
|
|
|
6
|
-
from pinexq_client.job_management import Job
|
|
6
|
+
from pinexq_client.job_management.tool import Job
|
|
7
7
|
from pinexq_client.job_management.hcos import JobQueryResultHco
|
|
8
8
|
from pinexq_client.job_management.model import JobStates
|
|
9
9
|
|
{pinexq_client-0.9.1.20241213.2.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/METADATA
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: pinexq-client
|
|
3
|
-
Version: 0.9.
|
|
3
|
+
Version: 0.9.2.20250317.3
|
|
4
4
|
Summary: A hypermedia-based client for the DataCybernetics PinexQ platform.
|
|
5
5
|
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>
|
|
6
6
|
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.1.20241213.2.dist-info → pinexq_client-0.9.2.20250317.3.dist-info}/RECORD
RENAMED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
pinexq_client-0.9.
|
|
2
|
-
pinexq_client-0.9.
|
|
3
|
-
pinexq_client-0.9.
|
|
4
|
-
pinexq_client-0.9.
|
|
5
|
-
pinexq_client/core/__init__.py,sha256=
|
|
1
|
+
pinexq_client-0.9.2.20250317.3.dist-info/METADATA,sha256=5NfTjM2ZTozjLvus0zcPMkXPZBDqss7G_fOzQ1IeyRA,3278
|
|
2
|
+
pinexq_client-0.9.2.20250317.3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
|
|
3
|
+
pinexq_client-0.9.2.20250317.3.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
|
|
4
|
+
pinexq_client-0.9.2.20250317.3.dist-info/licenses/LICENSE,sha256=3oz3tAhM7kOgRukkRe7wmh5T_HihZY77ZtJDJm91ZN8,1072
|
|
5
|
+
pinexq_client/core/__init__.py,sha256=zO9vUuAl6AEokL-SqQO3Jl1qrxFBZPA2kH99VNZugEU,598
|
|
6
6
|
pinexq_client/core/base_relations.py,sha256=oIUS58pkbMDdqm-3YOdsenhL1smtzeAk4fp7-U595MY,162
|
|
7
|
-
pinexq_client/core/enterapi.py,sha256=
|
|
7
|
+
pinexq_client/core/enterapi.py,sha256=eB4F2_t3lCbMgKhy-M-Sf_u9MhuJMO7OGh-GB-4Cc-8,731
|
|
8
8
|
pinexq_client/core/exceptions.py,sha256=NqB3y1ufjOfG3kv7Rz4ppXqJRAugt2zlgxkto2nIVQU,2228
|
|
9
9
|
pinexq_client/core/hco/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
10
|
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
|
|
|
20
20
|
pinexq_client/core/model/error.py,sha256=ZDbUlwsj7d8XPMolSSLTFwgs3RBLvOvgmlEtoBuon5Y,418
|
|
21
21
|
pinexq_client/core/model/sirenmodels.py,sha256=vGRQlhM2cSa2caxQel91Jr48KWqM-vMYX32iaQCzIds,5547
|
|
22
22
|
pinexq_client/core/polling.py,sha256=Z6VXn-PCGk4XX-4tQWZG59qJyCIS0eIrpPUORQDIGrs,1077
|
|
23
|
-
pinexq_client/core/sirenaccess.py,sha256=
|
|
24
|
-
pinexq_client/job_management/__init__.py,sha256=
|
|
23
|
+
pinexq_client/core/sirenaccess.py,sha256=F7eZI5Pz79el0D30SYNGsiS2qWaAZF_jrCrUy-q2GgY,6992
|
|
24
|
+
pinexq_client/job_management/__init__.py,sha256=iv5oNaGoBlgSEZbUZxIRqtYrPsQce2Mm28sv98EwQiM,598
|
|
25
25
|
pinexq_client/job_management/enterjma.py,sha256=Ivl_jVPw_gaLyU5nKbywM-bbVGpn0MoCrZ0DMbJYf3s,1411
|
|
26
|
-
pinexq_client/job_management/hcos/__init__.py,sha256=
|
|
26
|
+
pinexq_client/job_management/hcos/__init__.py,sha256=TZgs5kuBk3lSBxPfn5ehgbdUgzPy2jn1PC3Ea6VQY-k,584
|
|
27
27
|
pinexq_client/job_management/hcos/entrypoint_hco.py,sha256=qodjAwO_MtawUuhmaYjhGXHV-uW1k94V9gKRYZRkhn4,2234
|
|
28
28
|
pinexq_client/job_management/hcos/info_hco.py,sha256=zWjR63SCEO_sUcZ9ha_aIoC_qUzAWLf50Xu4AHddAn8,1328
|
|
29
29
|
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
|
|
|
42
42
|
pinexq_client/job_management/hcos/workdata_used_tags_query_result_hco.py,sha256=qB1iQpwD63579dq3tUF4DBB_rZRMqJ80y1ysf-41aOo,1087
|
|
43
43
|
pinexq_client/job_management/hcos/workdataroot_hco.py,sha256=LdEPW2JJTqAWi-6zj-40lfREhthcDL6nPXQk_nfMtCA,3936
|
|
44
44
|
pinexq_client/job_management/known_relations.py,sha256=f3-7RagAfeSFv9b54l5zxnLKbVQjQQHzYsM4W2QHf0Y,708
|
|
45
|
-
pinexq_client/job_management/model/__init__.py,sha256=
|
|
46
|
-
pinexq_client/job_management/model/open_api_generated.py,sha256=
|
|
47
|
-
pinexq_client/job_management/model/sirenentities.py,sha256=
|
|
48
|
-
pinexq_client/job_management/tool/__init__.py,sha256=
|
|
49
|
-
pinexq_client/job_management/tool/job.py,sha256=
|
|
50
|
-
pinexq_client/job_management/tool/job_group.py,sha256=
|
|
45
|
+
pinexq_client/job_management/model/__init__.py,sha256=iuAKRXdW_Mxo0i3HsBfEzhJJZUKkNe3qs4gLW-ge1PU,63
|
|
46
|
+
pinexq_client/job_management/model/open_api_generated.py,sha256=FP1dLyt53QjQySa42Cx3Db81xb1f07jNCGnDY9Ppu9Y,31462
|
|
47
|
+
pinexq_client/job_management/model/sirenentities.py,sha256=MUjgByEwzQcrduCEJuNK85uAj8SLTdyaiKmnlB44h3E,3430
|
|
48
|
+
pinexq_client/job_management/tool/__init__.py,sha256=zPobd-hQyANHzC0-TjJG91z9XrewvE54ZJ6VViymW5M,128
|
|
49
|
+
pinexq_client/job_management/tool/job.py,sha256=EQl98STgyjxdDoy9n2dC16rFG2EZYA2PX4rfmebT3qw,24971
|
|
50
|
+
pinexq_client/job_management/tool/job_group.py,sha256=TNWw46UDyP2gmArhbzMAqpHa6lS2hzwarLIrxxpOMnk,4822
|
|
51
51
|
pinexq_client/job_management/tool/processing_step.py,sha256=OOm36tV_N9RnJKh9WBZo_Xbmg1kb5JKh0NtNfECrNpM,10286
|
|
52
52
|
pinexq_client/job_management/tool/workdata.py,sha256=wRy_yfFZUJDh-hoGUuAbQaRGtPysDmEOhLwD84Fgz04,5510
|
|
53
|
-
pinexq_client-0.9.
|
|
53
|
+
pinexq_client-0.9.2.20250317.3.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|