Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/context change #239

Merged
merged 3 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions polytope_feature/datacube/backends/datacube.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,19 @@ def remap_path(self, path: DatacubePath):
return path

@staticmethod
def create(datacube, config={}, axis_options={}, compressed_axes_options=[], alternative_axes=[]):
def create(datacube, config={}, axis_options={}, compressed_axes_options=[], alternative_axes=[], context=None):
# TODO: get the configs as None for pre-determined value and change them to empty dictionary inside the function
if type(datacube).__name__ == "DataArray":
from .xarray import XArrayDatacube

xadatacube = XArrayDatacube(datacube, axis_options, compressed_axes_options)
xadatacube = XArrayDatacube(datacube, axis_options, compressed_axes_options, context)
return xadatacube
if type(datacube).__name__ == "GribJump":
from .fdb import FDBDatacube

fdbdatacube = FDBDatacube(datacube, config, axis_options, compressed_axes_options, alternative_axes)
fdbdatacube = FDBDatacube(
datacube, config, axis_options, compressed_axes_options, alternative_axes, context
)
return fdbdatacube

def check_branching_axes(self, request):
Expand Down
8 changes: 6 additions & 2 deletions polytope_feature/datacube/backends/fdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@


class FDBDatacube(Datacube):
def __init__(self, gj, config=None, axis_options=None, compressed_axes_options=[], alternative_axes=[]):
def __init__(
self, gj, config=None, axis_options=None, compressed_axes_options=[], alternative_axes=[], context=None
):
if config is None:
config = {}
if context is None:
context = {}

super().__init__(axis_options, compressed_axes_options)

Expand All @@ -25,7 +29,7 @@ def __init__(self, gj, config=None, axis_options=None, compressed_axes_options=[

self.gj = gj
if len(alternative_axes) == 0:
self.fdb_coordinates = self.gj.axes(partial_request)
self.fdb_coordinates = self.gj.axes(partial_request, ctx=context)
if len(self.fdb_coordinates) == 0:
raise BadRequestError(partial_request)
else:
Expand Down
2 changes: 1 addition & 1 deletion polytope_feature/datacube/backends/xarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class XArrayDatacube(Datacube):
"""Xarray arrays are labelled, axes can be defined as strings or integers (e.g. "time" or 0)."""

def __init__(self, dataarray: xr.DataArray, axis_options=None, compressed_axes_options=[]):
def __init__(self, dataarray: xr.DataArray, axis_options=None, compressed_axes_options=[], context=None):
super().__init__(axis_options, compressed_axes_options)
if axis_options is None:
axis_options = {}
Expand Down
20 changes: 11 additions & 9 deletions polytope_feature/polytope.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __repr__(self):


class Polytope:
def __init__(self, datacube, engine=None, options=None):
def __init__(self, datacube, engine=None, options=None, context=None):
from .datacube import Datacube
from .engine import Engine

Expand All @@ -48,22 +48,24 @@ def __init__(self, datacube, engine=None, options=None):

axis_options, compressed_axes_options, config, alternative_axes = PolytopeOptions.get_polytope_options(options)

self.datacube = Datacube.create(datacube, config, axis_options, compressed_axes_options, alternative_axes)
self.context = context

self.datacube = Datacube.create(
datacube, config, axis_options, compressed_axes_options, alternative_axes, self.context
)
self.engine = engine if engine is not None else Engine.default()
self.time = 0

def slice(self, polytopes: List[ConvexPolytope]):
"""Low-level API which takes a polytope geometry object and uses it to slice the datacube"""
return self.engine.extract(self.datacube, polytopes)

def retrieve(self, request: Request, method="standard", context=None):
def retrieve(self, request: Request, method="standard"):
"""Higher-level API which takes a request and uses it to slice the datacube"""
if context is None:
context = {}
logging.info("Starting request for %s ", context)
logging.info("Starting request for %s ", self.context)
self.datacube.check_branching_axes(request)
request_tree = self.engine.extract(self.datacube, request.polytopes())
logging.info("Created request tree for %s ", context)
self.datacube.get(request_tree, context)
logging.info("Retrieved data for %s ", context)
logging.info("Created request tree for %s ", self.context)
self.datacube.get(request_tree, self.context)
logging.info("Retrieved data for %s ", self.context)
return request_tree
Loading