python-esios 0.2.4__tar.gz → 0.2.6__tar.gz

{python_esios-0.2.4/python_esios.egg-info → python_esios-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-esios
-Version: 0.2.4
+Version: 0.2.6
 Summary: A Python wrapper for the ESIOS API
 Home-page: https://github.com/datons/python-esios
 Author: Jesús López

python_esios-0.2.6/esios/archives/preprocessing.py

@@ -0,0 +1,32 @@
+from pathlib import Path
+import pandas as pd
+
+
+def process_excel_file(path, sheet_name):
+    """
+    Process an Excel file and return a melted dataframe.
+    """
+
+    if not isinstance(path, Path):
+        path = Path(path)
+
+    sheet_data = pd.read_excel(path, sheet_name=sheet_name, skiprows=0, nrows=1)
+    position = sheet_data.columns.get_loc("Indicadores")
+
+    df = pd.read_excel(
+        path, sheet_name=sheet_name, index_col=list(range(position)), skiprows=2
+    ).iloc[:, 2:]
+
+    date = path.stem.split("_")[1]
+
+    if df.shape[1] > 30:
+        date_ = pd.to_datetime(date).tz_localize("Europe/Madrid")
+        date_range = pd.date_range(start=date_, periods=df.shape[1], freq="15min")
+        df.columns = date_range
+    else:
+        hour = df.columns.str.split("-", expand=True).get_level_values(0)
+        df.columns = pd.to_datetime(date + " " + hour).tz_localize("Europe/Madrid")
+
+    df = df.melt(ignore_index=False, var_name="datetime").reset_index()
+
+    return df

{python_esios-0.2.4 → python_esios-0.2.6}/esios/indicators.py

@@ -48,10 +48,18 @@ class Indicator:
         # Remove None values from params
         params = {k: v for k, v in params.items() if v is not None}
         
-        start_date = datetime.strptime(start, '%Y-%m-%d')
-        end_date = datetime.strptime(end, '%Y-%m-%d')
+        start_date = pd.to_datetime(start)
+        end_date = pd.to_datetime(end)
         three_weeks = timedelta(weeks=3)
-
+        
+        endpoint = f"indicators/{self.id}"
+        
+        if end_date - start_date <= three_weeks:
+            data = self.client._get(endpoint, self.client.public_headers, params=params)
+            data = data.get('indicator', {}).get('values', [])
+            
+            return self._to_dataframe(data, column_name)
+        
         data_all = []
 
         current_start = start_date
@@ -61,7 +69,6 @@ class Indicator:
             chunk_params['start_date'] = current_start.strftime('%Y-%m-%d')
             chunk_params['end_date'] = current_end.strftime('%Y-%m-%d') + 'T23:59:59'
 
-            endpoint = f"indicators/{self.id}"
             data = self.client._get(endpoint, self.client.public_headers, params=chunk_params)
             data_all.extend(data.get('indicator', {}).get('values', []))
 

{python_esios-0.2.4 → python_esios-0.2.6/python_esios.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-esios
-Version: 0.2.4
+Version: 0.2.6
 Summary: A Python wrapper for the ESIOS API
 Home-page: https://github.com/datons/python-esios
 Author: Jesús López

{python_esios-0.2.4 → python_esios-0.2.6}/python_esios.egg-info/SOURCES.txt

@@ -2,10 +2,11 @@ LICENSE
 README.md
 setup.py
 esios/__init__.py
-esios/archives.py
 esios/client.py
 esios/indicators.py
 esios/offer_indicators.py
+esios/archives/__init__.py
+esios/archives/preprocessing.py
 python_esios.egg-info/PKG-INFO
 python_esios.egg-info/SOURCES.txt
 python_esios.egg-info/dependency_links.txt

{python_esios-0.2.4 → python_esios-0.2.6}/setup.py

@@ -2,27 +2,28 @@ from setuptools import setup, find_packages
 
 
 from pathlib import Path
+
 this_directory = Path(__file__).parent
-long_description = (this_directory / "README.md").read_text(encoding='utf-8')
+long_description = (this_directory / "README.md").read_text(encoding="utf-8")
 
 setup(
-    name='python-esios',
-    version='0.2.4',
+    name="python-esios",
+    version="0.2.6",
     packages=find_packages(),
     install_requires=[
-        'requests',
-        'pandas',
+        "requests",
+        "pandas",
     ],
     author="Jesús López",
     author_email="jesus.lopez@datons.ai",
     description="A Python wrapper for the ESIOS API",
     long_description=long_description,
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
     url="https://github.com/datons/python-esios",
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
     ],
-    python_requires='>=3.6',
+    python_requires=">=3.6",
 )