clean up code

Author: michaelmattig

examples/data_usage.ipynb

@@ -21,7 +21,8 @@
    "outputs": [],
    "source": [
     "import geoengine as ge\n",
-    "import matplotlib.pyplot as plt"
+    "import matplotlib.pyplot as plt\n",
+    "import pandas as pd"
    ]
   },
   {
@@ -310,7 +311,18 @@
     }
    ],
    "source": [
-    "ge.plot_data_usage_summary(ge.UsageSummaryGranularity.MINUTES)"
+    "df = ge.data_usage_summary(ge.UsageSummaryGranularity.MINUTES)\n",
+    "df['timestamp'] = pd.to_datetime(df['timestamp']).dt.tz_localize(None)\n",
+    "\n",
+    "pivot_df = df.pivot(index='timestamp', columns='data', values='count').fillna(0)\n",
+    "pivot_df.plot(kind='bar', figsize=(10, 6))\n",
+    "\n",
+    "plt.title('Data Usage by Data over time')\n",
+    "plt.xlabel('Timestamp')\n",
+    "plt.ylabel('Count')\n",
+    "plt.xticks(rotation=45)\n",
+    "plt.legend(title='Data')\n",
+    "plt.show()"
    ]
   },
   {

geoengine/__init__.py

@@ -32,7 +32,7 @@
 
 from .util import clamp_datetime_ms_ns
 from .workflow import WorkflowId, Workflow, workflow_by_id, register_workflow, get_quota, update_quota, data_usage, \
-    data_usage_summary, plot_data_usage_summary
+    data_usage_summary
 from .raster import RasterTile2D
 from .raster_workflow_rio_writer import RasterWorkflowRioWriter
 

geoengine/workflow.py

@@ -29,7 +29,6 @@
 import websockets.client
 import xarray as xr
 import pyarrow as pa
-import matplotlib.pyplot as plt
 
 import geoengine_openapi_client
 from geoengine import api
@@ -1007,23 +1006,3 @@ def data_usage_summary(granularity: geoengine_openapi_client.UsageSummaryGranula
         df = pd.DataFrame(usage_dicts)
 
     return df
-
-
-def plot_data_usage_summary(granularity: geoengine_openapi_client.UsageSummaryGranularity,
-                            data: Optional[str] = None, offset: int = 0, limit: int = 10):
-    '''
-    Plot data usage summary
-    '''
-
-    df = data_usage_summary(granularity, data, offset, limit)
-    df['timestamp'] = pd.to_datetime(df['timestamp']).dt.tz_localize(None)
-
-    pivot_df = df.pivot(index='timestamp', columns='data', values='count').fillna(0)
-    pivot_df.plot(kind='bar', figsize=(10, 6))
-
-    plt.title('Data Usage by Data over time')
-    plt.xlabel('Timestamp')
-    plt.ylabel('Count')
-    plt.xticks(rotation=45)
-    plt.legend(title='Data')
-    plt.show()

setup.cfg

@@ -18,7 +18,7 @@ package_dir =
 packages = find:
 python_requires = >=3.9
 install_requires =
-    geoengine-openapi-client @ git+https://github.com/geo-engine/openapi-client@esg-quota#subdirectory=python # TODO update when merged
+    geoengine-openapi-client == 0.0.18
     geopandas >=0.9,<0.15
     matplotlib >=3.5,<3.8
     numpy >=1.21,<2