fix: add namespace to urls (#342)

* add: get namespace to base command

* add namespace to deployment, machines, projects urls

* add namespce to job urls

* add namespace to experiment urls

* lint

* check for ok

* check for instance

* test: update to has calls

* fix: add basecommand

* fix: add basecommand

Author: reynld

gradient/commands/common.py

@@ -8,8 +8,12 @@
 from click import style
 from halo import halo
 
+from gradient import api_sdk, exceptions
+from gradient.api_sdk import sdk_exceptions
+from gradient.api_sdk.config import config
 from gradient.clilogger import CliLogger
 from gradient.cliutils import get_terminal_lines, TerminalPrinter
+from gradient.cli_constants import CLI_PS_CLIENT_NAME
 from gradient.exceptions import ApplicationError
 
 
@@ -20,6 +24,22 @@ def __init__(self, api_key, logger=CliLogger()):
         self.client = self._get_client(api_key, logger)
         self.logger = logger
 
+    def get_namespace(self):
+        client = api_sdk.clients.http_client.API(
+            config.CONFIG_HOST,
+            api_key=self.api_key,
+            logger=self.logger,
+            ps_client_name=CLI_PS_CLIENT_NAME,
+        )
+
+        try:
+            resp = client.get(url='/teams/namespace')
+        except sdk_exceptions.GradientSdkError as e:
+                raise exceptions.ReceivingDataFailedError(e)
+        if isinstance(resp.json(), str):
+            return resp.json()
+        return ''
+
     @abc.abstractmethod
     def execute(self, *args, **kwargs):
         pass

gradient/commands/datasets.py

@@ -692,7 +692,7 @@ def update_status():
                             pool.put(self._delete, url=pre_signed.url)
 
 
-class ImportDatasetCommand(BaseCreateJobCommandMixin, BaseJobCommand):
+class ImportDatasetCommand(BaseCreateJobCommandMixin):
     def create_secret(self, key, value, expires_in=86400):
         client = api_sdk.clients.SecretsClient(
             api_key=self.api_key,

gradient/commands/deployments.py

@@ -77,7 +77,7 @@ def execute(self, **kwargs):
         self.logger.log(self.get_instance_url(deployment_id))
 
     def get_instance_url(self, instance_id):
-        url = concatenate_urls(config.WEB_URL, "/deployments/{}".format(instance_id))
+        url = concatenate_urls(config.WEB_URL, "{}/deployments/{}".format(self.get_namespace(), instance_id))
         return url
 
     def _handle_auth(self, kwargs):

gradient/commands/experiments.py

@@ -86,7 +86,7 @@ def _create_tensorboard_with_experiment(self, experiment_id):
 
 
 @six.add_metaclass(abc.ABCMeta)
-class BaseCreateExperimentCommandMixin(object):
+class BaseCreateExperimentCommandMixin(BaseCommand):
     SPINNER_MESSAGE = "Creating new experiment"
     CREATE_SUCCESS_MESSAGE_TEMPLATE = "New experiment created with ID: {}"
 
@@ -108,7 +108,7 @@ def execute(self, json_, add_to_tensorboard=False):
         return experiment_id
 
     def get_instance_url(self, instance_id, project_id):
-        url = concatenate_urls(config.WEB_URL, "projects/{}/experiments/{}".format(project_id, instance_id))
+        url = concatenate_urls(config.WEB_URL, "{}/projects/{}/experiments/{}".format(self.get_namespace(), project_id, instance_id))
         return url
 
     def _handle_workspace(self, instance_dict):

gradient/commands/jobs.py

@@ -28,7 +28,7 @@ def _get_client(self, api_key, logger_):
 
 
 @six.add_metaclass(abc.ABCMeta)
-class BaseCreateJobCommandMixin(object):
+class BaseCreateJobCommandMixin(BaseJobCommand):
     SPINNER_MESSAGE = "Creating new job"
     CREATE_SUCCESS_MESSAGE_TEMPLATE = "New job created with ID: {}"
 
@@ -45,9 +45,8 @@ def execute(self, json_):
         self.logger.log(self.CREATE_SUCCESS_MESSAGE_TEMPLATE.format(job_id))
         self.logger.log(self.get_instance_url(job_id))
 
-    @staticmethod
-    def get_instance_url(instance_id):
-        url = concatenate_urls(config.config.WEB_URL, "jobs/{}".format(instance_id))
+    def get_instance_url(self, instance_id):
+        url = concatenate_urls(config.config.WEB_URL, "{}/jobs/{}".format(self.get_namespace(), instance_id))
         return url
 
     def _handle_workspace(self, instance_dict):
@@ -158,7 +157,7 @@ class JobLogsCommand(LogsCommandMixin, BaseJobCommand):
     ENTITY = "Job"
 
 
-class CreateJobCommand(BaseCreateJobCommandMixin, BaseJobCommand):
+class CreateJobCommand(BaseCreateJobCommandMixin):
 
     def _create(self, json_, data):
         # because ignore_files is used by workspace handlers and not needed anymore (will fail if not "popped")

gradient/commands/machines.py

@@ -33,7 +33,7 @@ def execute(self, kwargs):
         self.logger.log(self.get_instance_url(handle))
 
     def get_instance_url(self, machine_id):
-        url = concatenate_urls(config.WEB_URL, "machines/{}".format(machine_id))
+        url = concatenate_urls(config.WEB_URL, "{}/machines/{}".format(self.get_namespace(), machine_id))
         return url
 
 

gradient/commands/projects.py

@@ -34,7 +34,7 @@ def execute(self, project_dict):
         self.logger.log(self.get_instance_url(project_id))
 
     def get_instance_url(self, project_id):
-        url = concatenate_urls(config.WEB_URL, "projects/{}".format(project_id))
+        url = concatenate_urls(config.WEB_URL, "{}/projects/{}".format(self.get_namespace(), project_id))
         return url
 
 

tests/functional/test_deployments.py

@@ -320,18 +320,23 @@ def test_should_send_proper_data_and_print_message_when_create_deployment_with_z
         post_params['workspaceUrl'] = workspace_url
 
         cli_command = self.BASIC_OPTIONS_COMMAND + ['--workspace', workspace_path]
-
+  
         runner = CliRunner()
         result = runner.invoke(cli.cli, cli_command)
 
         assert result.output == self.EXPECTED_STDOUT, result.exc_info
-        get_patched.assert_called_once_with(self.GET_PRESIGNED_URL,
-                                            headers=EXPECTED_HEADERS,
-                                            json=None,
-                                            params={
-                                                "contentType": content_type,
-                                                "fileName": archive_name,
-                                            })
+        get_patched.assert_has_calls(
+            [
+                mock.call(
+                    self.GET_PRESIGNED_URL,
+                    headers=EXPECTED_HEADERS,
+                    json=None,
+                    params={
+                        "contentType": content_type,
+                        "fileName": archive_name,
+                    })
+            ]
+        )
         post_patched.assert_called_once_with(self.URL,
                                              headers=EXPECTED_HEADERS,
                                              json=post_params,
@@ -389,13 +394,18 @@ def test_should_send_proper_data_and_print_message_when_create_deployment_with_w
 
         assert result.output == self.EXPECTED_STDOUT_WITH_WORKSPACE_ARCHIVING, result.exc_info
         mocked_archiver.archive.assert_called()
-        get_patched.assert_called_once_with(self.GET_PRESIGNED_URL,
-                                            headers=EXPECTED_HEADERS,
-                                            json=None,
-                                            params={
-                                                "contentType": content_type,
-                                                "fileName": archive_name,
-                                            })
+        get_patched.assert_has_calls(
+            [
+                mock.call(
+                    self.GET_PRESIGNED_URL,
+                    headers=EXPECTED_HEADERS,
+                    json=None,
+                    params={
+                        "contentType": content_type,
+                        "fileName": archive_name,
+                    })
+            ]
+        )
         post_patched.assert_called_once_with(self.URL,
                                              headers=EXPECTED_HEADERS,
                                              json=post_params,