pyEscoAPI 0.0.16__tar.gz → 0.0.18__tar.gz

{pyescoapi-0.0.16 → pyescoapi-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyEscoAPI
-Version: 0.0.16
+Version: 0.0.18
 Summary: Python client for Esco API (Esco bolsa)
 Author-email: Codetria <hola@codetria.com>
 License: MIT License

{pyescoapi-0.0.16 → pyescoapi-0.0.18}/pyEscoAPI/esco_api.py

@@ -42,10 +42,10 @@ class EscoAPI:
     client_id: str = ""
     version: APIVersion = APIVersion.VERSION_9
 
-    __token: str = ""
-    __expire_datetime: datetime
+    token: str = ""
+    expire_datetime: datetime
 
-    def __make_request(
+    def make_request(
             self,
             request_endpoint: str,
             request_method: HTTPMethod,
@@ -56,8 +56,8 @@ class EscoAPI:
         headers = {
             "api-version": str(self.version.value)
         }
-        if self.__token:
-            headers["Authorization"] = f"Bearer {self.__token}"
+        if self.token:
+            headers["Authorization"] = f"Bearer {self.token}"
         request_body = {key: value for key, value in request_body.items() if value is not None}
         params = {
             "url": f"{self.base_url}{request_endpoint}",
@@ -85,32 +85,32 @@ class EscoAPI:
             logger.error("EscoAPI: Failed response", extra={
                 "request_body": request_body,
                 "url": f"{self.base_url}{request_endpoint}",
-                "response_body": result.json(),
+                "response_body": str(result),
                 "status_code": result.status_code
             })
             raise PyEscoAPIError(endpoint=request_endpoint, status_code=result.status_code, error_message=error_message)
 
-    def __esco_login(self):
+    def esco_login(self):
         req_body = {
             "userName": self.username,
             "password": self.password,
             "clientId": self.client_id
         }
 
-        result_data = self.__make_request(
+        result_data = self.make_request(
             request_endpoint="/login",
             request_body=req_body,
             request_method=HTTPMethod.POST,
             error_message="Login to ESCO API failed."
         )
 
-        self.__token = result_data["access_token"]
+        self.token = result_data["access_token"]
         expires_in_minutes = result_data["expires_in"] - 1
-        self.__expire_datetime = datetime.now() + timedelta(minutes=expires_in_minutes)
+        self.expire_datetime = datetime.now() + timedelta(minutes=expires_in_minutes)
 
-    def __pre_connection(self):
-        if datetime.now() > self.__expire_datetime:
-            self.__esco_login()
+    def pre_connection(self):
+        if datetime.now() > self.expire_datetime:
+            self.esco_login()
 
     def __new__(cls, base_url: str, username: str, password: str, client_id: str, version: APIVersion):
         if cls._instance is None:
@@ -143,7 +143,7 @@ class EscoAPI:
             self.client_id = client_id
             self.version = version
 
-            self.__esco_login()
+            self.esco_login()
             self._initialized = True
 
     def get_posiciones(
@@ -183,8 +183,8 @@ class EscoAPI:
           "incluirFondos": incluir_fondos,
           "soloSaldosIniciales": solo_saldos_iniciales
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-posiciones",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -227,8 +227,8 @@ class EscoAPI:
           "fechaColocacionHasta": fecha_colocacion_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "esBloqueadoBcra": es_bloqueado_bcra
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-disponible-mon",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -271,8 +271,8 @@ class EscoAPI:
           "fechaColocacionHasta": fecha_colocacion_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "esBloqueadoBcra": es_bloqueado_bcra
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-disponible-mon-list",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -328,8 +328,8 @@ class EscoAPI:
             "valuarPosicion": valuar_posicion,
             "utilizaCotizacionesOnLine": utiliza_cotizaciones_online
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-tenenciaval",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -353,8 +353,8 @@ class EscoAPI:
           "fecha": fecha.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "incluirPPP": incluir_ppp
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-tenenciaval-vencimientos",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -380,8 +380,8 @@ class EscoAPI:
           "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "porConcertacion": por_concertacion
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-rendimiento-cartera",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -410,8 +410,8 @@ class EscoAPI:
             "pageSize": page_size
           }
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-instrumentos-paginada",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -428,8 +428,8 @@ class EscoAPI:
           "instrumento": instrumento,
           "exactMatch": exact_match
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-cotizaciones",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -441,8 +441,8 @@ class EscoAPI:
         cargadas en VBolsa.
         :return:
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-cotizaciones-fondos",
             request_body={},
             request_method=HTTPMethod.POST
@@ -465,8 +465,8 @@ class EscoAPI:
             "fechaDesde": fecha_desde.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
             "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-cotizaciones-historicas",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -489,8 +489,8 @@ class EscoAPI:
             "fechaDesde": fecha_desde.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
             "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-cotizaciones-historicas-fci",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -504,8 +504,8 @@ class EscoAPI:
         req_body = {
           "abreviatura": abreviatura
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-instrumento",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -522,8 +522,8 @@ class EscoAPI:
           "instrumento": instrumento,
           "mercado": mercado
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-cotizaciones-cierre-search",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -533,8 +533,8 @@ class EscoAPI:
         """
         Devuelve la cotización de cada moneda.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-cotizaciones-monedas",
             request_body={},
             request_method=HTTPMethod.GET
@@ -544,8 +544,8 @@ class EscoAPI:
         """
         Devuelve la lista de Monedas habilitadas.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-monedas",
             request_body={},
             request_method=HTTPMethod.GET
@@ -555,8 +555,8 @@ class EscoAPI:
         """
         Devuelve la lista de Feriados habilitados.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-feriados",
             request_body={},
             request_method=HTTPMethod.GET
@@ -566,8 +566,8 @@ class EscoAPI:
         """
         Devuelve la lista de Provincias habilitadas.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-provincias",
             request_body={},
             request_method=HTTPMethod.GET
@@ -577,8 +577,8 @@ class EscoAPI:
         """
         Devuelve la lista de Paises habilitados.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-paises",
             request_body={},
             request_method=HTTPMethod.GET
@@ -588,8 +588,8 @@ class EscoAPI:
         """
         Devuelve la lista de tipos de especies.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-tipos-especies",
             request_body={},
             request_method=HTTPMethod.GET
@@ -599,8 +599,8 @@ class EscoAPI:
         """
         Devuelve la lista de tipos de especies.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-tipos-fondos",
             request_body={},
             request_method=HTTPMethod.GET
@@ -610,8 +610,8 @@ class EscoAPI:
         """
         Devuelve la lista de tipos de riesgo de Comitente.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-tipos-riesgo-comitente",
             request_body={},
             request_method=HTTPMethod.GET
@@ -630,8 +630,8 @@ class EscoAPI:
                 "pageSize": 1
             }
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-detalle-cuenta",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -643,8 +643,8 @@ class EscoAPI:
         ser del comitente o de los condóminos.
         :param cuit: Nro de CUIT a buscar. Se deben ingresar solo numeros.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-cuentas-por-cuit?CUIT={cuit}",
             request_body={},
             request_method=HTTPMethod.GET
@@ -656,8 +656,8 @@ class EscoAPI:
         :param num_doc: Número de documento de la Persona a buscar.
         :param tipo_doc: Código del Tipo de Documento. 1: DNI, 2: Pasaporte, 3: Otros.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-persona?tipoDoc={tipo_doc}&numDoc={num_doc}",
             request_body={},
             request_method=HTTPMethod.GET
@@ -757,8 +757,8 @@ class EscoAPI:
           "gastos": gastos
         }
 
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-orden-compra",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -857,8 +857,8 @@ class EscoAPI:
           "gastos": gastos
         }
 
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-orden-venta",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -926,8 +926,8 @@ class EscoAPI:
           "controlaSaldoMonetario": controla_saldo_monetario,
           "incluyeCreditos": incluye_creditos
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-solicitud-suscripcion-fci",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1004,8 +1004,8 @@ class EscoAPI:
           "controlaSaldoMonetario": controla_saldo_monetario,
           "incluyeCreditos": incluye_creditos
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-solicitud-rescate-fci",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1038,8 +1038,8 @@ class EscoAPI:
           "esConsolidado": es_consolidado,
           "incluyeAnulados": incluye_anulados
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-boletos",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1068,8 +1068,8 @@ class EscoAPI:
           "porConcertacion": por_concertacion,
           "esConsolidado": es_consolidado,
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-recibos-comprobantes",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1080,8 +1080,8 @@ class EscoAPI:
         Es una consulta devuelve el estado de la orden solicitada.
         :param cod_orden: Código interno de la orden
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-estado-orden?CodOrden={cod_orden}",
             request_body={},
             request_method=HTTPMethod.GET
@@ -1107,8 +1107,8 @@ class EscoAPI:
           "fechaDesde": fecha_desde.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-ordenes",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1138,8 +1138,8 @@ class EscoAPI:
           "fechaDesde": fecha_desde.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-ctaCorriente-monetaria",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1170,8 +1170,8 @@ class EscoAPI:
           "fechaDesde": fecha_desde.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-ctaCorriente-instrumentos",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1200,8 +1200,8 @@ class EscoAPI:
           "fechaDesde": fecha_desde.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint="/get-ctaCorriente-consolidada",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1230,8 +1230,8 @@ class EscoAPI:
           "porConcertacion": por_concertacion,
           "esConsolidado": es_consolidado,
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-liquidaciones-fondos",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1271,8 +1271,8 @@ class EscoAPI:
              "pageSize": page_size
           }
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-solicitudes-fondos-paginada",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1283,8 +1283,8 @@ class EscoAPI:
         Cancela una orden que haya sido enviada.
         :param cod_orden: Codigo de Orden
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/cancel-orden?CodOrden={cod_orden}",
             request_body={},
             request_method=HTTPMethod.GET
@@ -1383,8 +1383,8 @@ class EscoAPI:
           "gastos": gastos
         }
 
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/previsualizar-orden-compra",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1483,8 +1483,8 @@ class EscoAPI:
           "gastos": gastos
         }
 
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/previsualizar-orden-venta",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1560,8 +1560,8 @@ class EscoAPI:
           "fixOrderId": fix_order_id
         }
 
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-orden-compra-futuro",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1642,8 +1642,8 @@ class EscoAPI:
           "fixOrderId": fix_order_id,
         }
 
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-orden-venta-futuro",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1669,8 +1669,8 @@ class EscoAPI:
           "fechaDesde": fecha_desde.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
           "fechaHasta": fecha_hasta.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/get-ordenes-futuros",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1681,8 +1681,8 @@ class EscoAPI:
         Es un insert para registrar personas, generados desde la ESCO API, la misma se utiliza únicamente para
         registrar y no para consultar.
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-persona",
             request_body=asdict(persona_data),
             request_method=HTTPMethod.POST
@@ -1692,8 +1692,8 @@ class EscoAPI:
         """
         Es un insert en la tabla de Cuentas Comitente, Personas y tablas vinculadas
         """
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-cuenta-comitente",
             request_body=asdict(comitente_data),
             request_method=HTTPMethod.POST
@@ -1737,8 +1737,8 @@ class EscoAPI:
           "alias": alias,
           "cuitTitular": cuit_titular
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-cuenta-bancaria-comitente",
             request_body=req_body,
             request_method=HTTPMethod.POST
@@ -1796,8 +1796,8 @@ class EscoAPI:
           "esEcheq": es_echeq,
           "numeroCheque": numero_cheque
         }
-        self.__pre_connection()
-        return self.__make_request(
+        self.pre_connection()
+        return self.make_request(
             request_endpoint=f"/insert-comprobante-pago",
             request_body=req_body,
             request_method=HTTPMethod.POST

{pyescoapi-0.0.16 → pyescoapi-0.0.18}/pyEscoAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyEscoAPI
-Version: 0.0.16
+Version: 0.0.18
 Summary: Python client for Esco API (Esco bolsa)
 Author-email: Codetria <hola@codetria.com>
 License: MIT License

{pyescoapi-0.0.16 → pyescoapi-0.0.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = 'pyEscoAPI'
-version = "0.0.16"
+version = "0.0.18"
 license = {text = "MIT License"}
 authors = [
   { name="Codetria", email="hola@codetria.com" },

{pyescoapi-0.0.16 → pyescoapi-0.0.18}/tests/test_client.py

@@ -19,7 +19,7 @@ def api_client():
     )
 
 
-@patch("pyEscoAPI.esco_api.EscoAPI._EscoAPI__esco_login")
+@patch("pyEscoAPI.esco_api.EscoAPI._EscoAPIesco_login")
 def test_singleton_should_login_just_once(mock_login):
     client = EscoAPI(
         base_url=os.getenv("base_url"),