polyaxon 2.3.0rc0__tar.gz → 2.3.0rc2__tar.gz

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyaxon
-Version: 2.3.0rc0
+Version: 2.3.0rc2
 Summary: Command Line Interface (CLI) and client to interact with Polyaxon API.
 Home-page: https://github.com/polyaxon/polyaxon
 Author: Polyaxon, Inc.

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_deploy/operators/compose.py

@@ -112,30 +112,6 @@ class ComposeOperator(CmdOperator):
             )
         return env
 
-    @staticmethod
-    def _generate_intervals(config):
-        template = "{}={}"
-        env = []
-        if config.intervals:
-            env.append(
-                template.format(
-                    "POLYAXON_INTERVALS_RUNS_SCHEDULER", config.intervals.runs_scheduler
-                )
-            )
-            env.append(
-                template.format(
-                    "POLYAXON_INTERVALS_OPERATIONS_DEFAULT_RETRY_DELAY",
-                    config.intervals.operations_default_retry_delay,
-                )
-            )
-            env.append(
-                template.format(
-                    "POLYAXON_INTERVALS_OPERATIONS_MAX_RETRY_DELAY",
-                    config.intervals.operations_max_retry_delay,
-                )
-            )
-        return env
-
     @staticmethod
     def _generate_email(config):
         template = "{}={}"
@@ -195,8 +171,6 @@ class ComposeOperator(CmdOperator):
         if config.allowed_hosts:
             env.append(template.format("POLYAXON_ALLOWED_HOSTS", config.allowed_hosts))
 
-        env += cls._generate_intervals(config)
-
         if config.log_level:
             env.append(template.format(ENV_KEYS_LOG_LEVEL, config.log_level))
         env += cls._generate_postgres(config)

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_deploy/schemas/deployment.py

@@ -255,6 +255,7 @@ class DeploymentConfig(BaseSchemaModel):
     allowed_hosts: Optional[List[StrictStr]] = Field(alias="allowedHosts")
     include_host_ips: Optional[bool] = Field(alias="includeHostIps")
     intervals: Optional[IntervalsConfig]
+    cleaning_intervals: Optional[Dict] = Field(alias="cleaningIntervals")
     artifacts_store: Optional[V1Connection] = Field(alias="artifactsStore")
     connections: Optional[List[V1Connection]]
     mount_connections: Optional[List[str]] = Field(alias="mountConnections")

polyaxon-2.3.0rc2/polyaxon/_deploy/schemas/intervals.py

@@ -0,0 +1,9 @@
+from typing import Optional
+
+from clipped.compact.pydantic import Field, StrictInt
+
+from polyaxon._schemas.base import BaseSchemaModel
+
+
+class IntervalsConfig(BaseSchemaModel):
+    compatibility_check: Optional[StrictInt] = Field(alias="compatibilityCheck")

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_flow/environment/__init__.py

@@ -408,9 +408,9 @@ class V1Environment(BaseSchemaModel):
     scheduler_name: Optional[StrictStr] = Field(alias="schedulerName")
     priority_class_name: Optional[StrictStr] = Field(alias="priorityClassName")
     priority: Optional[int]
-    restart_policy: Optional[Literal["Always", "OnFailure", "Never"]] = Field(
-        alias="restartPolicy"
-    )
+    restart_policy: Optional[
+        Literal["Always", "OnFailure", "Never", "ExitCode"]
+    ] = Field(alias="restartPolicy")
 
     @validator("affinity", always=True, pre=True)
     def validate_affinity(cls, v):

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_k8s/custom_resources/kubeflow/common.py

@@ -33,6 +33,6 @@ def get_kf_replicas_template(
 
     template_spec[replica_name] = {
         "replicas": replica.num_replicas,
-        "restartPolicy": pod_spec.restart_policy or "Never",
+        "restartPolicy": pod_spec.restart_policy or "OnFailure",
         "template": get_pod_template_spec(metadata=metadata, pod_spec=pod_spec),
     }

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_k8s/logging/async_monitor.py

@@ -121,7 +121,7 @@ async def query_k8s_pod_logs(
     return logs, last_time
 
 
-async def get_op_pos_and_services(
+async def get_op_pods_and_services(
     k8s_manager: AsyncK8sManager,
     run_uuid: str,
     run_kind: str,
@@ -138,12 +138,40 @@ async def get_op_pos_and_services(
     return pods, services
 
 
+async def get_resource_events(
+    k8s_manager: AsyncK8sManager, resource_type: str, resource_name: str
+):
+    field_selector = (
+        f"involvedObject.kind={resource_type},involvedObject.name={resource_name}"
+    )
+    try:
+        events = await k8s_manager.list_namespaced_events(field_selector=field_selector)
+
+        all_events = []
+        for event in events:
+            event_data = {
+                "reason": event.reason,
+                "message": event.message,
+                "first_timestamp": event.first_timestamp,
+                "last_timestamp": event.last_timestamp,
+                "count": event.count,
+                "type": event.type,
+            }
+            all_events.append(event_data)
+
+        return all_events
+
+    except ApiException as e:
+        print(f"Exception when calling CoreV1Api->list_namespaced_event: {e}")
+        return []
+
+
 async def get_op_spec(
     k8s_manager: AsyncK8sManager,
     run_uuid: str,
     run_kind: str,
 ):
-    pods, services = await get_op_pos_and_services(
+    pods, services = await get_op_pods_and_services(
         k8s_manager=k8s_manager,
         run_uuid=run_uuid,
         run_kind=run_kind,
@@ -153,11 +181,21 @@ async def get_op_spec(
         pods_list[
             pod.metadata.name
         ] = k8s_manager.api_client.sanitize_for_serialization(pod)
+        pods_list[pod.metadata.name]["events"] = await get_resource_events(
+            k8s_manager=k8s_manager,
+            resource_type="Pod",
+            resource_name=pod.metadata.name,
+        )
     services_list = {}
     for service in services or []:
         services_list[
             service.metadata.name
         ] = k8s_manager.api_client.sanitize_for_serialization(service)
+        services_list[service.metadata.name]["events"] = await get_resource_events(
+            k8s_manager=k8s_manager,
+            resource_type="Service",
+            resource_name=service.metadata.name,
+        )
     data = {"pods": pods_list, "services": services_list}
     return data, pods, services
 
@@ -185,11 +223,21 @@ async def get_agent_spec(
         pods_list[
             pod.metadata.name
         ] = k8s_manager.api_client.sanitize_for_serialization(pod)
+        pods_list[pod.metadata.name]["events"] = await get_resource_events(
+            k8s_manager=k8s_manager,
+            resource_type="Pod",
+            resource_name=pod.metadata.name,
+        )
     data = {"pods": pods_list}
     services_list = {}
     for service in services or []:
         services_list[
             service.metadata.name
         ] = k8s_manager.api_client.sanitize_for_serialization(service)
+        services_list[service.metadata.name]["events"] = await get_resource_events(
+            k8s_manager=k8s_manager,
+            resource_type="Service",
+            resource_name=service.metadata.name,
+        )
     data["services"] = services_list
     return data, pods, services

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_k8s/manager/async_manager.py

@@ -267,3 +267,18 @@ class AsyncK8sManager(BaseK8sManager):
                 raise PolyaxonK8sError("Connection error: %s" % e) from e
             else:
                 logger.debug("Custom object `{}` was not found".format(name))
+
+    async def list_namespaced_events(
+        self,
+        field_selector: str = None,
+        namespace: str = None,
+        reraise: bool = False,
+        **kwargs
+    ) -> List[client.CoreV1EventList]:
+        return await self._list_namespace_resource(
+            resource_api=self.k8s_api.list_namespaced_event,  # type: ignore[attr-defined]
+            reraise=reraise,
+            namespace=namespace,
+            field_selector=field_selector,
+            **kwargs,
+        )

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_k8s/manager/manager.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import List, Optional
 
 from kubernetes import client, config
 from kubernetes.client import Configuration
@@ -806,3 +806,18 @@ class K8sManager(BaseK8sManager):
             pod_id, namespace=namespace or self.namespace
         )
         return is_pod_running(event, container_id)
+
+    def list_namespaced_events(
+        self,
+        field_selector: str = None,
+        namespace: str = None,
+        reraise: bool = False,
+        **kwargs
+    ) -> List[client.CoreV1EventList]:
+        return self._list_namespace_resource(
+            resource_api=self.k8s_api.list_namespaced_event,  # type: ignore[attr-defined]
+            reraise=reraise,
+            namespace=namespace,
+            field_selector=field_selector,
+            **kwargs,
+        )

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/_sdk/schemas/v1_preset.py

@@ -6,6 +6,13 @@ from clipped.compact.pydantic import StrictStr
 from clipped.config.schema import BaseAllowSchemaModel
 from clipped.types.uuids import UUIDStr
 
+from polyaxon._sdk.schemas.v1_settings_catalog import V1SettingsCatalog
+
+
+class V1PresetSettings(BaseAllowSchemaModel):
+    projects: Optional[List[V1SettingsCatalog]]
+    runs: Optional[List[V1SettingsCatalog]]
+
 
 class V1Preset(BaseAllowSchemaModel):
     uuid: Optional[UUIDStr]
@@ -17,3 +24,4 @@ class V1Preset(BaseAllowSchemaModel):
     frozen: Optional[bool]
     live_state: Optional[int]
     content: Optional[StrictStr]
+    settings: Optional[V1PresetSettings]

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon/pkg.py

@@ -1,5 +1,5 @@
 NAME = "polyaxon"
-VERSION = "2.3.0-rc0"
+VERSION = "2.3.0-rc2"
 SCHEMA_VERSION = 1.1
 DESC = "Command Line Interface (CLI) and client to interact with Polyaxon API."
 URL = "https://github.com/polyaxon/polyaxon"

{polyaxon-2.3.0rc0 → polyaxon-2.3.0rc2}/polyaxon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyaxon
-Version: 2.3.0rc0
+Version: 2.3.0rc2
 Summary: Command Line Interface (CLI) and client to interact with Polyaxon API.
 Home-page: https://github.com/polyaxon/polyaxon
 Author: Polyaxon, Inc.

polyaxon-2.3.0rc0/polyaxon/_deploy/schemas/intervals.py

@@ -1,16 +0,0 @@
-from typing import Optional
-
-from clipped.compact.pydantic import Field, StrictInt
-
-from polyaxon._schemas.base import BaseSchemaModel
-
-
-class IntervalsConfig(BaseSchemaModel):
-    runs_scheduler: Optional[StrictInt] = Field(alias="runsScheduler")
-    operations_default_retry_delay: Optional[StrictInt] = Field(
-        alias="operationsDefaultRetryDelay"
-    )
-    operations_max_retry_delay: Optional[StrictInt] = Field(
-        alias="operationsMaxRetryDelay"
-    )
-    compatibility_check: Optional[StrictInt] = Field(alias="compatibilityCheck")