summaryrefslogtreecommitdiff
path: root/shared/src
diff options
context:
space:
mode:
Diffstat (limited to 'shared/src')
-rw-r--r--shared/src/shared/db.py29
-rw-r--r--shared/src/shared/events.py6
-rw-r--r--shared/src/shared/healthcheck.py5
-rw-r--r--shared/src/shared/metrics.py2
-rw-r--r--shared/src/shared/models.py29
-rw-r--r--shared/src/shared/notifier.py22
-rw-r--r--shared/src/shared/resilience.py4
-rw-r--r--shared/src/shared/sentiment.py5
-rw-r--r--shared/src/shared/sentiment_models.py5
9 files changed, 54 insertions, 53 deletions
diff --git a/shared/src/shared/db.py b/shared/src/shared/db.py
index e7cad92..a718951 100644
--- a/shared/src/shared/db.py
+++ b/shared/src/shared/db.py
@@ -3,26 +3,25 @@
import json
import uuid
from contextlib import asynccontextmanager
-from datetime import datetime, date, timedelta, timezone
+from datetime import UTC, date, datetime, timedelta
from decimal import Decimal
-from typing import Optional
from sqlalchemy import select, update
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
-from shared.models import Candle, Signal, Order, OrderStatus, NewsItem
-from shared.sentiment_models import SymbolScore, MarketSentiment
+from shared.models import Candle, NewsItem, Order, OrderStatus, Signal
from shared.sa_models import (
Base,
CandleRow,
- SignalRow,
+ MarketSentimentRow,
+ NewsItemRow,
OrderRow,
PortfolioSnapshotRow,
- NewsItemRow,
- SymbolScoreRow,
- MarketSentimentRow,
+ SignalRow,
StockSelectionRow,
+ SymbolScoreRow,
)
+from shared.sentiment_models import MarketSentiment, SymbolScore
class Database:
@@ -149,7 +148,7 @@ class Database:
self,
order_id: str,
status: OrderStatus,
- filled_at: Optional[datetime] = None,
+ filled_at: datetime | None = None,
) -> None:
"""Update the status (and optionally filled_at) of an order."""
stmt = (
@@ -195,7 +194,7 @@ class Database:
total_value=total_value,
realized_pnl=realized_pnl,
unrealized_pnl=unrealized_pnl,
- snapshot_at=datetime.now(timezone.utc),
+ snapshot_at=datetime.now(UTC),
)
session.add(row)
await session.commit()
@@ -206,7 +205,7 @@ class Database:
async def get_portfolio_snapshots(self, days: int = 30) -> list[dict]:
"""Retrieve recent portfolio snapshots."""
async with self.get_session() as session:
- since = datetime.now(timezone.utc) - timedelta(days=days)
+ since = datetime.now(UTC) - timedelta(days=days)
stmt = (
select(PortfolioSnapshotRow)
.where(PortfolioSnapshotRow.snapshot_at >= since)
@@ -249,7 +248,7 @@ class Database:
async def get_recent_news(self, hours: int = 24) -> list[dict]:
"""Retrieve news items published in the last N hours."""
- since = datetime.now(timezone.utc) - timedelta(hours=hours)
+ since = datetime.now(UTC) - timedelta(hours=hours)
stmt = (
select(NewsItemRow)
.where(NewsItemRow.published_at >= since)
@@ -367,7 +366,7 @@ class Database:
await session.rollback()
raise
- async def get_latest_market_sentiment(self) -> Optional[dict]:
+ async def get_latest_market_sentiment(self) -> dict | None:
"""Retrieve the 'latest' market sentiment row, or None if not found."""
stmt = select(MarketSentimentRow).where(MarketSentimentRow.id == "latest")
async with self._session_factory() as session:
@@ -409,7 +408,7 @@ class Database:
reason=reason,
key_news=json.dumps(key_news),
sentiment_snapshot=json.dumps(sentiment_snapshot),
- created_at=datetime.now(timezone.utc),
+ created_at=datetime.now(UTC),
)
async with self._session_factory() as session:
try:
diff --git a/shared/src/shared/events.py b/shared/src/shared/events.py
index 63f93a2..6f8def1 100644
--- a/shared/src/shared/events.py
+++ b/shared/src/shared/events.py
@@ -1,14 +1,14 @@
"""Event types and serialization for the trading platform."""
-from enum import Enum
+from enum import StrEnum
from typing import Any
from pydantic import BaseModel
-from shared.models import Candle, Signal, Order, NewsItem
+from shared.models import Candle, NewsItem, Order, Signal
-class EventType(str, Enum):
+class EventType(StrEnum):
CANDLE = "CANDLE"
SIGNAL = "SIGNAL"
ORDER = "ORDER"
diff --git a/shared/src/shared/healthcheck.py b/shared/src/shared/healthcheck.py
index 7411e8a..a19705b 100644
--- a/shared/src/shared/healthcheck.py
+++ b/shared/src/shared/healthcheck.py
@@ -3,10 +3,11 @@
from __future__ import annotations
import time
-from typing import Any, Callable, Awaitable
+from collections.abc import Awaitable, Callable
+from typing import Any
from aiohttp import web
-from prometheus_client import CollectorRegistry, REGISTRY, generate_latest, CONTENT_TYPE_LATEST
+from prometheus_client import CONTENT_TYPE_LATEST, REGISTRY, CollectorRegistry, generate_latest
class HealthCheckServer:
diff --git a/shared/src/shared/metrics.py b/shared/src/shared/metrics.py
index cd239f3..6189143 100644
--- a/shared/src/shared/metrics.py
+++ b/shared/src/shared/metrics.py
@@ -2,7 +2,7 @@
from __future__ import annotations
-from prometheus_client import Counter, Gauge, Histogram, CollectorRegistry, REGISTRY
+from prometheus_client import REGISTRY, CollectorRegistry, Counter, Gauge, Histogram
class ServiceMetrics:
diff --git a/shared/src/shared/models.py b/shared/src/shared/models.py
index a436c03..f357f9f 100644
--- a/shared/src/shared/models.py
+++ b/shared/src/shared/models.py
@@ -1,25 +1,24 @@
"""Shared Pydantic models for the trading platform."""
import uuid
+from datetime import UTC, datetime
from decimal import Decimal
-from datetime import datetime, timezone
-from enum import Enum
-from typing import Optional
+from enum import StrEnum
from pydantic import BaseModel, Field, computed_field
-class OrderSide(str, Enum):
+class OrderSide(StrEnum):
BUY = "BUY"
SELL = "SELL"
-class OrderType(str, Enum):
+class OrderType(StrEnum):
MARKET = "MARKET"
LIMIT = "LIMIT"
-class OrderStatus(str, Enum):
+class OrderStatus(StrEnum):
PENDING = "PENDING"
FILLED = "FILLED"
CANCELLED = "CANCELLED"
@@ -46,9 +45,9 @@ class Signal(BaseModel):
quantity: Decimal
reason: str
conviction: float = 1.0 # 0.0 to 1.0, signal strength/confidence
- stop_loss: Optional[Decimal] = None # Price to exit at loss
- take_profit: Optional[Decimal] = None # Price to exit at profit
- created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+ stop_loss: Decimal | None = None # Price to exit at loss
+ take_profit: Decimal | None = None # Price to exit at profit
+ created_at: datetime = Field(default_factory=lambda: datetime.now(UTC))
class Order(BaseModel):
@@ -60,8 +59,8 @@ class Order(BaseModel):
price: Decimal
quantity: Decimal
status: OrderStatus = OrderStatus.PENDING
- created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
- filled_at: Optional[datetime] = None
+ created_at: datetime = Field(default_factory=lambda: datetime.now(UTC))
+ filled_at: datetime | None = None
class Position(BaseModel):
@@ -76,7 +75,7 @@ class Position(BaseModel):
return self.quantity * (self.current_price - self.avg_entry_price)
-class NewsCategory(str, Enum):
+class NewsCategory(StrEnum):
POLICY = "policy"
EARNINGS = "earnings"
MACRO = "macro"
@@ -89,11 +88,11 @@ class NewsItem(BaseModel):
id: str = Field(default_factory=lambda: str(uuid.uuid4()))
source: str
headline: str
- summary: Optional[str] = None
- url: Optional[str] = None
+ summary: str | None = None
+ url: str | None = None
published_at: datetime
symbols: list[str] = []
sentiment: float
category: NewsCategory
raw_data: dict = {}
- created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+ created_at: datetime = Field(default_factory=lambda: datetime.now(UTC))
diff --git a/shared/src/shared/notifier.py b/shared/src/shared/notifier.py
index 3d7b6cf..cfc86cd 100644
--- a/shared/src/shared/notifier.py
+++ b/shared/src/shared/notifier.py
@@ -2,13 +2,13 @@
import asyncio
import logging
+from collections.abc import Sequence
from decimal import Decimal
-from typing import Optional, Sequence
import aiohttp
-from shared.models import Signal, Order, Position
-from shared.sentiment_models import SelectedStock, MarketSentiment
+from shared.models import Order, Position, Signal
+from shared.sentiment_models import MarketSentiment, SelectedStock
logger = logging.getLogger(__name__)
@@ -23,7 +23,7 @@ class TelegramNotifier:
self._bot_token = bot_token
self._chat_id = chat_id
self._semaphore = asyncio.Semaphore(1)
- self._session: Optional[aiohttp.ClientSession] = None
+ self._session: aiohttp.ClientSession | None = None
@property
def enabled(self) -> bool:
@@ -113,13 +113,13 @@ class TelegramNotifier:
"",
"<b>Positions:</b>",
]
- for pos in positions:
- lines.append(
- f" {pos.symbol}: qty={pos.quantity} "
- f"entry={pos.avg_entry_price} "
- f"current={pos.current_price} "
- f"pnl={pos.unrealized_pnl}"
- )
+ lines.extend(
+ f" {pos.symbol}: qty={pos.quantity} "
+ f"entry={pos.avg_entry_price} "
+ f"current={pos.current_price} "
+ f"pnl={pos.unrealized_pnl}"
+ for pos in positions
+ )
if not positions:
lines.append(" No open positions")
await self.send("\n".join(lines))
diff --git a/shared/src/shared/resilience.py b/shared/src/shared/resilience.py
index ef2a1f6..66225d7 100644
--- a/shared/src/shared/resilience.py
+++ b/shared/src/shared/resilience.py
@@ -11,9 +11,10 @@ import functools
import logging
import random
import time
+from collections.abc import Callable
from contextlib import asynccontextmanager
from enum import StrEnum
-from typing import Any, Callable
+from typing import Any
class _State(StrEnum):
@@ -21,6 +22,7 @@ class _State(StrEnum):
OPEN = "open"
HALF_OPEN = "half_open"
+
logger = logging.getLogger(__name__)
diff --git a/shared/src/shared/sentiment.py b/shared/src/shared/sentiment.py
index 5b4b0da..c56da3e 100644
--- a/shared/src/shared/sentiment.py
+++ b/shared/src/shared/sentiment.py
@@ -1,6 +1,7 @@
"""Market sentiment aggregation."""
from datetime import datetime
+from typing import ClassVar
from shared.sentiment_models import SymbolScore
@@ -14,9 +15,9 @@ def _safe_avg(values: list[float]) -> float:
class SentimentAggregator:
"""Aggregates per-news sentiment into per-symbol scores."""
- WEIGHTS = {"news": 0.3, "social": 0.2, "policy": 0.3, "filing": 0.2}
+ WEIGHTS: ClassVar[dict[str, float]] = {"news": 0.3, "social": 0.2, "policy": 0.3, "filing": 0.2}
- CATEGORY_MAP = {
+ CATEGORY_MAP: ClassVar[dict[str, str]] = {
"earnings": "news",
"macro": "news",
"social": "social",
diff --git a/shared/src/shared/sentiment_models.py b/shared/src/shared/sentiment_models.py
index a009601..ac06c20 100644
--- a/shared/src/shared/sentiment_models.py
+++ b/shared/src/shared/sentiment_models.py
@@ -1,7 +1,6 @@
"""Sentiment scoring and stock selection models."""
from datetime import datetime
-from typing import Optional
from pydantic import BaseModel
@@ -22,7 +21,7 @@ class SymbolScore(BaseModel):
class MarketSentiment(BaseModel):
fear_greed: int
fear_greed_label: str
- vix: Optional[float] = None
+ vix: float | None = None
fed_stance: str
market_regime: str
updated_at: datetime
@@ -39,6 +38,6 @@ class SelectedStock(BaseModel):
class Candidate(BaseModel):
symbol: str
source: str
- direction: Optional[OrderSide] = None
+ direction: OrderSide | None = None
score: float
reason: str
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-02 19:31:05 +0000