Skip to content

Add unknown kwargs in SCIM / Audit Logs clients #944

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
seratch merged 1 commit into from
Feb 4, 2021
Merged

Add unknown kwargs in SCIM / Audit Logs clients #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 46 additions & 2 deletions slack_sdk/audit_logs/v1/logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class User:
name: Optional[str]
email: Optional[str]
team: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -14,27 +15,37 @@ def __init__(
name: Optional[str] = None,
email: Optional[str] = None,
team: Optional[str] = None,
**kwargs,
) -> None:
self.id = id
self.name = name
self.email = email
self.team = team
self.unknown_fields = kwargs


class Actor:
type: Optional[str]
user: Optional[User]
unknown_fields: Dict[str, Any]

def __init__(self, type: Optional[str] = None, user: Optional[User] = None) -> None:
def __init__(
self,
type: Optional[str] = None,
user: Optional[User] = None,
**kwargs,
) -> None:
self.type = type
self.user = User(**user) if isinstance(user, dict) else user
self.unknown_fields = kwargs


class Location:
type: Optional[str]
id: Optional[str]
name: Optional[str]
domain: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -43,18 +54,21 @@ def __init__(
id: Optional[str] = None,
name: Optional[str] = None,
domain: Optional[str] = None,
**kwargs,
) -> None:
self.type = type
self.id = id
self.name = name
self.domain = domain
self.unknown_fields = kwargs


class Context:
location: Optional[Location]
ua: Optional[str]
ip_address: Optional[str]
session_id: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -63,11 +77,13 @@ def __init__(
ua: Optional[str] = None,
ip_address: Optional[str] = None,
session_id: Optional[str] = None,
**kwargs,
) -> None:
self.location = Location(**location) if isinstance(location, dict) else location
self.ua = ua
self.ip_address = ip_address
self.session_id = session_id
self.unknown_fields = kwargs


class Details:
Expand Down Expand Up @@ -96,6 +112,7 @@ class Details:
app_previously_resolved: Optional[bool]
admin_app_id: Optional[str]
bot_id: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand Down Expand Up @@ -125,6 +142,7 @@ def __init__(
app_previously_resolved: Optional[bool] = None,
admin_app_id: Optional[str] = None,
bot_id: Optional[str] = None,
**kwargs,
) -> None:
self.name = name
self.new_value = new_value
Expand All @@ -151,6 +169,7 @@ def __init__(
self.app_previously_resolved = app_previously_resolved
self.admin_app_id = admin_app_id
self.bot_id = bot_id
self.unknown_fields = kwargs


class App:
Expand All @@ -160,6 +179,7 @@ class App:
is_directory_approved: Optional[bool]
is_workflow_app: Optional[bool]
scopes: Optional[List[str]]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -170,13 +190,15 @@ def __init__(
is_directory_approved: Optional[bool] = None,
is_workflow_app: Optional[bool] = None,
scopes: Optional[List[str]] = None,
**kwargs,
) -> None:
self.id = id
self.name = name
self.is_distributed = is_distributed
self.is_directory_approved = is_directory_approved
self.is_workflow_app = is_workflow_app
self.scopes = scopes
self.unknown_fields = kwargs


class Channel:
Expand All @@ -187,6 +209,7 @@ class Channel:
is_org_shared: Optional[bool]
teams_shared_with: Optional[List[str]]
original_connected_channel_id: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -198,6 +221,7 @@ def __init__(
is_org_shared: Optional[bool] = None,
teams_shared_with: Optional[List[str]] = None,
original_connected_channel_id: Optional[str] = None,
**kwargs,
) -> None:
self.id = id
self.privacy = privacy
Expand All @@ -206,13 +230,15 @@ def __init__(
self.is_org_shared = is_org_shared
self.teams_shared_with = teams_shared_with
self.original_connected_channel_id = original_connected_channel_id
self.unknown_fields = kwargs


class File:
id: Optional[str]
name: Optional[str]
filetype: Optional[str]
title: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -221,11 +247,13 @@ def __init__(
name: Optional[str] = None,
filetype: Optional[str] = None,
title: Optional[str] = None,
**kwargs,
) -> None:
self.id = id
self.name = name
self.filetype = filetype
self.title = title
self.unknown_fields = kwargs


class Entity:
Expand All @@ -236,6 +264,7 @@ class Entity:
channel: Optional[Channel]
file: Optional[File]
app: Optional[App]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -247,6 +276,7 @@ def __init__(
channel: Optional[Union[Channel, dict]] = None,
file: Optional[Union[File, dict]] = None,
app: Optional[Union[App, dict]] = None,
**kwargs,
) -> None:
self.type = type
self.user = User(**user) if isinstance(user, dict) else user
Expand All @@ -259,6 +289,7 @@ def __init__(
self.channel = Channel(**channel) if isinstance(channel, dict) else channel
self.file = File(**file) if isinstance(file, dict) else file
self.app = App(**app) if isinstance(app, dict) else app
self.unknown_fields = kwargs


class Entry:
Expand All @@ -269,6 +300,7 @@ class Entry:
entity: Optional[Entity]
context: Optional[Context]
details: Optional[Details]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -280,6 +312,7 @@ def __init__(
entity: Optional[Entity] = None,
context: Optional[Context] = None,
details: Optional[Details] = None,
**kwargs,
) -> None:
self.id = id
self.date_create = date_create
Expand All @@ -288,13 +321,21 @@ def __init__(
self.entity = Entity(**entity) if isinstance(entity, dict) else entity
self.context = Context(**context) if isinstance(context, dict) else context
self.details = Details(**details) if isinstance(details, dict) else details
self.unknown_fields = kwargs


class ResponseMetadata:
next_cursor: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(self, *, next_cursor: Optional[str] = None) -> None:
def __init__(
self,
*,
next_cursor: Optional[str] = None,
**kwargs,
) -> None:
self.next_cursor = next_cursor
self.unknown_fields = kwargs


class LogsResponse:
Expand All @@ -304,6 +345,7 @@ class LogsResponse:
error: Optional[str]
needed: Optional[str]
provided: Optional[str]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -314,6 +356,7 @@ def __init__(
error: Optional[str] = None,
needed: Optional[str] = None,
provided: Optional[str] = None,
**kwargs,
) -> None:
self.entries = [Entry(**e) if isinstance(e, dict) else e for e in entries]
self.response_metadata = (
Expand All @@ -325,3 +368,4 @@ def __init__(
self.error = error
self.needed = needed
self.provided = provided
self.unknown_fields = kwargs
11 changes: 10 additions & 1 deletion slack_sdk/scim/v1/group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Optional, List, Union
from typing import Optional, List, Union, Dict, Any

from .default_arg import DefaultArg, NotGiven
from .internal_utils import _to_dict_without_not_given, _is_iterable
Expand All @@ -7,15 +7,18 @@
class GroupMember:
display: Union[Optional[str], DefaultArg]
value: Union[Optional[str], DefaultArg]
unknown_fields: Dict[str, Any]

def __init__(
self,
*,
display: Union[Optional[str], DefaultArg] = NotGiven,
value: Union[Optional[str], DefaultArg] = NotGiven,
**kwargs,
) -> None:
self.display = display
self.value = value
self.unknown_fields = kwargs

def to_dict(self):
return _to_dict_without_not_given(self)
Expand All @@ -24,15 +27,18 @@ def to_dict(self):
class GroupMeta:
created: Union[Optional[str], DefaultArg]
location: Union[Optional[str], DefaultArg]
unknown_fields: Dict[str, Any]

def __init__(
self,
*,
created: Union[Optional[str], DefaultArg] = NotGiven,
location: Union[Optional[str], DefaultArg] = NotGiven,
**kwargs,
) -> None:
self.created = created
self.location = location
self.unknown_fields = kwargs

def to_dict(self):
return _to_dict_without_not_given(self)
Expand All @@ -44,6 +50,7 @@ class Group:
members: Union[Optional[List[GroupMember]], DefaultArg]
meta: Union[Optional[GroupMeta], DefaultArg]
schemas: Union[Optional[List[str]], DefaultArg]
unknown_fields: Dict[str, Any]

def __init__(
self,
Expand All @@ -53,6 +60,7 @@ def __init__(
members: Union[Optional[List[GroupMember]], DefaultArg] = NotGiven,
meta: Union[Optional[GroupMeta], DefaultArg] = NotGiven,
schemas: Union[Optional[List[str]], DefaultArg] = NotGiven,
**kwargs,
) -> None:
self.display_name = display_name
self.id = id
Expand All @@ -65,6 +73,7 @@ def __init__(
GroupMeta(**meta) if meta is not None and isinstance(meta, dict) else meta
)
self.schemas = schemas
self.unknown_fields = kwargs

def to_dict(self):
return _to_dict_without_not_given(self)
Expand Down
2 changes: 1 addition & 1 deletion slack_sdk/scim/v1/internal_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def _to_dict_without_not_given(obj: Any) -> dict:
dict_value = {}
given_dict = obj if isinstance(obj, dict) else vars(obj)
for key, value in given_dict.items():
if key == "_additional_fields":
if key == "unknown_fields":
if value is not None:
converted = _to_dict_without_not_given(value)
dict_value.update(converted)
Expand Down
5 changes: 4 additions & 1 deletion slack_sdk/scim/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Optional, Union
from typing import Optional, Union, Dict, Any

from .default_arg import DefaultArg, NotGiven
from .internal_utils import _to_dict_without_not_given
Expand All @@ -8,17 +8,20 @@ class TypeAndValue:
primary: Union[Optional[bool], DefaultArg]
type: Union[Optional[str], DefaultArg]
value: Union[Optional[str], DefaultArg]
unknown_fields: Dict[str, Any]

def __init__(
self,
*,
primary: Union[Optional[bool], DefaultArg] = NotGiven,
type: Union[Optional[str], DefaultArg] = NotGiven,
value: Union[Optional[str], DefaultArg] = NotGiven,
**kwargs,
) -> None:
self.primary = primary
self.type = type
self.value = value
self.unknown_fields = kwargs

def to_dict(self) -> dict:
return _to_dict_without_not_given(self)
Loading