Skip to content

Commit 954f843

Browse files
committed
- Fixed File attribute empty issue. Assigned file parameter to form field.
- Fixed model enum issues. - Added fixes to api.yaml file.
1 parent ae0d6ab commit 954f843

16 files changed

+73
-108
lines changed

okta/api/themes_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ async def upload_brand_theme_logo(
15391539
_host_index=_host_index
15401540
)
15411541

1542-
form = {"file": file}
1542+
form = {}
15431543
keep_empty_params = False
15441544

15451545
request, error = await self._request_executor.create_request(

okta/models/application_feature.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from typing import Any, ClassVar, Dict, List, Optional, Union
3030
from okta.models.application_feature_links import ApplicationFeatureLinks
3131
from okta.models.application_feature_type import ApplicationFeatureType
32+
from okta.models.enabled_status import EnabledStatus
3233
from typing import Optional, Set
3334
from typing_extensions import Self
3435

@@ -43,7 +44,7 @@ class ApplicationFeature(BaseModel):
4344
""" # noqa: E501
4445
description: Optional[StrictStr] = Field(default=None, description="Description of the feature")
4546
name: Optional[ApplicationFeatureType] = None
46-
status: Optional[Any] = None
47+
status: Optional[EnabledStatus] = None
4748
links: Optional[ApplicationFeatureLinks] = Field(default=None, alias="_links")
4849
__properties: ClassVar[List[str]] = ["description", "name", "status", "_links"]
4950

@@ -104,13 +105,6 @@ def to_dict(self) -> Dict[str, Any]:
104105
exclude=excluded_fields,
105106
exclude_none=True,
106107
)
107-
# override the default output from pydantic by calling `to_dict()` of status
108-
if self.status:
109-
if not isinstance(self.status, dict):
110-
_dict['status'] = self.status.to_dict()
111-
else:
112-
_dict['status'] = self.status
113-
114108
# override the default output from pydantic by calling `to_dict()` of links
115109
if self.links:
116110
if not isinstance(self.links, dict):

okta/models/create_group_push_mapping_request.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
from pydantic import BaseModel, ConfigDict, Field, StrictStr
2828
from typing import Any, ClassVar, Dict, List, Optional
29+
from okta.models.app_config import AppConfig
2930
from okta.models.group_push_mapping_status_upsert import GroupPushMappingStatusUpsert
3031
from typing import Optional, Set
3132
from typing_extensions import Self
@@ -34,7 +35,7 @@ class CreateGroupPushMappingRequest(BaseModel):
3435
"""
3536
CreateGroupPushMappingRequest
3637
""" # noqa: E501
37-
app_config: Optional[Dict[str, Any]] = Field(default=None, alias="appConfig")
38+
app_config: Optional[AppConfig] = Field(default=None, alias="appConfig")
3839
source_group_id: StrictStr = Field(description="The ID of the source group for the group push mapping", alias="sourceGroupId")
3940
status: Optional[GroupPushMappingStatusUpsert] = GroupPushMappingStatusUpsert.ACTIVE
4041
target_group_id: Optional[StrictStr] = Field(default=None, description="The ID of the existing target group for the group push mapping. This is used to link to an existing group. Required if `targetGroupName` is not provided.", alias="targetGroupId")

okta/models/group_push_mapping.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from datetime import datetime
2828
from pydantic import BaseModel, ConfigDict, Field, StrictStr
2929
from typing import Any, ClassVar, Dict, List, Optional
30+
from okta.models.app_config import AppConfig
3031
from okta.models.group_push_mapping_links import GroupPushMappingLinks
3132
from typing import Optional, Set
3233
from typing_extensions import Self
@@ -35,7 +36,7 @@ class GroupPushMapping(BaseModel):
3536
"""
3637
GroupPushMapping
3738
""" # noqa: E501
38-
app_config: Optional[Dict[str, Any]] = Field(default=None, alias="appConfig")
39+
app_config: Optional[AppConfig] = Field(default=None, alias="appConfig")
3940
created: Optional[datetime] = Field(default=None, description="Timestamp when the group push mapping was created")
4041
error_summary: Optional[StrictStr] = Field(default=None, description="The error message summary if the latest push failed", alias="errorSummary")
4142
id: Optional[StrictStr] = Field(default=None, description="The ID of the group push mapping")

okta/models/inbound_provisioning_application_feature.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ def to_dict(self) -> Dict[str, Any]:
7979
exclude=excluded_fields,
8080
exclude_none=True,
8181
)
82-
# override the default output from pydantic by calling `to_dict()` of status
83-
if self.status:
84-
if not isinstance(self.status, dict):
85-
_dict['status'] = self.status.to_dict()
86-
else:
87-
_dict['status'] = self.status
88-
8982
# override the default output from pydantic by calling `to_dict()` of links
9083
if self.links:
9184
if not isinstance(self.links, dict):
@@ -114,7 +107,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
114107
_obj = cls.model_validate({
115108
"description": obj.get("description"),
116109
"name": obj.get("name"),
117-
"status": EnabledStatus.from_dict(obj["status"]) if obj.get("status") is not None else None,
110+
"status": obj.get("status"),
118111
"_links": ApplicationFeatureLinks.from_dict(obj["_links"]) if obj.get("_links") is not None else None,
119112
"capabilities": CapabilitiesInboundProvisioningObject.from_dict(obj["capabilities"]) if obj.get("capabilities") is not None else None
120113
})

okta/models/lifecycle_create_setting_object.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626

2727
from pydantic import BaseModel, ConfigDict
2828
from typing import Any, ClassVar, Dict, List, Optional
29+
from okta.models.enabled_status import EnabledStatus
2930
from typing import Optional, Set
3031
from typing_extensions import Self
3132

3233
class LifecycleCreateSettingObject(BaseModel):
3334
"""
3435
Determines whether to update a user in the app when a user in Okta is updated
3536
""" # noqa: E501
36-
status: Optional[Any] = None
37+
status: Optional[EnabledStatus] = None
3738
__properties: ClassVar[List[str]] = ["status"]
3839

3940
model_config = ConfigDict(
@@ -74,13 +75,6 @@ def to_dict(self) -> Dict[str, Any]:
7475
exclude=excluded_fields,
7576
exclude_none=True,
7677
)
77-
# override the default output from pydantic by calling `to_dict()` of status
78-
if self.status:
79-
if not isinstance(self.status, dict):
80-
_dict['status'] = self.status.to_dict()
81-
else:
82-
_dict['status'] = self.status
83-
8478
return _dict
8579

8680
@classmethod
@@ -93,7 +87,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
9387
return cls.model_validate(obj)
9488

9589
_obj = cls.model_validate({
96-
"status": EnabledStatus.from_dict(obj["status"]) if obj.get("status") is not None else None
90+
"status": obj.get("status")
9791
})
9892
return _obj
9993

okta/models/lifecycle_deactivate_setting_object.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626

2727
from pydantic import BaseModel, ConfigDict
2828
from typing import Any, ClassVar, Dict, List, Optional
29+
from okta.models.enabled_status import EnabledStatus
2930
from typing import Optional, Set
3031
from typing_extensions import Self
3132

3233
class LifecycleDeactivateSettingObject(BaseModel):
3334
"""
3435
Determines whether deprovisioning occurs when the app is unassigned
3536
""" # noqa: E501
36-
status: Optional[Any] = None
37+
status: Optional[EnabledStatus] = None
3738
__properties: ClassVar[List[str]] = ["status"]
3839

3940
model_config = ConfigDict(
@@ -74,13 +75,6 @@ def to_dict(self) -> Dict[str, Any]:
7475
exclude=excluded_fields,
7576
exclude_none=True,
7677
)
77-
# override the default output from pydantic by calling `to_dict()` of status
78-
if self.status:
79-
if not isinstance(self.status, dict):
80-
_dict['status'] = self.status.to_dict()
81-
else:
82-
_dict['status'] = self.status
83-
8478
return _dict
8579

8680
@classmethod
@@ -93,7 +87,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
9387
return cls.model_validate(obj)
9488

9589
_obj = cls.model_validate({
96-
"status": EnabledStatus.from_dict(obj["status"]) if obj.get("status") is not None else None
90+
"status": obj.get("status")
9791
})
9892
return _obj
9993

okta/models/list_subscriptions_role_role_ref_parameter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import pprint
2525
from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
2626
from typing import Any, List, Optional
27+
from okta.models.role_type import RoleType
2728
from pydantic import StrictStr, Field
2829
from typing import Union, List, Set, Optional, Dict
2930
from typing_extensions import Literal, Self
@@ -35,7 +36,7 @@ class ListSubscriptionsRoleRoleRefParameter(BaseModel):
3536
ListSubscriptionsRoleRoleRefParameter
3637
"""
3738
# data type: RoleType
38-
oneof_schema_1_validator: Optional[StrictStr] = None
39+
oneof_schema_1_validator: Optional[RoleType] = None
3940
# data type: str
4041
oneof_schema_2_validator: Optional[StrictStr] = None
4142
actual_instance: Optional[Union[RoleType, str]] = None

okta/models/password_setting_object.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from pydantic import BaseModel, ConfigDict
2828
from typing import Any, ClassVar, Dict, List, Optional
2929
from okta.models.change_enum import ChangeEnum
30+
from okta.models.enabled_status import EnabledStatus
3031
from okta.models.seed_enum import SeedEnum
3132
from typing import Optional, Set
3233
from typing_extensions import Self
@@ -37,7 +38,7 @@ class PasswordSettingObject(BaseModel):
3738
""" # noqa: E501
3839
change: Optional[ChangeEnum] = ChangeEnum.KEEP_EXISTING
3940
seed: Optional[SeedEnum] = SeedEnum.RANDOM
40-
status: Optional[Any] = None
41+
status: Optional[EnabledStatus] = None
4142
__properties: ClassVar[List[str]] = ["change", "seed", "status"]
4243

4344
model_config = ConfigDict(
@@ -78,13 +79,6 @@ def to_dict(self) -> Dict[str, Any]:
7879
exclude=excluded_fields,
7980
exclude_none=True,
8081
)
81-
# override the default output from pydantic by calling `to_dict()` of status
82-
if self.status:
83-
if not isinstance(self.status, dict):
84-
_dict['status'] = self.status.to_dict()
85-
else:
86-
_dict['status'] = self.status
87-
8882
return _dict
8983

9084
@classmethod
@@ -99,7 +93,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
9993
_obj = cls.model_validate({
10094
"change": obj.get("change"),
10195
"seed": obj.get("seed"),
102-
"status": EnabledStatus.from_dict(obj["status"]) if obj.get("status") is not None else None
96+
"status": obj.get("status")
10397
})
10498
return _obj
10599

okta/models/profile_mapping.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from pydantic import BaseModel, ConfigDict, Field, StrictStr
2828
from typing import Any, ClassVar, Dict, List, Optional
2929
from okta.models.links_self import LinksSelf
30+
from okta.models.profile_mapping_property import ProfileMappingProperty
3031
from okta.models.profile_mapping_source import ProfileMappingSource
3132
from okta.models.profile_mapping_target import ProfileMappingTarget
3233
from typing import Optional, Set
@@ -37,7 +38,7 @@ class ProfileMapping(BaseModel):
3738
The profile mapping object describes a mapping between an Okta user's and an app user's properties using [JSON Schema Draft 4](https://datatracker.ietf.org/doc/html/draft-zyp-json-schema-04). > **Note:** Same type source/target mappings aren't supported by this API. Profile mappings must be between Okta and an app.
3839
""" # noqa: E501
3940
id: Optional[StrictStr] = Field(default=None, description="Unique identifier for a profile mapping")
40-
properties: Optional[Dict[str, Any]] = None
41+
properties: Optional[Dict[str, ProfileMappingProperty]] = None
4142
source: Optional[ProfileMappingSource] = None
4243
target: Optional[ProfileMappingTarget] = None
4344
links: Optional[LinksSelf] = Field(default=None, alias="_links")
@@ -83,13 +84,13 @@ def to_dict(self) -> Dict[str, Any]:
8384
exclude=excluded_fields,
8485
exclude_none=True,
8586
)
86-
# override the default output from pydantic by calling `to_dict()` of properties
87+
# override the default output from pydantic by calling `to_dict()` of each value in properties (dict)
88+
_field_dict = {}
8789
if self.properties:
88-
if not isinstance(self.properties, dict):
89-
_dict['properties'] = self.properties.to_dict()
90-
else:
91-
_dict['properties'] = self.properties
92-
90+
for _key in self.properties:
91+
if self.properties[_key]:
92+
_field_dict[_key] = self.properties[_key].to_dict()
93+
_dict['properties'] = _field_dict
9394
# override the default output from pydantic by calling `to_dict()` of source
9495
if self.source:
9596
if not isinstance(self.source, dict):
@@ -124,7 +125,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
124125

125126
_obj = cls.model_validate({
126127
"id": obj.get("id"),
127-
"properties": obj.get("properties"),
128+
"properties": dict(
129+
(_k, ProfileMappingProperty.from_dict(_v))
130+
for _k, _v in obj["properties"].items()
131+
)
132+
if obj.get("properties") is not None
133+
else None,
128134
"source": ProfileMappingSource.from_dict(obj["source"]) if obj.get("source") is not None else None,
129135
"target": ProfileMappingTarget.from_dict(obj["target"]) if obj.get("target") is not None else None,
130136
"_links": LinksSelf.from_dict(obj["_links"]) if obj.get("_links") is not None else None

0 commit comments

Comments
 (0)