pssapi 0.4.0__tar.gz → 0.5.0__tar.gz

{pssapi-0.4.0 → pssapi-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pssapi
-Version: 0.4.0
+Version: 0.5.0
 Summary: Wrapper for the Pixel Starships API
 Home-page: https://github.com/PSS-Tools-Development/pssapi.py
 License: MIT

{pssapi-0.4.0 → pssapi-0.5.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "pssapi"
 description = "Wrapper for the Pixel Starships API"
-version = "0.4.0"
+version = "0.5.0"
 license = "MIT"
 authors = [
     "The worst. <theworstpss@gmail.com>",

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/__init__.py

@@ -11,4 +11,4 @@ __all__ = [
     PssApiClient.__name__,
 ]
 
-__version__ = "0.4.0"
+__version__ = "0.5.0"

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/client_base.py

@@ -121,6 +121,10 @@ class PssApiClientBase:
     def promotion_service(self) -> "_services.PromotionService":
         return self.__promotion_service
 
+    @property
+    def public_service(self) -> "_services.PublicService":
+        return self.__public_service
+
     @property
     def research_service(self) -> "_services.ResearchService":
         return self.__research_service
@@ -208,6 +212,7 @@ class PssApiClientBase:
         self.__message_service: _services.MessageService = _services.MessageService(self)
         self.__mission_service: _services.MissionService = _services.MissionService(self)
         self.__promotion_service: _services.PromotionService = _services.PromotionService(self)
+        self.__public_service: _services.PublicService = _services.PublicService(self)
         self.__research_service: _services.ResearchService = _services.ResearchService(self)
         self.__reward_service: _services.RewardService = _services.RewardService(self)
         self.__room_design_sprite_service: _services.RoomDesignSpriteService = _services.RoomDesignSpriteService(self)

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/core.py

@@ -1,4 +1,6 @@
+import base64 as _base64
 import json as _json
+import zlib as _zlib
 from datetime import datetime as _datetime
 from typing import Any as _Any
 from typing import Dict as _Dict
@@ -28,12 +30,19 @@ def create_request_content(structure: str, params: _Dict[str, _Any], content_typ
 
 
 async def get_entities_from_path(
-    entity_tags: _Iterable[_Tuple[_Type["_entities.EntityBase"], str, bool]], xml_parent_tag_name: str, production_server: str, path: str, method: str, request_content: str = None, **params
+    entity_tags: _Iterable[_Tuple[_Type["_entities.EntityBase"], str, bool]],
+    xml_parent_tag_name: str,
+    production_server: str,
+    path: str,
+    method: str,
+    request_content: str = None,
+    response_gzipped: bool = False,
+    **params,
 ):
-    raw_xml = await __get_data_from_path(production_server, path, method, content=request_content, **params)
+    raw_xml = await __get_data_from_path(production_server, path, method, content=request_content, response_gzipped=response_gzipped, **params)
 
     root = _ElementTree.fromstring(raw_xml)
-    if not root or root.tag.startswith("{http://www.w3.org/1999/xhtml}html"):
+    if root is None or root.tag is None or root.tag.startswith("{http://www.w3.org/1999/xhtml}html"):
         raise _utils.exceptions.PssApiError(f"A server error occured: {raw_xml}")
     if "errorMessage" in root.attrib:
         raise _utils.exceptions.PssApiError(root.attrib["errorMessage"])
@@ -78,14 +87,14 @@ def create_json_request_content(structure: str, params: _Dict[str, _Any]) -> str
     return _json.dumps(d)
 
 
-async def __get_data_from_path(production_server: str, path: str, method: str, content: str = None, **params) -> str:
+async def __get_data_from_path(production_server: str, path: str, method: str, content: str = None, response_gzipped: bool = False, **params) -> str:
     if path:
         path = path.strip("/")
     url = f"https://{production_server}/{path}"
-    return await __get_data_from_url(url, method, content, **params)
+    return await __get_data_from_url(url, method, content=content, response_gzipped=response_gzipped, **params)
 
 
-async def __get_data_from_url(url: str, method: str, content: str = None, **params) -> str:
+async def __get_data_from_url(url: str, method: str, content: str = None, response_gzipped: bool = False, **params) -> str:
     # filter parameters with a None value and format datetime
     filtered_params = {}
     for key, value in params.items():
@@ -100,12 +109,21 @@ async def __get_data_from_url(url: str, method: str, content: str = None, **para
     async with _aiohttp.ClientSession() as session:
         if method == "GET":
             async with session.get(url, params=filtered_params) as response:
-                data = await response.text(encoding="utf-8")
+                response_data = await response.read()
         elif method == "POST":
-            data = content.encode("utf-8") if content else None
-            async with session.post(url, data=data, params=filtered_params) as response:
-                data = await response.text(encoding="utf-8")
-    return data
+            request_data = content.encode("utf-8") if content else None
+            async with session.post(url, data=request_data, params=filtered_params) as response:
+                response_data = await response.read()
+
+    if response_gzipped:
+        try:
+            base64_decoded_data = _base64.b64decode(response_data)
+            response_data = _zlib.decompress(base64_decoded_data, _zlib.MAX_WBITS | 32)
+        except Exception:
+            pass  # If the data can't be base64-decoded or unzipped, then the endpoint returned an error message in plain xml instead.
+
+    decoded_data = response_data.decode("utf-8")
+    return decoded_data
 
 
 def __get_raw_entity_xml(node: _ElementTree.Element) -> dict[str, str]:

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/alliance.py

@@ -1,6 +1,4 @@
-from .. import enums as _enums
 from ..types import EntityInfo as _EntityInfo
-from ..utils import parse as _parse
 from .entity_base import EntityWithIdBase as _EntityWithIdBase
 from .raw import AllianceRaw as _AllianceRaw
 

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/collection_design.py

@@ -23,7 +23,7 @@ class CollectionDesign(_CollectionDesignRaw, _EntityWithIdBase):
     @property
     def enhancement_type_enum(self) -> "_enums.EnhancementType":
         return self._enhancement_type_enum
-    
+
     @property
     def flags_enum(self) -> "_enums.CollectionDesignFlag":
         return self._flags_enum

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/raw/achievement_design_raw.py

@@ -7,31 +7,33 @@ from typing import Dict as _Dict
 
 from ...types import EntityInfo as _EntityInfo
 from ...utils import parse as _parse
+from .entity_base_raw import EntityBaseRaw as _EntityBaseRaw
 
 
-class AchievementDesignRaw:
+class AchievementDesignRaw(_EntityBaseRaw):
     XML_NODE_NAME: str = "AchievementDesign"
 
     def __init__(self, achievement_design_info: _EntityInfo) -> None:
         self._dict: _Dict[str, _Any] = {}
-        self._achievement_description: str = _parse.pss_str(achievement_design_info.get("AchievementDescription"))
-        self._achievement_design_id: int = _parse.pss_int(achievement_design_info.get("AchievementDesignId"))
-        self._achievement_goal: int = _parse.pss_int(achievement_design_info.get("AchievementGoal"))
-        self._achievement_key: str = _parse.pss_str(achievement_design_info.get("AchievementKey"))
-        self._achievement_reward: int = _parse.pss_int(achievement_design_info.get("AchievementReward"))
-        self._achievement_title: str = _parse.pss_str(achievement_design_info.get("AchievementTitle"))
-        self._achievement_type: str = _parse.pss_str(achievement_design_info.get("AchievementType"))
-        self._duration_type: str = _parse.pss_str(achievement_design_info.get("DurationType"))
-        self._gas_reward: int = _parse.pss_int(achievement_design_info.get("GasReward"))
-        self._guide_argument: int = _parse.pss_int(achievement_design_info.get("GuideArgument"))
-        self._guide_type: str = _parse.pss_str(achievement_design_info.get("GuideType"))
-        self._is_hidden: bool = _parse.pss_bool(achievement_design_info.get("IsHidden"))
-        self._mineral_reward: int = _parse.pss_int(achievement_design_info.get("MineralReward"))
-        self._order_index: int = _parse.pss_int(achievement_design_info.get("OrderIndex"))
-        self._parent_achievement_design_id: int = _parse.pss_int(achievement_design_info.get("ParentAchievementDesignId"))
-        self._reward_string: str = _parse.pss_str(achievement_design_info.get("RewardString"))
-        self._root_achievement_design_id: int = _parse.pss_int(achievement_design_info.get("RootAchievementDesignId"))
-        self._sprite_id: int = _parse.pss_int(achievement_design_info.get("SpriteId"))
+        self._achievement_description: str = _parse.pss_str(achievement_design_info.pop("AchievementDescription", None))
+        self._achievement_design_id: int = _parse.pss_int(achievement_design_info.pop("AchievementDesignId", None))
+        self._achievement_goal: int = _parse.pss_int(achievement_design_info.pop("AchievementGoal", None))
+        self._achievement_key: str = _parse.pss_str(achievement_design_info.pop("AchievementKey", None))
+        self._achievement_reward: int = _parse.pss_int(achievement_design_info.pop("AchievementReward", None))
+        self._achievement_title: str = _parse.pss_str(achievement_design_info.pop("AchievementTitle", None))
+        self._achievement_type: str = _parse.pss_str(achievement_design_info.pop("AchievementType", None))
+        self._duration_type: str = _parse.pss_str(achievement_design_info.pop("DurationType", None))
+        self._gas_reward: int = _parse.pss_int(achievement_design_info.pop("GasReward", None))
+        self._guide_argument: int = _parse.pss_int(achievement_design_info.pop("GuideArgument", None))
+        self._guide_type: str = _parse.pss_str(achievement_design_info.pop("GuideType", None))
+        self._is_hidden: bool = _parse.pss_bool(achievement_design_info.pop("IsHidden", None))
+        self._mineral_reward: int = _parse.pss_int(achievement_design_info.pop("MineralReward", None))
+        self._order_index: int = _parse.pss_int(achievement_design_info.pop("OrderIndex", None))
+        self._parent_achievement_design_id: int = _parse.pss_int(achievement_design_info.pop("ParentAchievementDesignId", None))
+        self._reward_string: str = _parse.pss_str(achievement_design_info.pop("RewardString", None))
+        self._root_achievement_design_id: int = _parse.pss_int(achievement_design_info.pop("RootAchievementDesignId", None))
+        self._sprite_id: int = _parse.pss_int(achievement_design_info.pop("SpriteId", None))
+        super().__init__(achievement_design_info)
 
     @property
     def achievement_description(self) -> str:
@@ -149,5 +151,6 @@ class AchievementDesignRaw:
                 "RootAchievementDesignId": self.root_achievement_design_id,
                 "SpriteId": self.sprite_id,
             }
+            self._dict.update(super().__dict__())
 
         return self._dict

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/raw/action_type_raw.py

@@ -7,28 +7,31 @@ from typing import Dict as _Dict
 
 from ...types import EntityInfo as _EntityInfo
 from ...utils import parse as _parse
+from .entity_base_raw import EntityBaseRaw as _EntityBaseRaw
 
 
-class ActionTypeRaw:
+class ActionTypeRaw(_EntityBaseRaw):
     XML_NODE_NAME: str = "ActionType"
 
     def __init__(self, action_type_info: _EntityInfo) -> None:
         self._dict: _Dict[str, _Any] = {}
-        self._action_type_category: str = _parse.pss_str(action_type_info.get("ActionTypeCategory"))
-        self._action_type_description: str = _parse.pss_str(action_type_info.get("ActionTypeDescription"))
-        self._action_type_id: int = _parse.pss_int(action_type_info.get("ActionTypeId"))
-        self._action_type_key: str = _parse.pss_str(action_type_info.get("ActionTypeKey"))
-        self._action_type_name: str = _parse.pss_str(action_type_info.get("ActionTypeName"))
-        self._action_type_parameter_relativity: str = _parse.pss_str(action_type_info.get("ActionTypeParameterRelativity"))
-        self._action_type_parameter_value: int = _parse.pss_int(action_type_info.get("ActionTypeParameterValue"))
-        self._color_string: str = _parse.pss_str(action_type_info.get("ColorString"))
-        self._condition_type_category: str = _parse.pss_str(action_type_info.get("ConditionTypeCategory"))
-        self._condition_type_parameter: str = _parse.pss_str(action_type_info.get("ConditionTypeParameter"))
-        self._image_sprite_id: int = _parse.pss_int(action_type_info.get("ImageSpriteId"))
-        self._order_index: int = _parse.pss_int(action_type_info.get("OrderIndex"))
-        self._required_research_design_id: int = _parse.pss_int(action_type_info.get("RequiredResearchDesignId"))
-        self._room_category_type: str = _parse.pss_str(action_type_info.get("RoomCategoryType"))
-        self._room_type: str = _parse.pss_str(action_type_info.get("RoomType"))
+        self._action_type_category: str = _parse.pss_str(action_type_info.pop("ActionTypeCategory", None))
+        self._action_type_description: str = _parse.pss_str(action_type_info.pop("ActionTypeDescription", None))
+        self._action_type_id: int = _parse.pss_int(action_type_info.pop("ActionTypeId", None))
+        self._action_type_key: str = _parse.pss_str(action_type_info.pop("ActionTypeKey", None))
+        self._action_type_name: str = _parse.pss_str(action_type_info.pop("ActionTypeName", None))
+        self._action_type_parameter_relativity: str = _parse.pss_str(action_type_info.pop("ActionTypeParameterRelativity", None))
+        self._action_type_parameter_value: int = _parse.pss_int(action_type_info.pop("ActionTypeParameterValue", None))
+        self._color_string: str = _parse.pss_str(action_type_info.pop("ColorString", None))
+        self._condition_parameter_argument: int = _parse.pss_int(action_type_info.pop("ConditionParameterArgument", None))
+        self._condition_type_category: str = _parse.pss_str(action_type_info.pop("ConditionTypeCategory", None))
+        self._condition_type_parameter: str = _parse.pss_str(action_type_info.pop("ConditionTypeParameter", None))
+        self._image_sprite_id: int = _parse.pss_int(action_type_info.pop("ImageSpriteId", None))
+        self._order_index: int = _parse.pss_int(action_type_info.pop("OrderIndex", None))
+        self._required_research_design_id: int = _parse.pss_int(action_type_info.pop("RequiredResearchDesignId", None))
+        self._room_category_type: str = _parse.pss_str(action_type_info.pop("RoomCategoryType", None))
+        self._room_type: str = _parse.pss_str(action_type_info.pop("RoomType", None))
+        super().__init__(action_type_info)
 
     @property
     def action_type_category(self) -> str:
@@ -62,6 +65,10 @@ class ActionTypeRaw:
     def color_string(self) -> str:
         return self._color_string
 
+    @property
+    def condition_parameter_argument(self) -> int:
+        return self._condition_parameter_argument
+
     @property
     def condition_type_category(self) -> str:
         return self._condition_type_category
@@ -100,6 +107,7 @@ class ActionTypeRaw:
             self.action_type_parameter_relativity,
             self.action_type_parameter_value,
             self.color_string,
+            self.condition_parameter_argument,
             self.condition_type_category,
             self.condition_type_parameter,
             self.image_sprite_id,
@@ -120,6 +128,7 @@ class ActionTypeRaw:
                 "ActionTypeParameterRelativity": self.action_type_parameter_relativity,
                 "ActionTypeParameterValue": self.action_type_parameter_value,
                 "ColorString": self.color_string,
+                "ConditionParameterArgument": self.condition_parameter_argument,
                 "ConditionTypeCategory": self.condition_type_category,
                 "ConditionTypeParameter": self.condition_type_parameter,
                 "ImageSpriteId": self.image_sprite_id,
@@ -128,5 +137,6 @@ class ActionTypeRaw:
                 "RoomCategoryType": self.room_category_type,
                 "RoomType": self.room_type,
             }
+            self._dict.update(super().__dict__())
 
         return self._dict

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/raw/add_starbux_raw.py

@@ -7,14 +7,16 @@ from typing import Dict as _Dict
 
 from ...types import EntityInfo as _EntityInfo
 from ...utils import parse as _parse
+from .entity_base_raw import EntityBaseRaw as _EntityBaseRaw
 
 
-class AddStarbuxRaw:
+class AddStarbuxRaw(_EntityBaseRaw):
     XML_NODE_NAME: str = "AddStarbux"
 
     def __init__(self, add_starbux_info: _EntityInfo) -> None:
         self._dict: _Dict[str, _Any] = {}
-        self._error_message: str = _parse.pss_str(add_starbux_info.get("errorMessage"))
+        self._error_message: str = _parse.pss_str(add_starbux_info.pop("errorMessage", None))
+        super().__init__(add_starbux_info)
 
     @property
     def error_message(self) -> str:
@@ -28,5 +30,6 @@ class AddStarbuxRaw:
             self._dict = {
                 "errorMessage": self.error_message,
             }
+            self._dict.update(super().__dict__())
 
         return self._dict

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/raw/alliance_raw.py

@@ -8,33 +8,35 @@ from typing import Dict as _Dict
 
 from ...types import EntityInfo as _EntityInfo
 from ...utils import parse as _parse
+from .entity_base_raw import EntityBaseRaw as _EntityBaseRaw
 
 
-class AllianceRaw:
+class AllianceRaw(_EntityBaseRaw):
     XML_NODE_NAME: str = "Alliance"
 
     def __init__(self, alliance_info: _EntityInfo) -> None:
         self._dict: _Dict[str, _Any] = {}
-        self._alliance_country_code: str = _parse.pss_str(alliance_info.get("AllianceCountryCode"))
-        self._alliance_description: str = _parse.pss_str(alliance_info.get("AllianceDescription"))
-        self._alliance_id: int = _parse.pss_int(alliance_info.get("AllianceId"))
-        self._alliance_name: str = _parse.pss_str(alliance_info.get("AllianceName"))
-        self._alliance_ship_user_id: int = _parse.pss_int(alliance_info.get("AllianceShipUserId"))
-        self._alliance_sprite_id: int = _parse.pss_int(alliance_info.get("AllianceSpriteId"))
-        self._championship_score: int = _parse.pss_int(alliance_info.get("ChampionshipScore"))
-        self._channel_id: int = _parse.pss_int(alliance_info.get("ChannelId"))
-        self._credits: str = _parse.pss_str(alliance_info.get("Credits"))
-        self._division_design_id: int = _parse.pss_int(alliance_info.get("DivisionDesignId"))
-        self._enable_wars: bool = _parse.pss_bool(alliance_info.get("EnableWars"))
-        self._immunity_date: _datetime = _parse.pss_datetime(alliance_info.get("ImmunityDate"))
-        self._min_score_contribution: int = _parse.pss_int(alliance_info.get("MinScoreContribution"))
-        self._min_trophy_required: int = _parse.pss_int(alliance_info.get("MinTrophyRequired"))
-        self._number_of_approved_members: int = _parse.pss_int(alliance_info.get("NumberOfApprovedMembers"))
-        self._number_of_members: int = _parse.pss_int(alliance_info.get("NumberOfMembers"))
-        self._ranking: int = _parse.pss_int(alliance_info.get("Ranking"))
-        self._requires_approval: bool = _parse.pss_bool(alliance_info.get("RequiresApproval"))
-        self._score: int = _parse.pss_int(alliance_info.get("Score"))
-        self._trophy: int = _parse.pss_int(alliance_info.get("Trophy"))
+        self._alliance_country_code: str = _parse.pss_str(alliance_info.pop("AllianceCountryCode", None))
+        self._alliance_description: str = _parse.pss_str(alliance_info.pop("AllianceDescription", None))
+        self._alliance_id: int = _parse.pss_int(alliance_info.pop("AllianceId", None))
+        self._alliance_name: str = _parse.pss_str(alliance_info.pop("AllianceName", None))
+        self._alliance_ship_user_id: int = _parse.pss_int(alliance_info.pop("AllianceShipUserId", None))
+        self._alliance_sprite_id: int = _parse.pss_int(alliance_info.pop("AllianceSpriteId", None))
+        self._championship_score: int = _parse.pss_int(alliance_info.pop("ChampionshipScore", None))
+        self._channel_id: int = _parse.pss_int(alliance_info.pop("ChannelId", None))
+        self._credits: str = _parse.pss_str(alliance_info.pop("Credits", None))
+        self._division_design_id: int = _parse.pss_int(alliance_info.pop("DivisionDesignId", None))
+        self._enable_wars: bool = _parse.pss_bool(alliance_info.pop("EnableWars", None))
+        self._immunity_date: _datetime = _parse.pss_datetime(alliance_info.pop("ImmunityDate", None))
+        self._min_score_contribution: int = _parse.pss_int(alliance_info.pop("MinScoreContribution", None))
+        self._min_trophy_required: int = _parse.pss_int(alliance_info.pop("MinTrophyRequired", None))
+        self._number_of_approved_members: int = _parse.pss_int(alliance_info.pop("NumberOfApprovedMembers", None))
+        self._number_of_members: int = _parse.pss_int(alliance_info.pop("NumberOfMembers", None))
+        self._ranking: int = _parse.pss_int(alliance_info.pop("Ranking", None))
+        self._requires_approval: bool = _parse.pss_bool(alliance_info.pop("RequiresApproval", None))
+        self._score: int = _parse.pss_int(alliance_info.pop("Score", None))
+        self._trophy: int = _parse.pss_int(alliance_info.pop("Trophy", None))
+        super().__init__(alliance_info)
 
     @property
     def alliance_country_code(self) -> str:
@@ -164,5 +166,6 @@ class AllianceRaw:
                 "Score": self.score,
                 "Trophy": self.trophy,
             }
+            self._dict.update(super().__dict__())
 
         return self._dict

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/raw/animation_raw.py

@@ -7,18 +7,20 @@ from typing import Dict as _Dict
 
 from ...types import EntityInfo as _EntityInfo
 from ...utils import parse as _parse
+from .entity_base_raw import EntityBaseRaw as _EntityBaseRaw
 
 
-class AnimationRaw:
+class AnimationRaw(_EntityBaseRaw):
     XML_NODE_NAME: str = "Animation"
 
     def __init__(self, animation_info: _EntityInfo) -> None:
         self._dict: _Dict[str, _Any] = {}
-        self._animation_effect_type: str = _parse.pss_str(animation_info.get("AnimationEffectType"))
-        self._animation_id: int = _parse.pss_int(animation_info.get("AnimationId"))
-        self._animation_sprites: str = _parse.pss_str(animation_info.get("AnimationSprites"))
-        self._duration: int = _parse.pss_int(animation_info.get("Duration"))
-        self._key: str = _parse.pss_str(animation_info.get("Key"))
+        self._animation_effect_type: str = _parse.pss_str(animation_info.pop("AnimationEffectType", None))
+        self._animation_id: int = _parse.pss_int(animation_info.pop("AnimationId", None))
+        self._animation_sprites: str = _parse.pss_str(animation_info.pop("AnimationSprites", None))
+        self._duration: int = _parse.pss_int(animation_info.pop("Duration", None))
+        self._key: str = _parse.pss_str(animation_info.pop("Key", None))
+        super().__init__(animation_info)
 
     @property
     def animation_effect_type(self) -> str:
@@ -58,5 +60,6 @@ class AnimationRaw:
                 "Duration": self.duration,
                 "Key": self.key,
             }
+            self._dict.update(super().__dict__())
 
         return self._dict

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/raw/asset_raw.py

@@ -7,19 +7,21 @@ from typing import Dict as _Dict
 
 from ...types import EntityInfo as _EntityInfo
 from ...utils import parse as _parse
+from .entity_base_raw import EntityBaseRaw as _EntityBaseRaw
 
 
-class AssetRaw:
+class AssetRaw(_EntityBaseRaw):
     XML_NODE_NAME: str = "Asset"
 
     def __init__(self, asset_info: _EntityInfo) -> None:
         self._dict: _Dict[str, _Any] = {}
-        self._asset_design_name: str = _parse.pss_str(asset_info.get("AssetDesignName"))
-        self._asset_id: int = _parse.pss_int(asset_info.get("AssetId"))
-        self._asset_label: str = _parse.pss_str(asset_info.get("AssetLabel"))
-        self._asset_type: str = _parse.pss_str(asset_info.get("AssetType"))
-        self._download_type: str = _parse.pss_str(asset_info.get("DownloadType"))
-        self._file_id: int = _parse.pss_int(asset_info.get("FileId"))
+        self._asset_design_name: str = _parse.pss_str(asset_info.pop("AssetDesignName", None))
+        self._asset_id: int = _parse.pss_int(asset_info.pop("AssetId", None))
+        self._asset_label: str = _parse.pss_str(asset_info.pop("AssetLabel", None))
+        self._asset_type: str = _parse.pss_str(asset_info.pop("AssetType", None))
+        self._download_type: str = _parse.pss_str(asset_info.pop("DownloadType", None))
+        self._file_id: int = _parse.pss_int(asset_info.pop("FileId", None))
+        super().__init__(asset_info)
 
     @property
     def asset_design_name(self) -> str:
@@ -65,5 +67,6 @@ class AssetRaw:
                 "DownloadType": self.download_type,
                 "FileId": self.file_id,
             }
+            self._dict.update(super().__dict__())
 
         return self._dict

{pssapi-0.4.0 → pssapi-0.5.0}/src/pssapi/entities/raw/background_raw.py

@@ -7,35 +7,37 @@ from typing import Dict as _Dict
 
 from ...types import EntityInfo as _EntityInfo
 from ...utils import parse as _parse
+from .entity_base_raw import EntityBaseRaw as _EntityBaseRaw
 
 
-class BackgroundRaw:
+class BackgroundRaw(_EntityBaseRaw):
     XML_NODE_NAME: str = "Background"
 
     def __init__(self, background_info: _EntityInfo) -> None:
         self._dict: _Dict[str, _Any] = {}
-        self._background_effect_type: str = _parse.pss_str(background_info.get("BackgroundEffectType"))
-        self._background_id: int = _parse.pss_int(background_info.get("BackgroundId"))
-        self._background_sprite_id: int = _parse.pss_int(background_info.get("BackgroundSpriteId"))
-        self._background_type: str = _parse.pss_str(background_info.get("BackgroundType"))
-        self._close_object_sprite_id: str = _parse.pss_str(background_info.get("CloseObjectSpriteId"))
-        self._environment_float_argument: int = _parse.pss_int(background_info.get("EnvironmentFloatArgument"))
-        self._environment_int_argument: int = _parse.pss_int(background_info.get("EnvironmentIntArgument"))
-        self._environment_type: str = _parse.pss_str(background_info.get("EnvironmentType"))
-        self._far_object_sprite_id: str = _parse.pss_str(background_info.get("FarObjectSpriteId"))
-        self._hazard_argument: int = _parse.pss_int(background_info.get("HazardArgument"))
-        self._hazard_category: str = _parse.pss_str(background_info.get("HazardCategory"))
-        self._hazard_chance: int = _parse.pss_int(background_info.get("HazardChance"))
-        self._hazard_effect_sprite_id: int = _parse.pss_int(background_info.get("HazardEffectSpriteId"))
-        self._hazard_icon_sprite_id: int = _parse.pss_int(background_info.get("HazardIconSpriteId"))
-        self._hazard_type: str = _parse.pss_str(background_info.get("HazardType"))
-        self._is_active: bool = _parse.pss_bool(background_info.get("IsActive"))
-        self._max_hazard_interval: int = _parse.pss_int(background_info.get("MaxHazardInterval"))
-        self._medium_object_sprite_id: str = _parse.pss_str(background_info.get("MediumObjectSpriteId"))
-        self._min_hazard_interval: int = _parse.pss_int(background_info.get("MinHazardInterval"))
-        self._music_file_id: int = _parse.pss_int(background_info.get("MusicFileId"))
-        self._orbit_anchor_alignment: str = _parse.pss_str(background_info.get("OrbitAnchorAlignment"))
-        self._orbit_animation_id: int = _parse.pss_int(background_info.get("OrbitAnimationId"))
+        self._background_effect_type: str = _parse.pss_str(background_info.pop("BackgroundEffectType", None))
+        self._background_id: int = _parse.pss_int(background_info.pop("BackgroundId", None))
+        self._background_sprite_id: int = _parse.pss_int(background_info.pop("BackgroundSpriteId", None))
+        self._background_type: str = _parse.pss_str(background_info.pop("BackgroundType", None))
+        self._close_object_sprite_id: str = _parse.pss_str(background_info.pop("CloseObjectSpriteId", None))
+        self._environment_float_argument: int = _parse.pss_int(background_info.pop("EnvironmentFloatArgument", None))
+        self._environment_int_argument: int = _parse.pss_int(background_info.pop("EnvironmentIntArgument", None))
+        self._environment_type: str = _parse.pss_str(background_info.pop("EnvironmentType", None))
+        self._far_object_sprite_id: str = _parse.pss_str(background_info.pop("FarObjectSpriteId", None))
+        self._hazard_argument: int = _parse.pss_int(background_info.pop("HazardArgument", None))
+        self._hazard_category: str = _parse.pss_str(background_info.pop("HazardCategory", None))
+        self._hazard_chance: int = _parse.pss_int(background_info.pop("HazardChance", None))
+        self._hazard_effect_sprite_id: int = _parse.pss_int(background_info.pop("HazardEffectSpriteId", None))
+        self._hazard_icon_sprite_id: int = _parse.pss_int(background_info.pop("HazardIconSpriteId", None))
+        self._hazard_type: str = _parse.pss_str(background_info.pop("HazardType", None))
+        self._is_active: bool = _parse.pss_bool(background_info.pop("IsActive", None))
+        self._max_hazard_interval: int = _parse.pss_int(background_info.pop("MaxHazardInterval", None))
+        self._medium_object_sprite_id: str = _parse.pss_str(background_info.pop("MediumObjectSpriteId", None))
+        self._min_hazard_interval: int = _parse.pss_int(background_info.pop("MinHazardInterval", None))
+        self._music_file_id: int = _parse.pss_int(background_info.pop("MusicFileId", None))
+        self._orbit_anchor_alignment: str = _parse.pss_str(background_info.pop("OrbitAnchorAlignment", None))
+        self._orbit_animation_id: int = _parse.pss_int(background_info.pop("OrbitAnimationId", None))
+        super().__init__(background_info)
 
     @property
     def background_effect_type(self) -> str:
@@ -177,5 +179,6 @@ class BackgroundRaw:
                 "OrbitAnchorAlignment": self.orbit_anchor_alignment,
                 "OrbitAnimationId": self.orbit_animation_id,
             }
+            self._dict.update(super().__dict__())
 
         return self._dict