opensampl 1.2.0__tar.gz → 1.2.2__tar.gz

{opensampl-1.2.0 → opensampl-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: opensampl
-Version: 1.2.0
+Version: 1.2.2
 Summary: Python tools for adding clock data to a timescale db.
 Project-URL: Homepage, https://github.com/ORNL/OpenSAMPL
 Project-URL: Repository, https://github.com/ORNL/OpenSAMPL
@@ -70,11 +70,11 @@ Requires-Dist: psycopg2-binary<3,>=2.9.0
 Requires-Dist: pydanclick
 Requires-Dist: pydantic-settings>=2.9.0
 Requires-Dist: pydantic<3,>=2.10.3
-Requires-Dist: python-dotenv
-Requires-Dist: python-multipart<0.0.27,>=0.0.26
+Requires-Dist: python-dotenv<2,>=1.1.1
+Requires-Dist: python-multipart<0.1,>=0.0.27
 Requires-Dist: pytz~=2024.1
 Requires-Dist: pyyaml<7,>=6.0.0
-Requires-Dist: requests<3,>=2.31.0
+Requires-Dist: requests<3,>=2.32.4
 Requires-Dist: sqlalchemy<3,>=2.0.39
 Requires-Dist: tabulate
 Requires-Dist: tqdm<5,>=4.66.2

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/db/orm.py

@@ -280,7 +280,10 @@ class ProbeData(Base):
         primary_key=True,
         comment="Foreign key to the metric type being measured",
     )
-    value = Column(JSONB, comment="Measurement value stored as JSON; value's expected type defined via metric")
+    value_float = Column(Float, nullable=True, comment="Float type value; value's expected type defined via metric")
+    value_jsonb = Column(
+        JSONB, nullable=True, comment="Measurement value stored as JSON; value's expected type defined via metric"
+    )
 
 
 class MetricType(Base):

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/load_data.py

@@ -138,18 +138,28 @@ def load_time_data(
         df["probe_uuid"] = data_definition.probe.uuid  # ty: ignore[possibly-unbound-attribute]
         df["reference_uuid"] = data_definition.reference.uuid  # ty: ignore[possibly-unbound-attribute]
         df["metric_type_uuid"] = data_definition.metric.uuid  # ty: ignore[possibly-unbound-attribute]
-        logger.debug(df.head())
-        # Ensure correct dtypes
+
+        # Ensure correct time dtypes
         df["time"] = pd.to_datetime(df["time"], format="mixed", utc=True, errors="raise")
-        df["value"] = df["value"].apply(json.dumps)
+
+        if data_definition.metric.is_numeric():
+            df["value_float"] = pd.to_numeric(df["value"], errors="raise")
+            df["value_jsonb"] = None
+        else:
+            df["value_float"] = None
+            df["value_jsonb"] = df["value"].apply(json.dumps)
+
+        df = df.drop(columns=["value"])  # Drop original value column, as we now have value_float and value_jsonb
+        logger.debug(df.head())
+
         records = df.to_dict(orient="records")
         insert_stmt = text(f"""
-        INSERT INTO {ProbeData.__table__.schema}.{ProbeData.__tablename__}
-        (time, probe_uuid, reference_uuid, metric_type_uuid, value)
-        VALUES (:time, :probe_uuid, :reference_uuid, :metric_type_uuid, :value)
-        ON CONFLICT (time, probe_uuid, reference_uuid, metric_type_uuid)
-        DO NOTHING
-        """)  # noqa: S608
+                INSERT INTO {ProbeData.__table__.schema}.{ProbeData.__tablename__}
+                (time, probe_uuid, reference_uuid, metric_type_uuid, value_float, value_jsonb)
+                VALUES (:time, :probe_uuid, :reference_uuid, :metric_type_uuid, :value_float, :value_jsonb)
+                ON CONFLICT (time, probe_uuid, reference_uuid, metric_type_uuid)
+                DO NOTHING
+                """)  # noqa: S608
 
         try:
             result = session.execute(insert_stmt, records)

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/metrics.py

@@ -21,6 +21,10 @@ class MetricType(BaseModel):
         """Convert a given value to the expected type for the Metric"""
         return self.value_type(value)
 
+    def is_numeric(self) -> bool:
+        """Return True if the metric's value_type is numeric (int or float)"""
+        return self.value_type in [int, float]
+
     @field_serializer("value_type")
     def serialize_type(self, value: type):
         """Return the name of value_type for serializing"""

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/server/grafana/grafana-dashboards/ntp_dash.json

@@ -1313,7 +1313,7 @@
               "editorMode": "code",
               "format": "table",
               "rawQuery": true,
-              "rawSql": "WITH probe_ref AS (\n    SELECT\n        uuid,\n        COALESCE(pm.name, CONCAT(pm.ip_address, ' ', pm.probe_id)) AS probe_name\n    FROM castdb.probe_metadata pm\n)\nSELECT\n    time_bucket('1 minute'::interval, pd.time AT TIME ZONE 'UTC') AS time,\n    pd.probe_uuid,\n    pr.probe_name,\n    pd.reference_uuid,\n    AVG(pd.value::float * 1e9) FILTER (WHERE lower(m.name) = 'phase offset') AS phase_offset,\n    AVG(pd.value::float * 1e9)  FILTER (WHERE lower(m.name) = 'jitter') AS jitter,\n    AVG((pd.value)::float) FILTER (WHERE lower(m.name) = 'stratum') AS stratum,\n    AVG((pd.value)::float) FILTER (WHERE lower(m.name) = 'sync health') AS sync_health\nFROM castdb.probe_data pd\nJOIN probe_ref pr\n    ON pd.probe_uuid = pr.uuid\nJOIN castdb.metric_type m\n    ON pd.metric_type_uuid = m.uuid\nWHERE pd.probe_uuid = ANY(ARRAY[${ntp_probe:sqlstring}]::text[]) AND $__timeFilter(pd.time)\nGROUP BY 1, 2, 3, 4\nORDER BY\n    1, 3;",
+              "rawSql": "WITH probe_ref AS (\n    SELECT\n        uuid,\n        COALESCE(pm.name, CONCAT(pm.ip_address, ' ', pm.probe_id)) AS probe_name\n    FROM castdb.probe_metadata pm\n)\nSELECT\n    time_bucket('1 minute'::interval, pd.time AT TIME ZONE 'UTC') AS time,\n    pd.probe_uuid,\n    pr.probe_name,\n    pd.reference_uuid,\n    AVG(pd.value_float * 1e9) FILTER (WHERE lower(m.name) = 'phase offset') AS phase_offset,\n    AVG(pd.value_float * 1e9)  FILTER (WHERE lower(m.name) = 'jitter') AS jitter,\n    AVG((pd.value)::float) FILTER (WHERE lower(m.name) = 'stratum') AS stratum,\n    AVG((pd.value)::float) FILTER (WHERE lower(m.name) = 'sync health') AS sync_health\nFROM castdb.probe_data pd\nJOIN probe_ref pr\n    ON pd.probe_uuid = pr.uuid\nJOIN castdb.metric_type m\n    ON pd.metric_type_uuid = m.uuid\nWHERE pd.probe_uuid = ANY(ARRAY[${ntp_probe:sqlstring}]::text[]) AND $__timeFilter(pd.time)\nGROUP BY 1, 2, 3, 4\nORDER BY\n    1, 3;",
               "refId": "A",
               "sql": {
                 "columns": [

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/server/grafana/grafana-dashboards/public-timing-dashboard.json

@@ -650,7 +650,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, concat(pm.ip_address, ' Interface ', pm.probe_id)),\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM castdb.probe_data pd JOIN castdb.probe_metadata pm ON pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pm.vendor IN ('ADVA', 'MicrochipTP4100', 'NTP')\n  AND coalesce(pm.public, true)\n  AND (trim('${clock_name:csv}') = '' OR pd.probe_uuid = ANY(string_to_array(trim('${clock_name:csv}'), ',')))\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, concat(pm.ip_address, ' Interface ', pm.probe_id)),\n  AVG(pd.value_float) * 1e9 AS value\nFROM castdb.probe_data pd JOIN castdb.probe_metadata pm ON pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pm.vendor IN ('ADVA', 'MicrochipTP4100', 'NTP')\n  AND coalesce(pm.public, true)\n  AND (trim('${clock_name:csv}') = '' OR pd.probe_uuid = ANY(string_to_array(trim('${clock_name:csv}'), ',')))\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -776,7 +776,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, CONCAT(pm.ip_address, ' Interface ', pm.probe_id)),\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM castdb.probe_data pd JOIN castdb.probe_metadata pm ON pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pm.vendor IN ('ADVA', 'MicrochipTP4100', 'NTP')\n  AND coalesce(pm.public, true)\n  AND (trim('${clock_name:csv}') = '' OR pd.probe_uuid = ANY(string_to_array(trim('${clock_name:csv}'), ',')))\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, CONCAT(pm.ip_address, ' Interface ', pm.probe_id)),\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM castdb.probe_data pd JOIN castdb.probe_metadata pm ON pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pm.vendor IN ('ADVA', 'MicrochipTP4100', 'NTP')\n  AND coalesce(pm.public, true)\n  AND (trim('${clock_name:csv}') = '' OR pd.probe_uuid = ANY(string_to_array(trim('${clock_name:csv}'), ',')))\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -916,7 +916,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value_float) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -1027,7 +1027,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/server/grafana/grafana-dashboards/public_twst_dash.json

@@ -493,7 +493,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, pm.probe_id) AS channel,\n  AVG(pd.value::FLOAT) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\nJOIN \n  castdb.reference r ON pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nWHERE \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.name,\n  pm.probe_id\nORDER BY \n  time\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, pm.probe_id) AS channel,\n  AVG(pd.value_float) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\nJOIN \n  castdb.reference r ON pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nWHERE \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.name,\n  pm.probe_id\nORDER BY \n  time\n",
           "refId": "B",
           "sql": {
             "columns": [
@@ -628,7 +628,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  AVG(pd.value_float) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -763,7 +763,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -1246,7 +1246,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value::FLOAT) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value_float) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -1367,7 +1367,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value_float) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -1488,7 +1488,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/server/grafana/grafana-dashboards/timing-dashboard2.json

@@ -653,7 +653,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, concat(pm.ip_address, ' Interface ', pm.probe_id)),\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM castdb.probe_data pd join castdb.probe_metadata pm on pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid IN (${clock_name:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, concat(pm.ip_address, ' Interface ', pm.probe_id)),\n  AVG(pd.value_float) * 1e9 AS value\nFROM castdb.probe_data pd join castdb.probe_metadata pm on pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid IN (${clock_name:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -778,7 +778,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(name, CONCAT(ip_address, ' Interface ', probe_id)),\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM castdb.probe_data pd join castdb.probe_metadata pm on pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid in (${clock_name:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(name, CONCAT(ip_address, ' Interface ', probe_id)),\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM castdb.probe_data pd join castdb.probe_metadata pm on pd.probe_uuid = pm.uuid\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid in (${clock_name:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid,\n  pm.name,\n  pm.ip_address,\n  pm.probe_id\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -917,7 +917,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value_float) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -1027,7 +1027,7 @@
           "editorMode": "code",
           "format": "time_series",
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM castdb.probe_data pd\nWHERE\n  $__timeFilter(pd.time)\n  AND pd.probe_uuid = ${clock_name:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')\n",
           "refId": "A",
           "sql": {
             "columns": [

{opensampl-1.2.0 → opensampl-1.2.2}/opensampl/server/grafana/grafana-dashboards/twst_dash.json

@@ -492,7 +492,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, pm.probe_id) AS channel,\n  AVG(pd.value::FLOAT) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\nJOIN \n  castdb.reference r ON pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nWHERE \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.name,\n  pm.probe_id\nORDER BY \n  time\n",
+          "rawSql": "SELECT \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  coalesce(pm.name, pm.probe_id) AS channel,\n  AVG(pd.value_float) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\nJOIN \n  castdb.reference r ON pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nWHERE \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.name,\n  pm.probe_id\nORDER BY \n  time\n",
           "refId": "B",
           "sql": {
             "columns": [
@@ -627,7 +627,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  AVG(pd.value_float) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -762,7 +762,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  COALESCE(pm.name, pm.probe_id) as name,\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nJOIN \n  castdb.probe_metadata pm ON r.compound_reference_uuid = pm.uuid\nwhere \n  $__timeFilter(pd.time)\n  and r.compound_reference_uuid in (${compound_ref:sqlstring})\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pm.uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -1247,7 +1247,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value::FLOAT) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value_float) AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${ebno_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -1368,7 +1368,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value::FLOAT) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  AVG(pd.value_float) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [
@@ -1489,7 +1489,7 @@
           "format": "table",
           "hide": false,
           "rawQuery": true,
-          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value::FLOAT) - MIN(pd.value::FLOAT)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
+          "rawSql": "select \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC') AS time,\n  (MAX(pd.value_float) - MIN(pd.value_float)) * 1e9 AS value\nFROM \n  get_probe_data_by_probe_and_metric(${modem:sqlstring}, ${phase_offset_uuid:sqlstring}) pd\njoin castdb.reference r on pd.reference_uuid = r.uuid\nwhere \n  $__timeFilter(pd.time)\n  AND r.compound_reference_uuid = ${compound_ref:sqlstring}\nGROUP BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC'),\n  pd.probe_uuid\nORDER BY \n  time_bucket(${resolution:sqlstring}, pd.time AT TIME ZONE 'UTC')",
           "refId": "B",
           "sql": {
             "columns": [

opensampl-1.2.2/opensampl/server/migrations/_migrations/versions/2026_09_11_1445_update_probe_data_types.py

@@ -0,0 +1,56 @@
+"""update probe_data types
+
+Revision ID: b88042bae240
+Revises: c95e49e551be
+Create Date: 2026-09-11 14:45:53.382353
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b88042bae240'
+down_revision: Union[str, None] = 'c95e49e551be'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+SCHEMA = 'castdb'
+
+def upgrade() -> None:
+    op.alter_column("probe_data",
+                    "value",
+                    new_column_name="value_jsonb",
+                    nullable=True,
+                    schema=SCHEMA)
+    op.add_column("probe_data",
+                  sa.Column("value_float", sa.Float(), nullable=True),
+                  schema=SCHEMA)
+
+    # Backfill value_float from the numeric jsonb values
+    op.execute(
+        """
+        UPDATE castdb.probe_data pd
+        SET value_float = (pd.value_jsonb #>> '{}')::double precision
+        FROM castdb.metric_type mt
+        WHERE pd.metric_type_uuid = mt.uuid
+          AND mt.value_type IN ('float'
+            , 'int')
+        """
+    )
+
+
+def downgrade() -> None:
+    op.execute(
+        """
+        UPDATE castdb.probe_data
+        SET value_jsonb = to_jsonb(value_float)
+        WHERE value_float IS NOT NULL
+        """
+    )
+    op.drop_column("probe_data", "value_float", schema=SCHEMA)
+
+    op.alter_column("probe_data", "value_jsonb", nullable=False, new_column_name="value", schema=SCHEMA)

{opensampl-1.2.0 → opensampl-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opensampl"
-version = "1.2.0"
+version = "1.2.2"
 description = "Python tools for adding clock data to a timescale db."
 license = {file = "LICENSE"}
 authors = [
@@ -49,13 +49,13 @@ dependencies = [
     "tqdm>=4.66.2,<5",
     "numpy>=1.26.4,<2",
     "pytz~=2024.1",
-    "requests>=2.31.0,<3",
+    "requests>=2.32.4,<3",
     "pyyaml>=6.0.0,<7",
     "allantools",
     "loguru>=0.7.0,<0.8",
     "psycopg2-binary>=2.9.0,<3",
-    "python-dotenv",
-    "python-multipart>=0.0.26,<0.0.27",
+    "python-dotenv>=1.1.1,<2",
+    "python-multipart>=0.0.27,<0.1",
     "astor",
     "libcst",
     "jinja2>=3.1.6",
@@ -92,7 +92,7 @@ opensampl-collect = "opensampl.collect.cli:cli"
 [dependency-groups]
 dev = [
     "ty",
-    "pytest",
+    "pytest>=8.4.0",
     "pytest-cov",
     "pytest-mock",
     "ruff",