From 6aafe17ff45ecad4a75ed1c66208cf0f5c2d0934 Mon Sep 17 00:00:00 2001 From: Muhammad Faizud Daroin Date: Mon, 14 Aug 2023 15:06:00 +0700 Subject: [PATCH] fix: urlencode the part id --- onshape_to_robot/onshape_api/client.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/onshape_to_robot/onshape_api/client.py b/onshape_to_robot/onshape_api/client.py index 37f7d33..73a235f 100644 --- a/onshape_to_robot/onshape_api/client.py +++ b/onshape_to_robot/onshape_api/client.py @@ -13,10 +13,11 @@ import os import json import hashlib +import urllib.parse from pathlib import Path -def escape_slash(s): - return s.replace('/', '%2f') +def urlencode(s): + return urllib.parse.quote(s) class Client(): ''' @@ -338,18 +339,18 @@ def invoke(): req_headers = { 'Accept': '*/*' } - return self._api.request('get', '/api/parts/d/' + did + '/m/' + mid + '/e/' + eid + '/partid/'+escape_slash(partid)+'/stl', query={'mode': 'binary', 'units': 'meter', 'configuration': configuration}, headers=req_headers) + return self._api.request('get', '/api/parts/d/' + did + '/m/' + mid + '/e/' + eid + '/partid/'+urlencode(partid)+'/stl', query={'mode': 'binary', 'units': 'meter', 'configuration': configuration}, headers=req_headers) return self.cache_get('part_stl', (did, mid, eid, self.hash_partid(partid), configuration), invoke) def part_get_metadata(self, did, mid, eid, partid, configuration = 'default'): def invoke(): - return self._api.request('get', '/api/metadata/d/' + did + '/m/' + mid + '/e/' + eid + '/p/'+escape_slash(partid), query={'configuration': configuration}) + return self._api.request('get', '/api/metadata/d/' + did + '/m/' + mid + '/e/' + eid + '/p/'+urlencode(partid), query={'configuration': configuration}) return json.loads(self.cache_get('metadata', (did, mid, eid, self.hash_partid(partid), configuration), invoke, True)) def part_mass_properties(self, did, mid, eid, partid, configuration = 'default'): def invoke(): - return self._api.request('get', '/api/parts/d/' + did + '/m/' + mid + '/e/' + eid + '/partid/'+escape_slash(partid)+'/massproperties', query={'configuration': configuration, 'useMassPropertyOverrides': True}) + return self._api.request('get', '/api/parts/d/' + did + '/m/' + mid + '/e/' + eid + '/partid/'+urlencode(partid)+'/massproperties', query={'configuration': configuration, 'useMassPropertyOverrides': True}) return json.loads(self.cache_get('massproperties', (did, mid, eid, self.hash_partid(partid), configuration), invoke, True))