ecapi-sdk 3.3.5__tar.gz → 3.3.8__tar.gz

{ecapi_sdk-3.3.5 → ecapi_sdk-3.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecapi-sdk
-Version: 3.3.5
+Version: 3.3.8
 Summary: ECAPI SDK for Python
 Author: EaseCation
 License: MIT

{ecapi_sdk-3.3.5 → ecapi_sdk-3.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ecapi-sdk"
-version = "3.3.5"
+version = "3.3.8"
 description = "ECAPI SDK for Python"
 readme = "README.md"
 requires-python = ">=3.9"

{ecapi_sdk-3.3.5 → ecapi_sdk-3.3.8}/src/ecapi_sdk/client.py

@@ -265,26 +265,53 @@ class _BaseApi:
         request_kwargs, query_kwargs = _extract_request_kwargs(kwargs)
         return self._http.request("GET", path, query=query, **request_kwargs, **query_kwargs)
 
-    def _post(self, path: str, body: Any = None, **kwargs: Any) -> Any:
+    def _post(
+        self,
+        path: str,
+        body: Any = None,
+        *,
+        query: Optional[QueryParams] = None,
+        **kwargs: Any,
+    ) -> Any:
         request_kwargs, query_kwargs = _extract_request_kwargs(kwargs)
-        return self._http.request("POST", path, body=body, **request_kwargs, **query_kwargs)
+        return self._http.request(
+            "POST", path, query=query, body=body, **request_kwargs, **query_kwargs
+        )
 
-    def _put(self, path: str, body: Any = None, **kwargs: Any) -> Any:
+    def _put(
+        self,
+        path: str,
+        body: Any = None,
+        *,
+        query: Optional[QueryParams] = None,
+        **kwargs: Any,
+    ) -> Any:
         request_kwargs, query_kwargs = _extract_request_kwargs(kwargs)
-        return self._http.request("PUT", path, body=body, **request_kwargs, **query_kwargs)
+        return self._http.request(
+            "PUT", path, query=query, body=body, **request_kwargs, **query_kwargs
+        )
 
-    def _patch(self, path: str, body: Any = None, **kwargs: Any) -> Any:
+    def _patch(
+        self,
+        path: str,
+        body: Any = None,
+        *,
+        query: Optional[QueryParams] = None,
+        **kwargs: Any,
+    ) -> Any:
         request_kwargs, query_kwargs = _extract_request_kwargs(kwargs)
-        return self._http.request("PATCH", path, body=body, **request_kwargs, **query_kwargs)
+        return self._http.request(
+            "PATCH", path, query=query, body=body, **request_kwargs, **query_kwargs
+        )
 
     def _delete(self, path: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
         request_kwargs, query_kwargs = _extract_request_kwargs(kwargs)
         return self._http.request("DELETE", path, query=query, **request_kwargs, **query_kwargs)
 
 class PIT2API(_BaseApi):
-    def get_draws(self, xuid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
-        """分页查询 PIT2 抽奖会话"""
-        return self._get(f"/pit2/players/{quote(str(xuid), safe='')}/gacha-draws", query, **kwargs)
+    def get_draws(self, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """分页查询全服 PIT2 抽奖会话"""
+        return self._get(f"/pit2/gacha-draws", query, **kwargs)
 
     def get_ender_chest(self, xuid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
         """查询 PIT2 末影箱与备份"""
@@ -298,21 +325,25 @@ class PIT2API(_BaseApi):
         """查询 PIT2 背包与备份"""
         return self._get(f"/pit2/players/{quote(str(xuid), safe='')}/inventory", query, **kwargs)
 
+    def get_item_locations_by_uuid(self, itemUuid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """分页查询 PIT2 唯一物品位置"""
+        return self._get(f"/pit2/items/{quote(str(itemUuid), safe='')}/locations", query, **kwargs)
+
     def get_mails(self, xuid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
         """分页查询 PIT2 邮箱"""
         return self._get(f"/pit2/players/{quote(str(xuid), safe='')}/mails", query, **kwargs)
 
-    def get_payments(self, xuid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
-        """分页查询 PIT2 支付记录"""
-        return self._get(f"/pit2/players/{quote(str(xuid), safe='')}/gacha-payments", query, **kwargs)
+    def get_payments(self, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """分页查询全服 PIT2 支付记录"""
+        return self._get(f"/pit2/gacha-payments", query, **kwargs)
 
     def get_player(self, xuid: str, **kwargs: Any) -> Any:
         """查询 PIT2 玩家资料"""
         return self._get(f"/pit2/players/{quote(str(xuid), safe='')}", None, **kwargs)
 
-    def get_season_exchanges(self, xuid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
-        """分页查询 PIT2 赛季兑换"""
-        return self._get(f"/pit2/players/{quote(str(xuid), safe='')}/gacha-season-exchanges", query, **kwargs)
+    def get_season_exchanges(self, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """分页查询全服 PIT2 赛季兑换"""
+        return self._get(f"/pit2/gacha-season-exchanges", query, **kwargs)
 
     def restore_ender_chest(self, xuid: str, payload: Mapping[str, Any], **kwargs: Any) -> Any:
         """恢复 PIT2 末影箱备份"""
@@ -322,6 +353,10 @@ class PIT2API(_BaseApi):
         """恢复 PIT2 背包备份"""
         return self._post(f"/pit2/players/{quote(str(xuid), safe='')}/inventory-restorations", payload, **kwargs)
 
+    def search_player_item_locations(self, xuid: str, payload: Mapping[str, Any], query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """分页搜索 PIT2 玩家精确物品位置"""
+        return self._post(f"/pit2/players/{quote(str(xuid), safe='')}/item-location-searches", payload, query=query, **kwargs)
+
     def send_mail(self, xuid: str, payload: Mapping[str, Any], **kwargs: Any) -> Any:
         """发送 PIT2 奖励邮件"""
         return self._post(f"/pit2/players/{quote(str(xuid), safe='')}/mails", payload, **kwargs)
@@ -735,6 +770,18 @@ class PlayerAPI(_BaseApi):
         """获取玩家基础数据"""
         return self._get(f"/players/{quote(str(ecid), safe='')}/data", None, **kwargs)
 
+    def get_farm_archive(self, ecid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """分页查询 EC 农场馆藏"""
+        return self._get(f"/players/{quote(str(ecid), safe='')}/farm/archive", query, **kwargs)
+
+    def get_farm_freshness_batches(self, ecid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """分页查询 EC 农场加工品新鲜度批次"""
+        return self._get(f"/players/{quote(str(ecid), safe='')}/farm/freshness-batches", query, **kwargs)
+
+    def get_farm_overview(self, ecid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
+        """查询 EC 农场 S1 完整总览"""
+        return self._get(f"/players/{quote(str(ecid), safe='')}/farm/overview", query, **kwargs)
+
     def get_farm_summary(self, ecid: str, query: Optional[QueryParams] = None, **kwargs: Any) -> Any:
         """查询 EC 农场摘要"""
         return self._get(f"/players/{quote(str(ecid), safe='')}/farm/summary", query, **kwargs)

{ecapi_sdk-3.3.5 → ecapi_sdk-3.3.8}/src/ecapi_sdk/client.pyi

@@ -10,6 +10,40 @@ Headers = Dict[str, str]
 AuthCredentials = Dict[str, str]
 AuthProvider = Callable[[], Union[Optional[AuthCredentials], Awaitable[Optional[AuthCredentials]]]]
 
+class PIT2APIGetDrawsQuery(TypedDict, total=False):
+    current: QueryValue
+    pageSize: QueryValue
+    startTime: QueryValue
+    endTime: QueryValue
+    xuid: QueryValue
+    status: QueryValue
+    drawType: QueryValue
+
+class PIT2APIGetPaymentsQuery(TypedDict, total=False):
+    current: QueryValue
+    pageSize: QueryValue
+    startTime: QueryValue
+    endTime: QueryValue
+    xuid: QueryValue
+    status: QueryValue
+    productId: QueryValue
+
+class PIT2APIGetSeasonExchangesQuery(TypedDict, total=False):
+    current: QueryValue
+    pageSize: QueryValue
+    startTime: QueryValue
+    endTime: QueryValue
+    xuid: QueryValue
+    status: QueryValue
+    seasonId: QueryValue
+    itemKey: QueryValue
+
+class PIT2APIGetItemLocationsByUuidQuery(TypedDict, total=False):
+    current: QueryValue
+    pageSize: QueryValue
+    startTime: QueryValue
+    endTime: QueryValue
+
 class PIT2APIUpdatePlayerBodyRequired(TypedDict):
     updates: Sequence[Any]
 
@@ -36,31 +70,6 @@ class PIT2APIRestoreEnderChestBodyRequired(TypedDict):
 class PIT2APIRestoreEnderChestBody(PIT2APIRestoreEnderChestBodyRequired, total=False):
     pass
 
-class PIT2APIGetDrawsQuery(TypedDict, total=False):
-    current: QueryValue
-    pageSize: QueryValue
-    startTime: QueryValue
-    endTime: QueryValue
-    status: QueryValue
-    drawType: QueryValue
-
-class PIT2APIGetPaymentsQuery(TypedDict, total=False):
-    current: QueryValue
-    pageSize: QueryValue
-    startTime: QueryValue
-    endTime: QueryValue
-    status: QueryValue
-    productId: QueryValue
-
-class PIT2APIGetSeasonExchangesQuery(TypedDict, total=False):
-    current: QueryValue
-    pageSize: QueryValue
-    startTime: QueryValue
-    endTime: QueryValue
-    status: QueryValue
-    seasonId: QueryValue
-    itemKey: QueryValue
-
 class PIT2APIGetInventoryQuery(TypedDict, total=False):
     current: QueryValue
     pageSize: QueryValue
@@ -81,6 +90,18 @@ class PIT2APIRestoreInventoryBodyRequired(TypedDict):
 class PIT2APIRestoreInventoryBody(PIT2APIRestoreInventoryBodyRequired, total=False):
     pass
 
+class PIT2APISearchPlayerItemLocationsQuery(TypedDict, total=False):
+    current: QueryValue
+    pageSize: QueryValue
+    startTime: QueryValue
+    endTime: QueryValue
+
+class PIT2APISearchPlayerItemLocationsBodyRequired(TypedDict):
+    serializedItemStack: str
+
+class PIT2APISearchPlayerItemLocationsBody(PIT2APISearchPlayerItemLocationsBodyRequired, total=False):
+    pass
+
 class PIT2APIGetMailsQuery(TypedDict, total=False):
     current: QueryValue
     pageSize: QueryValue
@@ -585,6 +606,26 @@ class PlayerAPISearchQueryRequired(TypedDict):
 class PlayerAPISearchQuery(PlayerAPISearchQueryRequired, total=False):
     pass
 
+class PlayerAPIGetFarmArchiveQuery(TypedDict, total=False):
+    current: QueryValue
+    pageSize: QueryValue
+    startTime: QueryValue
+    endTime: QueryValue
+    displayed: QueryValue
+    itemId: QueryValue
+
+class PlayerAPIGetFarmFreshnessBatchesQuery(TypedDict, total=False):
+    current: QueryValue
+    pageSize: QueryValue
+    startTime: QueryValue
+    endTime: QueryValue
+    itemId: QueryValue
+    includeConsumed: QueryValue
+    order: QueryValue
+
+class PlayerAPIGetFarmOverviewQuery(TypedDict, total=False):
+    recentLimit: QueryValue
+
 class PlayerAPIGetFarmSummaryQuery(TypedDict, total=False):
     recentSpendLimit: QueryValue
 
@@ -970,16 +1011,18 @@ class ECAPIError(Exception):
     def __init__(self, message: str, status: int, payload: Any, url: str) -> None: ...
 
 class PIT2API:
-    def get_draws(self, xuid: str, query: Optional[PIT2APIGetDrawsQuery] = ..., **kwargs: Any) -> Any: ...
+    def get_draws(self, query: Optional[PIT2APIGetDrawsQuery] = ..., **kwargs: Any) -> Any: ...
     def get_ender_chest(self, xuid: str, query: Optional[PIT2APIGetEnderChestQuery] = ..., **kwargs: Any) -> Any: ...
     def get_event_queue(self, **kwargs: Any) -> Any: ...
     def get_inventory(self, xuid: str, query: Optional[PIT2APIGetInventoryQuery] = ..., **kwargs: Any) -> Any: ...
+    def get_item_locations_by_uuid(self, itemUuid: str, query: Optional[PIT2APIGetItemLocationsByUuidQuery] = ..., **kwargs: Any) -> Any: ...
     def get_mails(self, xuid: str, query: Optional[PIT2APIGetMailsQuery] = ..., **kwargs: Any) -> Any: ...
-    def get_payments(self, xuid: str, query: Optional[PIT2APIGetPaymentsQuery] = ..., **kwargs: Any) -> Any: ...
+    def get_payments(self, query: Optional[PIT2APIGetPaymentsQuery] = ..., **kwargs: Any) -> Any: ...
     def get_player(self, xuid: str, **kwargs: Any) -> Any: ...
-    def get_season_exchanges(self, xuid: str, query: Optional[PIT2APIGetSeasonExchangesQuery] = ..., **kwargs: Any) -> Any: ...
+    def get_season_exchanges(self, query: Optional[PIT2APIGetSeasonExchangesQuery] = ..., **kwargs: Any) -> Any: ...
     def restore_ender_chest(self, xuid: str, payload: PIT2APIRestoreEnderChestBody, **kwargs: Any) -> Any: ...
     def restore_inventory(self, xuid: str, payload: PIT2APIRestoreInventoryBody, **kwargs: Any) -> Any: ...
+    def search_player_item_locations(self, xuid: str, payload: PIT2APISearchPlayerItemLocationsBody, query: Optional[PIT2APISearchPlayerItemLocationsQuery] = ..., **kwargs: Any) -> Any: ...
     def send_mail(self, xuid: str, payload: PIT2APISendMailBody, **kwargs: Any) -> Any: ...
     def update_ender_chest(self, xuid: str, payload: PIT2APIUpdateEnderChestBody, **kwargs: Any) -> Any: ...
     def update_inventory(self, xuid: str, payload: PIT2APIUpdateInventoryBody, **kwargs: Any) -> Any: ...
@@ -1136,6 +1179,9 @@ class PlayerAPI:
     status: PlayerStatusAPI
     year_summary: PlayerYearSummaryAPI
     def get_data(self, ecid: str, **kwargs: Any) -> Any: ...
+    def get_farm_archive(self, ecid: str, query: Optional[PlayerAPIGetFarmArchiveQuery] = ..., **kwargs: Any) -> Any: ...
+    def get_farm_freshness_batches(self, ecid: str, query: Optional[PlayerAPIGetFarmFreshnessBatchesQuery] = ..., **kwargs: Any) -> Any: ...
+    def get_farm_overview(self, ecid: str, query: Optional[PlayerAPIGetFarmOverviewQuery] = ..., **kwargs: Any) -> Any: ...
     def get_farm_summary(self, ecid: str, query: Optional[PlayerAPIGetFarmSummaryQuery] = ..., **kwargs: Any) -> Any: ...
     def get_friends(self, ecid: str, query: Optional[PlayerAPIGetFriendsQuery] = ..., **kwargs: Any) -> Any: ...
     def get_head_icon(self, ecid: str, query: Optional[PlayerAPIGetHeadIconQuery] = ..., **kwargs: Any) -> Any: ...

{ecapi_sdk-3.3.5 → ecapi_sdk-3.3.8}/src/ecapi_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecapi-sdk
-Version: 3.3.5
+Version: 3.3.8
 Summary: ECAPI SDK for Python
 Author: EaseCation
 License: MIT