Refactor Client class to streamline token creation

Author: gabino

README.md

@@ -45,9 +45,8 @@ Before performing searches, you need to create an authentication token using the
 ```python
 from quienesquien import Client
 
-client = Client(os.environ['QEQ_USER'], os.environ['QEQ_CLIENT_ID'])
-
-auth_token = await client.create_token(os.environ['QEQ_SECRET_ID'])
+client = Client(os.environ['QEQ_USER'])
+auth_token = await client.create_token(os.environ['QEQ_CLIENT_ID'], os.environ['QEQ_SECRET_ID'])
 ```
 
 You can reuse this token in subsequent requests.
@@ -70,7 +69,6 @@ from quienesquien.exc import (
 # Create the client with the token
 client = Client(
     os.environ['QEQ_USER'],
-    os.environ['QEQ_CLIENT_ID'],
     auth_token,
 )
 

quienesquien/client.py

@@ -1,6 +1,6 @@
 import datetime as dt
 from dataclasses import dataclass, field
-from typing import Mapping
+from typing import Any, Mapping
 
 import httpx
 
@@ -20,7 +20,6 @@
 class Client:
     base_url = 'https://app.q-detect.com'
     username: str
-    client_id: str
     auth_token: str | None = None
     _client: httpx.AsyncClient = field(
         default_factory=httpx.AsyncClient, init=False
@@ -32,7 +31,7 @@ async def _make_request(
         url: str,
         *,
         headers: Mapping[str, str] | None = None,
-        params: Mapping[str, str | int | None] | None = None,
+        params: Mapping[str, Any] | None = None,
     ) -> httpx.Response:
         """Make an HTTP request using an async client."""
         response = await self._client.request(
@@ -41,19 +40,21 @@ async def _make_request(
         response.raise_for_status()
         return response
 
-    async def create_token(self, secret_key: str) -> str:
+    @classmethod
+    async def create_token(cls, client_id: str, secret_key: str) -> str:
         """Create a new authentication token."""
-
-        auth_url = f'{self.base_url}/api/token'
-        params = {'client_id': self.client_id}
+        auth_url = f'{cls.base_url}/api/token'
+        params = {'client_id': client_id}
         headers = {
             'Authorization': f'Bearer {secret_key}',
             'Accept-Encoding': 'identity',
         }
         try:
-            response = await self._make_request(
-                'GET', auth_url, headers=headers, params=params
-            )
+            async with httpx.AsyncClient() as client:
+                response = await client.request(
+                    'GET', auth_url, headers=headers, params=params
+                )
+                response.raise_for_status()
         except httpx.HTTPStatusError as exc:
             raise QuienEsQuienError(exc.response) from exc
         return response.text
@@ -91,37 +92,25 @@ async def search(
             self.auth_token
         ), 'you must create or reuse an already created auth token'
 
-        # Validate search criteria
-        by_name = full_name is not None
-        by_rfc = rfc is not None
-        by_curp = curp is not None
-
-        if not (by_name or by_rfc or by_curp):
+        if not (full_name or rfc or curp):
             raise InvalidSearchCriteriaError
 
         # Build base URL with required parameters
         search_url = f'{self.base_url}/api/find'
 
-        params: dict[str, str | int | None] = {
-            'client_id': self.client_id,
+        params = {
             'username': self.username,
             'percent': match_score,
+            'name': full_name,
+            'rfc': rfc,
+            'curp': curp,
+            'sex': gender.value if gender else None,
+            'birthday': birthday.strftime('%d/%m/%Y') if birthday else None,
+            'type': search_type.value if search_type is not None else None,
+            'list': ','.join(search_list) if search_list else None,
         }
 
-        if by_name:
-            params['name'] = full_name
-        if rfc:
-            params['rfc'] = rfc
-        if curp:
-            params['curp'] = curp
-        if gender:
-            params['sex'] = gender.value
-        if birthday:
-            params['birthday'] = birthday.strftime('%d/%m/%Y')
-        if search_type is not None:
-            params['type'] = search_type.value
-        if search_list:
-            params['list'] = ','.join(search_list)
+        params = {k: v for k, v in params.items() if v is not None}
 
         headers = {'Authorization': f'Bearer {self.auth_token}'}
 

quienesquien/version.py

@@ -1 +1 @@
-__version__ = '1.0.1.dev4'
+__version__ = '1.0.1'

tests/cassettes/test_block_account.yaml

@@ -15,7 +15,7 @@ interactions:
       user-agent:
       - python-httpx/0.28.1
     method: GET
-    uri: https://app.q-detect.com/api/find?client_id=DUMMY_CLIENT_ID&name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
+    uri: https://app.q-detect.com/api/find?name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
   response:
     body:
       string: "{\"success\":false,\"status\":\"El token proporcionado para realizar

tests/cassettes/test_create_token.yaml

@@ -60,7 +60,7 @@ interactions:
       user-agent:
       - python-httpx/0.28.1
     method: GET
-    uri: https://app.q-detect.com/api/find?client_id=DUMMY_CLIENT_ID&name=Andres+Manuel+Lopez+Obrador&percent=80&username=DUMMY_USERNAME
+    uri: https://app.q-detect.com/api/find?name=Andres+Manuel+Lopez+Obrador&percent=80&username=DUMMY_USERNAME
   response:
     body:
       string: '{"success":true,"data":[{"NOMBRECOMP":"Andres Manuel L\u00f3pez Obrador","CURP":"LOOA531113HTCPBN07","RFC":"LOOA531113F15","ID_PERSONA":"QEQ0281252","NOMBRE":"Andres

tests/cassettes/test_insufficient_balance.yaml

@@ -15,7 +15,7 @@ interactions:
       user-agent:
       - python-httpx/0.28.1
     method: GET
-    uri: https://app.q-detect.com/api/find?client_id=DUMMY_CLIENT_ID&name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
+    uri: https://app.q-detect.com/api/find?name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
   response:
     body:
       string: "{\"success\":false,\"status\":\"No se puede realizar la b\xFAsqueda,

tests/cassettes/test_internal_server_error.yaml

@@ -15,7 +15,7 @@ interactions:
       user-agent:
       - python-httpx/0.28.1
     method: GET
-    uri: https://app.q-detect.com/api/find?client_id=DUMMY_CLIENT_ID&name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
+    uri: https://app.q-detect.com/api/find?name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
   response:
     body:
       string: '{"success":false,"status":"Internal server error"}'

tests/cassettes/test_invalid_plan.yaml

@@ -15,7 +15,7 @@ interactions:
       user-agent:
       - python-httpx/0.28.1
     method: GET
-    uri: https://app.q-detect.com/api/find?client_id=DUMMY_CLIENT_ID&name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
+    uri: https://app.q-detect.com/api/find?name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
   response:
     body:
       string: '{"success":false,"status":"Tu plan de consultas ha expirado, por favor

tests/cassettes/test_invalid_token.yaml

@@ -15,7 +15,7 @@ interactions:
       user-agent:
       - python-httpx/0.28.1
     method: GET
-    uri: https://app.q-detect.com/api/find?client_id=DUMMY_CLIENT_ID&name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
+    uri: https://app.q-detect.com/api/find?name=Pepito+Cuenca&percent=80&username=DUMMY_USERNAME
   response:
     body:
       string: '{"success":false,"status":"El token proporcionado para realizar esta

tests/cassettes/test_search_by_curp.yaml

@@ -15,7 +15,7 @@ interactions:
       user-agent:
       - python-httpx/0.28.1
     method: GET
-    uri: https://app.q-detect.com/api/find?birthday=13%2F11%2F1953&client_id=DUMMY_CLIENT_ID&curp=LOOA531113HTCPBN07&list=PPE%2CONU&percent=85&sex=M&type=0&username=DUMMY_USERNAME
+    uri: https://app.q-detect.com/api/find?birthday=13%2F11%2F1953&curp=LOOA531113HTCPBN07&list=PPE%2CONU&percent=85&sex=M&type=0&username=DUMMY_USERNAME
   response:
     body:
       string: '{"success":true,"data":[{"NOMBRECOMP":"Andres Manuel L\u00f3pez Obrador","CURP":"LOOA531113HTCPBN07","RFC":"LOOA531113F15","ID_PERSONA":"QEQ0281252","NOMBRE":"Andres