Skip to content

Commit

Permalink
Remove load all (#139)
Browse files Browse the repository at this point in the history
Remove load all
  • Loading branch information
KitBurgess committed Dec 11, 2019
2 parents dd118ac + c14bc99 commit 2e6ff90
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 56 deletions.
5 changes: 0 additions & 5 deletions vortexasdk/config.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import os
from datetime import datetime
from dateutil.relativedelta import relativedelta

LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO")
LOG_FILE = os.getenv("LOG_FILE", "vortexasdk.log")

END_OF_AVAILABLE_DATA = datetime.utcnow() + relativedelta(months=6)
BEGINNING_OF_AVAILABLE_DATA = END_OF_AVAILABLE_DATA - relativedelta(years=4)
27 changes: 0 additions & 27 deletions vortexasdk/endpoints/cargo_movements.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

from vortexasdk.api import ID
from vortexasdk.api.shared_types import to_ISODate
from vortexasdk.config import (
BEGINNING_OF_AVAILABLE_DATA,
END_OF_AVAILABLE_DATA,
)
from vortexasdk.endpoints.cargo_movements_result import CargoMovementsResult
from vortexasdk.endpoints.endpoints import CARGO_MOVEMENTS_RESOURCE
from vortexasdk.logger import get_logger
Expand All @@ -29,29 +25,6 @@ class CargoMovements(Search):
def __init__(self):
Search.__init__(self, CARGO_MOVEMENTS_RESOURCE)

def load_all(self) -> CargoMovementsResult:
"""
Load all available Cargo Movements.
# Example
Let's load all cargo movements.
```python
>>> from vortexasdk import CargoMovements
>>> df = CargoMovements().load_all().to_df() # doctest: +SKIP
```
"""
logger.info(
f"Loading all Cargo Movements between {BEGINNING_OF_AVAILABLE_DATA} and {END_OF_AVAILABLE_DATA},"
)
return self.search(
filter_activity="loading_start",
filter_time_min=BEGINNING_OF_AVAILABLE_DATA,
filter_time_max=END_OF_AVAILABLE_DATA,
)

def search(
self,
filter_activity: str,
Expand Down
24 changes: 0 additions & 24 deletions vortexasdk/endpoints/vessel_movements.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
from typing import List, Union

from vortexasdk.api.shared_types import to_ISODate
from vortexasdk.config import (
BEGINNING_OF_AVAILABLE_DATA,
END_OF_AVAILABLE_DATA,
)
from vortexasdk.endpoints.endpoints import VESSEL_MOVEMENTS_RESOURCE
from vortexasdk.endpoints.vessel_movements_result import VesselMovementsResult
from vortexasdk.logger import get_logger
Expand Down Expand Up @@ -34,26 +30,6 @@ class VesselMovements(Search):
def __init__(self):
Search.__init__(self, VESSEL_MOVEMENTS_RESOURCE)

def load_all(self) -> VesselMovementsResult:
"""Load all available Vessel Movements.
# Example
Let's load all vessel movements as a `pd.DataFrame`.
```python
>>> from vortexasdk import VesselMovements
>>> df = VesselMovements().load_all().to_df() # doctest: +SKIP
```
"""
logger.info(
f"Loading all Vessel Movements between {BEGINNING_OF_AVAILABLE_DATA} and {END_OF_AVAILABLE_DATA},"
)

return self.search(
filter_time_min=BEGINNING_OF_AVAILABLE_DATA,
filter_time_max=END_OF_AVAILABLE_DATA,
)

def search(
self,
filter_time_min: datetime = datetime(2019, 10, 1, 0),
Expand Down

0 comments on commit 2e6ff90

Please sign in to comment.