armonik 3.8.2.dev382__tar.gz → 3.8.3.dev470__tar.gz

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armonik
-Version: 3.8.2.dev382
+Version: 3.8.3.dev470
 Summary: GRPC python binding for the ArmoniK orchestrator API
 License: Apache v2.0 LICENSE
 Project-URL: Homepage, https://github.com/aneoconsulting/ArmoniK.Api

armonik-3.8.3.dev470/src/armonik/_version.py

@@ -0,0 +1,3 @@
+# generated by genversion.py, based on setuptools_scm
+__version__ = "3.8.3.dev470"
+__version_tuple__ = (3, 8, 3, 'dev470')

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik/client/__init__.py

@@ -1,2 +1,3 @@
 from .submitter import ArmoniKSubmitter
 from .tasks import ArmoniKTasks
+from .results import ArmoniKResult

armonik-3.8.3.dev470/src/armonik/client/results.py

@@ -0,0 +1,19 @@
+from grpc import Channel
+
+from typing import List, Dict, cast
+
+from ..protogen.client.results_service_pb2_grpc import ResultsStub
+from ..protogen.common.results_common_pb2 import CreateResultsMetaDataRequest, CreateResultsMetaDataResponse
+
+
+class ArmoniKResult:
+    def __init__(self, grpc_channel: Channel):
+        """ Result service client
+
+        Args:
+            grpc_channel: gRPC channel to use
+        """
+        self._client = ResultsStub(grpc_channel)
+
+    def get_results_ids(self, session_id: str, names : List[str]) -> Dict[str, str]:
+        return {r.name : r.result_id for r in cast(CreateResultsMetaDataResponse, self._client.CreateResultsMetaData(CreateResultsMetaDataRequest(results=[CreateResultsMetaDataRequest.ResultCreate(name = n) for n in names], session_id=session_id))).results}

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik/client/submitter.py

@@ -232,17 +232,6 @@ class ArmoniKSubmitter:
             return ResultAvailability(errors=[e.detail for e in response.error.errors])
         return None
 
-    def request_output_id(self, session_id: str) -> str:
-        """Request an output id
-
-        Args:
-            session_id: Session Id
-
-        Returns:
-            Output id
-        """
-        return f"{session_id}%{uuid.uuid4()}"
-
 
 def _to_request_stream_internal(request: TaskRequest, is_last: bool, chunk_max_size: int) -> Generator[CreateLargeTaskRequest, None, None]:
     """ Generate the CreateLargeTaskRequests for the given request

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik/common/helpers.py

@@ -1,5 +1,5 @@
 from datetime import timedelta, datetime, timezone
-from typing import List, Optional, cast
+from typing import List, Optional
 
 import google.protobuf.duration_pb2 as duration
 import google.protobuf.timestamp_pb2 as timestamp

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik/common/objects.py

@@ -19,7 +19,7 @@ class TaskOptions:
     application_namespace: Optional[str] = None
     application_service: Optional[str] = None
     engine_type: Optional[str] = None
-    options: Optional[Dict] = field(default_factory=dict)
+    options: Dict[str, str] = field(default_factory=dict)
 
     @classmethod
     def from_message(cls, task_options):
@@ -66,7 +66,7 @@ class Output:
 @dataclass()
 class TaskDefinition:
     payload: bytes
-    expected_output_ids: List[str]
+    expected_output_ids: List[str] = field(default_factory=list)
     data_dependencies: List[str] = field(default_factory=list)
 
     def __post_init__(self):
@@ -79,10 +79,10 @@ class Task:
     id: Optional[str] = None
     session_id: Optional[str] = None
     owner_pod_id: Optional[str] = None
-    parent_task_ids: Optional[List[str]] = None
-    data_dependencies: Optional[List[str]] = None
-    expected_output_ids: Optional[List[str]] = None
-    retry_of_ids: Optional[List[str]] = None
+    parent_task_ids: List[str] = field(default_factory=list)
+    data_dependencies: List[str] = field(default_factory=list)
+    expected_output_ids: List[str] = field(default_factory=list)
+    retry_of_ids: List[str] = field(default_factory=list)
     status: TaskStatus = TaskStatus.UNSPECIFIED
     status_message: Optional[str] = None
     options: Optional[TaskOptions] = None
@@ -102,13 +102,13 @@ class Task:
         Args:
             task_client: ArmoniKTasks client
         """
-        result = task_client.get_task(self.id)
+        result : "Task" = task_client.get_task(self.id)
         self.session_id = result.session_id
         self.owner_pod_id = result.owner_pod_id
-        self.parent_task_ids = list(result.parent_task_ids)
-        self.data_dependencies = list(result.data_dependencies)
-        self.expected_output_ids = list(result.expected_output_ids)
-        self.retry_of_ids = list(result.retry_of_ids)
+        self.parent_task_ids = result.parent_task_ids
+        self.data_dependencies = result.data_dependencies
+        self.expected_output_ids = result.expected_output_ids
+        self.retry_of_ids = result.retry_of_ids
         self.status = TaskStatus(result.status)
         self.status_message = result.status_message
         self.options = result.options
@@ -121,6 +121,7 @@ class Task:
         self.pod_hostname = result.pod_hostname
         self.received_at = result.received_at
         self.acquired_at = result.acquired_at
+        self.is_init = True
 
     @classmethod
     def from_message(cls, task_raw: TaskRaw) -> "Task":
@@ -134,7 +135,7 @@ class Task:
             retry_of_ids=list(task_raw.retry_of_ids),
             status=TaskStatus(task_raw.status),
             status_message=task_raw.status_message,
-            options=task_raw.options,
+            options=TaskOptions.from_message(task_raw.options),
             created_at=timestamp_to_datetime(task_raw.created_at),
             submitted_at=timestamp_to_datetime(task_raw.submitted_at),
             started_at=timestamp_to_datetime(task_raw.started_at),

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik/worker/seqlogger.py

@@ -94,7 +94,7 @@ class ClefLogger:
         """
         self.log(logging.ERROR, message, exc_info=exc_info, **kwargs)
 
-    def log(self, level: int, message: str, exc_info: Union[BaseException, Tuple[Type[BaseException], BaseException, Optional[TracebackType]], bool, None] = None, **kwargs):
+    def log(self, level: int, message: str, exc_info: Union[BaseException, Union[Tuple[Union[Type[BaseException], None], Union[BaseException, None], Optional[TracebackType]], None], bool, None] = None, **kwargs):
         """ Log a message
 
         Args:
@@ -115,8 +115,7 @@ class ClefLogger:
                         exc_info = sys.exc_info()
                     elif isinstance(exc_info, BaseException):
                         exc_info = (type(exc_info), exc_info, exc_info.__traceback__)
-                    exc_info = "\n".join(traceback.format_exception(*exc_info))
-                    payload["@x"] = exc_info
+                    payload["@x"] = "\n".join(traceback.format_exception(*exc_info))
                 for k, v in kwargs:
                     if k.startswith("@"):
                         k = "@"+k

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik/worker/taskhandler.py

@@ -1,8 +1,8 @@
 import uuid
-from typing import Optional, Dict, List, Tuple, Union
+from typing import Optional, Dict, List, Tuple, Union, cast
 
 from ..common import TaskOptions, TaskDefinition, Task
-from ..protogen.common.agent_common_pb2 import Result, CreateTaskRequest
+from ..protogen.common.agent_common_pb2 import Result, CreateTaskRequest, CreateResultsMetaDataRequest, CreateResultsMetaDataResponse
 from ..protogen.common.objects_pb2 import TaskRequest, InitKeyedDataStream, DataChunk, InitTaskRequest, TaskRequestHeader, Configuration
 from ..protogen.worker.agent_service_pb2_grpc import AgentStub
 
@@ -35,12 +35,12 @@ class TaskHandler:
             raise ValueError("Expected a Compute request type with InitRequest to start the stream.")
 
         init_request = current.compute.init_request
-        self.session_id: str = init_request.session_id
-        self.task_id: str = init_request.task_id
-        self.task_options: TaskOptions = TaskOptions.from_message(init_request.task_options)
+        self.session_id = init_request.session_id
+        self.task_id = init_request.task_id
+        self.task_options = TaskOptions.from_message(init_request.task_options)
         self.expected_results = list(init_request.expected_output_keys)
         self.configuration = init_request.configuration
-        self.token: str = current.communication_token
+        self.token = current.communication_token
 
         datachunk = init_request.payload
         self.payload.extend(datachunk.data)
@@ -98,7 +98,7 @@ class TaskHandler:
             task_request.data_dependencies.extend(t.data_dependencies)
             task_request.payload = t.payload
             task_requests.append(task_request)
-
+        assert self.configuration is not None
         create_tasks_reply = self._client.CreateTask(_to_request_stream(task_requests, self.token, task_options.to_message() if task_options is not None else None, self.configuration.data_chunk_max_size))
         ret = create_tasks_reply.WhichOneof("Response")
         if ret is None or ret == "error":
@@ -115,14 +115,6 @@ class TaskHandler:
             raise Exception("Unknown value")
         return tasks_created, tasks_creation_failed
 
-    def request_output_id(self) -> str:
-        """Request an output id
-
-                Returns:
-                    Output id
-        """
-        return f"{self.token}%{uuid.uuid4()}"
-
     def send_result(self, key: str, data: Union[bytes, bytearray]) -> None:
         """ Send task result
 
@@ -132,6 +124,7 @@ class TaskHandler:
         """
         def result_stream():
             res = Result(communication_token=self.token, init=InitKeyedDataStream(key=key))
+            assert self.configuration is not None
             yield res
             start = 0
             data_len = len(data)
@@ -148,6 +141,10 @@ class TaskHandler:
         result_reply = self._client.SendResult(result_stream())
         if result_reply.WhichOneof("type") == "error":
             raise Exception(f"Cannot send result id={key}")
+    
+    def get_results_ids(self, names : List[str]) -> Dict[str, str]:
+        return {r.name : r.result_id for r in cast(CreateResultsMetaDataResponse, self._client.CreateResultsMetaData(CreateResultsMetaDataRequest(results=[CreateResultsMetaDataRequest.ResultCreate(name = n) for n in names], session_id=self.session_id, communication_token=self.token))).results}
+
 
 
 def _to_request_stream_internal(request, communication_token, is_last, chunk_max_size):

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik/worker/worker.py

@@ -1,6 +1,6 @@
 import traceback
 from concurrent import futures
-from typing import Callable
+from typing import Callable, Union
 
 import grpc
 from grpc import Channel
@@ -45,7 +45,7 @@ class ArmoniKWorker(WorkerServicer):
         server.start()
         server.wait_for_termination()
 
-    def Process(self, request_iterator, context) -> ProcessReply:
+    def Process(self, request_iterator, context) -> Union[ProcessReply, None]:
         try:
             self._logger.debug("Received task")
             task_handler = TaskHandler.create(request_iterator, self._client)

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armonik
-Version: 3.8.2.dev382
+Version: 3.8.3.dev470
 Summary: GRPC python binding for the ArmoniK orchestrator API
 License: Apache v2.0 LICENSE
 Project-URL: Homepage, https://github.com/aneoconsulting/ArmoniK.Api

{armonik-3.8.2.dev382 → armonik-3.8.3.dev470}/src/armonik.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/armonik.egg-info/dependency_links.txt
 src/armonik.egg-info/requires.txt
 src/armonik.egg-info/top_level.txt
 src/armonik/client/__init__.py
+src/armonik/client/results.py
 src/armonik/client/submitter.py
 src/armonik/client/tasks.py
 src/armonik/common/__init__.py

armonik-3.8.2.dev382/src/armonik/_version.py

@@ -1,3 +0,0 @@
-# generated by genversion.py, based on setuptools_scm
-__version__ = "3.8.2.dev382"
-__version_tuple__ = (3, 8, 2, 'dev382')