Skip to content

Model conversion #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 4, 2019
Merged

Model conversion #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baba44d
fix(model): remove _from_dict step in _convert_model
ehdsouza Aug 30, 2019
a7f10ac
chore(model): Add json loads when string
ehdsouza Aug 30, 2019
fbdf3d4
fix(classname): Classname is no longer needed param
ehdsouza Sep 3, 2019
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
8 changes: 3 additions & 5 deletions ibm_cloud_sdk_core/base_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,9 @@ def prepare_request(self, method, url, headers=None,


@staticmethod
def _convert_model(val, classname=None):
if classname is not None and not hasattr(val, "_from_dict"):
if isinstance(val, str):
val = json_import.loads(val)
val = classname._from_dict(dict(val))
def _convert_model(val):
if isinstance(val, str):
val = json_import.loads(val)
if hasattr(val, "_to_dict"):
return val._to_dict()
return val
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this method could be even simpler, since there is no longer any need for the classname parameter:

    def _convert_model(val):
        if isinstance(val, str):
            val = json_import.loads(val)
        if hasattr(val, "_to_dict"):
            return val._to_dict()
        return val

Expand Down
2 changes: 1 addition & 1 deletion test/test_base_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ def _from_dict(cls, _dict):
model1 = service._convert_model(mock)
assert model1 == {'x': 'foo'}

model2 = service._convert_model("{\"x\": \"foo\"}", MockModel)
model2 = service._convert_model("{\"x\": \"foo\"}")
assert model2 is not None
assert model2['x'] == 'foo'

Expand Down