diff --git a/Algorithmia/algorithm.py b/Algorithmia/algorithm.py index 2410c22..2fe5820 100644 --- a/Algorithmia/algorithm.py +++ b/Algorithmia/algorithm.py @@ -69,18 +69,19 @@ def update(self, details={}, settings={}, version_info={}): # Publish an algorithm def publish(self, details={}, settings={}, version_info={}): - detailsObj = Details(**details) - settingsObj = SettingsPublish(**settings) - versionRequestObj = VersionInfoPublish(**version_info) - publish_parameters = {"details": detailsObj, "settings": settingsObj, "version_info": versionRequestObj} - version_request = VersionRequest(**publish_parameters) # VersionRequest | Publish Version Request - try: - # Publish Algorithm - api_response = self.client.manageApi.publish_algorithm(self.username, self.algoname, version_request) - return api_response - except ApiException as e: - error_message = json.loads(e.body) - raise raiseAlgoApiError(error_message) + # detailsObj = Details(**details) + # settingsObj = SettingsPublish(**settings) + # versionRequestObj = VersionInfoPublish(**version_info) + # publish_parameters = {"details": detailsObj, "settings": settingsObj, "version_info": versionRequestObj} + # version_request = VersionRequest(**publish_parameters) # VersionRequest | Publish Version Request + publish_parameters = {"details": details, "settings": settings, "version_info": version_info} + url = "/v1/algorithms/"+self.username+"/"+self.algoname + "/versions" + print(publish_parameters) + api_response = self.client.postJsonHelper(url, publish_parameters, parse_response_as_json=True, **self.query_parameters) + return api_response + # except ApiException as e: + # error_message = json.loads(e.body) + # raise raiseAlgoApiError(error_message) def builds(self, limit=56, marker=None): try: diff --git a/Test/client_test.py b/Test/client_test.py index edfda54..e7d7e8f 100644 --- a/Test/client_test.py +++ b/Test/client_test.py @@ -213,7 +213,7 @@ def test_algorithm_programmatic_create_process(self): settings=pub_settings, version_info=pub_version_info ) - self.assertEqual(response.version_info.semantic_version, "0.1.0", "Publishing failed, semantic version is not correct.") + self.assertEqual(response["version_info"]["semantic_version"], "0.1.0", "Publishing failed, semantic version is not correct.") # --- publishing complete, getting additional information diff --git a/requirements.txt b/requirements.txt index c688cc2..f12c984 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ enum-compat toml argparse algorithmia-api-client==1.5.1 -algorithmia-adk>=1.0.4,<1.1 +algorithmia-adk>=1.1,<1.2 numpy<2 uvicorn==0.14.0 fastapi==0.65.2 diff --git a/requirements27.txt b/requirements27.txt index ad17eba..3d2b39c 100644 --- a/requirements27.txt +++ b/requirements27.txt @@ -4,5 +4,5 @@ enum-compat toml argparse algorithmia-api-client==1.5.1 -algorithmia-adk>=1.0.4,<1.1 +algorithmia-adk>=1.1,<1.2 numpy<2 diff --git a/setup.py b/setup.py index 728dee9..3730ce4 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ 'toml', 'argparse', 'algorithmia-api-client==1.5.1', - 'algorithmia-adk>=1.0.2,<1.1' + 'algorithmia-adk>=1.1,<1.2' ], include_package_data=True, classifiers=[