polyaxon 2.3.0rc0__py3-none-any.whl → 2.3.0rc1__py3-none-any.whl

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/_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/_deploy/schemas/intervals.py

@@ -6,11 +6,4 @@ 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")

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,42 @@ 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(
+            namespace=namespace, field_selector=field_selector
+        )
+
+        all_events = []
+        for event in events.items:
+            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 client.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 +183,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 +225,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/_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/_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/_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/pkg.py

@@ -1,5 +1,5 @@
 NAME = "polyaxon"
-VERSION = "2.3.0-rc0"
+VERSION = "2.3.0-rc1"
 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.dist-info → polyaxon-2.3.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyaxon
-Version: 2.3.0rc0
+Version: 2.3.0rc1
 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.dist-info → polyaxon-2.3.0rc1.dist-info}/RECORD

@@ -9,7 +9,7 @@ polyaxon/exceptions.py,sha256=ujvG9p1Pn2KHYbHqB3-faadW46dEuULUQXNtfkd2zk8,10236
 polyaxon/fs.py,sha256=RS8XmVrrfXfIJXN6cTCCRRYwesCLHVVfC01Vi56lecs,246
 polyaxon/k8s.py,sha256=nI5oPCSlqU4aaeVShM6SlYS9eqYiYUL4GDXIZ4bnq-I,1051
 polyaxon/logger.py,sha256=gdZQms37Pe5G2j-Ear5jbSAJeGgX6fnvg7oE8_9MSlc,2309
-polyaxon/pkg.py,sha256=7WoPkmjAGnsjsE-BWohvb8w8pjoke4npZvSnvyifJuM,266
+polyaxon/pkg.py,sha256=EpPiYvbxI85_k9who2bs3azkLZ4Q_H5ASoU-3WPOGGY,266
 polyaxon/polyaxonfile.py,sha256=xHmHT_cHomfuAQm82Jhnp71YNN5mQ-Lod7EbonjY4b4,429
 polyaxon/schemas.py,sha256=-CykY3emoAUCs_zRNbjwkuMkqbaEDjfKsZC86rI8154,5870
 polyaxon/settings.py,sha256=Pxx1-T2oeJ5XmvGFN0YgnVzum_9FyTPaQtl68aQvYc4,4116
@@ -122,7 +122,7 @@ polyaxon/_deploy/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,
 polyaxon/_deploy/reader.py,sha256=fYv1aXvaWulqy-mr0jbgnhAIa9oAXzDA3KQVOy3_kCo,220
 polyaxon/_deploy/operators/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 polyaxon/_deploy/operators/cmd_operator.py,sha256=lXDwLKuayiajzd0PVxxxoLb5qbf9OhYWb4iGm_D9IxU,1746
-polyaxon/_deploy/operators/compose.py,sha256=qbrVXUb_Xu1_My0I1Trzpv5qOZcz1Q4XrWYKtyBkh9k,7254
+polyaxon/_deploy/operators/compose.py,sha256=CmXAk27rqdCAzkEwsz9Tfrg_Va9BhXAUQTfwltO9sNc,6426
 polyaxon/_deploy/operators/conda.py,sha256=x5PzfziR1rr68lBffqzQuObdqzlKEwpCI7aFWE42LTE,575
 polyaxon/_deploy/operators/docker.py,sha256=aaaEU3eMqYbcq4YTMf9khgcDyfbNvv3fiaEkbauFglw,1115
 polyaxon/_deploy/operators/helm.py,sha256=e3aa7Ogdbv0O5wi7dwvwnLXaW776WJzFrVTlqhLZ3gI,779
@@ -131,11 +131,11 @@ polyaxon/_deploy/operators/pip.py,sha256=zLJeApCYRo4KkP7PFGrqJZMJpjT2gwTQN2DofIf
 polyaxon/_deploy/schemas/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 polyaxon/_deploy/schemas/auth.py,sha256=xGUexJVGRvLGmWXjyW0pxfft95SPSvZWSIXtS82mdEQ,296
 polyaxon/_deploy/schemas/celery.py,sha256=ITDLTotzZ_IAZyLoAlUstQzQmq8gHEP3tF39vVYQQag,812
-polyaxon/_deploy/schemas/deployment.py,sha256=6bUx65X42l8tAv0WJdEGFmGerYAHkeHU0fFR1stpkwE,12798
+polyaxon/_deploy/schemas/deployment.py,sha256=KQNzHF28Fc4aahzwdicGvEMKIPrw3XmFeNWbs8jV-Ws,12872
 polyaxon/_deploy/schemas/deployment_types.py,sha256=yLmUxXNlF2glMgzAyNg21KbTD5tnobM7hAl8pyal8Gk,348
 polyaxon/_deploy/schemas/email.py,sha256=r_NwHFF4MoFHR4RvzFma38zr5tLc_W6oxpZKIEw3LlM,545
 polyaxon/_deploy/schemas/ingress.py,sha256=MRhjOhTO9FqdQOA_g5SfHiod7eMEF4FjWMyJ4xkdvq0,423
-polyaxon/_deploy/schemas/intervals.py,sha256=-LqGQYMvEb2ohT0pwma3G7_dzj6X-8BDYsweTFSqPdo,551
+polyaxon/_deploy/schemas/intervals.py,sha256=c0fHEvm1JphgGMoqsR-SIGb3ik3b1rCmE1h4Gij5yKU,258
 polyaxon/_deploy/schemas/operators.py,sha256=KSf3TLWpWFb__0ncKW88WVwL0JRE6lBfATawsmSq6x0,344
 polyaxon/_deploy/schemas/proxy.py,sha256=hG5F8kzl59bAIZn5djIdsYNpptNsxHxmrH6urkoQ8kM,580
 polyaxon/_deploy/schemas/rbac.py,sha256=bIHzx5zweJdHAtc9eXkweV4n3J8tuj_lsTrA8ZNIVqQ,145
@@ -343,12 +343,12 @@ polyaxon/_k8s/executor/async_executor.py,sha256=5JShP9O0Jv2Czgyab8BkAVxjuPLD5FWV
 polyaxon/_k8s/executor/base.py,sha256=5qD21gfBlAq9KabgMYkExHejs61LtFAUAcnAqsmj3k0,4004
 polyaxon/_k8s/executor/executor.py,sha256=Qub57Q86SdmBv73CuyFJxydFOIyL0CZKp4B_7aSyLsU,321
 polyaxon/_k8s/logging/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-polyaxon/_k8s/logging/async_monitor.py,sha256=tVh2aEkPbRRE3FY44L7uWEQRHNB66IJBQu_E9RF-eco,5475
+polyaxon/_k8s/logging/async_monitor.py,sha256=N8hJs-26sBdenkZznYYMgZC9jW79us59jTPoBV0rhIc,7250
 polyaxon/_k8s/logging/monitor.py,sha256=4-NLN4_y0QVsReNJr8Ekv8kh0XNRRTKiiHopWs4wtMc,3426
 polyaxon/_k8s/manager/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-polyaxon/_k8s/manager/async_manager.py,sha256=146Hi2_yAZD6EhSchIZ5US6R33APyiUaVBHAgif5rnQ,8987
+polyaxon/_k8s/manager/async_manager.py,sha256=REeGSH-rP0WvpCQvwE-6ZfELfpVCJBsDkTe1QzPLy3o,9474
 polyaxon/_k8s/manager/base.py,sha256=d4ZnURFAwo1S63GVvi_57zgiuUVu-EnMuSfRzNLCEpk,2839
-polyaxon/_k8s/manager/manager.py,sha256=eJESZ6upQjeUrAYeU13cwXb_jmDYp56_SoysCZbY7VU,30143
+polyaxon/_k8s/manager/manager.py,sha256=o0rCjmDysD8lLP8mjQWPa76SRMKcezhj1IzPP5NkLXc,30624
 polyaxon/_local_process/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyaxon/_local_process/agent.py,sha256=Ph2oZtu3dOONIiuu9wlloSpfPBkXXhV61lbc0cPHC7E,168
 polyaxon/_local_process/executor.py,sha256=-Ewk1nL5HmC41JZEJh_h--ikDrvzWiZ1CKpCuwe0_eQ,5028
@@ -525,7 +525,7 @@ polyaxon/_sdk/schemas/v1_organization.py,sha256=n535i5c6X-TYEO1gbi3LXxwUeJLTxrHn
 polyaxon/_sdk/schemas/v1_organization_member.py,sha256=ww8icQ-Z4E09fhoMLT7oxtAWkufQ6R7eDxCjr3n6vZw,454
 polyaxon/_sdk/schemas/v1_password_change.py,sha256=gKqrwN-f4beEJGFOnrpsWuw2tRUYWRcQeSD3hrzZ5eQ,295
 polyaxon/_sdk/schemas/v1_pipeline.py,sha256=hPhg5Bwz6oacOjDvYgBhjP_Vk3lR0N9BH1eevrqnrB8,349
-polyaxon/_sdk/schemas/v1_preset.py,sha256=_chcLQK5ndw6eVymJu3GEGPVHfRAQ69ouBWHsQnth7U,543
+polyaxon/_sdk/schemas/v1_preset.py,sha256=bwnD6Mk0W2PB5Ksh_Z0UyVOThnPI60Bjbvl2WZllElU,797
 polyaxon/_sdk/schemas/v1_project.py,sha256=SopG7_j_zACdW9lLa0zOAPP5brkyoLPEGunhx-mEv_E,951
 polyaxon/_sdk/schemas/v1_project_settings.py,sha256=5ITp9NZRbewyrXf2Mcy9zOue7_51-mbAp9ObZEH7Pl0,669
 polyaxon/_sdk/schemas/v1_project_version.py,sha256=Ql7sgYaFuGSH1RpO5dA10aLz2aifwFN88-tl6JVA9_Y,1067
@@ -611,9 +611,9 @@ polyaxon/tuners/hyperopt.py,sha256=zd6MblMGkooqLGDFJVo5kClqYnBoMwGj-opqqj8FDzQ,7
 polyaxon/tuners/mapping.py,sha256=pOdHCiwEufTk-QT7pNyjBjAEWNTM-lMC17WNTCk7C24,69
 polyaxon/tuners/random_search.py,sha256=6VEekM3N9h6E1lbpVTTUGKFPJlGMY2u-GkG615_nQcI,80
 polyaxon_sdk/__init__.py,sha256=HWvFdGWESyVG3f26K_szewiG-McMOHFkXKTfZcBlHsM,92
-polyaxon-2.3.0rc0.dist-info/LICENSE,sha256=86kroZbQUDsmSWOomB7dpceG65UXiVSPob4581tStBc,11349
-polyaxon-2.3.0rc0.dist-info/METADATA,sha256=KqMQHta1OI2x6JJPqEFvwEXhtd8_EoobKd5PyrJbD8c,11711
-polyaxon-2.3.0rc0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-polyaxon-2.3.0rc0.dist-info/entry_points.txt,sha256=aFbUMjkg9vzRBVAFhqvR1m92yG8Cov7UAF0zViGfoQw,70
-polyaxon-2.3.0rc0.dist-info/top_level.txt,sha256=I_2e_Vv8rdcqWcMMdZocbrHiKPNGqoSMBqIObrw00Rg,22
-polyaxon-2.3.0rc0.dist-info/RECORD,,
+polyaxon-2.3.0rc1.dist-info/LICENSE,sha256=86kroZbQUDsmSWOomB7dpceG65UXiVSPob4581tStBc,11349
+polyaxon-2.3.0rc1.dist-info/METADATA,sha256=bKKtzoP-Nk78Iiq0Dmmzj_e-a1sTdf2skooaeBsy7js,11711
+polyaxon-2.3.0rc1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+polyaxon-2.3.0rc1.dist-info/entry_points.txt,sha256=aFbUMjkg9vzRBVAFhqvR1m92yG8Cov7UAF0zViGfoQw,70
+polyaxon-2.3.0rc1.dist-info/top_level.txt,sha256=I_2e_Vv8rdcqWcMMdZocbrHiKPNGqoSMBqIObrw00Rg,22
+polyaxon-2.3.0rc1.dist-info/RECORD,,