diff --git a/README.md b/README.md index 9f25b37..15b6643 100644 --- a/README.md +++ b/README.md @@ -79,4 +79,4 @@ Apache License Version 2.0 - 1, V2.0.0-dev Provide only few functions of opensearch, not yet cover all functions. - 2, V2.0.0 completed all api functions. - 3, V2.0.1 add compatibility for python3. - +- 4, v2.0.2 fix data process url diff --git a/demo.py b/demo.py index 22be8f1..4188d31 100644 --- a/demo.py +++ b/demo.py @@ -67,7 +67,7 @@ def creat_data_process(client): } ] items = json.dumps(items) - data_ret = client.data.create(table_name, items) + data_ret = client.data.create('test_app', table_name, items) print(data_ret) ''' { @@ -238,8 +238,11 @@ def get_error_log(client): key_id = mykey.KEY['key_id'] client = Client(url, key, key_id) # list_app(client) - # creat_data_process(client) # create_app(client) + + # must create app before create data process + + # creat_data_process(client) # search(client) # suggest(client) # index_refactor(client) diff --git a/opensearchsdk/demo.py b/opensearchsdk/demo.py index 22be8f1..4188d31 100644 --- a/opensearchsdk/demo.py +++ b/opensearchsdk/demo.py @@ -67,7 +67,7 @@ def creat_data_process(client): } ] items = json.dumps(items) - data_ret = client.data.create(table_name, items) + data_ret = client.data.create('test_app', table_name, items) print(data_ret) ''' { @@ -238,8 +238,11 @@ def get_error_log(client): key_id = mykey.KEY['key_id'] client = Client(url, key, key_id) # list_app(client) - # creat_data_process(client) # create_app(client) + + # must create app before create data process + + # creat_data_process(client) # search(client) # suggest(client) # index_refactor(client) diff --git a/opensearchsdk/tests/v2/test_data.py b/opensearchsdk/tests/v2/test_data.py index 4565d2e..86975ca 100644 --- a/opensearchsdk/tests/v2/test_data.py +++ b/opensearchsdk/tests/v2/test_data.py @@ -16,6 +16,8 @@ def setUp(self): Manager.send_get = Manager.send_post = mock_send def test_list(self): - resp = self.data_manager.create('1', '2') + resp = self.data_manager.create('a', '1', '2') self.assertEqual(FAKE_RESP, resp) - Manager.send_post.assert_called_with({'table_name': '1', 'items': '2'}) + Manager.send_post.assert_called_with({'table_name': '1', + 'items': '2'}, + '/a') diff --git a/opensearchsdk/v2/data.py b/opensearchsdk/v2/data.py index c345468..0f0f4d1 100644 --- a/opensearchsdk/v2/data.py +++ b/opensearchsdk/v2/data.py @@ -4,12 +4,14 @@ class DataManager(api_base.Manager): """Data Process resource manage class""" - def create(self, table_name, items): + def create(self, app_name, table_name, items): """ create data process to application + :param app_name: app name :param table_name: table name of upload items :param items: items in json format :return:{"status":"OK","request_id":"10373587"} """ body = dict(table_name=table_name, items=items) - return self.send_post(body) + spec_url = '/' + app_name + return self.send_post(body, spec_url) diff --git a/setup.py b/setup.py index f2a17a1..6294fbe 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name='ali-opensearch', - version='2.0.1', + version='2.0.2', packages=find_packages(), keywords=('OpenSearch SDK', 'Ali Cloud'), description='Python SDK for OpenSearch of Ali Cloud',