pikobs 3.0.331__py3-none-any.whl → 3.0.332__py3-none-any.whl

pikobs/obstimedb/obstimedb.py

@@ -374,50 +374,65 @@ def create_and_populate_moyenne_table(
         # it into its own column. Every other family leaves `channel` as
         # a literal NULL and groups exactly as before -- this is a pure
         # addition, the non-radiance extraction path is unchanged.
+        #
+        # CRITICAL: the per-channel rows must NEVER be the only rows
+        # inserted for a radiance family. The SAME id_obs (profile)
+        # appears in MANY channel rows (one per channel it reports), so
+        # summing Nobsdata/Nobsprofile ACROSS channel rows -- exactly
+        # what every consumer of `moyenne` that isn't channel-aware does
+        # (the main Nobs/Nobsprofile series behind the mosaic, global
+        # time series, and profile summary table) -- silently multiplies
+        # the true profile count by roughly the number of channels
+        # reported (confirmed directly: a 10-profile/15-channel test
+        # case summed to 150, not 10). The fix is to ALSO insert a
+        # SEPARATE, non-channel-split row (channel=NULL) with the
+        # correct, ungrouped-by-channel counts, so every consumer that
+        # filters `WHERE channel IS NULL` (the main series) gets the
+        # right numbers, while `WHERE channel IS NOT NULL` (the
+        # per-channel breakdown) still works exactly as before.
         # ------------------------------------------------------------------
         is_radiance = (VCOTYP == 'CANAL')
         if is_radiance:
-            channel_expr = "vcoord"
-            group_by_clause = f"{group_col}, vcoord"
+            passes = [("NULL", group_col), ("vcoord", f"{group_col}, vcoord")]
         else:
-            channel_expr = "NULL"
-            group_by_clause = group_col
-
-        insert_query = f"""
-            INSERT INTO moyenne (Nobsdata, Nobsprofile, avg_omp, avg_oma, id_stn, channel, date)
-            SELECT
-                count(DISTINCT(id_data)),
-                count(DISTINCT(id_obs)),
-                {avg_omp_expr},
-                {avg_oma_expr},
-                {id_stn_expr},
-                {channel_expr},
-                {date_match.group(1)}
-            FROM db.header
-            NATURAL JOIN db.DATA
-            WHERE obsvalue IS NOT NULL
-                {flag_criteria}
-                {LATLONCRIT}
-                {VCOCRIT}
-                {family_filter}
-            GROUP BY {group_by_clause};
-        """
-
-        try:
-            cursor.execute(insert_query)
-        except sqlite3.OperationalError as err:
-            msg = str(err).lower()
-            fb_query = insert_query
-            for metric in agr_list:
-                if metric in msg:
-                    print(f"[WARNING] Column '{metric}' not found in "
-                          f"{os.path.basename(existing_db_filename)}; storing NULL.",
-                          flush=True)
-                    fb_query = fb_query.replace(f"AVG({metric})", "NULL")
-            if fb_query != insert_query:
-                cursor.execute(fb_query)
-            else:
-                raise
+            passes = [("NULL", group_col)]
+
+        for channel_expr, group_by_clause in passes:
+            insert_query = f"""
+                INSERT INTO moyenne (Nobsdata, Nobsprofile, avg_omp, avg_oma, id_stn, channel, date)
+                SELECT
+                    count(DISTINCT(id_data)),
+                    count(DISTINCT(id_obs)),
+                    {avg_omp_expr},
+                    {avg_oma_expr},
+                    {id_stn_expr},
+                    {channel_expr},
+                    {date_match.group(1)}
+                FROM db.header
+                NATURAL JOIN db.DATA
+                WHERE obsvalue IS NOT NULL
+                    {flag_criteria}
+                    {LATLONCRIT}
+                    {VCOCRIT}
+                    {family_filter}
+                GROUP BY {group_by_clause};
+            """
+
+            try:
+                cursor.execute(insert_query)
+            except sqlite3.OperationalError as err:
+                msg = str(err).lower()
+                fb_query = insert_query
+                for metric in agr_list:
+                    if metric in msg:
+                        print(f"[WARNING] Column '{metric}' not found in "
+                              f"{os.path.basename(existing_db_filename)}; storing NULL.",
+                              flush=True)
+                        fb_query = fb_query.replace(f"AVG({metric})", "NULL")
+                if fb_query != insert_query:
+                    cursor.execute(fb_query)
+                else:
+                    raise
         mem_conn.commit()
 
         try:

pikobs/obstimedb/obstimedb_plot.py

@@ -891,7 +891,7 @@ def obstimedb_plot(
             select_extra.append(
                 f"SUM(CASE WHEN {col} IS NOT NULL THEN Nobsdata ELSE 0 END) as _wden_{metric}")
         query = ("SELECT date, id_stn, " + ", ".join(select_extra) +
-                 " FROM moyenne GROUP BY date, id_stn;")
+                 " FROM moyenne WHERE channel IS NULL GROUP BY date, id_stn;")
         try:
             df = pd.read_sql_query(query, conn)
         except Exception as e:

{pikobs-3.0.331.dist-info → pikobs-3.0.332.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pikobs
-Version: 3.0.331
+Version: 3.0.332
 Summary: pikobs
 Home-page: https://gitlab.science.gc.ca/dlo001/pikobs
 Author: David Lobon

{pikobs-3.0.331.dist-info → pikobs-3.0.332.dist-info}/RECORD

@@ -42,8 +42,8 @@ pikobs/obscutoff/__init__.py,sha256=zBvprGRCin9W3w6_k-SZLJ-p-lZa82cqXr1aDIti-UE,
 pikobs/obscutoff/obscutoff.py,sha256=z78FWocYD8QZus6z5X4tQ738__K5q8_RxzngEm9N0iQ,40238
 pikobs/obscutoff/obscutoff_plot.py,sha256=AiqPI6IvViuzoVQzia9NK97lDHtsqcn0newN8MRjojQ,37858
 pikobs/obstimedb/__init__.py,sha256=0-sYoNyHDzRGXT1mzbU5Ek0hSGGlUXn84yx7lvE3qVk,56
-pikobs/obstimedb/obstimedb.py,sha256=XJo1D49-b6uWZjUSO2wV57IjOdf8vCCuUSvKFy2A78A,26478
-pikobs/obstimedb/obstimedb_plot.py,sha256=idsW_80Nlllc1LjtkQozsLvo4Za8xKaqXlNWOy2uCHE,68749
+pikobs/obstimedb/obstimedb.py,sha256=LQYwCV3rm5tJQZKj5hd9y7MH_D2TqJ2AEEFmM0nuXOM,27668
+pikobs/obstimedb/obstimedb_plot.py,sha256=1JZyZZzPW-dUfPMGUoWx9fM-DRaHVeXchm9RVlB4J-4,68771
 pikobs/pbs_submit/__init__.py,sha256=atE3cvhxT_mLdd7RFpRQEIicE0rhoqNMm1bqMtckqmA,26
 pikobs/pbs_submit/pbs_submit.py,sha256=UT8mZnLtCo2xSKW8IZVOsON2x_jIPjBTcpId5RTF6zo,9562
 pikobs/pikobsburp2rdb/__init__.py,sha256=gGD_XwalMfcunOvTeN4ogtTqBdL5HSOfdWhy6zdIr8E,31
@@ -73,7 +73,7 @@ pikobs/web/viewer.py,sha256=EZsFajvuyIcEoIcqnUAJ65gvqLgq69jqtGjUd4_RZIE,23372
 pikobs/zone/__init__.py,sha256=3crOJs1I5hf34SkRFtmDCXWwdAoYGuL52gG8QWuiN1Y,45
 pikobs/zone/zone.py,sha256=UtwUYKZgw9u6OKn2gRFw2m3Th8ChqMFkiO4OOG9FLrA,54443
 pikobs/zone/zone_plot.py,sha256=epESi90eeoofrqVDCkhjY6QMEyuH1WWbiPjAmNPwWe0,26773
-pikobs-3.0.331.dist-info/METADATA,sha256=6vGqbe3YN1ws4LlIMcQgGJ6HZ65QcHZbfsY0ysHhxGs,1059
-pikobs-3.0.331.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-pikobs-3.0.331.dist-info/top_level.txt,sha256=UAWCWWUoD-o_b3nFqEG6V0_v37qzVY7i_BPRhfMdnJ0,7
-pikobs-3.0.331.dist-info/RECORD,,
+pikobs-3.0.332.dist-info/METADATA,sha256=acD_bePcLiOXWxmwgCLBibBRWne5ec-5hQErZhBHF5c,1059
+pikobs-3.0.332.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+pikobs-3.0.332.dist-info/top_level.txt,sha256=UAWCWWUoD-o_b3nFqEG6V0_v37qzVY7i_BPRhfMdnJ0,7
+pikobs-3.0.332.dist-info/RECORD,,