pinexq-client 0.5.0.20241018.1__py3-none-any.whl → 0.5.0.20241030.1__py3-none-any.whl

pinexq_client/job_management/__init__.py

@@ -3,4 +3,4 @@ from .enterjma import enter_jma
 from .tool import Job, ProcessingStep, WorkData
 
 # Protocol version the JMA is using
-__jma_version__ = [6, 2, 4]
+__jma_version__ = [7, 0, 0]

pinexq_client/job_management/hcos/jobsroot_hco.py

@@ -10,15 +10,15 @@ from pinexq_client.core.hco.link_hco import LinkHco
 from pinexq_client.core.hco.unavailable import UnavailableAction, UnavailableLink
 from pinexq_client.job_management.hcos.job_hco import JobLink
 from pinexq_client.job_management.hcos.job_query_result_hco import (
-	JobQueryResultHco,
-	JobQueryResultLink
+    JobQueryResultHco,
+    JobQueryResultLink
 )
 from pinexq_client.job_management.hcos.job_used_tags_hco import JobUsedTagsLink
 from pinexq_client.job_management.known_relations import Relations
 from pinexq_client.job_management.model.open_api_generated import (
-	CreateJobParameters,
-	JobQueryParameters,
-	CreateSubJobParameters, SetJobsErrorStateParameters
+    CreateJobParameters,
+    JobQueryParameters,
+    CreateSubJobParameters
 )
 from pinexq_client.job_management.model.sirenentities import JobsRootEntity
 
@@ -54,23 +54,11 @@ class JobQueryAction(ActionWithParametersHco):
         return self._get_default_parameters(JobQueryParameters, JobQueryParameters())
 
 
-class JobSetToErrorStateAction(ActionWithParametersHco[SetJobsErrorStateParameters]):
-    def execute(self, parameters: SetJobsErrorStateParameters):
-        self._execute(parameters)
-
-    def default_parameters(self) -> SetJobsErrorStateParameters:
-        return self._get_default_parameters(SetJobsErrorStateParameters, SetJobsErrorStateParameters(
-            message='Manually set to error state by admin',
-            created_this_many_hours_ago=0,
-        ))
-
-
 class JobsRootHco(Hco[JobsRootEntity]):
     create_job_action: CreateJobAction | UnavailableAction
     job_query_action: JobQueryAction | UnavailableAction
     create_subjob_action: CreateSubJobAction | UnavailableAction
     used_tags_link: JobUsedTagsLink | UnavailableLink
-    set_jobs_to_error_state: JobSetToErrorStateAction | UnavailableAction
 
     self_link: 'JobsRootLink'
 
@@ -86,8 +74,6 @@ class JobsRootHco(Hco[JobsRootEntity]):
         instance.used_tags_link = JobUsedTagsLink.from_entity_optional(
             instance._client, instance._entity, Relations.USED_TAGS)
         instance.self_link = JobsRootLink.from_entity(instance._client, instance._entity, Relations.SELF)
-        instance.set_jobs_to_error_state = JobSetToErrorStateAction.from_entity_optional(instance._client, instance._entity,
-                                                                                "SetJobsToErrorState")
 
         return instance
 

pinexq_client/job_management/model/open_api_generated.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.json
-#   timestamp: 2024-10-18T08:23:13+00:00
+#   timestamp: 2024-10-28T09:17:20+00:00
 
 from __future__ import annotations
 
@@ -372,15 +372,6 @@ class SetJobTagsParameters(BaseModel):
     tags: List[str] = Field(..., alias='Tags')
 
 
-class SetJobsErrorStateParameters(BaseModel):
-    model_config = ConfigDict(
-        extra='allow',
-        populate_by_name=True,
-    )
-    message: constr(min_length=1) = Field(..., alias='Message')
-    created_before: AwareDatetime = Field(..., alias='CreatedBefore')
-
-
 class SetNameWorkDataParameters(BaseModel):
     model_config = ConfigDict(
         extra='allow',

pinexq_client/job_management/tool/job_group.py

@@ -125,17 +125,29 @@ class JobGroup:
         """
         return [job for job in self._jobs if job.get_state() == JobStates.error]
 
-    def remove(self, job_name: str) -> Self:
+    def remove(self, jobs: Job | list[Job]) -> Self:
         """
-        Removes all jobs from the group whose name matches the provided name
+        Removes given job(s) from the group
 
         Args:
-            job_name:
-                The name of the job(s) to be removed
+            jobs:
+                The Job instance(s) to be removed
         Returns:
             This `JobGroup` object
         """
-        self._jobs = [job for job in self._jobs if job.get_name() != job_name]
+
+        def remove_by_url(job_url: str):
+            for existing_job in self._jobs:
+                if existing_job.self_link().get_url() == job_url:
+                    self._jobs.remove(existing_job)
+                    break
+
+        if isinstance(jobs, list):
+            for job in jobs:
+                remove_by_url(str(job.self_link().get_url()))
+        else:
+            remove_by_url(str(jobs.self_link().get_url()))
+
         return self
 
     def clear(self) -> Self:

{pinexq_client-0.5.0.20241018.1.dist-info → pinexq_client-0.5.0.20241030.1.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
-pinexq_client-0.5.0.20241018.1.dist-info/METADATA,sha256=iPZaVcmKxfXwSxywFo5dj9iyfOnBo_igmxoWRHo-PJU,3278
-pinexq_client-0.5.0.20241018.1.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
-pinexq_client-0.5.0.20241018.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-pinexq_client-0.5.0.20241018.1.dist-info/licenses/LICENSE,sha256=3oz3tAhM7kOgRukkRe7wmh5T_HihZY77ZtJDJm91ZN8,1072
+pinexq_client-0.5.0.20241030.1.dist-info/METADATA,sha256=KinUo0StjaqqHggN1Wq4WIpxQnqdKUIQPUtjpeQMTBQ,3278
+pinexq_client-0.5.0.20241030.1.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+pinexq_client-0.5.0.20241030.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+pinexq_client-0.5.0.20241030.1.dist-info/licenses/LICENSE,sha256=3oz3tAhM7kOgRukkRe7wmh5T_HihZY77ZtJDJm91ZN8,1072
 pinexq_client/core/__init__.py,sha256=8SVD_PRgJtpUCOtVjdR6fRrv6KPNk7HD6UQrn0FKR04,235
 pinexq_client/core/base_relations.py,sha256=oIUS58pkbMDdqm-3YOdsenhL1smtzeAk4fp7-U595MY,162
 pinexq_client/core/enterapi.py,sha256=sL9TmF1L5LaDJnre1l_tiHDUo9vTbZ8cvPSov3Q1UTs,671
@@ -21,7 +21,7 @@ pinexq_client/core/model/error.py,sha256=MZHma9zCxcTCUp21KZeD22EXK0xhcrKWDQVTEk7
 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=moZQz2ujFsl8_WP_jfl8eM6lOzTHD6CK0dXBD8Wrg2g,6939
-pinexq_client/job_management/__init__.py,sha256=kvOmgq1qw5ksPm9tbEg1p1XiiZRrwsdKBEgDR_qsk08,164
+pinexq_client/job_management/__init__.py,sha256=UcBfBCxxj858ePyl9kFQmUGU6YedgBPaXparMI7V7fk,164
 pinexq_client/job_management/enterjma.py,sha256=Ivl_jVPw_gaLyU5nKbywM-bbVGpn0MoCrZ0DMbJYf3s,1411
 pinexq_client/job_management/hcos/__init__.py,sha256=vMIdxGHBsVcKYKrVkCzD4a_VaheKSNxCimospFn5N88,396
 pinexq_client/job_management/hcos/entrypoint_hco.py,sha256=qodjAwO_MtawUuhmaYjhGXHV-uW1k94V9gKRYZRkhn4,2234
@@ -30,7 +30,7 @@ pinexq_client/job_management/hcos/input_dataslot_hco.py,sha256=SDflhyW8kjpcTUfKA
 pinexq_client/job_management/hcos/job_hco.py,sha256=CwF0eD07pd88iZPQUb_10iDtotiemy48BJ5exYN5gRc,8649
 pinexq_client/job_management/hcos/job_query_result_hco.py,sha256=I0G8YIlYDhTahLz8n06L8BywlcsMGNWUEsmEr4Sk0GU,3315
 pinexq_client/job_management/hcos/job_used_tags_hco.py,sha256=nys6E97NNXATdnvX6KZ46JR9qEb2lnqol9ZvJVEiNpQ,944
-pinexq_client/job_management/hcos/jobsroot_hco.py,sha256=_mHEw_gVvWDZ_LcD7T6zLajl-TrmS1x4ULrBk6AmknY,4637
+pinexq_client/job_management/hcos/jobsroot_hco.py,sha256=P8C5CaIEq_bkh6YgJBuQEp45Cc4fHuU5lYuWNdgtISY,3853
 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=MykmFssysIc8fIUoPyNOLEGLGQNoC4zFgjIAIjf0v7U,5190
 pinexq_client/job_management/hcos/processing_step_used_tags_hco.py,sha256=90-2IWlYTcYX62NzmAPnmcUCwMDhmMZyBrNs_G3yigs,1067
@@ -43,11 +43,11 @@ pinexq_client/job_management/hcos/workdata_used_tags_query_result_hco.py,sha256=
 pinexq_client/job_management/hcos/workdataroot_hco.py,sha256=LdEPW2JJTqAWi-6zj-40lfREhthcDL6nPXQk_nfMtCA,3936
 pinexq_client/job_management/known_relations.py,sha256=UlOF-sua8SyOPNNKzT_j6JVG8T-aewHIzn7S2ajXBhI,593
 pinexq_client/job_management/model/__init__.py,sha256=ApHhNfjx4bPuz10sQnyBA2zajYbU7loDTZSKC5H_jBY,34
-pinexq_client/job_management/model/open_api_generated.py,sha256=-7TWWzqSeaNld3w_a5sSQWAGZvqY6Oq5c-b_RkL9RrE,31137
+pinexq_client/job_management/model/open_api_generated.py,sha256=uofaSjihzqg0B9CRtjs8Lz5MzlTwcecleYGT457ZCS0,30864
 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=aUa03aZ8rYPJA1SPAbCmdYS65G1s2xIPC9kEhzEnw08,22427
-pinexq_client/job_management/tool/job_group.py,sha256=4zW_SEbQMLVNqu_zLUP57epkypBbRc5gxjPLp_FZgZo,4515
+pinexq_client/job_management/tool/job_group.py,sha256=ticUSWw1Pgf1NOX5rqvSvod6nRL0tW7X-waQTgw9bWk,4835
 pinexq_client/job_management/tool/processing_step.py,sha256=0qq64JOESPFAgpUpmM9hWndh21BnCB95EExd21ZHYOg,9730
 pinexq_client/job_management/tool/workdata.py,sha256=8DwvzcjefKL-wBuCxy9ziaUC7gTf0TMXAa1WoCmHvZM,4903
-pinexq_client-0.5.0.20241018.1.dist-info/RECORD,,
+pinexq_client-0.5.0.20241030.1.dist-info/RECORD,,

{pinexq_client-0.5.0.20241018.1.dist-info → pinexq_client-0.5.0.20241030.1.dist-info}/WHEEL

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