refactor(storage): route project DSNs and remove legacy backends

app/infra/cache/redis_client.py

@@ -1,19 +0,0 @@
-import redis
-import msgpack
-from datetime import datetime
-from typing import Any
-
-# Initialize Redis connection
-redis_client = redis.Redis(host="127.0.0.1", port=6379, db=0)
-
-def encode_datetime(obj: Any) -> Any:
-    """Serialize datetime objects to dictionary format."""
-    if isinstance(obj, datetime):
-        return {"__datetime__": True, "as_str": obj.strftime("%Y%m%dT%H:%M:%S.%f")}
-    return obj
-
-def decode_datetime(obj: Any) -> Any:
-    """Deserialize dictionary format to datetime objects."""
-    if "__datetime__" in obj:
-        return datetime.strptime(obj["as_str"], "%Y%m%dT%H:%M:%S.%f")
-    return obj

app/infra/db/influxdb/info.py

@@ -1,5 +0,0 @@
-from app.core.config import settings
-
-url = settings.INFLUXDB_URL
-token = settings.INFLUXDB_TOKEN
-org = settings.INFLUXDB_ORG

app/infra/db/influxdb/query.py

@@ -1,33 +0,0 @@
-from influxdb_client import InfluxDBClient, Point, WriteOptions
-from influxdb_client.client.query_api import QueryApi
-import influxdb_info
-
-# 配置 InfluxDB 连接
-url = influxdb_info.url
-token = influxdb_info.token
-org = influxdb_info.org
-bucket = "SCADA_data"
-
-# 创建 InfluxDB 客户端
-client = InfluxDBClient(url=url, token=token, org=org)
-
-# 创建查询 API 对象
-query_api = client.query_api()
-
-# 构建查询语句
-query = f'''
-from(bucket: "{bucket}")
-  |> range(start: -1h)
-'''
-
-# 执行查询
-result = query_api.query(query)
-print(result)
-
-# 处理查询结果
-for table in result:
-    for record in table.records:
-        print(f"Time: {record.get_time()}, Value: {record.get_value()}, Measurement: {record.get_measurement()}, Field: {record.get_field()}")
-
-# 关闭客户端连接
-client.close()

app/infra/db/metadb/repositories/metadata_repository.py

@@ -20,14 +20,17 @@ def _normalize_postgres_dsn(dsn: str) -> str:
     scheme, rest = dsn.split("://", 1)
     if scheme not in ("postgresql", "postgres", "postgresql+psycopg"):
         return dsn
+    if scheme == "postgresql+psycopg":
+        scheme = "postgresql"
+    normalized_dsn = f"{scheme}://{rest}"
     if "@" not in rest:
-        return dsn
+        return normalized_dsn
     userinfo, hostinfo = rest.rsplit("@", 1)
     if ":" not in userinfo:
-        return dsn
+        return normalized_dsn
     username, password = userinfo.split(":", 1)
     if "@" not in password:
-        return dsn
+        return normalized_dsn
     password = password.replace("@", "%40")
     return f"{scheme}://{username}:{password}@{hostinfo}"
 

app/infra/db/postgresql/database.py

@@ -3,7 +3,7 @@ from contextlib import asynccontextmanager
 from typing import AsyncGenerator, Dict, Optional
 import psycopg_pool
 from psycopg.rows import dict_row
-import app.core.config as postgresql_info
+from app.infra.db.project_routing import get_project_pgconn_string
 
 # Configure logging
 logger = logging.getLogger(__name__)
@@ -13,6 +13,7 @@ class Database:
     def __init__(self, db_name=None):
         self.pool = None
         self.db_name = db_name
+        self.conninfo = None
 
     def init_pool(self, db_name=None):
         """Initialize the connection pool."""
@@ -21,9 +22,10 @@ class Database:
         
         # Get connection string, handling default case where target_db_name might be None
         if target_db_name:
-            conn_string = postgresql_info.get_pgconn_string(db_name=target_db_name)
+            conn_string = get_project_pgconn_string(db_name=target_db_name)
         else:
-            conn_string = postgresql_info.get_pgconn_string()
+            conn_string = get_project_pgconn_string()
+        self.conninfo = conn_string
             
         try:
             self.pool = psycopg_pool.AsyncConnectionPool(
@@ -75,6 +77,12 @@ async def get_database_instance(db_name: Optional[str] = None) -> Database:
     if not db_name:
         return db  # 返回默认数据库实例
 
+    expected_conninfo = get_project_pgconn_string(db_name=db_name)
+    existing = _database_instances.get(db_name)
+    if existing is not None and existing.conninfo != expected_conninfo:
+        await existing.close()
+        del _database_instances[db_name]
+
     if db_name not in _database_instances:
         # 创建新的数据库实例
         instance = create_database_instance(db_name)

app/infra/db/project_routing.py

@@ -0,0 +1,65 @@
+from __future__ import annotations
+
+from contextlib import contextmanager
+from contextvars import ContextVar, Token
+from dataclasses import dataclass
+from typing import Iterator
+
+from psycopg.conninfo import make_conninfo
+
+from app.core.config import get_pgconn_string, get_timescaledb_pgconn_string
+
+
+@dataclass(frozen=True)
+class ActiveProjectRouting:
+    project_code: str
+    business_dsn: str
+    timescale_dsn: str | None = None
+
+
+_active_project_routing: ContextVar[ActiveProjectRouting | None] = ContextVar(
+    "active_project_routing",
+    default=None,
+)
+
+
+def get_active_project_routing() -> ActiveProjectRouting | None:
+    return _active_project_routing.get()
+
+
+@contextmanager
+def activate_project_routing(
+    routing: ActiveProjectRouting,
+) -> Iterator[ActiveProjectRouting]:
+    token: Token[ActiveProjectRouting | None] = _active_project_routing.set(routing)
+    try:
+        yield routing
+    finally:
+        _active_project_routing.reset(token)
+
+
+def _dsn_for_database(dsn: str, database_name: str) -> str:
+    return make_conninfo(dsn, dbname=database_name)
+
+
+def get_project_pgconn_string(db_name: str | None = None) -> str:
+    routing = get_active_project_routing()
+    if routing is None:
+        return get_pgconn_string(db_name=db_name)
+    if db_name is None or db_name == routing.project_code:
+        return routing.business_dsn
+    return _dsn_for_database(routing.business_dsn, db_name)
+
+
+def get_project_timescale_pgconn_string(db_name: str | None = None) -> str:
+    routing = get_active_project_routing()
+    if routing is None:
+        return get_timescaledb_pgconn_string(db_name=db_name)
+    if routing.timescale_dsn is None:
+        raise RuntimeError(
+            f"TimescaleDB routing is not configured for project {routing.project_code}"
+        )
+    # Legacy simulation code used to derive the Timescale database name from
+    # the project code. Project-scoped requests must instead use the complete
+    # iot_data DSN selected by metadata routing.
+    return routing.timescale_dsn

app/infra/db/timescaledb/database.py

@@ -3,7 +3,7 @@ from contextlib import asynccontextmanager
 from typing import AsyncGenerator, Dict, Optional
 import psycopg_pool
 from psycopg.rows import dict_row
-from app.core.config import get_timescaledb_pgconn_string
+from app.infra.db.project_routing import get_project_timescale_pgconn_string
 
 # Configure logging
 logger = logging.getLogger(__name__)
@@ -13,6 +13,7 @@ class Database:
     def __init__(self, db_name=None):
         self.pool = None
         self.db_name = db_name
+        self.conninfo = None
 
     def init_pool(self, db_name=None):
         """Initialize the connection pool."""
@@ -21,9 +22,10 @@ class Database:
         
         # Get connection string, handling default case where target_db_name might be None
         if target_db_name:
-            conn_string = get_timescaledb_pgconn_string(db_name=target_db_name)
+            conn_string = get_project_timescale_pgconn_string(db_name=target_db_name)
         else:
-            conn_string = get_timescaledb_pgconn_string()
+            conn_string = get_project_timescale_pgconn_string()
+        self.conninfo = conn_string
 
         try:
             self.pool = psycopg_pool.AsyncConnectionPool(
@@ -54,8 +56,8 @@ class Database:
         """Get the TimescaleDB connection string."""
         target_db_name = db_name or self.db_name
         if target_db_name:
-            return get_timescaledb_pgconn_string(db_name=target_db_name)
-        return get_timescaledb_pgconn_string()
+            return get_project_timescale_pgconn_string(db_name=target_db_name)
+        return get_project_timescale_pgconn_string()
 
     @asynccontextmanager
     async def get_connection(self) -> AsyncGenerator:
@@ -84,6 +86,12 @@ async def get_database_instance(db_name: Optional[str] = None) -> Database:
     if not db_name:
         return db  # 返回默认数据库实例
 
+    expected_conninfo = get_project_timescale_pgconn_string(db_name=db_name)
+    existing = _database_instances.get(db_name)
+    if existing is not None and existing.conninfo != expected_conninfo:
+        await existing.close()
+        del _database_instances[db_name]
+
     if db_name not in _database_instances:
         # 创建新的数据库实例
         instance = create_database_instance(db_name)

app/infra/db/timescaledb/internal_queries.py

@@ -6,7 +6,7 @@ import psycopg
 from psycopg import sql
 from psycopg.rows import dict_row
 import time
-from app.core.config import get_timescaledb_pgconn_string
+from app.infra.db.project_routing import get_project_timescale_pgconn_string
 from app.infra.db.timescaledb.repositories.scheme import SchemeRepository
 from app.infra.db.timescaledb.repositories.realtime import RealtimeRepository
 from app.infra.db.timescaledb.repositories.scada import ScadaRepository
@@ -26,9 +26,9 @@ class InternalStorage:
         for attempt in range(max_retries):
             try:
                 conn_string = (
-                    get_timescaledb_pgconn_string(db_name=db_name)
+                    get_project_timescale_pgconn_string(db_name=db_name)
                     if db_name
-                    else get_timescaledb_pgconn_string()
+                    else get_project_timescale_pgconn_string()
                 )
                 with psycopg.Connection.connect(conn_string) as conn:
                     RealtimeRepository.store_realtime_simulation_result_sync(
@@ -58,9 +58,9 @@ class InternalStorage:
         for attempt in range(max_retries):
             try:
                 conn_string = (
-                    get_timescaledb_pgconn_string(db_name=db_name)
+                    get_project_timescale_pgconn_string(db_name=db_name)
                     if db_name
-                    else get_timescaledb_pgconn_string()
+                    else get_project_timescale_pgconn_string()
                 )
                 with psycopg.Connection.connect(conn_string) as conn:
                     SchemeRepository.store_scheme_simulation_result_sync(
@@ -99,9 +99,9 @@ class InternalQueries:
         for attempt in range(max_retries):
             try:
                 conn_string = (
-                    get_timescaledb_pgconn_string(db_name=db_name)
+                    get_project_timescale_pgconn_string(db_name=db_name)
                     if db_name
-                    else get_timescaledb_pgconn_string()
+                    else get_project_timescale_pgconn_string()
                 )
                 with psycopg.Connection.connect(conn_string) as conn:
                     rows = ScadaRepository.get_scada_by_ids_time_range_sync(
@@ -140,9 +140,9 @@ class InternalQueries:
         for attempt in range(max_retries):
             try:
                 conn_string = (
-                    get_timescaledb_pgconn_string(db_name=db_name)
+                    get_project_timescale_pgconn_string(db_name=db_name)
                     if db_name
-                    else get_timescaledb_pgconn_string()
+                    else get_project_timescale_pgconn_string()
                 )
                 with psycopg.Connection.connect(conn_string) as conn:
                     rows = ScadaRepository.get_scada_by_ids_time_range_sync(
@@ -185,9 +185,9 @@ class InternalQueries:
         for attempt in range(max_retries):
             try:
                 conn_string = (
-                    get_timescaledb_pgconn_string(db_name=db_name)
+                    get_project_timescale_pgconn_string(db_name=db_name)
                     if db_name
-                    else get_timescaledb_pgconn_string()
+                    else get_project_timescale_pgconn_string()
                 )
                 with psycopg.Connection.connect(conn_string) as conn:
                     return ScadaRepository.get_latest_scada_time_sync(
@@ -286,9 +286,9 @@ class InternalQueries:
         for attempt in range(max_retries):
             try:
                 conn_string = (
-                    get_timescaledb_pgconn_string(db_name=db_name)
+                    get_project_timescale_pgconn_string(db_name=db_name)
                     if db_name
-                    else get_timescaledb_pgconn_string()
+                    else get_project_timescale_pgconn_string()
                 )
                 with psycopg.Connection.connect(conn_string) as conn:
                     with conn.cursor(row_factory=dict_row) as cur: