@@ -1 +1 @@
-3.8.11
+3.10.12

@@ -1,9 +1,9 @@
-FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8
+FROM tiangolo/uvicorn-gunicorn-fastapi:python3.10
 
 WORKDIR /app
 
 # Install Poetry
-RUN curl -sSL https://raw.usercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
+RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python && \
 cd /usr/local/bin && \
 ln -s /opt/poetry/bin/poetry && \
 poetry config virtualenvs.create false

@@ -111,6 +111,13 @@ async def persist(keys: Keys, data: BitcoinSentiments):
 ), data,
 )
 
+async def get_latest_timestamp(ts_key: str):
+response = await redis.execute_command(
+'TS.GET', ts_key
+)
+
+# Returns a list of the structure [timestamp, value]
+return response
 
 async def get_hourly_average(ts_key: str, top_of_the_hour: int):
 response = await redis.execute_command(
@@ -167,7 +174,11 @@ def now():
 async def calculate_three_hours_of_data(keys: Keys) -> Dict[str, str]:
 sentiment_key = keys.timeseries_sentiment_key()
 price_key = keys.timeseries_price_key()
-three_hours_ago_ms = int((now() - timedelta(hours=3)).timestamp() * 1000)
+latest_data = await get_latest_timestamp(sentiment_key)
+#three_hours_ago_ms = int((now() - timedelta(hours=3)).timestamp() * 1000)
+three_hours_ago_ms = latest_data[0] - (1000 * 60 * 60 * 2)
+
+print(three_hours_ago_ms)
 
 sentiment = await get_hourly_average(sentiment_key, three_hours_ago_ms)
 price = await get_hourly_average(price_key, three_hours_ago_ms)

@@ -1,12 +1,10 @@
-version: '3.8'
 services:
 redis:
-image: redislabs/redismod
+image: redis/redis-stack
 ports:
 - "16379:6379"
 volumes:
 - $PWD/data:/data
-command: --dir /data --loadmodule /usr/lib/redis/modules/redistimeseries.so
 
 app:
 restart: always