Skip to content
This repository was archived by the owner on Apr 15, 2024. It is now read-only.

FAB:925 Added namespace removal changes to client sdk #46

Merged
svangapally-cs merged 1 commit into from
Jan 30, 2021
Merged

FAB:925 Added namespace removal changes to client sdk #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cortex/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"""

import json
import urllib.parse
from .serviceconnector import _Client, ServiceConnector
from .camel import CamelResource
from .utils import get_logger
Expand Down Expand Up @@ -75,7 +76,7 @@ def get_connection(name, project, client: ConnectionClient):
:param project: The project from which connection has to be retrieved.
:return: A Connection object.
"""
uri = 'projects/{projectId}/connections/{name}'.format(projectId=project, name=name)
uri = 'projects/{projectId}/connections/{name}'.format(projectId=project, name=urllib.parse.quote(name, safe=''))
log.debug('Getting connection using URI: %s' % uri)
r = client._serviceconnector.request('GET', uri)
raise_for_status_with_detail(r)
Expand Down
33 changes: 18 additions & 15 deletions cortex/experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import dill
import os
import json
import urllib.parse

from pathlib import Path
from .run import Run, RemoteRun
Expand Down Expand Up @@ -73,30 +74,30 @@ def save_experiment(self, experiment_name, project, **kwargs):
return r.json()

def delete_experiment(self, experiment_name, project):
uri = self.URIs['experiment'].format(projectId=project, experimentName=experiment_name)
uri = self.URIs['experiment'].format(projectId=project, experimentName=self.parse_string(experiment_name))
r = self._serviceconnector.request(method='DELETE', uri=uri)
raise_for_status_with_detail(r)
rs = r.json()

return rs.get('success', False)

def get_experiment(self, experiment_name, project):
uri = self.URIs['experiment'].format(projectId=project, experimentName=experiment_name)
uri = self.URIs['experiment'].format(projectId=project, experimentName=self.parse_string(experiment_name))
r = self._serviceconnector.request(method='GET', uri=uri)
raise_for_status_with_detail(r)

return r.json()

def list_runs(self, experiment_name, project):
uri = self.URIs['runs'].format(projectId=project, experimentName=experiment_name)
uri = self.URIs['runs'].format(projectId=project, experimentName=self.parse_string(experiment_name))
r = self._serviceconnector.request(method='GET', uri=uri)
raise_for_status_with_detail(r)
rs = r.json()

return rs.get('runs', [])

def find_runs(self, experiment_name, project, filter, sort=None, limit=25):
uri = self.URIs['runs'].format(projectId=project, experimentName=experiment_name)
uri = self.URIs['runs'].format(projectId=project, experimentName=self.parse_string(experiment_name))

# filter and limit are required query params
params = {
Expand All @@ -115,7 +116,7 @@ def find_runs(self, experiment_name, project, filter, sort=None, limit=25):
return rs.get('runs', [])

def delete_runs(self, experiment_name, project, filter=None, sort=None, limit=None):
uri = self.URIs['runs'].format(projectId=project, experimentName=experiment_name)
uri = self.URIs['runs'].format(projectId=project, experimentName=self.parse_string(experiment_name))

params = {}

Expand Down Expand Up @@ -145,13 +146,13 @@ def create_run(self, experiment_name, project, **kwargs):

body = json.dumps(body_obj)
headers = {'Content-Type': 'application/json'}
uri = self.URIs['runs'].format(projectId=project, experimentName=experiment_name)
uri = self.URIs['runs'].format(projectId=project, experimentName=self.parse_string(experiment_name))
r = self._serviceconnector.request(method='POST', uri=uri, body=body, headers=headers)
raise_for_status_with_detail(r)
return r.json()

def get_run(self, experiment_name, project, run_id):
uri = self.URIs['run'].format(projectId=project, experimentName=experiment_name, runId=run_id)
uri = self.URIs['run'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id)
r = self._serviceconnector.request(method='GET', uri=uri)
raise_for_status_with_detail(r)

Expand All @@ -165,7 +166,7 @@ def update_run(self, experiment_name, project, run_id, **kwargs):

body = json.dumps(body_obj)
headers = {'Content-Type': 'application/json'}
uri = self.URIs['run'].format(projectId=project, experimentName=experiment_name, runId=run_id)
uri = self.URIs['run'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id)
r = self._serviceconnector.request(method='PUT', uri=uri, body=body, headers=headers)
raise_for_status_with_detail(r)
rs = r.json()
Expand All @@ -176,7 +177,7 @@ def update_run(self, experiment_name, project, run_id, **kwargs):
return success

def delete_run(self, experiment_name, project, run_id):
uri = self.URIs['run'].format(projectId=project, experimentName=experiment_name, runId=run_id)
uri = self.URIs['run'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id)
r = self._serviceconnector.request(method='DELETE', uri=uri)
raise_for_status_with_detail(r)
rs = r.json()
Expand All @@ -187,7 +188,7 @@ def delete_run(self, experiment_name, project, run_id):
return success

def update_meta(self, experiment_name, project, run_id, meta, val):
uri = self.URIs['meta'].format(projectId=project, experimentName=experiment_name, runId=run_id, metaId=meta)
uri = self.URIs['meta'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id, metaId=meta)
headers = {'Content-Type': 'application/json'}
r = self._serviceconnector.request(method='PUT', uri=uri, body=json.dumps({'value': val}), headers=headers)
raise_for_status_with_detail(r)
Expand All @@ -199,7 +200,7 @@ def update_meta(self, experiment_name, project, run_id, meta, val):
return success

def update_param(self, experiment_name, project, run_id, param, val):
uri = self.URIs['param'].format(projectId=project, experimentName=experiment_name, runId=run_id, paramId=param)
uri = self.URIs['param'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id, paramId=param)
headers = {'Content-Type': 'application/json'}
r = self._serviceconnector.request(method='PUT', uri=uri, body=json.dumps({'value': val}), headers=headers)
raise_for_status_with_detail(r)
Expand All @@ -211,7 +212,7 @@ def update_param(self, experiment_name, project, run_id, param, val):
return success

def update_metric(self, experiment_name, project, run_id, metric, val):
uri = self.URIs['metric'].format(projectId=project, experimentName=experiment_name, runId=run_id, metricId=metric)
uri = self.URIs['metric'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id, metricId=metric)
headers = {'Content-Type': 'application/json'}
r = self._serviceconnector.request(method='PUT', uri=uri, body=json.dumps({'value': val}), headers=headers)
raise_for_status_with_detail(r)
Expand All @@ -223,7 +224,7 @@ def update_metric(self, experiment_name, project, run_id, metric, val):
return success

def update_artifact(self, experiment_name, project, run_id, artifact, stream):
uri = self.URIs['artifact'].format(projectId=project, experimentName=experiment_name, runId=run_id, artifactId=artifact)
uri = self.URIs['artifact'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id, artifactId=artifact)
r = self._serviceconnector.request(method='PUT', uri=uri, body=stream)
raise_for_status_with_detail(r)
rs = r.json()
Expand All @@ -234,12 +235,15 @@ def update_artifact(self, experiment_name, project, run_id, artifact, stream):
return success

def get_artifact(self, experiment_name, project, run_id, artifact):
uri = self.URIs['artifact'].format(projectId=project, experimentName=experiment_name, runId=run_id, artifactId=artifact)
uri = self.URIs['artifact'].format(projectId=project, experimentName=self.parse_string(experiment_name), runId=run_id, artifactId=artifact)
r = self._serviceconnector.request(method='GET', uri=uri, stream=True)
raise_for_status_with_detail(r)

return r.content

def parse_string(self, string):
# Replaces special characters like / with %2F
return urllib.parse.quote(string, safe='')

def _to_html(exp):
try:
Expand Down Expand Up @@ -339,7 +343,6 @@ def _to_html(exp):
metric_names=sorted(list(metric_names))
)


class Experiment(CamelResource):
"""
Tracks runs, associated parameters, metrics, and artifacts of experiments.
Expand Down
3 changes: 2 additions & 1 deletion cortex/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
limitations under the License.
"""

import urllib.parse
from cortex.serviceconnector import _Client, ServiceConnector
from cortex.utils import get_logger
from .camel import CamelResource
Expand Down Expand Up @@ -55,7 +56,7 @@ def get_schema(name, project, client: SchemaClient):
:param name: The name of the schema to retrieve.
:return: A schema object.
"""
uri = 'projects/{projectId}types/{name}'.format(projectId=project, name=name)
uri = 'projects/{projectId}/types/{name}'.format(projectId=project, name=urllib.parse.quote(name, safe=''))
log.debug('Getting schema using URI: %s' % uri)
r = client._serviceconnector.request('GET', uri)
raise_for_status_with_detail(r)
Expand Down