api-to-dataframe 1.3.13__tar.gz → 1.4.0__tar.gz

{api_to_dataframe-1.3.13 → api_to_dataframe-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: api-to-dataframe
-Version: 1.3.13
+Version: 1.4.0
 Summary: A package to convert API responses to pandas dataframe
 License: MIT
 Author: IvanildoBarauna
@@ -16,8 +16,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.8
-Requires-Dist: datadog (>=0.50.2,<0.51.0)
 Requires-Dist: logging (>=0.4.9.6,<0.5.0.0)
+Requires-Dist: otel-wrapper (>=0.0.1,<0.0.2)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Project-URL: Documentation, https://github.com/IvanildoBarauna/api-to-dataframe/blob/main/README.md

{api_to_dataframe-1.3.13 → api_to_dataframe-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "api-to-dataframe"
-version = "1.3.13"
+version = "1.4.0"
 description = "A package to convert API responses to pandas dataframe"
 authors = ["IvanildoBarauna <ivanildo.jnr@outlook.com>"]
 readme = "README.md"
@@ -27,7 +27,7 @@ python = "^3.9"
 pandas = "^2.2.3"
 requests = "^2.32.3"
 logging = "^0.4.9.6"
-datadog = "^0.50.2"
+otel-wrapper = "^0.0.1"
 
 [tool.poetry.group.dev.dependencies]
 poetry-dynamic-versioning = "^1.3.0"

{api_to_dataframe-1.3.13 → api_to_dataframe-1.4.0}/src/api_to_dataframe/controller/client_builder.py

@@ -1,7 +1,7 @@
 from api_to_dataframe.models.retainer import retry_strategies, Strategies
 from api_to_dataframe.models.get_data import GetData
-from api_to_dataframe.utils.logger import log, LogLevel
-from api_to_dataframe.utils.metrics import MetricsClient
+from api_to_dataframe.utils.logger import logger
+from otel_wrapper import OpenObservability
 
 
 class ClientBuilder:
@@ -35,16 +35,16 @@ class ClientBuilder:
         if headers is None:
             headers = {}
         if endpoint == "":
-            log("endpoint param is mandatory", LogLevel.ERROR)
+            logger.error("endpoint cannot be an empty string")
             raise ValueError
         if not isinstance(retries, int) or retries < 0:
-            log("retries must be a non-negative integer", LogLevel.ERROR)
+            logger.error("retries must be a non-negative integer")
             raise ValueError
         if not isinstance(initial_delay, int) or initial_delay < 0:
-            log("delay must be a non-negative integer", LogLevel.ERROR)
+            logger.error("initial_delay must be a non-negative integer")
             raise ValueError
         if not isinstance(connection_timeout, int) or connection_timeout < 0:
-            log("connection_timeout must be a non-negative integer", LogLevel.ERROR)
+            logger.error("connection_timeout must be a non-negative integer")
             raise ValueError
 
         self.endpoint = endpoint
@@ -53,10 +53,9 @@ class ClientBuilder:
         self.headers = headers
         self.retries = retries
         self.delay = initial_delay
-        self.metrics_client = MetricsClient()
-
-        self.metrics_client.increment("builded_client")
-
+        self._o11y_wrapper = OpenObservability(application_name="api-to-dataframe").get_wrapper()
+        self._traces = self._o11y_wrapper.traces()
+        self._tracer = self._traces.get_tracer()
 
     @retry_strategies
     def get_api_data(self):
@@ -71,16 +70,15 @@ class ClientBuilder:
             dict: The JSON response from the API as a dictionary.
         """
 
-        self.metrics_client.increment("get_api_data_attempt")
-
-        response = GetData.get_response(
-            endpoint=self.endpoint,
-            headers=self.headers,
-            connection_timeout=self.connection_timeout,
-        )
+        with self._tracer.start_as_current_span("get_last_quote") as span:
+            span.set_attribute("endpoint", self.endpoint)
 
+            response = GetData.get_response(
+                endpoint=self.endpoint,
+                headers=self.headers,
+                connection_timeout=self.connection_timeout,
+            )
 
-        self.metrics_client.increment("get_api_data_success")
 
         return response.json()
 
@@ -99,9 +97,7 @@ class ClientBuilder:
         Returns:
             DataFrame: A pandas DataFrame containing the data from the API response.
         """
-        MetricsClient().increment("api_to_dataframe_attempt")
 
         df = GetData.to_dataframe(response)
 
-        MetricsClient().increment("api_to_dataframe_success")
         return df

{api_to_dataframe-1.3.13 → api_to_dataframe-1.4.0}/src/api_to_dataframe/models/get_data.py

@@ -1,8 +1,6 @@
 import requests
 import pandas as pd
 
-from api_to_dataframe.utils.logger import log, LogLevel
-
 
 class GetData:
     @staticmethod
@@ -16,13 +14,11 @@ class GetData:
         try:
             df = pd.DataFrame(response)
         except Exception as err:
-            log(f"Error serializing to dataframe: {err}", LogLevel.ERROR)
             raise TypeError(
                 f"Invalid response for transform in dataframe: {err}"
             ) from err
 
         if df.empty:
-            log("DataFrame is empty", LogLevel.ERROR)
             raise ValueError("::: DataFrame is empty :::")
 
         return df

{api_to_dataframe-1.3.13 → api_to_dataframe-1.4.0}/src/api_to_dataframe/models/retainer.py

@@ -2,7 +2,7 @@ import time
 from enum import Enum
 
 from requests.exceptions import RequestException
-from api_to_dataframe.utils.logger import log, LogLevel
+from api_to_dataframe.utils.logger import logger
 from api_to_dataframe.utils import Constants
 
 
@@ -18,11 +18,7 @@ def retry_strategies(func):
         while retry_number < args[0].retries:
             try:
                 if retry_number > 0:
-                    log(
-                        f"Trying for the {retry_number} of {Constants.MAX_OF_RETRIES} retries. "
-                        f"Using {args[0].retry_strategy}",
-                        LogLevel.INFO,
-                    )
+                    logger.info(f"Trying for the {retry_number} of {Constants.MAX_OF_RETRIES} retries. Using {args[0].retry_strategy}")
                 return func(*args, **kwargs)
             except RequestException as e:
                 retry_number += 1
@@ -35,10 +31,7 @@ def retry_strategies(func):
                     time.sleep(args[0].delay * retry_number)
 
                 if retry_number in (args[0].retries, Constants.MAX_OF_RETRIES):
-                    log(
-                        f"Failed after {retry_number} retries using {args[0].retry_strategy}",
-                        LogLevel.ERROR,
-                    )
+                    logger.error(f"Failed after {retry_number} retries")
                     raise e
 
     return wrapper

api_to_dataframe-1.4.0/src/api_to_dataframe/utils/logger.py

@@ -0,0 +1,11 @@
+import logging
+
+# Configure logging once at the start of your program
+logging.basicConfig(
+    encoding="utf-8",
+    format="%(asctime)s :: api-to-dataframe[%(levelname)s] :: %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S %Z",
+    level=logging.INFO,
+)
+
+logger = logging.getLogger("api-to-dataframe")

api_to_dataframe-1.3.13/src/api_to_dataframe/utils/logger.py

@@ -1,22 +0,0 @@
-import logging
-from enum import Enum
-
-
-class LogLevel(Enum):
-    INFO = logging.INFO
-    WARNING = logging.WARNING
-    ERROR = logging.ERROR
-
-
-# Configure logging once at the start of your program
-logging.basicConfig(
-    encoding="utf-8",
-    format="%(asctime)s :: api-to-dataframe[%(levelname)s] :: %(message)s",
-    datefmt="%Y-%m-%d %H:%M:%S %Z",
-    level=logging.INFO,
-)
-
-
-def log(message: str, level: LogLevel):
-    logger = logging.getLogger("api-to-dataframe")
-    logger.log(level.value, message)

api_to_dataframe-1.3.13/src/api_to_dataframe/utils/metrics.py

@@ -1,19 +0,0 @@
-from datadog import initialize, statsd
-
-
-class MetricsClient:
-    def __init__(self) -> None:
-        self.options = options = {
-            "statsd_host": "node-metrics-ba28.ivanildobarauna.dev",
-            "statsd_port": 8125,
-        }
-        self.client = initialize(**options)
-        self.application_name = "api-to-dataframe"
-
-    def increment(
-        self, action: str, tags: list[str] = ["env:production"], value: float = 1.0
-    ):
-
-        tags.append(f"action:{action}")
-
-        statsd.increment(metric=self.application_name, tags=tags, value=value)