polyaxon 2.0.6rc9__py3-none-any.whl → 2.1.0__py3-none-any.whl

polyaxon/_schemas/agent.py

@@ -18,6 +18,7 @@ from polyaxon._connections import V1Connection, V1ConnectionKind, V1HostPathConn
 from polyaxon._contexts import paths as ctx_paths
 from polyaxon._env_vars.getters import get_artifacts_store_name
 from polyaxon._env_vars.keys import (
+    ENV_KEYS_ADDITIONAL_NAMESPACES,
     ENV_KEYS_AGENT_ARTIFACTS_STORE,
     ENV_KEYS_AGENT_CLEANER,
     ENV_KEYS_AGENT_CONNECTIONS,
@@ -35,6 +36,8 @@ from polyaxon._env_vars.keys import (
     ENV_KEYS_ARTIFACTS_STORE_NAME,
     ENV_KEYS_K8S_APP_SECRET_NAME,
     ENV_KEYS_K8S_NAMESPACE,
+    ENV_KEYS_SINGLE_NAMESPACE,
+    ENV_KEYS_WATCH_CLUSTER,
 )
 from polyaxon._fs.utils import get_store_path
 from polyaxon._schemas.base import BaseSchemaModel
@@ -185,6 +188,11 @@ class AgentConfig(BaseAgentConfig):
     _IDENTIFIER = "agent"
 
     is_replica: Optional[bool] = Field(alias=ENV_KEYS_AGENT_IS_REPLICA)
+    watch_cluster: Optional[bool] = Field(alias=ENV_KEYS_WATCH_CLUSTER)
+    single_namespace: Optional[bool] = Field(alias=ENV_KEYS_SINGLE_NAMESPACE)
+    additional_namespaces: Optional[List[StrictStr]] = Field(
+        alias=ENV_KEYS_ADDITIONAL_NAMESPACES
+    )
     sidecar: Optional[V1PolyaxonSidecarContainer] = Field(alias=ENV_KEYS_AGENT_SIDECAR)
     init: Optional[V1PolyaxonInitContainer] = Field(alias=ENV_KEYS_AGENT_INIT)
     notifier: Optional[V1PolyaxonNotifier] = Field(alias=ENV_KEYS_AGENT_NOTIFIER)
@@ -217,6 +225,24 @@ class AgentConfig(BaseAgentConfig):
             and "isReplica" in values
         ):
             values[ENV_KEYS_AGENT_IS_REPLICA] = values["isReplica"]
+        if (
+            not values.get("watch_cluster")
+            and not values.get(ENV_KEYS_WATCH_CLUSTER)
+            and "watchCluster" in values
+        ):
+            values[ENV_KEYS_WATCH_CLUSTER] = values["watchCluster"]
+        if (
+            not values.get("single_namespace")
+            and not values.get(ENV_KEYS_SINGLE_NAMESPACE)
+            and "singleNamespace" in values
+        ):
+            values[ENV_KEYS_SINGLE_NAMESPACE] = values["singleNamespace"]
+        if (
+            not values.get("additional_namespace")
+            and not values.get(ENV_KEYS_ADDITIONAL_NAMESPACES)
+            and "additionalNamespaces" in values
+        ):
+            values[ENV_KEYS_ADDITIONAL_NAMESPACES] = values["additionalNamespaces"]
         if (
             not values.get("use_proxy_env_vars_use_in_ops")
             and not values.get(ENV_KEYS_AGENT_USE_PROXY_ENV_VARS_IN_OPS)
@@ -312,7 +338,7 @@ class AgentConfig(BaseAgentConfig):
                 "Received an invalid {} `{}`".format(field.alias, v)
             ) from e
 
-    @validator("default_image_pull_secrets", pre=True)
+    @validator("additional_namespaces", "default_image_pull_secrets", pre=True)
     def validate_str_list(cls, v, field):
         try:
             return ConfigParser.parse(str)(

polyaxon/_schemas/client.py

@@ -1,3 +1,5 @@
+import os
+
 from typing import Dict, Optional, Union
 
 import urllib3
@@ -29,6 +31,7 @@ from polyaxon._env_vars.keys import (
     ENV_KEYS_NO_API,
     ENV_KEYS_NO_OP,
     ENV_KEYS_RETRIES,
+    ENV_KEYS_SECRET_INTERNAL_TOKEN,
     ENV_KEYS_SSL_CA_CERT,
     ENV_KEYS_TIME_ZONE,
     ENV_KEYS_TIMEOUT,
@@ -137,6 +140,10 @@ class ClientConfig(BaseSchemaModel):
         self.client_header["header_name"] = self.header
         self.client_header["header_value"] = self.header_service
 
+    def get_internal_header(self) -> Dict:
+        header = PolyaxonServiceHeaders.get_header(PolyaxonServiceHeaders.INTERNAL)
+        return {"header_name": header, "header_value": self.header_service}
+
     def get_full_headers(self, headers=None, auth_key="Authorization") -> Dict:
         request_headers = {}
         request_headers.update(headers or {})
@@ -151,7 +158,19 @@ class ClientConfig(BaseSchemaModel):
         return request_headers
 
     @property
-    def sdk_config(self) -> Configuration:
+    def sdk_config(self):
+        return self.get_sdk_config()
+
+    @property
+    def internal_sdk_config(self):
+        return self.get_sdk_config(
+            token=os.environ.get(ENV_KEYS_SECRET_INTERNAL_TOKEN),
+            authentication_type=AuthenticationTypes.INTERNAL_TOKEN,
+        )
+
+    def get_sdk_config(
+        self, token: str = None, authentication_type: AuthenticationTypes = None
+    ) -> Configuration:
         if not self.host and not self.in_cluster:
             raise PolyaxonClientException(
                 "Api config requires at least a host if not running in-cluster."
@@ -171,8 +190,10 @@ class ClientConfig(BaseSchemaModel):
         if self.connection_pool_maxsize:
             config.connection_pool_maxsize = self.connection_pool_maxsize
         if self.token:
-            config.api_key["ApiKey"] = self.token
-            config.api_key_prefix["ApiKey"] = self.authentication_type
+            config.api_key["ApiKey"] = token or self.token
+            config.api_key_prefix["ApiKey"] = (
+                authentication_type or self.authentication_type
+            )
         return config
 
     @property
@@ -181,6 +202,12 @@ class ClientConfig(BaseSchemaModel):
         config.connection_pool_maxsize = 100
         return config
 
+    @property
+    def async_internal_sdk_config(self) -> Configuration:
+        config = self.internal_sdk_config
+        config.connection_pool_maxsize = 100
+        return config
+
     @classmethod
     def patch_from(cls, config: "ClientConfig", **kwargs) -> "ClientConfig":
         data = {**config.to_dict(), **kwargs}