feat: choose client in RequestModel.request()

pyclasher/api/requests/abc.py

@@ -5,7 +5,8 @@
 from ..models import Paging
 from ...client import Client
 from ...utils.request_methods import RequestMethods
-from ...exceptions import NoClient, ClientIsNotRunning, RequestNotDone, MISSING
+from ...exceptions import (NoClient, ClientIsNotRunning, RequestNotDone,
+ MISSING, InvalidClientId)
 
 request_id = 0
 
@@ -90,11 +91,16 @@ def _get_data(self, item):
  else:
  return MISSING
 
- async def request(self):
+ async def request(self, client_id=None):
  """
  makes a request to the ClashOfClans API
  """
- self.client = Client.get_instance()
+ self.client = Client.get_instance(client_id)
+ if self.client is None:
+ raise NoClient
+ if self.client is MISSING:
+ raise InvalidClientId(f"Cannot find a client with the client_id "
+ f"{client_id}.")
 
  if not self.client.is_running:
  raise ClientIsNotRunning
@@ -118,6 +124,8 @@ async def request(self):
  raise req_error.value
 
  self.client.logger.debug(f"request {self._request_id} done")
+
+ self.client = None
  return self
 
  async def __aenter__(self):

pyclasher/api/requests/abc.pyi

@@ -42,7 +42,7 @@ class RequestModel(ABC):
  def _get_data(self, item) -> dict:
  ...
 
- async def request(self) -> RequestModel:
+ async def request(self, client_id: int | str = None) -> RequestModel:
  ...
 
  async def __aenter__(self):

pyclasher/client.py

@@ -205,7 +205,10 @@ def get_instance(cls, client_id=None):
  if len(clients):
  if client_id is None:
  return clients[0]
- return clients[client_id]
+ for client in clients:
+ if client.client_id == client_id:
+ return client
+ return MISSING
  return None
 
  @classmethod

pyclasher/exceptions.py

@@ -122,3 +122,7 @@ def __str__(self):
 class RequestTimeout(PyClasherException):
  def __str__(self):
  return "The request took to much time and was cancelled."
+
+
+class InvalidClientId(PyClasherException):
+ pass

pyclasher/exceptions.pyi

@@ -224,3 +224,7 @@ class InvalidSeasonFormat(Exception):
 class RequestTimeout(Exception):
  def __str__(self) -> str:
  ...
+
+
+class InvalidClientId(PyClasherException):
+ pass