Release 1.0.3

Primarily a fix for bugs introduced by ty type checking changes:
- Moved where the sqlalchemy session typing is checked
- changed type_ -> type in load_data check

---------

Co-authored-by: MacFarland, Midgie <macfarlandmj@ornl.gov>

Author: midgemacf

CHANGELOG.md

@@ -38,10 +38,28 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 -->
 
-## [1.0.0] - 2025-05-09
-- Initial commit
+## [Unreleased] - YYYY-MM-DD
+### Added
+- 🔥 Environment variable OPENSAMPL_COMPOSE_FILE used to identify compose file used for opensampl-server 
+
+### Changed
+- ⚡ Order of changelog, newest on top
+
+### Fixed
+- 🩹 Bugs in load_data introduced by ty type checking changes
 
 
+## [1.0.2] - 2025-05-12
+### Added
+- 🔥 `black` added as a dependency for auto-creation of probe types
+- 🔥 `ty` added as a dependency for type-checking
+
+### Fixed
+- 🩹 `ty` type checking errors addressed
+
+### Changed
+- ⚡ linting github action now confirms that the documentation can be built
+
 ## [1.0.1] - 2025-05-09
 ### Added
 - 🔥 pytest as a dev dependency, used for running tests
@@ -63,13 +81,5 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - 🗡️ Remove unused imports from many files
 - 🗡️ Remove commented-out code in some classes
 
-## [1.0.2] - 2025-05-12
-### Added
-- 🔥 `black` added as a dependency for auto-creation of probe types
-- 🔥 `ty` added as a dependency for type-checking
-
-### Fixed
-- 🩹 `ty` type checking errors addressed
-
-### Changed
-- ⚡ linting github action now confirms that the documentation can be built
+## [1.0.0] - 2025-05-09
+- Initial commit

opensampl/db/orm.py

@@ -56,7 +56,7 @@ def __init__(self, **kwargs: dict):
             lat = kwargs.pop("lat")
             lon = kwargs.pop("lon")
             z = kwargs.pop("z", None)
-            projection = kwargs.pop("projection", 4326)
+            projection = int(kwargs.pop("projection", 4326))
             point_str = f"POINT({lon} {lat} {z})" if z is not None else f"POINT({lon} {lat})"
             kwargs["geom"] = WKTElement(point_str, srid=projection)
         super().__init__(**kwargs)

opensampl/helpers/source_writer.py

@@ -15,11 +15,11 @@ def _get_statement_type(self, stmt: cst.CSTNode) -> str:
         if isinstance(stmt, cst.SimpleStatementLine):  # noqa: SIM102
             if len(stmt.body) == 1:  # noqa: SIM102
                 if isinstance(stmt.body[0], cst.Assign):
-                    if isinstance(stmt.body[0].targets[0], cst.Name):
-                        name = stmt.body[0].targets[0].value
+                    if isinstance(stmt.body[0].targets[0], cst.Name):  # ty: ignore[unresolved-attribute]
+                        name = stmt.body[0].targets[0].value  # ty: ignore[unresolved-attribute]
                         if name.startswith("__"):
                             return "dunder"
-                    value = stmt.body[0].value
+                    value = stmt.body[0].value  # ty: ignore[unresolved-attribute]
                     if isinstance(value, cst.Call):
                         func_name = str(value.func.value)
                         if "Column" in func_name:

opensampl/load_data.py

@@ -117,14 +117,15 @@ def write_to_table(
         SQLAlchemyError: For database errors
 
     """
-    if not isinstance(session, Session):
-        raise TypeError("Session must be a SQLAlchemy session")
     if if_exists not in ["error", "replace", "update", "ignore"]:
         raise ValueError("on_conflict must be one of: 'error', 'replace', 'update', 'ignore'")
 
     if ENV_VARS.ROUTE_TO_BACKEND.get_value():
         return {"table": table, "data": data, "if_exists": if_exists}
 
+    if not isinstance(session, Session):
+        raise TypeError("Session must be a SQLAlchemy session")
+
     try:
         TableModel = resolve_table_model(table)  # noqa: N806
         inspector = inspect(TableModel)
@@ -201,7 +202,7 @@ def build_pk_conditions(
             pk_conditions.append(getattr(TableModel, pk) == data[pk])
         else:
             logger.debug(f"{pk} is primary but not in data")
-    logger.debug(f"{pk_conditions=}")
+    logger.debug(f"pk_conditions={', '.join([str(x) for x in pk_conditions])}")
     return pk_conditions
 
 
@@ -225,7 +226,7 @@ def extract_unique_constraints(inspector: Any, data: dict[str, Any]):
             cols = [col.key for col in constraint.columns]
             if all(col in data for col in cols):
                 unique_constraints.append([(col, data[col]) for col in cols])
-    logger.debug(f"{unique_constraints=}")
+    logger.debug(f"unique_constraints={', '.join([str(x) for x in unique_constraints])}")
     return unique_constraints
 
 
@@ -327,8 +328,6 @@ def handle_existing_entry(  # noqa: PLR0913
 @route_or_direct("load_time_data", send_file=True)
 def load_time_data(probe_key: ProbeKey, data: pd.DataFrame, session: Optional[Session] = None):
     """Load time series data"""
-    if not isinstance(session, Session):
-        raise TypeError("Session must be a SQLAlchemy session")
     route_to_backend = ENV_VARS.ROUTE_TO_BACKEND.get_value()
     if route_to_backend:
         csv_data = data.to_csv(index=False).encode("utf-8")
@@ -339,6 +338,8 @@ def load_time_data(probe_key: ProbeKey, data: pd.DataFrame, session: Optional[Se
 
     from opensampl.db.orm import ProbeData, ProbeMetadata
 
+    if not isinstance(session, Session):
+        raise TypeError("Session must be a SQLAlchemy session")
     try:
         # Verify probe exists and get UUID
         probe = (
@@ -357,9 +358,10 @@ def load_time_data(probe_key: ProbeKey, data: pd.DataFrame, session: Optional[Se
         df["probe_uuid"] = probe.uuid
 
         # Ensure correct dtypes
-        df = df.astype({"time": "datetime64[ns]", "value": "float64", "probe_uuid": str})
+        df["time"] = pd.to_datetime(df["time"], utc=True, errors="raise")
+        df = df.astype({"value": "float64", "probe_uuid": str})
 
-        dtype = {column.name: column.type_ for column in ProbeData.__table__.columns}
+        dtype = {column.name: column.type for column in ProbeData.__table__.columns}
 
         # Write directly to database using pandas
         df.to_sql(
@@ -387,8 +389,6 @@ def load_probe_metadata(
     session: Optional[Session] = None,
 ):
     """Write object to table"""
-    if not isinstance(session, Session):
-        raise TypeError("Session must be a SQLAlchemy session")
     route_to_backend = ENV_VARS.ROUTE_TO_BACKEND.get_value()
     if route_to_backend:
         return {
@@ -397,6 +397,9 @@ def load_probe_metadata(
             "data": data,
         }
 
+    if not isinstance(session, Session):
+        raise TypeError("Session must be a SQLAlchemy session")
+
     try:
         from opensampl.db.orm import ProbeMetadata
 
@@ -428,11 +431,13 @@ def load_probe_metadata(
 @route_or_direct("create_new_tables", method="GET")
 def create_new_tables(create_schema: bool = True, session: Optional[Session] = None):
     """Use the ORM definition to create all tables, optionally creating the schema as well"""
-    if not isinstance(session, Session):
-        raise TypeError("Session must be a SQLAlchemy session")
     route_to_backend = ENV_VARS.ROUTE_TO_BACKEND.get_value()
     if route_to_backend:
         return {"create_schema": create_schema}
+
+    if not isinstance(session, Session):
+        raise TypeError("Session must be a SQLAlchemy session")
+
     try:
         if create_schema:
             session.execute(text(f"CREATE SCHEMA IF NOT EXISTS {Base.metadata.schema}"))

opensampl/server/cli.py

@@ -48,7 +48,7 @@ def get_compose_command():
 def get_cast_compose_file():
     """Get the fully qualified path to the docker-compose.yaml file included inside the package."""
     try:
-        filename = "docker-compose.yaml"
+        filename = os.getenv("OPENSAMPL_COMPOSE_FILE", "docker-compose.yaml")
         with pkg_resources.path("opensampl.server", filename) as path:
             return str(path)
     except ImportError:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opensampl"
-version = "1.0.2"
+version = "1.0.3"
 description = "Python tools for adding clock data to a timescale db."
 authors = [
     { name = "Midgie MacFarland", email = "macfarlandmj@ornl.gov" },
@@ -96,4 +96,3 @@ quote-style = "double"
 indent-style = "space"
 skip-magic-trailing-comma = false
 docstring-code-format = true
-