Skip to content

Commit 056ef1c

Browse files
zeryxaslisabanci
andauthored
removal of api-client utilization for algo.publish (#114)
* tested and verified publish works as expected * updated ADK client version to minimum 1.1 * Treat algo publish response as a dict Co-authored-by: aslisabanci <aslisabanci@gmail.com>
1 parent 339d779 commit 056ef1c

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

Algorithmia/algorithm.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,19 @@ def update(self, details={}, settings={}, version_info={}):
6969

7070
# Publish an algorithm
7171
def publish(self, details={}, settings={}, version_info={}):
72-
detailsObj = Details(**details)
73-
settingsObj = SettingsPublish(**settings)
74-
versionRequestObj = VersionInfoPublish(**version_info)
75-
publish_parameters = {"details": detailsObj, "settings": settingsObj, "version_info": versionRequestObj}
76-
version_request = VersionRequest(**publish_parameters) # VersionRequest | Publish Version Request
77-
try:
78-
# Publish Algorithm
79-
api_response = self.client.manageApi.publish_algorithm(self.username, self.algoname, version_request)
80-
return api_response
81-
except ApiException as e:
82-
error_message = json.loads(e.body)
83-
raise raiseAlgoApiError(error_message)
72+
# detailsObj = Details(**details)
73+
# settingsObj = SettingsPublish(**settings)
74+
# versionRequestObj = VersionInfoPublish(**version_info)
75+
# publish_parameters = {"details": detailsObj, "settings": settingsObj, "version_info": versionRequestObj}
76+
# version_request = VersionRequest(**publish_parameters) # VersionRequest | Publish Version Request
77+
publish_parameters = {"details": details, "settings": settings, "version_info": version_info}
78+
url = "/v1/algorithms/"+self.username+"/"+self.algoname + "/versions"
79+
print(publish_parameters)
80+
api_response = self.client.postJsonHelper(url, publish_parameters, parse_response_as_json=True, **self.query_parameters)
81+
return api_response
82+
# except ApiException as e:
83+
# error_message = json.loads(e.body)
84+
# raise raiseAlgoApiError(error_message)
8485

8586
def builds(self, limit=56, marker=None):
8687
try:

Test/client_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def test_algorithm_programmatic_create_process(self):
213213
settings=pub_settings,
214214
version_info=pub_version_info
215215
)
216-
self.assertEqual(response.version_info.semantic_version, "0.1.0", "Publishing failed, semantic version is not correct.")
216+
self.assertEqual(response["version_info"]["semantic_version"], "0.1.0", "Publishing failed, semantic version is not correct.")
217217

218218
# --- publishing complete, getting additional information
219219

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ enum-compat
44
toml
55
argparse
66
algorithmia-api-client==1.5.1
7-
algorithmia-adk>=1.0.4,<1.1
7+
algorithmia-adk>=1.1,<1.2
88
numpy<2
99
uvicorn==0.14.0
1010
fastapi==0.65.2

requirements27.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ enum-compat
44
toml
55
argparse
66
algorithmia-api-client==1.5.1
7-
algorithmia-adk>=1.0.4,<1.1
7+
algorithmia-adk>=1.1,<1.2
88
numpy<2

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
'toml',
2323
'argparse',
2424
'algorithmia-api-client==1.5.1',
25-
'algorithmia-adk>=1.0.2,<1.1'
25+
'algorithmia-adk>=1.1,<1.2'
2626
],
2727
include_package_data=True,
2828
classifiers=[

0 commit comments

Comments
 (0)