Update to use consDB

python/lsst/rubintv/analysis/service/__init__.py

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from . import butler, command, commands, data, database, efd, query, utils, worker
+from . import butler, command, commands, data, database, efd, query, utils, viewer, worker

python/lsst/rubintv/analysis/service/commands/__init__.py

@@ -1,2 +1,3 @@
-from .db import *
 from .butler import *
+from .db import *
+from .image import *

python/lsst/rubintv/analysis/service/commands/db.py

@@ -34,7 +34,7 @@
     from ..data import DataCenter
 
 
-logger = logging.getLogger("lsst.rubintv.analysis.service.command")
+logger = logging.getLogger("lsst.rubintv.analysis.service.commands.db")
 
 
 @dataclass(kw_only=True)
@@ -63,7 +63,7 @@ class LoadColumnsCommand(BaseCommand):
 
     def build_contents(self, data_center: DataCenter) -> dict:
         # Query the database to return the requested columns
-        database = data_center.databases[self.database]
+        database = data_center.schemas[self.database]
         data = database.query(self.columns, self.query)
 
         if not data:
@@ -76,7 +76,7 @@ def build_contents(self, data_center: DataCenter) -> dict:
         else:
             content = {
                 "schema": self.database,
-                "columns": self.columns,
+                "columns": list(data.keys()),
                 "data": data,
             }
 
@@ -101,7 +101,7 @@ class CalculateBoundsCommand(BaseCommand):
 
     def build_contents(self, data_center: DataCenter) -> dict:
         # Query the database to return the requested columns
-        database = data_center.databases[self.database]
+        database = data_center.schemas[self.database]
         data = database.calculate_bounds(
             column=self.column,
         )
@@ -156,12 +156,13 @@ def build_contents(self, data_center: DataCenter) -> dict:
         }
 
         # Load the data base to access the schema
+        schema_name = f"cdb_{instrument}"
         try:
-            schema_name = f"cdb_{instrument}"
-            database = data_center.databases[schema_name]
+            database = data_center.schemas[schema_name]
             result["schema"] = database.schema
         except KeyError:
             logger.warning(f"No database connection available for {schema_name}")
+            logger.warning(f"Available databases: {data_center.schemas.keys()}")
 
         return result
 
@@ -170,6 +171,7 @@ def build_contents(self, data_center: DataCenter) -> dict:
 class SelectDataPointsCommand(BaseCommand):
     pass
 
+
 # Register the commands
 LoadColumnsCommand.register("load columns")
 CalculateBoundsCommand.register("get bounds")

python/lsst/rubintv/analysis/service/commands/image.py

@@ -0,0 +1,53 @@
+# This file is part of lsst_rubintv_analysis_service.
+#
+# Developed for the LSST Data Management System.
+# This product includes software developed by the LSST Project
+# (https://www.lsst.org).
+# See the COPYRIGHT file at the top-level directory of this distribution
+# for details of code ownership.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+import logging
+from typing import Any, TYPE_CHECKING
+
+from lsst.rubintv.analysis.service.data import DataCenter
+
+from ..command import BaseCommand
+
+if TYPE_CHECKING:
+    from ..data import DataCenter
+
+logger = logging.getLogger("lsst.rubintv.analysis.service.commands.image")
+
+
+
+
+
+@dataclass(kw_only=True)
+class LoadDetectorImageCommand(BaseCommand):
+    """Load an image from a data center.
+    """
+    database: str
+    detector: int
+    visit_id: int
+
+    def build_contents(self, data_center: DataCenter) -> dict:
+        #butler = data_center.butler
+        #assert butler is not None
+        #image = butler.get(, **data_id)
+        pass

python/lsst/rubintv/analysis/service/data.py

@@ -28,7 +28,7 @@
 if TYPE_CHECKING:
     from lsst.daf.butler import Butler
 
-    from .database import DatabaseConnection
+    from .database import ConsDbSchema
     from .efd import EfdClient
 
 
@@ -143,19 +143,16 @@ class DataCenter:
         An EFD client instance.
     """
 
-    matches: dict[tuple[DataId, DataId], Callable]
-    databases: dict[str, DatabaseConnection]
-    butler: Butler | None = None
+    schemas: dict[str, ConsDbSchema]
+    butlers: dict[str, Butler] | None = None
     efd_client: EfdClient | None = None
 
     def __init__(
         self,
-        databases: dict[str, DatabaseConnection],
-        butler: Butler | None = None,
+        schemas: dict[str, ConsDbSchema],
+        butlers: dict[str, Butler] | None = None,
         efd_client: EfdClient | None = None,
-        matches: dict[tuple[DataId, DataId], Callable] | None = None,
     ):
-        self.databases = databases
-        self.butler = butler
+        self.schemas = schemas
+        self.butlers = butlers
         self.efdClient = efd_client
-        self.matches = matches or {}