Fix checking org/cluster name validity before re-fetching config

CHANGELOG.D/2543.bugfix

@@ -0,0 +1,2 @@
+Cluster/org name validness now checked after config re-fetch in `neuro config switch-cluster`
+and `neuro config switch-org` commands.

neuro-cli/src/neuro_cli/click_types.py

@@ -345,13 +345,18 @@ async def async_shell_complete(
 class ClusterType(AsyncType[str]):
     name = "cluster"
 
+    def __init__(self, allow_unknown: bool = False):
+        self._allow_unknown = allow_unknown
+
     async def async_convert(
         self,
         root: Root,
         value: str,
         param: Optional[click.Parameter],
         ctx: Optional[click.Context],
     ) -> str:
+        if self._allow_unknown:
+            return value
         client = await root.init_client()
         if value not in client.config.clusters:
             raise click.BadParameter(
@@ -373,19 +378,25 @@ async def async_shell_complete(
 
 
 CLUSTER = ClusterType()
+CLUSTER_ALLOW_UNKNOWN = ClusterType(allow_unknown=True)
 
 
 class OrgType(AsyncType[str]):
     name = "org"
     NO_ORG_STR = "NO_ORG"
 
+    def __init__(self, allow_unknown: bool = False):
+        self._allow_unknown = allow_unknown
+
     async def async_convert(
         self,
         root: Root,
         value: str,
         param: Optional[click.Parameter],
         ctx: Optional[click.Context],
     ) -> str:
+        if self._allow_unknown:
+            return value
         client = await root.init_client()
         org_name = value if value != self.NO_ORG_STR else None
         if org_name not in client.config.clusters[client.config.cluster_name].orgs:
@@ -412,6 +423,7 @@ async def async_shell_complete(
 
 
 ORG = OrgType()
+ORG_ALLOW_UNKNOWN = OrgType(allow_unknown=True)
 
 
 class JobType(AsyncType[str]):

neuro-cli/src/neuro_cli/config.py

@@ -18,7 +18,7 @@
 from neuro_cli.formatters.config import ClustersFormatter
 
 from .alias import list_aliases
-from .click_types import CLUSTER, ORG
+from .click_types import CLUSTER_ALLOW_UNKNOWN, ORG, ORG_ALLOW_UNKNOWN
 from .formatters.config import AliasesFormatter, ConfigFormatter
 from .root import Root
 from .utils import argument, command, group, option
@@ -226,7 +226,7 @@ async def get_clusters(root: Root) -> None:
 
 
 @command()
-@argument("cluster_name", required=False, default=None, type=CLUSTER)
+@argument("cluster_name", required=False, default=None, type=CLUSTER_ALLOW_UNKNOWN)
 async def switch_cluster(root: Root, cluster_name: Optional[str]) -> None:
     """Switch the active cluster.
 
@@ -252,7 +252,7 @@ async def switch_cluster(root: Root, cluster_name: Optional[str]) -> None:
 
 
 @command()
-@argument("org_name", required=True, type=ORG)
+@argument("org_name", required=True, type=ORG_ALLOW_UNKNOWN)
 async def switch_org(root: Root, org_name: Optional[str]) -> None:
     """Switch the active organization.
 

neuro-sdk/src/neuro_sdk/_config.py

@@ -199,7 +199,6 @@ async def switch_cluster(self, name: str) -> None:
             raise RuntimeError(
                 f"Cluster {name} doesn't exist in "
                 f"a list of available clusters {list(self.clusters)}. "
-                f"Please logout and login again."
             )
         org_name = self.org_name
         if org_name not in self.clusters[name].orgs:
@@ -221,7 +220,6 @@ async def switch_org(self, name: Optional[str]) -> None:
                 f"Org {name or 'NO_ORG'} doesn't exist in "
                 f"a list of available orgs {list(cluster_org_names)} for "
                 f"cluster '{self.cluster_name}'. "
-                f"Please logout and login again."
             )
         self.__config_data = replace(self._config_data, org_name=name)
         _save(self._config_data, self._path)