Skip to content

Commit 738e6e0

Browse files
author
Grzegorz Pustulka
committed
elasticsearch - done
1 parent b522e83 commit 738e6e0

File tree

7 files changed

+214
-419
lines changed

7 files changed

+214
-419
lines changed

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,12 @@ class DatabaseLogic(BaseDatabaseLogic):
112112

113113
async_settings: AsyncSearchSettings = attr.ib(factory=AsyncSearchSettings)
114114
sync_settings: SyncSearchSettings = attr.ib(factory=SyncSearchSettings)
115-
async_index_inserter: AsyncIndexInserter = attr.ib(init=False)
115+
116116
async_index_selector: IndexSelectionStrategy = attr.ib(init=False)
117117
sync_index_selector: IndexSelectionStrategy = attr.ib(init=False)
118+
async_index_inserter: AsyncIndexInserter = attr.ib(init=False)
119+
sync_index_inserter: SyncIndexInserter = attr.ib(init=False)
120+
118121
client = attr.ib(init=False)
119122
sync_client = attr.ib(init=False)
120123

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/datetime.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ def return_date(
4040
if isinstance(interval, str):
4141
if "/" in interval:
4242
parts = interval.split("/")
43-
result["gte"] = parts[0] if parts[0] != ".." else datetime_type.min
43+
result["gte"] = parts[0] if parts[0] != ".." else datetime_type.min.isoformat() + "Z"
4444
result["lte"] = (
45-
parts[1] if len(parts) > 1 and parts[1] != ".." else datetime_type.max
45+
parts[1] if len(parts) > 1 and parts[1] != ".." else datetime_type.max.isoformat() + "Z"
4646
)
4747
else:
4848
converted_time = interval if interval != ".." else None

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/index.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from datetime import datetime
77
from functools import lru_cache
88
from typing import Any, List, Optional
9+
from dateutil.parser import parse
910

1011
from stac_fastapi.sfeos_helpers.mappings import (
1112
_ES_INDEX_NAME_UNSUPPORTED_CHARS_TABLE,
@@ -83,7 +84,7 @@ def filter_indexes_by_datetime(
8384

8485
def parse_datetime(dt_str: str) -> datetime:
8586
"""Parse datetime string, handling both with and without 'Z' suffix."""
86-
return datetime.fromisoformat(dt_str.rstrip('Z'))
87+
return parse(dt_str).replace(tzinfo=None)
8788

8889
def extract_date_range_from_index(index_name: str) -> tuple:
8990
"""Extract start and end dates from index name."""

0 commit comments

Comments
 (0)